commit 26dd98b7b41fb47962bc862a55503ab06548c710
parent 99ac266d22aa934287a8cde13da0f2c104da91d7
Author: Raymond Li <hi@raymond.li>
Date: Sun, 14 Feb 2021 16:31:35 -0500
Merge branch 'master' into pr/197
Diffstat:
9 files changed, 80 insertions(+), 89 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,3 @@ Makefile.in
/missing
/stamp-h1
*.in~
-pam/i3lock
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@
### The world's most popular non-default computer lockscreen.
**A modern version of i3lock with color functionality and other features.**
-
+
i3lock is a simple screen locker like slock. After starting it, you will see a white screen (you can configure the color/an image). You can return to your screen by entering your password.
diff --git a/configure.ac b/configure.ac
@@ -68,8 +68,7 @@ AC_FUNC_STRNLEN
AC_CHECK_FUNCS([atexit dup2 ftruncate getcwd gettimeofday localtime_r memchr memset mkdir rmdir setlocale socket strcasecmp strchr strdup strerror strncasecmp strndup strrchr strspn strstr strtol strtoul], , [AC_MSG_FAILURE([cannot find the $ac_func function, which i3lock requires])])
AC_CHECK_FUNCS([explicit_bzero])
-# Checks for libraries.
-
+# Check for libraries
AC_SEARCH_LIBS([floor], [m], , [AC_MSG_FAILURE([cannot find the required floor() function despite trying to link with -lm])])
# libev does not ship with a pkg-config file :(.
diff --git a/examples/lock.sh b/examples/lock.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+B='#00000000' # blank
+C='#ffffff22' # clear ish
+D='#ff00ffcc' # default
+T='#ee00eeee' # text
+W='#880000bb' # wrong
+V='#bb00bbbb' # verifying
+
+i3lock \
+--insidevercolor=$C \
+--ringvercolor=$V \
+\
+--insidewrongcolor=$C \
+--ringwrongcolor=$W \
+\
+--insidecolor=$B \
+--ringcolor=$D \
+--linecolor=$B \
+--separatorcolor=$D \
+\
+--verifcolor=$T \
+--wrongcolor=$T \
+--timecolor=$T \
+--datecolor=$T \
+--layoutcolor=$T \
+--keyhlcolor=$W \
+--bshlcolor=$W \
+\
+--screen 1 \
+--blur 5 \
+--clock \
+--indicator \
+--timestr="%H:%M:%S" \
+--datestr="%A, %m %Y" \
+--keylayout 1 \
diff --git a/examples/lock_bar.sh b/examples/lock_bar.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+B='#00000000' # blank
+C='#ffffff22' # clear ish
+D='#ff00ffcc' # default
+T='#ee00eeee' # text
+W='#880000bb' # wrong
+V='#bb00bbbb' # verifying
+
+i3lock \
+--blur 5 \
+--bar-indicator \
+--bar-position y+h \
+--bar-direction 1 \
+--bar-max-height 50 \
+--bar-base-width 50 \
+--bar-color 000000cc \
+--keyhlcolor 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 \
+--date-align 1 \
+--time-align 1 \
+--ringvercolor 8800ff88 \
+--ringwrongcolor ff008888 \
+--statuspos x+5:y+h-16 \
+--verif-align 1 \
+--wrong-align 1 \
+--verifcolor ffffffff \
+--wrongcolor ffffffff \
+--modifpos -50:-50
diff --git a/screenshot.png b/examples/screenshot.png
Binary files differ.
diff --git a/lock.sh b/lock.sh
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-B='#00000000' # blank
-C='#ffffff22' # clear ish
-D='#ff00ffcc' # default
-T='#ee00eeee' # text
-W='#880000bb' # wrong
-V='#bb00bbbb' # verifying
-
-./x86_64-pc-linux-gnu/i3lock \
---insidevercolor=$C \
---ringvercolor=$V \
-\
---insidewrongcolor=$C \
---ringwrongcolor=$W \
-\
---insidecolor=$B \
---ringcolor=$D \
---linecolor=$B \
---separatorcolor=$D \
-\
---verifcolor=$T \
---wrongcolor=$T \
---timecolor=$T \
---datecolor=$T \
---layoutcolor=$T \
---keyhlcolor=$W \
---bshlcolor=$W \
-\
---screen 1 \
---blur 5 \
---clock \
---indicator \
---timestr="%H:%M:%S" \
---datestr="%A, %m %Y" \
---keylayout 1 \
-
-# --veriftext="Drinking verification can..."
-# --wrongtext="Nope!"
-# --textsize=20
-# --modsize=10
-# --timefont=comic-sans
-# --datefont=monofur
-# etc
diff --git a/lock_bar.sh b/lock_bar.sh
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-B='#00000000' # blank
-C='#ffffff22' # clear ish
-D='#ff00ffcc' # default
-T='#ee00eeee' # text
-W='#880000bb' # wrong
-V='#bb00bbbb' # verifying
-
-./x86_64-pc-linux-gnu/i3lock \
---blur 5 \
---bar-indicator \
---bar-position y+h \
---bar-direction 1 \
---bar-max-height 50 \
---bar-base-width 50 \
---bar-color 000000cc \
---keyhlcolor 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 \
---date-align 1 \
---time-align 1 \
---ringvercolor 8800ff88 \
---ringwrongcolor ff008888 \
---statuspos x+5:y+h-16 \
---verif-align 1 \
---wrong-align 1 \
---verifcolor ffffffff \
---wrongcolor ffffffff \
---modifpos -50:-50
diff --git a/pam/i3lock b/pam/i3lock
@@ -1,7 +1,8 @@
#
-# PAM configuration file for the i3lock-color screen locker. By default, it includes
-# the 'system-auth' configuration file (see /etc/pam.d/system-auth) for Arch and Gentoo
-# and 'login' for Debian. Note that vanilla i3lock upstream uses 'login' instead.
+# PAM configuration file for the i3lock-color screen locker. By default, it
+# includes the 'system-auth' configuration file (see /etc/pam.d/system-auth)
+# for Arch and Gentoo and 'login' for Debian. Note that upstream uses only
+# 'login', which breaks on Arch and Gentoo.
#
#auth include system-auth # For Arch/Gentoo
