commit 1d8ad45302fa0d1de416731e757c8f41efb6221b
parent 1eba26c25b8bd160b16f8d35de86cf61a1684c66
Author: Raymond Li <hi@raymond.li>
Date: Fri, 28 May 2021 18:09:06 -0400
Merge branch 'master' into modifcolor
Diffstat:
3 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/examples/lock.sh b/examples/lock.sh
@@ -8,29 +8,29 @@ W='#880000bb' # wrong
V='#bb00bbbb' # verifying
i3lock \
---insidevercolor=$C \
---ringvercolor=$V \
+--insidever-color=$C \
+--ringver-color=$V \
\
---insidewrongcolor=$C \
---ringwrongcolor=$W \
+--insidewrong-color=$C \
+--ringwrong-color=$W \
\
---insidecolor=$B \
---ringcolor=$D \
---linecolor=$B \
---separatorcolor=$D \
+--inside-color=$B \
+--ring-color=$D \
+--line-color=$B \
+--separator-color=$D \
\
---verifcolor=$T \
---wrongcolor=$T \
---timecolor=$T \
---datecolor=$T \
---layoutcolor=$T \
---keyhlcolor=$W \
---bshlcolor=$W \
+--verif-color=$T \
+--wrong-color=$T \
+--time-color=$T \
+--date-color=$T \
+--layout-color=$T \
+--keyhl-color=$W \
+--bshl-color=$W \
\
--screen 1 \
--blur 5 \
--clock \
--indicator \
---timestr="%H:%M:%S" \
---datestr="%A, %m %Y" \
+--time-str="%H:%M:%S" \
+--date-str="%A, %m %Y" \
--keylayout 1 \
diff --git a/examples/lock_bar.sh b/examples/lock_bar.sh
@@ -10,29 +10,29 @@ V='#bb00bbbb' # verifying
i3lock \
--blur 5 \
--bar-indicator \
---bar-position y+h \
+--bar-pos y+h \
--bar-direction 1 \
--bar-max-height 50 \
--bar-base-width 50 \
--bar-color 000000cc \
---keyhlcolor 880088cc \
+--keyhl-color 880088cc \
--bar-periodic-step 50 \
--bar-step 50 \
--redraw-thread \
\
--clock \
--force-clock \
---timepos x+5:y+h-80 \
---timecolor 880088ff \
---datepos tx:ty+15 \
---datecolor 990099ff \
+--time-pos x+5:y+h-80 \
+--time-color 880088ff \
+--date-pos tx:ty+15 \
+--date-color 990099ff \
--date-align 1 \
--time-align 1 \
---ringvercolor 8800ff88 \
---ringwrongcolor ff008888 \
---statuspos x+5:y+h-16 \
+--ringver-color 8800ff88 \
+--ringwrong-color ff008888 \
+--status-pos x+5:y+h-16 \
--verif-align 1 \
--wrong-align 1 \
---verifcolor ffffffff \
---wrongcolor ffffffff \
---modifpos -50:-50
+--verif-color ffffffff \
+--wrong-color ffffffff \
+--modif-pos -50:-50
diff --git a/i3lock.1 b/i3lock.1
@@ -184,7 +184,9 @@ The width of the ring unlock indicator. Defaults to 7.0.
.TP
.B \-\-{inside, ring}\-color=rrggbbaa
-Sets the idle color for the interior circle and ring.
+Sets the idle color for the interior circle and ring. Note: use individual
+options per element unless the shell supports brace expansion (in which case
+remove the spaces inside the curly braces).
.TP
.B \-\-{inside, ring}ver\-color=rrggbbaa
@@ -200,7 +202,7 @@ Sets the color for the line separating the inside circle and the outer ring.
.TP
.B \-\-line\-uses\-{inside, ring}
-Overrides \-\-linecolor. The line will match the {inside, ring} color.
+Overrides \-\-line\-color. The line will match the {inside, ring} color.
Note: these two options conflict with each other.
.TP
@@ -313,7 +315,7 @@ r - the unlock indicator radius.
.TP
.B \-\-time\-pos="x\-position:y\-position"
-Sets the position for the time string. All the variables from \-\-indpos may be
+Sets the position for the time string. All the variables from \-\-ind\-pos may be
used, in addition to:
.RS
.RS
@@ -324,8 +326,8 @@ iy - the y value of the indicator on the current display.
.TP
.B \-\-date\-pos="x\-position:y\-position"
-Sets the position for the date string. All the variables from \-\-indpos and
-\-\-timepos may be used, in addition to:
+Sets the position for the date string. All the variables from \-\-ind\-pos and
+\-\-time\-pos may be used, in addition to:
.RS
.RS
tx - the computed x value of the timestring, for the current display.
@@ -335,8 +337,8 @@ ty - the computed y value of the timestring, for the current display.
.TP
.B \-\-greeter\-pos="x\-position:y\-position"
-Sets the position for the greeter string. All the variables from \-\-indpos and
-\-\-timepos may be used.
+Sets the position for the greeter string. All the variables from \-\-ind\-pos and
+\-\-time\-pos may be used.
.TP
.B \-\-pass\-{media, screen, power, volume}\-keys
