Hello community, here is the log from the commit of package swaylock for openSUSE:Factory checked in at 2020-01-23 15:55:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swaylock (Old) and /work/SRC/openSUSE:Factory/.swaylock.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swaylock" Thu Jan 23 15:55:04 2020 rev:3 rq:766522 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/swaylock/swaylock.changes 2019-05-24 11:31:38.661402459 +0200 +++ /work/SRC/openSUSE:Factory/.swaylock.new.26092/swaylock.changes 2020-01-23 15:55:14.711105649 +0100 @@ -1,0 +2,17 @@ +Thu Jan 23 08:56:15 UTC 2020 - Michael Vetter <[email protected]> + +- Update to 1.5: + * Add option to show indicator even if idle + * fish-completion: use the correct fallback directory + * Submit password by pressing Ctrl+m + * Fix indicator position + * Add option to adjust ring position via CLI arguments and the config file + * Add fixed font-size option for indicator + * Fix, clean up and sync docs and completions + * Bug fixes +- Refresh swaylock-version.patch + See https://github.com/swaywm/swaylock/pull/128 +- Mark pam.d/swaylock a config file +- Update fish path + +------------------------------------------------------------------- Old: ---- 1.4.tar.gz New: ---- 1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swaylock.spec ++++++ --- /var/tmp/diff_new_pack.TkwAiK/_old 2020-01-23 15:55:16.767106759 +0100 +++ /var/tmp/diff_new_pack.TkwAiK/_new 2020-01-23 15:55:16.771106761 +0100 @@ -1,7 +1,7 @@ # # spec file for package swaylock # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: swaylock -Version: 1.4 +Version: 1.5 Release: 0 Summary: Screen locker for Wayland License: MIT Group: System/GUI/Other URL: https://github.com/swaywm/swaylock Source0: https://github.com/swaywm/swaylock/archive/%{version}.tar.gz +# https://github.com/swaywm/swaylock/pull/128 Patch0: swaylock-version.patch BuildRequires: meson >= 0.48.0 BuildRequires: pam-devel @@ -84,7 +85,7 @@ %files %{_bindir}/swaylock -%{_sysconfdir}/pam.d/swaylock +%config %{_sysconfdir}/pam.d/swaylock %{_mandir}/man1/swaylock.1%{?ext_man} %files bash-completion @@ -93,7 +94,7 @@ %files fish-completion %dir %{_datadir}/fish/ -%{_datadir}/fish/completions +%{_datadir}/fish/vendor_completions.d/ %files zsh-completion %dir %{_datadir}/zsh/ ++++++ 1.4.tar.gz -> 1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/completions/bash/swaylock new/swaylock-1.5/completions/bash/swaylock --- old/swaylock-1.4/completions/bash/swaylock 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/completions/bash/swaylock 2020-01-22 17:19:47.000000000 +0100 @@ -6,25 +6,78 @@ _get_comp_words_by_ref -n : cur prev short=( - -h + -C -c + -d + -e + -f + -F + -h + -i + -k + -K + -L + -l + -n + -r -s -t - -v - -i -u - -f + -v ) long=( - --help + --bs-hl-color + --caps-lock-bs-hl-color + --caps-lock-key-hl-color --color + --config + --daemonize + --debug + --disable-caps-lock-text + --font + --font-size + --help + --hide-keyboard-layout + --ignore-empty-password + --image + --indicator-caps-lock + --indicator-idle-visible + --indicator-radius + --indicator-thickness + --inside-caps-lock-color + --inside-clear-color + --inside-color + --inside-ver-color + --inside-wrong-color + --key-hl-color + --layout-bg-color + --layout-border-color + --layout-text-color + --line-caps-lock-color + --line-clear-color + --line-color + --line-uses-inside + --line-uses-ring + --line-ver-color + --line-wrong-color + --no-unlock-indicator + --ring-caps-lock-color + --ring-clear-color + --ring-color + --ring-ver-color + --ring-wrong-color --scaling + --separator-color + --show-failed-attempts + --show-keyboard-layout + --text-caps-lock-color + --text-clear-color + --text-color + --text-ver-color + --text-wrong-color --tiling --version - --image - --no-unlock-indicator - --daemonize ) scaling=( @@ -33,6 +86,7 @@ 'fit' 'center' 'tile' + 'solid_color' ) case $prev in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/completions/fish/swaylock.fish new/swaylock-1.5/completions/fish/swaylock.fish --- old/swaylock-1.4/completions/fish/swaylock.fish 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/completions/fish/swaylock.fish 2020-01-22 17:19:47.000000000 +0100 @@ -1,39 +1,53 @@ # swaylock(1) completion -complete -c swaylock -s C -l config --description 'The config file to use. Default: $HOME/.swaylock/config, $XDG_CONFIG_HOME/swaylock/config, and SYSCONFDIR/swaylock/config.' -complete -c swaylock -s h -l help --description "Show help message and quit." -complete -c swaylock -s f -l daemonize --description "Fork into the background after spawning. Note: this is the default bahavior of i3lock." -complete -c swaylock -s v -l version --description "Show the version number and quit." -complete -c swaylock -s s -l socket --description "Use the specified socket path. Otherwise, swaymsg will as sway where the socket is (which is the value of $SWAYSOCK, then of $I350CK)." -complete -c swaylock -s e -l ignore-empty-password --description 'When an empty password is provided by the user, do not validate it.' - -# Appearance -complete -c swaylock -s u -l no-unlock-indicator --description "Disable the unlock indicator." -complete -c swaylock -s i -l image --description "Display the given image, optionally on the given output. Use -c to set a background color." -complete -c swaylock -s s -l scaling --description "Scaling mode for images: stretch, fill, fit, center, or tile." -complete -c swaylock -s t -l tiling --description "Same as --scaling=tile." -complete -c swaylock -s c -l color --description "Turn the screen into the given color. If -i is used, this sets the background of the image into the given color. Defaults to white (ffffff), or transparent (00000000) if an image is in use." -complete -c swaylock -l bs-hl-color --description 'Sets the color of backspace highlight segments.' -complete -c swaylock -l font --description 'Sets the font of the text inside the indicator.' -complete -c swaylock -l indicator-radius --description 'Sets the radius of the indicator to radius pixels. Default: 50' -complete -c swaylock -l indicator-thickness --description 'Sets the thickness of the indicator to thickness pixels. Default: 10' -complete -c swaylock -l inside-color --description 'Sets the color of the inside of the indicator when typing or idle.' -complete -c swaylock -l inside-clear-color --description 'Sets the color of the inside of the indicator when cleared.' -complete -c swaylock -l inside-ver-color --description 'Sets the color of the inside of the indicator when verifying.' -complete -c swaylock -l inside-wrong-color --description 'Sets the color of the inside of the indicator when invalid.' -complete -c swaylock -l key-hl-color --description 'Sets the color of key press highlight segments.' -complete -c swaylock -l line-color --description 'Sets the color of the lines that separate the inside and outside of the indicator when typing or idle.' -complete -c swaylock -l line-clear-color --description 'Sets the color of the lines that separate the inside and outside of the indicator when cleared.' -complete -c swaylock -l line-ver-color --description 'Sets the color of the lines that separate the inside and outside of the indicator when verifying.' -complete -c swaylock -l line-wrong-color --description 'Sets the color of the lines that separate the inside and outside of the indicator when invalid.' -complete -c swaylock -s n -l line-uses-inside --description 'Use the color of the inside of the indicator for the line separating the inside and outside of the indicator.' -complete -c swaylock -s r -l line-uses-ring --description 'Use the outer ring\'s color for the line separating the inside and outside of the indicator.' -complete -c swaylock -l ring-color --description 'Sets the color of the outside of the indicator when typing or idle.' -complete -c swaylock -l ring-clear-color --description 'Sets the color of the outside of the indicator when cleared.' -complete -c swaylock -l ring-ver-color --description 'Sets the color of the outside of the indicator when verifying.' -complete -c swaylock -l ring-wrong-color --description 'Sets the color of the outside of the indicator when invalid.' -complete -c swaylock -l separator-color --description 'Sets the color of the lines that separate highlight segments.' -complete -c swaylock -l text-color --description 'Sets the color of the text inside the indicator when typing or idle.' -complete -c swaylock -l text-clear-color --description 'Sets the color of the text inside the indicator when cleared.' -complete -c swaylock -l text-ver-color --description 'Sets the color of the text inside the indicator when verifying.' -complete -c swaylock -l text-wrong-color --description 'Sets the color of the text inside the indicator when invalid.' +complete -c swaylock -l bs-hl-color --description "Sets the color of backspace highlight segments." +complete -c swaylock -l caps-lock-bs-hl-color --description "Sets the color of backspace highlight segments when Caps Lock is active." +complete -c swaylock -l caps-lock-key-hl-color --description "Sets the color of the key press highlight segments when Caps Lock is active." +complete -c swaylock -l color -s c --description "Turn the screen into the given color instead of white." +complete -c swaylock -l config -s C --description "Path to the config file." +complete -c swaylock -l daemonize -s f --description "Detach from the controlling terminal after locking." +complete -c swaylock -l debug -s d --description "Enable debugging output." +complete -c swaylock -l disable-caps-lock-text -s L --description "Disable the Caps Lock text." +complete -c swaylock -l font --description "Sets the font of the text." +complete -c swaylock -l font-size --description "Sets a fixed font size for the indicator text." +complete -c swaylock -l help -s h --description "Show help message and quit." +complete -c swaylock -l hide-keyboard-layout -s K --description "Hide the current xkb layout while typing." +complete -c swaylock -l ignore-empty-password -s e --description "When an empty password is provided, do not validate it." +complete -c swaylock -l image -s i --description "Display the given image, optionally only on the given output." +complete -c swaylock -l indicator-caps-lock -s l --description "Show the current Caps Lock state also on the indicator." +complete -c swaylock -l indicator-idle-visible --description "Sets the indicator to show even if idle." +complete -c swaylock -l indicator-radius --description "Sets the indicator radius." +complete -c swaylock -l indicator-thickness --description "Sets the indicator thickness." +complete -c swaylock -l inside-caps-lock-color --description "Sets the color of the inside of the indicator when Caps Lock is active." +complete -c swaylock -l inside-clear-color --description "Sets the color of the inside of the indicator when cleared." +complete -c swaylock -l inside-color --description "Sets the color of the inside of the indicator." +complete -c swaylock -l inside-ver-color --description "Sets the color of the inside of the indicator when verifying." +complete -c swaylock -l inside-wrong-color --description "Sets the color of the inside of the indicator when invalid." +complete -c swaylock -l key-hl-color --description "Sets the color of the key press highlight segments." +complete -c swaylock -l layout-bg-color --description "Sets the background color of the box containing the layout text." +complete -c swaylock -l layout-border-color --description "Sets the color of the border of the box containing the layout text." +complete -c swaylock -l layout-text-color --description "Sets the color of the layout text." +complete -c swaylock -l line-caps-lock-color --description "Sets the color of the line between the inside and ring when Caps Lock is active." +complete -c swaylock -l line-clear-color --description "Sets the color of the line between the inside and ring when cleared." +complete -c swaylock -l line-color --description "Sets the color of the line between the inside and ring." +complete -c swaylock -l line-uses-inside -s n --description "Use the inside color for the line between the inside and ring." +complete -c swaylock -l line-uses-ring -s r --description "Use the ring color for the line between the inside and ring." +complete -c swaylock -l line-ver-color --description "Sets the color of the line between the inside and ring when verifying." +complete -c swaylock -l line-wrong-color --description "Sets the color of the line between the inside and ring when invalid." +complete -c swaylock -l no-unlock-indicator -s u --description "Disable the unlock indicator." +complete -c swaylock -l ring-caps-lock-color --description "Sets the color of the ring of the indicator when Caps Lock is active." +complete -c swaylock -l ring-clear-color --description "Sets the color of the ring of the indicator when cleared." +complete -c swaylock -l ring-color --description "Sets the color of the ring of the indicator." +complete -c swaylock -l ring-ver-color --description "Sets the color of the ring of the indicator when verifying." +complete -c swaylock -l ring-wrong-color --description "Sets the color of the ring of the indicator when invalid." +complete -c swaylock -l scaling -s s --description "Image scaling mode: stretch, fill, fit, center, tile, solid_color." +complete -c swaylock -l separator-color --description "Sets the color of the lines that separate highlight segments." +complete -c swaylock -l show-failed-attempts -s F --description "Show current count of failed authentication attempts." +complete -c swaylock -l show-keyboard-layout -s k --description "Display the current xkb layout while typing." +complete -c swaylock -l text-caps-lock-color --description "Sets the color of the text when Caps Lock is active." +complete -c swaylock -l text-clear-color --description "Sets the color of the text when cleared." +complete -c swaylock -l text-color --description "Sets the color of the text." +complete -c swaylock -l text-ver-color --description "Sets the color of the text when verifying." +complete -c swaylock -l text-wrong-color --description "Sets the color of the text when invalid." +complete -c swaylock -l tiling -s t --description "Same as --scaling=tile." +complete -c swaylock -l version -s v --description "Show the version number and quit." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/completions/zsh/_swaylock new/swaylock-1.5/completions/zsh/_swaylock --- old/swaylock-1.4/completions/zsh/_swaylock 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/completions/zsh/_swaylock 2020-01-22 17:19:47.000000000 +0100 @@ -4,37 +4,54 @@ # _arguments -s \ - '(-C --config)'{-C,--config}'[Path to the config file]:filename:_files' \ - '(-c --color)'{-c,--color}'[Turn the screen into the given color instead of white]:color:' \ - '(-e --ignore-empty-password)'{-e,--ignore-empty-password}'[When an empty password is provided, do not validate it]' \ - '(-f --daemonize)'{-f,--daemonize}'[Detach from the controlling terminal after locking]' \ - '(-h --help)'{-h,--help}'[Show help message and quit]' \ - '(-i --image)'{-i,--image}'[Display an image]:filename:_files' \ - '(-s --scaling)'{-s,--scaling}'[Scaling mode]:mode:(stretch fill fit center tile)' \ - '(-t --tiling)'{-t,--tiling}'[Same as --scaling=tile]' \ - '(-u --no-unlock-indicator)'{-u,--no-unlock-indicator}'[Disable the unlock indicator]' \ - '(-v --version)'{-v,--version}'[Show the version number and quit]' \ - '(--bs-hl-color)'--bs-hl-color'[Sets the color of backspace highlights segments]:color:' \ + '(--bs-hl-color)'--bs-hl-color'[Sets the color of backspace highlight segments]:color:' \ + '(--caps-lock-bs-hl-color)'--caps-lock-bs-hl-color'[Sets the color of backspace highlight segments when Caps Lock is active]:color:' \ + '(--caps-lock-key-hl-color)'--caps-lock-key-hl-color'[Sets the color of the key press highlight segments when Caps Lock is active]:color:' \ + '(--color -c)'{--color,-c}'[Turn the screen into the given color instead of white]:color:' \ + '(--config -C)'{--config,-C}'[Path to the config file]:filename:_files' \ + '(--daemonize -f)'{--daemonize,-f}'[Detach from the controlling terminal after locking]' \ + '(--debug -d)'{--debug,-d}'[Enable debugging output]' \ + '(--disable-caps-lock-text -L)'{--disable-caps-lock-text,-L}'[Disable the Caps Lock text]' \ '(--font)'--font'[Sets the font of the text]:font:' \ + '(--font-size)'--font-size'[Sets a fixed font size for the indicator text]' \ + '(--help -h)'{--help,-h}'[Show help message and quit]' \ + '(--hide-keyboard-layout -K)'{--hide-keyboard-layout,-K}'[Hide the current xkb layout while typing]' \ + '(--ignore-empty-password -e)'{--ignore-empty-password,-e}'[When an empty password is provided, do not validate it]' \ + '(--image -i)'{--image,-i}'[Display the given image, optionally only on the given output]:filename:_files' \ + '(--indicator-caps-lock -l)'{--indicator-caps-lock,-l}'[Show the current Caps Lock state also on the indicator]' \ + '(--indicator-idle-visible)'--indicator-idle-visible'[Sets the indicator to show even if idle]' \ '(--indicator-radius)'--indicator-radius'[Sets the indicator radius]:radius:' \ '(--indicator-thickness)'--indicator-thickness'[Sets the indicator thickness]:thickness:' \ - '(--inside-color)'--inside-color'[Sets the color of the inside of the indicator]:color:' \ + '(--inside-caps-lock-color)'--inside-caps-lock-color'[Sets the color of the inside of the indicator when Caps Lock is active]:color:' \ '(--inside-clear-color)'--inside-clear-color'[Sets the color of the inside of the indicator when cleared]:color:' \ - '(--inside-clear-color)'--inside-clear-color'[Sets the color of the inside of the indicator when verifying]:color:' \ + '(--inside-color)'--inside-color'[Sets the color of the inside of the indicator]:color:' \ + '(--inside-ver-color)'--inside-ver-color'[Sets the color of the inside of the indicator when verifying]:color:' \ '(--inside-wrong-color)'--inside-wrong-color'[Sets the color of the inside of the indicator when invalid]:color:' \ '(--key-hl-color)'--key-hl-color'[Sets the color of the key press highlight segments]:color:' \ - '(--line-color)'--line-color'[Sets the color of the line between the inside and ring]:color:' \ + '(--layout-bg-color)'--layout-bg-color'[Sets the background color of the box containing the layout text]:color:' \ + '(--layout-border-color)'--layout-border-color'[Sets the color of the border of the box containing the layout text]:color:' \ + '(--layout-text-color)'--layout-text-color'[Sets the color of the layout text]:color:' \ + '(--line-caps-lock-color)'--line-caps-lock-color'[Sets the color of the line between the inside and ring when Caps Lock is active]:color:' \ '(--line-clear-color)'--line-clear-color'[Sets the color of the line between the inside and ring when cleared]:color:' \ + '(--line-color)'--line-color'[Sets the color of the line between the inside and ring]:color:' \ + '(--line-uses-inside -n)'{--line-uses-inside,-n}'[Use the inside color for the line between the inside and ring]' \ + '(--line-uses-ring -r)'{--line-uses-ring,-r}'[Use the ring color for the line between the inside and ring]' \ '(--line-ver-color)'--line-ver-color'[Sets the color of the line between the inside and ring when verifying]:color:' \ '(--line-wrong-color)'--line-wrong-color'[Sets the color of the line between the inside and ring when invalid]:color:' \ - '(-n --line-uses-inside)'{-n,--line-uses-inside}'[Use the inside color for the line between the inside and ring]' \ - '(-r --line-uses-ring)'{-r,--line--uses-ring}'[Use the ring color for the line between the inside and ring]' \ - '(--ring-color)'--ring-color'[Sets the color of the ring of the indicator]:color:' \ + '(--no-unlock-indicator -u)'{--no-unlock-indicator,-u}'[Disable the unlock indicator]' \ + '(--ring-caps-lock-color)'--ring-caps-lock-color'[Sets the color of the ring of the indicator when Caps Lock is active]:color:' \ '(--ring-clear-color)'--ring-clear-color'[Sets the color of the ring of the indicator when cleared]:color:' \ + '(--ring-color)'--ring-color'[Sets the color of the ring of the indicator]:color:' \ '(--ring-ver-color)'--ring-ver-color'[Sets the color of the ring of the indicator when verifying]:color:' \ '(--ring-wrong-color)'--ring-wrong-color'[Sets the color of the ring of the indicator when invalid]:color:' \ + '(--scaling -s)'{--scaling,-s}'[Image scaling mode: stretch, fill, fit, center, tile, solid_color]:mode:(stretch fill fit center tile solid_color)' \ '(--separator-color)'--separator-color'[Sets the color of the lines that separate highlight segments]:color:' \ - '(--text-color)'--text-color'[Sets the color of the text]:color:' \ + '(--show-failed-attempts -F)'{--show-failed-attempts,-F}'[Show current count of failed authentication attempts]' \ + '(--show-keyboard-layout -k)'{--show-keyboard-layout,-k}'[Display the current xkb layout while typing]' \ + '(--text-caps-lock-color)'--text-caps-lock-color'[Sets the color of the text when Caps Lock is active]:color:' \ '(--text-clear-color)'--text-clear-color'[Sets the color of the text when cleared]:color:' \ + '(--text-color)'--text-color'[Sets the color of the text]:color:' \ '(--text-ver-color)'--text-ver-color'[Sets the color of the text when verifying]:color:' \ - '(--text-wrong-color)'--text-wrong-color'[Sets the color of the text when invalid]:color:' \ No newline at end of file + '(--text-wrong-color)'--text-wrong-color'[Sets the color of the text when invalid]:color:' \ + '(--tiling -t)'{--tiling,-t}'[Same as --scaling=tile]' \ + '(--version -v)'{--version,-v}'[Show the version number and quit]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/include/swaylock.h new/swaylock-1.5/include/swaylock.h --- old/swaylock-1.4/include/swaylock.h 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/include/swaylock.h 2020-01-22 17:19:47.000000000 +0100 @@ -47,8 +47,13 @@ struct swaylock_colors colors; enum background_mode mode; char *font; + uint32_t font_size; uint32_t radius; uint32_t thickness; + uint32_t indicator_x_position; + uint32_t indicator_y_position; + bool override_indicator_x_position; + bool override_indicator_y_position; bool ignore_empty; bool show_indicator; bool show_caps_lock_text; @@ -57,6 +62,7 @@ bool hide_keyboard_layout; bool show_failed_attempts; bool daemonize; + bool indicator_idle_visible; }; struct swaylock_password { @@ -100,6 +106,7 @@ struct pool_buffer *current_buffer; bool frame_pending, dirty; uint32_t width, height; + uint32_t indicator_width, indicator_height; int32_t scale; enum wl_output_subpixel subpixel; char *output_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/loop.c new/swaylock-1.5/loop.c --- old/swaylock-1.4/loop.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/loop.c 2020-01-22 17:19:47.000000000 +0100 @@ -1,4 +1,4 @@ -#define _POSIX_C_SOURCE 200112L +#define _POSIX_C_SOURCE 200809L #include <limits.h> #include <string.h> #include <stdbool.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/main.c new/swaylock-1.5/main.c --- old/swaylock-1.4/main.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/main.c 2020-01-22 17:19:47.000000000 +0100 @@ -168,6 +168,8 @@ struct swaylock_surface *surface = data; surface->width = width; surface->height = height; + surface->indicator_width = 1; + surface->indicator_height = 1; zwlr_layer_surface_v1_ack_configure(layer_surface, serial); render_frame_background(surface); render_frame(surface); @@ -504,7 +506,11 @@ LO_CAPS_LOCK_BS_HL_COLOR, LO_CAPS_LOCK_KEY_HL_COLOR, LO_FONT, + LO_FONT_SIZE, + LO_IND_IDLE_VISIBLE, LO_IND_RADIUS, + LO_IND_X_POSITION, + LO_IND_Y_POSITION, LO_IND_THICKNESS, LO_INSIDE_COLOR, LO_INSIDE_CLEAR_COLOR, @@ -544,7 +550,6 @@ {"disable-caps-lock-text", no_argument, NULL, 'L'}, {"indicator-caps-lock", no_argument, NULL, 'l'}, {"line-uses-inside", no_argument, NULL, 'n'}, - {"socket", required_argument, NULL, 'p'}, {"line-uses-ring", no_argument, NULL, 'r'}, {"scaling", required_argument, NULL, 's'}, {"tiling", no_argument, NULL, 't'}, @@ -557,8 +562,12 @@ {"caps-lock-bs-hl-color", required_argument, NULL, LO_CAPS_LOCK_BS_HL_COLOR}, {"caps-lock-key-hl-color", required_argument, NULL, LO_CAPS_LOCK_KEY_HL_COLOR}, {"font", required_argument, NULL, LO_FONT}, + {"font-size", required_argument, NULL, LO_FONT_SIZE}, + {"indicator-idle-visible", no_argument, NULL, LO_IND_IDLE_VISIBLE}, {"indicator-radius", required_argument, NULL, LO_IND_RADIUS}, {"indicator-thickness", required_argument, NULL, LO_IND_THICKNESS}, + {"indicator-x-position", required_argument, NULL, LO_IND_X_POSITION}, + {"indicator-y-position", required_argument, NULL, LO_IND_Y_POSITION}, {"inside-color", required_argument, NULL, LO_INSIDE_COLOR}, {"inside-clear-color", required_argument, NULL, LO_INSIDE_CLEAR_COLOR}, {"inside-caps-lock-color", required_argument, NULL, LO_INSIDE_CAPS_LOCK_COLOR}, @@ -605,7 +614,7 @@ " -h, --help " "Show help message and quit.\n" " -i, --image [[<output>]:]<path> " - "Display the given image.\n" + "Display the given image, optionally only on the given output.\n" " -k, --show-keyboard-layout " "Display the current xkb layout while typing.\n" " -K, --hide-keyboard-layout " @@ -615,7 +624,7 @@ " -l, --indicator-caps-lock " "Show the current Caps Lock state also on the indicator.\n" " -s, --scaling <mode> " - "Scaling mode: stretch, fill, fit, center, tile.\n" + "Image scaling mode: stretch, fill, fit, center, tile, solid_color.\n" " -t, --tiling " "Same as --scaling=tile.\n" " -u, --no-unlock-indicator " @@ -632,10 +641,18 @@ "Caps Lock is active.\n" " --font <font> " "Sets the font of the text.\n" + " --font-size <size> " + "Sets a fixed font size for the indicator text.\n" + " --indicator-idle-visible " + "Sets the indicator to show even if idle.\n" " --indicator-radius <radius> " "Sets the indicator radius.\n" " --indicator-thickness <thick> " "Sets the indicator thickness.\n" + " --indicator-x-position <x> " + "Sets the horizontal position of the indicator.\n" + " --indicator-y-position <y> " + "Sets the vertical position of the indicator.\n" " --inside-color <color> " "Sets the color of the inside of the indicator.\n" " --inside-clear-color <color> " @@ -815,6 +832,16 @@ state->args.font = strdup(optarg); } break; + case LO_FONT_SIZE: + if (state) { + state->args.font_size = atoi(optarg); + } + break; + case LO_IND_IDLE_VISIBLE: + if (state) { + state->args.indicator_idle_visible = true; + } + break; case LO_IND_RADIUS: if (state) { state->args.radius = strtol(optarg, NULL, 0); @@ -825,6 +852,18 @@ state->args.thickness = strtol(optarg, NULL, 0); } break; + case LO_IND_X_POSITION: + if (state) { + state->args.override_indicator_x_position = true; + state->args.indicator_x_position = atoi(optarg); + } + break; + case LO_IND_Y_POSITION: + if (state) { + state->args.override_indicator_y_position = true; + state->args.indicator_y_position = atoi(optarg); + } + break; case LO_INSIDE_COLOR: if (state) { state->args.colors.inside.input = parse_color(optarg); @@ -1058,21 +1097,28 @@ int main(int argc, char **argv) { swaylock_log_init(LOG_ERROR); initialize_pw_backend(argc, argv); + srand(time(NULL)); enum line_mode line_mode = LM_LINE; state.failed_attempts = 0; state.args = (struct swaylock_args){ .mode = BACKGROUND_MODE_FILL, .font = strdup("sans-serif"), + .font_size = 0, .radius = 50, .thickness = 10, + .indicator_x_position = 0, + .indicator_y_position = 0, + .override_indicator_x_position = false, + .override_indicator_y_position = false, .ignore_empty = false, .show_indicator = true, .show_caps_lock_indicator = false, .show_caps_lock_text = true, .show_keyboard_layout = false, .hide_keyboard_layout = false, - .show_failed_attempts = false + .show_failed_attempts = false, + .indicator_idle_visible = false }; wl_list_init(&state.images); set_default_colors(&state.args.colors); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/meson.build new/swaylock-1.5/meson.build --- old/swaylock-1.4/meson.build 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/meson.build 2020-01-22 17:19:47.000000000 +0100 @@ -1,7 +1,7 @@ project( 'swaylock', 'c', - version: '1.3', + version: '1.4', license: 'MIT', meson_version: '>=0.48.0', default_options: [ @@ -40,6 +40,8 @@ xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) +bash_comp = dependency('bash-completion', required: false) +fish_comp = dependency('fish', required: false) libpam = cc.find_library('pam', required: get_option('pam')) crypt = cc.find_library('crypt', required: not libpam.found()) math = cc.find_library('m') @@ -152,19 +154,10 @@ install: true ) -if is_freebsd - install_data( - 'pam/swaylock.freebsd', - install_dir: sysconfdir + '/pam.d/', - rename: 'swaylock' - ) -else - install_data( - 'pam/swaylock.linux', - install_dir: sysconfdir + '/pam.d/', - rename: 'swaylock' - ) -endif +install_data( + 'pam/swaylock', + install_dir: sysconfdir + '/pam.d/' +) if scdoc.found() sh = find_program('sh') @@ -205,7 +198,11 @@ bash_files = files( 'completions/bash/swaylock', ) - bash_install_dir = datadir + '/bash-completion/completions' + if bash_comp.found() + bash_install_dir = bash_comp.get_pkgconfig_variable('completionsdir') + else + bash_install_dir = datadir + '/bash-completion/completions' + endif install_data(bash_files, install_dir: bash_install_dir) endif @@ -214,7 +211,11 @@ fish_files = files( 'completions/fish/swaylock.fish', ) - fish_install_dir = datadir + '/fish/completions' + if fish_comp.found() + fish_install_dir = fish_comp.get_pkgconfig_variable('completionsdir') + else + fish_install_dir = datadir + '/fish/vendor_completions.d' + endif install_data(fish_files, install_dir: fish_install_dir) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/pam/swaylock new/swaylock-1.5/pam/swaylock --- old/swaylock-1.4/pam/swaylock 1970-01-01 01:00:00.000000000 +0100 +++ new/swaylock-1.5/pam/swaylock 2020-01-22 17:19:47.000000000 +0100 @@ -0,0 +1,6 @@ +# +# PAM configuration file for the swaylock screen locker. By default, it includes +# the 'login' configuration file (see /etc/pam.d/login) +# + +auth include login diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/pam/swaylock.freebsd new/swaylock-1.5/pam/swaylock.freebsd --- old/swaylock-1.4/pam/swaylock.freebsd 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/pam/swaylock.freebsd 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# -# PAM configuration file for the swaylock screen locker. By default, it includes -# the 'passwd' configuration file (see /etc/pam.d/passwd) -# - -auth include passwd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/pam/swaylock.linux new/swaylock-1.5/pam/swaylock.linux --- old/swaylock-1.4/pam/swaylock.linux 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/pam/swaylock.linux 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# -# PAM configuration file for the swaylock screen locker. By default, it includes -# the 'login' configuration file (see /etc/pam.d/login) -# - -auth include login diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/password.c new/swaylock-1.5/password.c --- old/swaylock-1.4/password.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/password.c 2020-01-22 17:19:47.000000000 +0100 @@ -139,6 +139,7 @@ break; case XKB_KEY_m: /* fallthrough */ case XKB_KEY_d: + case XKB_KEY_j: if (state->xkb.control) { submit_password(state); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/pool-buffer.c new/swaylock-1.5/pool-buffer.c --- old/swaylock-1.4/pool-buffer.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/pool-buffer.c 2020-01-22 17:19:47.000000000 +0100 @@ -1,4 +1,4 @@ -#define _POSIX_C_SOURCE 200809 +#define _POSIX_C_SOURCE 200809L #include <assert.h> #include <cairo/cairo.h> #include <fcntl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/render.c new/swaylock-1.5/render.c --- old/swaylock-1.4/render.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/render.c 2020-01-22 17:19:47.000000000 +0100 @@ -74,15 +74,36 @@ int arc_radius = state->args.radius * surface->scale; int arc_thickness = state->args.thickness * surface->scale; int buffer_diameter = (arc_radius + arc_thickness) * 2; - int buffer_height = buffer_diameter * 2; - int indicator_radius = state->args.radius + state->args.thickness; - int subsurf_xpos = surface->width / 2 - indicator_radius; - int subsurf_ypos = surface->height / 2 - indicator_radius; + int buffer_width = surface->indicator_width; + int buffer_height = surface->indicator_height; + int new_width = buffer_diameter; + int new_height = buffer_diameter; + + int subsurf_xpos; + int subsurf_ypos; + + // Center the indicator unless overridden by the user + if (state->args.override_indicator_x_position) { + subsurf_xpos = state->args.indicator_x_position - + buffer_width / (2 * surface->scale) + 2 / surface->scale; + } else { + subsurf_xpos = surface->width / 2 - + buffer_width / (2 * surface->scale) + 2 / surface->scale; + } + + if (state->args.override_indicator_y_position) { + subsurf_ypos = state->args.indicator_y_position - + (state->args.radius + state->args.thickness); + } else { + subsurf_ypos = surface->height / 2 - + (state->args.radius + state->args.thickness); + } + wl_subsurface_set_position(surface->subsurface, subsurf_xpos, subsurf_ypos); surface->current_buffer = get_next_buffer(state->shm, - surface->indicator_buffers, buffer_diameter, buffer_height); + surface->indicator_buffers, buffer_width, buffer_height); if (surface->current_buffer == NULL) { return; } @@ -111,10 +132,11 @@ float type_indicator_border_thickness = TYPE_INDICATOR_BORDER_THICKNESS * surface->scale; - if (state->args.show_indicator && state->auth_state != AUTH_STATE_IDLE) { + if (state->args.show_indicator && (state->auth_state != AUTH_STATE_IDLE || + state->args.indicator_idle_visible)) { // Draw circle cairo_set_line_width(cairo, arc_thickness); - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, arc_radius, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius, 0, 2 * M_PI); set_color_for_state(cairo, state, &state->args.colors.inside); cairo_fill_preserve(cairo); @@ -128,7 +150,11 @@ set_color_for_state(cairo, state, &state->args.colors.text); cairo_select_font_face(cairo, state->args.font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - cairo_set_font_size(cairo, arc_radius / 3.0f); + if (state->args.font_size > 0) { + cairo_set_font_size(cairo, state->args.font_size); + } else { + cairo_set_font_size(cairo, arc_radius / 3.0f); + } switch (state->auth_state) { case AUTH_STATE_VALIDATING: text = "verifying"; @@ -156,7 +182,7 @@ } xkb_layout_index_t num_layout = xkb_keymap_num_layouts(state->xkb.keymap); - if (!state->args.hide_keyboard_layout && + if (!state->args.hide_keyboard_layout && (state->args.show_keyboard_layout || num_layout > 1)) { xkb_layout_index_t curr_layout = 0; @@ -180,7 +206,7 @@ double x, y; cairo_text_extents(cairo, text, &extents); cairo_font_extents(cairo, &fe); - x = (buffer_diameter / 2) - + x = (buffer_width / 2) - (extents.width / 2 + extents.x_bearing); y = (buffer_diameter / 2) + (fe.height / 2 - fe.descent); @@ -189,6 +215,10 @@ cairo_show_text(cairo, text); cairo_close_path(cairo); cairo_new_sub_path(cairo); + + if (new_width < extents.width) { + new_width = extents.width; + } } // Typing indicator: Highlight random part on keypress @@ -197,7 +227,7 @@ static double highlight_start = 0; highlight_start += (rand() % (int)(M_PI * 100)) / 100.0 + M_PI * 0.5; - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius, highlight_start, highlight_start + TYPE_INDICATOR_RANGE); if (state->auth_state == AUTH_STATE_INPUT) { @@ -217,12 +247,12 @@ // Draw borders cairo_set_source_u32(cairo, state->args.colors.separator); - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius, highlight_start, highlight_start + type_indicator_border_thickness); cairo_stroke(cairo); - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius, highlight_start + TYPE_INDICATOR_RANGE, highlight_start + TYPE_INDICATOR_RANGE + type_indicator_border_thickness); @@ -232,10 +262,10 @@ // Draw inner + outer border of the circle set_color_for_state(cairo, state, &state->args.colors.line); cairo_set_line_width(cairo, 2.0 * surface->scale); - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius - arc_thickness / 2, 0, 2 * M_PI); cairo_stroke(cairo); - cairo_arc(cairo, buffer_diameter / 2, buffer_diameter / 2, + cairo_arc(cairo, buffer_width / 2, buffer_diameter / 2, arc_radius + arc_thickness / 2, 0, 2 * M_PI); cairo_stroke(cairo); @@ -248,9 +278,8 @@ cairo_text_extents(cairo, layout_text, &extents); cairo_font_extents(cairo, &fe); // upper left coordinates for box - x = (buffer_diameter / 2) - (extents.width / 2) - box_padding; - y = (buffer_diameter / 2) + arc_radius + arc_thickness/2 + - box_padding; // use box_padding also as gap to indicator + x = (buffer_width / 2) - (extents.width / 2) - box_padding; + y = buffer_diameter; // background box cairo_rectangle(cairo, x, y, @@ -261,7 +290,6 @@ // border cairo_set_source_u32(cairo, state->args.colors.layout_border); cairo_stroke(cairo); - cairo_new_sub_path(cairo); // take font extents and padding into account cairo_move_to(cairo, @@ -270,6 +298,18 @@ cairo_set_source_u32(cairo, state->args.colors.layout_text); cairo_show_text(cairo, layout_text); cairo_new_sub_path(cairo); + + new_height += fe.height + 2 * box_padding; + if (new_width < extents.width + 2 * box_padding) { + new_width = extents.width + 2 * box_padding; + } + } + + if (buffer_width != new_width || buffer_height != new_height) { + destroy_buffer(surface->current_buffer); + surface->indicator_width = new_width; + surface->indicator_height = new_height; + render_frame(surface); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/seat.c new/swaylock-1.5/seat.c --- old/swaylock-1.4/seat.c 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/seat.c 2020-01-22 17:19:47.000000000 +0100 @@ -22,7 +22,8 @@ exit(1); } struct xkb_keymap *keymap = xkb_keymap_new_from_string( - state->xkb.context, map_shm, XKB_KEYMAP_FORMAT_TEXT_V1, 0); + state->xkb.context, map_shm, XKB_KEYMAP_FORMAT_TEXT_V1, + XKB_KEYMAP_COMPILE_NO_FLAGS); munmap(map_shm, size); close(fd); assert(keymap); @@ -61,6 +62,11 @@ uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { struct swaylock_state *state = data; + int layout_same = xkb_state_layout_index_is_active(state->xkb.state, + group, XKB_STATE_LAYOUT_EFFECTIVE); + if (!layout_same) { + damage_state(state); + } xkb_state_update_mask(state->xkb.state, mods_depressed, mods_latched, mods_locked, 0, 0, group); int caps_lock = xkb_state_mod_name_is_active(state->xkb.state, @@ -72,7 +78,6 @@ state->xkb.control = xkb_state_mod_name_is_active(state->xkb.state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED); - } static void keyboard_repeat_info(void *data, struct wl_keyboard *wl_keyboard, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swaylock-1.4/swaylock.1.scd new/swaylock-1.5/swaylock.1.scd --- old/swaylock-1.4/swaylock.1.scd 2019-04-29 16:37:47.000000000 +0200 +++ new/swaylock-1.5/swaylock.1.scd 2020-01-22 17:19:47.000000000 +0100 @@ -25,10 +25,10 @@ Enable debugging output. *-e, --ignore-empty-password* - When an empty password is provided by the user, do not validate it. + When an empty password is provided, do not validate it. *-F, --show-failed-attempts* - Show the number of failed authentication attempts on the indicator. + Show current count of failed authentication attempts. *-f, --daemonize* Detach from the controlling terminal after locking. @@ -52,30 +52,30 @@ ':' to prevent interpreting part of it as <output>. *-k, --show-keyboard-layout* - Force displaying the current xkb layout while typing, even if only one layout - is configured. + Display the current xkb layout while typing. *-K, --hide-keyboard-layout* Force hiding the current xkb layout while typing, even if more than one layout is configured or the show-keyboard-layout option is set. *-L, --disable-caps-lock-text* - Disable the Caps Lock Text. + Disable the Caps Lock text. *-l, --indicator-caps-lock* Show the current Caps Lock state also on the indicator. *-s, --scaling* - Scaling mode for images: _stretch_, _fill_, _fit_, _center_, or _tile_. Use - the additional mode _solid\_color_ to display only the background color, even + Image scaling mode: _stretch_, _fill_, _fit_, _center_, _tile_, + _solid\_color_. Use _solid\_color_ to display only the background color, even if a background image is specified. *-t, --tiling* Same as --scaling=tile. *-c, --color* <rrggbb[aa]> - Turn the screen into the given color. If -i is used, this sets the - background of the image to the given color. Defaults to white (FFFFFF). + Turn the screen into the given color instead of white. If -i is used, this + sets the background of the image to the given color. Defaults to white + (FFFFFF). *--bs-hl-color* <rrggbb[aa]> Sets the color of backspace highlight segments. @@ -87,18 +87,22 @@ Sets the color of the key press highlight segments when Caps Lock is active. *--font* <font> - Sets the font of the text inside the indicator. + Sets the font of the text. + +*--font-size* <size> + Sets a fixed font size for the indicator text. + +*--indicator-idle-visible* + Sets the indicator to show even if idle. *--indicator-radius* <radius> - Sets the radius of the indicator to _radius_ pixels. The default value is - 50. + Sets the indicator radius. The default value is 50. *--indicator-thickness* <thickness> - Sets the thickness of the indicator to _thickness_ pixels. The default value - is 10. + Sets the indicator thickness. The default value is 10. *--inside-color* <rrggbb[aa]> - Sets the color of the inside of the indicator when typing or idle. + Sets the color of the inside of the indicator. *--inside-clear-color* <rrggbb[aa]> Sets the color of the inside of the indicator when cleared. @@ -113,7 +117,7 @@ Sets the color of the inside of the indicator when invalid. *--key-hl-color* <rrggbb[aa]> - Sets the color of key press highlight segments. + Sets the color of the key press highlight segments. *--layout-bg-color* <rrggbb[aa]> Sets the background color of the box containing the layout text. @@ -125,65 +129,59 @@ Sets the color of the layout text. *--line-color* <rrggbb[aa]> - Sets the color of the lines that separate the inside and outside of the - indicator when typing or idle. + Sets the color of the line between the inside and ring. *--line-clear-color* <rrggbb[aa]> - Sets the color of the lines that separate the inside and outside of the - indicator when cleared. + Sets the color of the line between the inside and ring when cleared. *--line-caps-lock-color* <rrggbb[aa]> - Sets the color of the line between the inside and ring when Caps Lock - is active. + Sets the color of the line between the inside and ring when Caps Lock is + active. *--line-ver-color* <rrggbb[aa]> - Sets the color of the lines that separate the inside and outside of the - indicator when verifying. + Sets the color of the line between the inside and ring when verifying. *--line-wrong-color* <rrggbb[aa]> - Sets the color of the lines that separate the inside and outside of the - indicator when invalid. + Sets the color of the line between the inside and ring when invalid. *-n, --line-uses-inside* - Use the color of the inside of the indicator for the line separating the - inside and outside of the indicator. + Use the inside color for the line between the inside and ring. *-r, --line-uses-ring* - Use the outer ring's color for the line separating the inside and outside of - the indicator. + Use the ring color for the line between the inside and ring. *--ring-color* <rrggbb[aa]> - Sets the color of the outside of the indicator when typing or idle. + Sets the color of the ring of the indicator when typing or idle. *--ring-clear-color* <rrggbb[aa]> - Sets the color of the outside of the indicator when cleared. + Sets the color of the ring of the indicator when cleared. *--ring-caps-lock-color* <rrggbb[aa]> Sets the color of the ring of the indicator when Caps Lock is active. *--ring-ver-color* <rrggbb[aa]> - Sets the color of the outside of the indicator when verifying. + Sets the color of the ring of the indicator when verifying. *--ring-wrong-color* <rrggbb[aa]> - Sets the color of the outside of the indicator when invalid. + Sets the color of the ring of the indicator when invalid. *--separator-color* <rrggbb[aa]> Sets the color of the lines that separate highlight segments. *--text-color* <rrggbb[aa]> - Sets the color of the text inside the indicator when typing or idle. + Sets the color of the text. *--text-clear-color* <rrggbb[aa]> - Sets the color of the text inside the indicator when cleared. + Sets the color of the text when cleared. *--text-caps-lock-color* <rrggbb[aa]> Sets the color of the text when Caps Lock is active. *--text-ver-color* <rrggbb[aa]> - Sets the color of the text inside the indicator when verifying. + Sets the color of the text when verifying. *--text-wrong-color* <rrggbb[aa]> - Sets the color of the text inside the indicator when invalid. + Sets the color of the text when invalid. # AUTHORS ++++++ swaylock-version.patch ++++++ --- /var/tmp/diff_new_pack.TkwAiK/_old 2020-01-23 15:55:16.851106804 +0100 +++ /var/tmp/diff_new_pack.TkwAiK/_new 2020-01-23 15:55:16.851106804 +0100 @@ -1,12 +1,12 @@ -diff -urEbwB swaylock-1.4/meson.build swaylock-1.4.new/meson.build ---- swaylock-1.4/meson.build 2019-04-29 16:37:47.000000000 +0200 -+++ swaylock-1.4.new/meson.build 2019-05-23 08:09:39.276483783 +0200 +diff -urEbw swaylock-1.5/meson.build swaylock-1.5.new/meson.build +--- swaylock-1.5/meson.build 2020-01-22 17:19:47.000000000 +0100 ++++ swaylock-1.5.new/meson.build 2020-01-23 09:59:07.028748129 +0100 @@ -1,7 +1,7 @@ project( 'swaylock', 'c', -- version: '1.3', -+ version: '1.4', +- version: '1.4', ++ version: '1.5', license: 'MIT', meson_version: '>=0.48.0', default_options: [
