Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wizard: simplify instant prompt screen; make sure all screens work with 47x14 terminal size

Browse Source
pull/995/head
Roman Perepelitsa 4 years ago
parent 2a4c962c21
commit f2bf019758
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File

8
internal/configure.zsh
Unescape Escape View File

@ -1,5 +1,7 @@
typeset -gr __p9k_wizard_columns=51 # Fewer than 47 columns will probably work. Haven't tried it.
typeset -gr __p9k_wizard_lines=12 typeset -gr __p9k_wizard_columns=47
# The bottleneck is ask_tails with nerd fonts. Everything else works fine with 12 lines.
typeset -gr __p9k_wizard_lines=14
typeset -gr __p9k_zd=${ZDOTDIR:-$HOME} typeset -gr __p9k_zd=${ZDOTDIR:-$HOME}
typeset -gr __p9k_zd_u=${${${(q)__p9k_zd}/#(#b)${(q)HOME}(|\/*)/'~'$match[1]}//\%/%%} typeset -gr __p9k_zd_u=${${${(q)__p9k_zd}/#(#b)${(q)HOME}(|\/*)/'~'$match[1]}//\%/%%}
typeset -gr __p9k_zshrc=${${:-$__p9k_zd/.zshrc}:A} typeset -gr __p9k_zshrc=${${:-$__p9k_zd/.zshrc}:A}
@ -44,7 +46,7 @@ function _p9k_can_configure() {
done done
(( LINES >= __p9k_wizard_lines && COLUMNS >= __p9k_wizard_columns )) || { (( LINES >= __p9k_wizard_lines && COLUMNS >= __p9k_wizard_columns )) || {
$0_error "terminal size too small; must be at least $__p9k_wizard_columns x $__p9k_wizard_lines" $0_error "terminal size too small; must be at least $__p9k_wizard_columns columns by $__p9k_wizard_lines lines"
return 1 return 1
} }
[[ -t 0 && -t 1 ]] || { $0_error "no TTY"; return 2 } [[ -t 0 && -t 1 ]] || { $0_error "no TTY"; return 2 }

52
internal/wizard.zsh
Unescape Escape View File

@ -281,6 +281,7 @@ function quit() {
} }
local screen_widgets=() local screen_widgets=()
local -i max_priority
local -i prompt_idx local -i prompt_idx
local choice local choice
@ -289,6 +290,7 @@ function add_widget() {
shift shift
local render="${(j: :)${(@q)*}}" local render="${(j: :)${(@q)*}}"
screen_widgets+=("$priority" "$render") screen_widgets+=("$priority" "$render")
(( priority <= max_priority )) || max_priority=priority
} }
function render_screen_pass() { function render_screen_pass() {
@ -327,7 +329,7 @@ function render_screen() {
else else
break break
fi fi
while (( (COLUMNS > 88 ? 88 : COLUMNS) == wizard_columns && LINES == wizard_lines )); do while (( get_columns() == wizard_columns && LINES == wizard_lines )); do
sleep 1 sleep 1
done done
done done
@ -356,7 +358,7 @@ function render_screen() {
flowing -c %1FNot enough vertical space.%f flowing -c %1FNot enough vertical space.%f
print print
flowing Make terminal window %Btaller%b or press %BCtrl-C%b to abort Powerlevel10k configuration wizard. flowing Make terminal window %Btaller%b or press %BCtrl-C%b to abort Powerlevel10k configuration wizard.
while (( (COLUMNS > 88 ? 88 : COLUMNS) == wizard_columns && LINES == wizard_lines )); do while (( get_columns() == wizard_columns && LINES == wizard_lines )); do
sleep 1 sleep 1
done done
done done
@ -389,6 +391,7 @@ function ask() {
local -i lines columns wizard_lines wizard_columns local -i lines columns wizard_lines wizard_columns
add_widget 0 print -P "(q) Quit and do nothing." add_widget 0 print -P "(q) Quit and do nothing."
add_widget 0 print add_widget 0 print
add_widget $((max_priority + 1))
add_widget 0 print -P "%BChoice [${choices}q]: %b" add_widget 0 print -P "%BChoice [${choices}q]: %b"
while true; do while true; do
=true =true
@ -404,6 +407,7 @@ function ask() {
fi fi
if [[ $choices == *$choice* ]]; then if [[ $choices == *$choice* ]]; then
screen_widgets=() screen_widgets=()
max_priority=0
prompt_idx=0 prompt_idx=0
return return
fi fi
@ -666,13 +670,13 @@ function ask_diamond() {
add_widget 0 print add_widget 0 print
add_widget 0 flowing -c -- "---> \uE0B2\uE0B0 <---" add_widget 0 flowing -c -- "---> \uE0B2\uE0B0 <---"
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 3
add_widget 0 print -P "%B(y) Yes.%b" add_widget 0 print -P "%B(y) Yes.%b"
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 1
add_widget 0 print -P "%B(n) No.%b" add_widget 0 print -P "%B(n) No.%b"
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 2
if (( can_install_font )); then if (( can_install_font )); then
extra+=r extra+=r
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
@ -694,10 +698,13 @@ function ask_lock() {
add_widget 0 print add_widget 0 print
add_widget 0 flowing -c -- "---> $1 <---" add_widget 0 flowing -c -- "---> $1 <---"
add_widget 0 print add_widget 0 print
add_widget 3
add_widget 0 print -P "%B(y) Yes.%b" add_widget 0 print -P "%B(y) Yes.%b"
add_widget 0 print add_widget 0 print
add_widget 1
add_widget 0 print -P "%B(n) No.%b" add_widget 0 print -P "%B(n) No.%b"
add_widget 0 print add_widget 0 print
add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask ynr ask ynr
case $choice in case $choice in
@ -714,10 +721,13 @@ function ask_python() {
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 0 flowing -c -- "---> \uE63C <---" add_widget 0 flowing -c -- "---> \uE63C <---"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 3
add_widget 0 print -P "%B(y) Yes.%b" add_widget 0 print -P "%B(y) Yes.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 1
add_widget 0 print -P "%B(n) No.%b" add_widget 0 print -P "%B(n) No.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask ynr ask ynr
case $choice in case $choice in
@ -733,10 +743,13 @@ function ask_arrow() {
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 0 flowing -c -- "---> \u276F\u276E <---" add_widget 0 flowing -c -- "---> \u276F\u276E <---"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 3
add_widget 0 print -P "%B(y) Yes.%b" add_widget 0 print -P "%B(y) Yes.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 1
add_widget 0 print -P "%B(n) No.%b" add_widget 0 print -P "%B(n) No.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask ynr ask ynr
case $choice in case $choice in
@ -753,10 +766,13 @@ function ask_debian() {
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 0 flowing -c -- "---> \uF306 <---" add_widget 0 flowing -c -- "---> \uF306 <---"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 3
add_widget 0 print -P "%B(y) Yes.%b" add_widget 0 print -P "%B(y) Yes.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 1
add_widget 0 print -P "%B(n) No.%b" add_widget 0 print -P "%B(n) No.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask ynr ask ynr
case $choice in case $choice in
@ -787,10 +803,13 @@ function ask_icon_padding() {
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 0 flowing -c -- "---> $text <---" add_widget 0 flowing -c -- "---> $text <---"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 3
add_widget 0 flowing +c -i 5 "%B(y) Yes." Icons are very close to the crosses but there is "%b%2Fno overlap%f%B.%b" add_widget 0 flowing +c -i 5 "%B(y) Yes." Icons are very close to the crosses but there is "%b%2Fno overlap%f%B.%b"
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 1
add_widget 0 flowing +c -i 5 "%B(n) No." Some icons "%b%2Foverlap%f%B" neighbouring crosses.%b add_widget 0 flowing +c -i 5 "%B(n) No." Some icons "%b%2Foverlap%f%B" neighbouring crosses.%b
add_widget 0 print -P "" add_widget 0 print -P ""
add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask ynr ask ynr
case $choice in case $choice in
@ -1392,16 +1411,16 @@ function ask_empty_line() {
add_widget 0 print -P "%B(1) Compact.%b" add_widget 0 print -P "%B(1) Compact.%b"
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 1
add_widget 0 print_prompt add_prompt_n
add_widget 0 print_prompt add_prompt_n
add_widget 0 print add_widget 0 print
add_widget 2 add_widget 2
add_widget 0 print -P "%B(2) Sparse.%b" add_widget 0 print -P "%B(2) Sparse.%b"
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 1
add_widget 0 print_prompt add_prompt_n
add_widget 0 print add_widget 0 print
add_widget 0 print_prompt add_prompt_n
add_widget 0 print add_widget 0 print
add_widget 2 add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
@ -1437,27 +1456,24 @@ function ask_instant_prompt() {
add_widget 1 add_widget 1
add_widget 0 print add_widget 0 print
add_widget 2 add_widget 2
add_widget 0 flowing +c -i 5 "%B(1) Off.%b" Disable instant prompt. Choose this if you\'ve \ add_widget 0 flowing +c -i 5 "%B(1) Verbose (recommended).%b"
tried instant prompt and found it incompatible with your zsh configuration files.
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 1
add_widget 0 flowing +c -i 5 "%B(2) Quiet.%b" Enable instant prompt and %Bdon\'t print \ add_widget 0 flowing +c -i 5 "%B(2) Quiet.%b" Choose this if you\'ve read and understood \
warnings%b when detecting console output during zsh initialization. Choose this if you\'ve \ instant prompt documentation.
read and understood instant prompt documentation.
add_widget 0 print add_widget 0 print
add_widget 1 add_widget 1
add_widget 0 flowing +c -i 5 "%B(3) Verbose.%b" Enable instant prompt and %Bprint a warning%b \ add_widget 0 flowing +c -i 5 "%B(3) Off.%b" Choose this if you\'ve tried instant prompt \
when detecting console output during zsh initialization. %BChoose this if you\'ve never tried \ and found it incompatible with your zsh configuration files.
instant prompt, haven\'t seen the warning, or if you are unsure what this all means%b.
add_widget 0 print add_widget 0 print
add_widget 2 add_widget 2
add_widget 0 print -P "(r) Restart from the beginning." add_widget 0 print -P "(r) Restart from the beginning."
ask 123r ask 123r
case $choice in case $choice in
r) return 1;; r) return 1;;
1) instant_prompt=off; options+=instant_prompt=off;; 1) instant_prompt=verbose; options+=instant_prompt=verbose;;
2) instant_prompt=quiet; options+=instant_prompt=quiet;; 2) instant_prompt=quiet; options+=instant_prompt=quiet;;
3) instant_prompt=verbose; options+=instant_prompt=verbose;; 3) instant_prompt=off; options+=instant_prompt=off;;
esac esac
return 0 return 0
} }

Write Preview
Loading…
Cancel
Save