diff --git a/i3lock.1 b/i3lock.1 index 6ec352c..8e3bf1e 100644 --- a/i3lock.1 +++ b/i3lock.1 @@ -197,8 +197,16 @@ Sets the color of the ring 'highlight' strokes that appear upon backspace. Sets the color of the 'separtor', which is at both ends of the ring highlights. .TP -.B \-\-textcolor=rrggbbaa -Sets the color of the status text ("verifying...", "wrong!", etc). +.B \-\-verifcolor=rrggbbaa +Sets the color of the status text while verifying. + +.TP +.B \-\-wrongcolor=rrggbbaa +Sets the color of the status text when "wrong". + +.TP +.B \-\-layoutcolor=rrggbbaa +Sets the color of the keyboard layout text. .TP .B \-\-indpos="x position:y position" @@ -227,14 +235,6 @@ Sets the color of the time in the clock. .B \-\-timestr="%H:%M:%S" Sets the format used for generating the time string. See strftime(3) for a full list of format specifiers. -.TP -.B \-\-timefont=sans-serif -Sets the font used to render the time string. - -.TP -.B \-\-timesize=number -Sets the font size for rendering the time string. Defaults to 32. - .TP .B \-\-timepos="x position:y position" Sets the position for the time string. All the variables from \-\-indpos may be used, in addition to: @@ -253,8 +253,8 @@ ch - the clock height. .RE .TP -.B \-\-time\-align, \-\-date\-align, \-\-layout\-align -Sets the text alignment of the time, date, and keyboard layout. Values are: +.B \-\-time\-align, \-\-date\-align, \-\-layout\-align, \-\-verif\-align, \-\-wrong\-align, \-\-modif\-align +Sets the text alignment of the time, date, keylayout, verification text, wrong text, and modifier text. .RS .RS @@ -274,13 +274,14 @@ Sets the color of the date in the clock. .TP .B \-\-datestr="%A, %m %Y" Sets the format used for generating the date string. See strftime(3) for a full list of format specifiers. + .TP -.B \-\-datefont=sans-serif -Sets the font used to render the date string. +.B \-\-{time, date, layout, verif, wrong}\-font=sans-serif +Sets the font used to render various strings. .TP -.B \-\-datesize=number -Sets the font size for rendering the date string. Defaults to 14. +.B \-\-{time, date, layout, verif, wrong}size=number +Sets the font size used to render various strings. .TP .B \-\-datepos="x position:y position" @@ -307,18 +308,14 @@ Sets the string to be shown while verifying the password/input/key/etc. Defaults .B \-\-wrongtext="text" Sets the string to be shown upon entering an incorrect password. Defaults to "wrong!". -.TP -.B \-\-textsize=number -The fontsize of the status text. Defaults to 28. - -.TP -.B \-\-modsize=number -The fontsize of the text listing all the active modifiers (caps lock, num lock, etc). Defaults to 14. - .TP .B \-\-radius The radius of the circle. Defaults to 90. +.TP +.B \-\-ring\-width +The width of the ring unlock indicator. Defaults to 7.0. + .TP .B \-\-bar\-indicator Replaces the usual ring indicator with a bar indicator, with a variety of options. diff --git a/i3lock.c b/i3lock.c index c9f339a..84e30a8 100644 --- a/i3lock.c +++ b/i3lock.c @@ -1085,6 +1085,8 @@ int main(int argc, char *argv[]) { {"verif-font", required_argument, NULL, 0}, {"wrong-font", required_argument, NULL, 0}, {"layout-font", required_argument, NULL, 0}, + {"verifsize", required_argument, NULL, 0}, + {"wrongsize", required_argument, NULL, 0}, {"timesize", required_argument, NULL, 0}, {"datesize", required_argument, NULL, 0}, {"layoutsize", required_argument, NULL, 0}, @@ -1097,8 +1099,6 @@ int main(int argc, char *argv[]) { {"veriftext", required_argument, NULL, 0}, {"wrongtext", required_argument, NULL, 0}, - {"verifsize", required_argument, NULL, 0}, - {"wrongsize", required_argument, NULL, 0}, {"modsize", required_argument, NULL, 0}, {"radius", required_argument, NULL, 0}, {"ring-width", required_argument, NULL, 0},