slock, branch HEAD

Replace upstream README with personal build README

2026-02-19T08:34:11Z

commit 4cbf627d5efd593387ed8561dcd30580ca34d423 parent e1a42edb2b515a6b322b37246f098a7c26958080 Author: Kris Yotam Date: Thu, 19 Feb 2026 02:34:11 -0600 Replace upstream README with personal build README

Visual unlock - adding command line argument to help output and correcting typo ref. #14

2026-01-04T20:57:53Z

commit e1a42edb2b515a6b322b37246f098a7c26958080 parent bb763ba9865e36eb3b655051a8b73f4301da299b Author: bakkeby Date: Sun, 4 Jan 2026 21:57:53 +0100 Visual unlock - adding command line argument to help output and correcting typo ref. #14

Adding visual unlock patch ref. #14

2025-11-15T07:55:48Z

commit bb763ba9865e36eb3b655051a8b73f4301da299b parent 3fc1818219dc28817a0df53c2f0108b763941e74 Author: bakkeby Date: Sat, 15 Nov 2025 08:55:48 +0100 Adding visual unlock patch ref. #14

alpha: reverting alpha value back to float and casting to double instead ref. #13

2025-09-04T06:35:38Z

commit 3fc1818219dc28817a0df53c2f0108b763941e74 parent 263310fe63eed7fc536c100ea42626edce33a946 Author: bakkeby Date: Thu, 4 Sep 2025 08:35:38 +0200 alpha: reverting alpha value back to float and casting to double instead ref. #13

background iamge: bail early if the image could not be loaded from path

2025-09-03T19:36:44Z

commit 263310fe63eed7fc536c100ea42626edce33a946 parent 934febedfa35ed19de89ce71f931bead030f5e89 Author: bakkeby Date: Wed, 3 Sep 2025 21:36:44 +0200 background iamge: bail early if the image could not be loaded from path

alpha: change alpha variable from float to double

2025-09-03T08:12:48Z

commit 934febedfa35ed19de89ce71f931bead030f5e89 parent 433e9618820375b603f46c272ee2ca4740c8100f Author: bakkeby Date: Wed, 3 Sep 2025 10:12:48 +0200 alpha: change alpha variable from float to double The float value caused the opacity to be calculated as 0 due to precision loss when multiplying with unsigned int 0xffffffff.

Merge pull request #12 from veltza/fix-controlclear

2025-09-01T20:11:38Z

commit 433e9618820375b603f46c272ee2ca4740c8100f parent 06e06a1507143728cf3909a23191d423331e64a4 Author: Stein Gunnar Bakkeby Date: Mon, 1 Sep 2025 22:11:38 +0200 Merge pull request #12 from veltza/fix-controlclear Prevent the control clear patch from blocking ctrl-u

Prevent the control clear patch from blocking ctrl-u

2025-09-01T18:43:59Z

commit 04bb6dccb761875cb38e8a54c06eb1b4718291e3 parent 06e06a1507143728cf3909a23191d423331e64a4 Author: veltza <106755522+veltza@users.noreply.github.com> Date: Mon, 1 Sep 2025 21:43:59 +0300 Prevent the control clear patch from blocking ctrl-u The control clear patch is not compatible with the latest ctrl-u feature because it blocks all ctrl shortcuts. This fix ensures that the patch is active only when the ctrl key is pressed without any other keys. Note that the patch is also active when the shift or alt key is pressed without any other keys. This is an undocumented feature of this patch and is caused by the iscntrl function, which returns true if the ascii value is zero.

Support ^U for clearing password

2025-08-16T13:25:42Z

commit 06e06a1507143728cf3909a23191d423331e64a4 parent b52162c32bcb8a8bf64ede7d12bd52fbf1cee2e6 Author: bakkeby Date: Sat, 16 Aug 2025 15:25:42 +0200 Support ^U for clearing password ^U is a fairly common key combo for clearing fields, this patch adds support for it. https://git.suckless.org/slock/commit/bf0a5577acbd9ec7c6a577601b97144b205840d7.html https://git.suckless.org/slock/commit/3791a996e230aec59d61faea46634ae4f031e359.html

bump version to 1.6

2025-08-10T13:57:35Z

commit b52162c32bcb8a8bf64ede7d12bd52fbf1cee2e6 parent ec9c01c2d485d09614cfa251ca6600a045113f46 Author: bakkeby Date: Sun, 10 Aug 2025 15:57:35 +0200 bump version to 1.6 https://git.suckless.org/slock/commit/e3fb34364ed2c53b21edde07ac17560a601783a9.html

quick cancel: allow cancelling by key press in addition to mouse movement ref. #11

2025-08-03T20:27:35Z

commit ec9c01c2d485d09614cfa251ca6600a045113f46 parent 72023758232e708018d3c7b0b324e61f55cb5c9b Author: bakkeby Date: Sun, 3 Aug 2025 22:27:35 +0200 quick cancel: allow cancelling by key press in addition to mouse movement ref. #11

simplify post-lock cmd and die if it fails

2025-03-09T11:52:16Z

commit 72023758232e708018d3c7b0b324e61f55cb5c9b parent 316de8856f9f25685f6f1c4e94dbf76e4f64c06b Author: bakkeby Date: Sun, 9 Mar 2025 12:52:16 +0100 simplify post-lock cmd and die if it fails this patch does two things: 0. simplify the code by using posix_spawn() 1. unify the behavior of what happens if the post-lock cmd fails. currently, if `fork()` fails, slock will die without locking the screen. HOWEVER if `execvp()` fails it prints a message to stderr (which the user cannot see since the screen has been locked already) and only exits the child while the parent locks the screen. to reproduce: # slock some_bin_that_doesnt_exist this behavior is inconsistent, if the idea is that post-lock cmd is _not_ important then we shouldn't `die()` on `fork()` failure either. and if we assume that the post-lock cmd _is_ important, then we should die on exec failure as well. this patch assumes the latter and calls `die()` if `posix_spawn()` fails. ref. https://git.suckless.org/slock/commit/a70d5d2429abf8dcb70a8817990975dc9a621d27.html

slock.1: use standard wording for options

2023-10-06T10:45:37Z

commit 316de8856f9f25685f6f1c4e94dbf76e4f64c06b parent 6020a799985f0accc3d820a3b15ad560803a70cd Author: bakkeby Date: Fri, 6 Oct 2023 12:45:37 +0200 slock.1: use standard wording for options Remove the OPTIONS section and add an EXIT STATUS section. ref. https://git.suckless.org/slock/commit/a34d8fb4327bbb1afd92e7527c53fcaad547a495.html

write version to stdout like the man page says

2023-10-06T10:42:21Z

commit 6020a799985f0accc3d820a3b15ad560803a70cd parent 67f3da2d6aa1443044d4a85063f8725567a5ef85 Author: bakkeby Date: Fri, 6 Oct 2023 12:42:21 +0200 write version to stdout like the man page says ref. https://git.suckless.org/slock/commit/e8bca65d629a4faa89439c9f0e599efb5a259573.html

slock.1: improve man page

2023-10-06T10:40:55Z

commit 67f3da2d6aa1443044d4a85063f8725567a5ef85 parent 66fc3b5ae01b2daadf63fcd3c48cd5f1424cc739 Author: bakkeby Date: Fri, 6 Oct 2023 12:40:55 +0200 slock.1: improve man page * Fix all lint warnings. * Remove "Op Ar arg..." in the description. It looks ugly. * No need to set -offset left for .Bd literal. ref. https://git.suckless.org/slock/commit/ca6f30f621c1195b577ace7a14b9037fab0dab91.html

config.mk: no need to set CC

2023-10-06T10:36:54Z

commit 66fc3b5ae01b2daadf63fcd3c48cd5f1424cc739 parent d06ca3a607e4313b495f37a7e27cbe087995fa09 Author: bakkeby Date: Fri, 6 Oct 2023 12:36:54 +0200 config.mk: no need to set CC ref. https://git.suckless.org/slock/commit/2fec14c567411b939e717c380d8b4460d462b146.html

Makefile: be verbose and remove options

2023-10-06T10:36:01Z

commit d06ca3a607e4313b495f37a7e27cbe087995fa09 parent 03112a0d32d6193ff6ffe10bfe2458cfa999b651 Author: bakkeby Date: Fri, 6 Oct 2023 12:36:01 +0200 Makefile: be verbose and remove options Some things to improve at some point: * Respect system/packaging CFLAGS/LDFLAGS (don't hardcode -Os -Wall -pedantic, -s, etc). ref. https://git.suckless.org/slock/commit/5678764412873baa62e1536f0622d6a7cec62181.html

update LICENSE

2023-10-06T10:32:12Z

commit 03112a0d32d6193ff6ffe10bfe2458cfa999b651 parent 780a7887a3b976a48786f991d55fc8a474e76a25 Author: bakkeby Date: Fri, 6 Oct 2023 12:32:12 +0200 update LICENSE ref. https://git.suckless.org/slock/commit/aecfb3f6803bc2e7a5478aeb4f3390cbaaa563c7.html

Bump to 4f04554.

2022-10-06T13:29:45Z

commit 780a7887a3b976a48786f991d55fc8a474e76a25 parent 3131706fc5f202759cbf81c661df14578d721fb8 Author: bakkeby Date: Thu, 6 Oct 2022 15:29:45 +0200 Bump to 4f04554. Makefile: explicit_bzero.c was copied twice (GNU make gives a warning) bump version to 1.5 Ref. https://git.suckless.org/slock/commit/265704d73647e0d4823126bbb7ddde1d415a618d.html https://git.suckless.org/slock/commit/4f045545a25cc02c64bfc08d27ed2ccecb962292.html

Merge pull request #8 from herrwusel/pam_consistant

2022-06-03T07:44:08Z

commit 3131706fc5f202759cbf81c661df14578d721fb8 parent 9036c899a99e0ae11c7dc4048c77c32283a70905 Author: Stein Gunnar Bakkeby Date: Fri, 3 Jun 2022 09:44:08 +0200 Merge pull request #8 from herrwusel/pam_consistant Consistent unlock styles with pam and blur patches

Consistent unlock styles with pam and blur patches

2022-05-30T10:44:03Z

commit 8f6f789708e1aaa6a4ffca307069f49aa7c85da8 parent 9036c899a99e0ae11c7dc4048c77c32283a70905 Author: herrwusel Date: Mon, 30 May 2022 10:44:03 +0000 Consistent unlock styles with pam and blur patches

config.mk: adding reference to -D_NETBSD_SOURCE and -D_BSD_SOURCE

2022-03-28T14:15:30Z

commit 9036c899a99e0ae11c7dc4048c77c32283a70905 parent e71a42ee2b0a1c9a9b109a946f6cd6f10ae84a4f Author: bakkeby Date: Mon, 28 Mar 2022 16:15:30 +0200 config.mk: adding reference to -D_NETBSD_SOURCE and -D_BSD_SOURCE

Adding background image patch

2022-03-28T12:22:21Z

commit e71a42ee2b0a1c9a9b109a946f6cd6f10ae84a4f parent 312951b9781eec0024a4602fa8f0c7ef8900adcb Author: bakkeby Date: Mon, 28 Mar 2022 14:22:21 +0200 Adding background image patch

Proposed change to avoid high CPU usage ref. #7

2022-01-11T12:51:52Z

commit 312951b9781eec0024a4602fa8f0c7ef8900adcb parent 51d3f49e04518f847ac2f9409d77c81443beb489 Author: bakkeby Date: Tue, 11 Jan 2022 13:51:52 +0100 Proposed change to avoid high CPU usage ref. #7

Fix for secret password patch compilation error ref. #6

2021-12-23T20:17:17Z

commit 51d3f49e04518f847ac2f9409d77c81443beb489 parent dc5c20a6d1de8a560ed784ed22dffbdb54866ad3 Author: bakkeby Date: Thu, 23 Dec 2021 21:17:17 +0100 Fix for secret password patch compilation error ref. #6

Comment out dependencies by default

2021-09-13T13:42:39Z

commit dc5c20a6d1de8a560ed784ed22dffbdb54866ad3 parent 3f2ac9baec092def7ca42772a007253936b4feec Author: bakkeby Date: Mon, 13 Sep 2021 15:42:39 +0200 Comment out dependencies by default

dwmlogo: avoid defining BACKGROUND colour if BLUR_PIXELATED_SCREEN_PATCH is enabled ref. #5

2021-09-13T13:40:10Z

commit 3f2ac9baec092def7ca42772a007253936b4feec parent e5e04272d1bc7b0f39a942d99cac3ab78bbf9859 Author: bakkeby Date: Mon, 13 Sep 2021 15:40:10 +0200 dwmlogo: avoid defining BACKGROUND colour if BLUR_PIXELATED_SCREEN_PATCH is enabled ref. #5

Adding dwmlogo patch ref. #5

2021-09-13T08:48:56Z

commit e5e04272d1bc7b0f39a942d99cac3ab78bbf9859 parent e5a9d8539b2ec56aacb1db455a4235e4d1ff41ca Author: bakkeby Date: Mon, 13 Sep 2021 10:48:56 +0200 Adding dwmlogo patch ref. #5

Adding auto-timeout patch

2021-09-09T09:54:37Z

commit e5a9d8539b2ec56aacb1db455a4235e4d1ff41ca parent 35fd53f6f2f5c911532572e889333c4b43927afa Author: bakkeby Date: Thu, 9 Sep 2021 11:54:37 +0200 Adding auto-timeout patch

Adding secret password patch

2021-09-09T09:07:56Z

commit 35fd53f6f2f5c911532572e889333c4b43927afa parent 7dc450118fbc31a3a04568f814392870d616a615 Author: bakkeby Date: Thu, 9 Sep 2021 11:07:56 +0200 Adding secret password patch

Adding failure-command patch

2021-09-09T08:17:00Z

commit 7dc450118fbc31a3a04568f814392870d616a615 parent d7b259be346091fad33ce27b155586c8d96bc615 Author: bakkeby Date: Thu, 9 Sep 2021 10:17:00 +0200 Adding failure-command patch

message patch: add xresources compatibility ref. #3

2021-06-08T12:12:46Z

commit d7b259be346091fad33ce27b155586c8d96bc615 parent d2be9eb63274510155688db4039bb2b20565b1b5 Author: bakkeby Date: Tue, 8 Jun 2021 14:12:46 +0200 message patch: add xresources compatibility ref. #3

Adding color message patch ref. #3

2021-06-08T11:29:12Z

commit d2be9eb63274510155688db4039bb2b20565b1b5 parent ce8387f52c4fa0e1d99239adac69184775c01d48 Author: bakkeby Date: Tue, 8 Jun 2021 13:29:12 +0200 Adding color message patch ref. #3

Adding link to alpha patch

2020-08-03T16:42:41Z

commit ce8387f52c4fa0e1d99239adac69184775c01d48 parent 0bba46172d433ddb205fc66eaf6ce69e08688bcb Author: bakkeby Date: Mon, 3 Aug 2020 18:42:41 +0200 Adding link to alpha patch

Adding alpha patch

2020-08-03T15:25:50Z

commit 0bba46172d433ddb205fc66eaf6ce69e08688bcb parent 74c66223a5743aba14789cfb07ffae1e9d4d6bc8 Author: bakkeby Date: Mon, 3 Aug 2020 17:25:50 +0200 Adding alpha patch

Adding blur pixelated screen patch

2020-08-03T14:56:33Z

commit 74c66223a5743aba14789cfb07ffae1e9d4d6bc8 parent c07648d3f9226db04db0711fc62693f5317e9609 Author: bakkeby Date: Mon, 3 Aug 2020 16:56:33 +0200 Adding blur pixelated screen patch

Adding keypress_feedback patch

2020-08-03T13:53:34Z

commit c07648d3f9226db04db0711fc62693f5317e9609 parent 4b280b29ef50782e5b0dfba7112a55865b4748a2 Author: bakkeby Date: Mon, 3 Aug 2020 15:53:34 +0200 Adding keypress_feedback patch

Adding slock to .gitignore

2020-08-03T13:53:08Z

commit 4b280b29ef50782e5b0dfba7112a55865b4748a2 parent 55e6696897017c5707c4e1254dba864a3bfb1f8b Author: bakkeby Date: Mon, 3 Aug 2020 15:53:08 +0200 Adding slock to .gitignore

Specifying latest version

2020-03-29T10:24:26Z

commit 55e6696897017c5707c4e1254dba864a3bfb1f8b parent 2445d75b5db8a16f1d98c91bf0fd767a4cd6bbe7 Author: bakkeby Date: Sun, 29 Mar 2020 12:24:26 +0200 Specifying latest version

Fix bug in DPMS patch + moved patches.h to patches.def.h to match that of config

2020-01-26T15:16:38Z

commit 2445d75b5db8a16f1d98c91bf0fd767a4cd6bbe7 parent 4c905a9c07d1c63e9f9df7187e9e4c5806007920 Author: bakkeby Date: Sun, 26 Jan 2020 16:16:38 +0100 Fix bug in DPMS patch + moved patches.h to patches.def.h to match that of config

Adding xresources patch

2019-11-27T07:42:00Z

commit 4c905a9c07d1c63e9f9df7187e9e4c5806007920 parent 2cf80900dad28a63647bcd6488382cd243abe562 Author: bakkeby Date: Wed, 27 Nov 2019 08:42:00 +0100 Adding xresources patch

Added capscolor, control clear, dpms, mediakeys, message, pam auth, quickcancel patches

2019-10-17T17:06:39Z

commit 2cf80900dad28a63647bcd6488382cd243abe562 parent 35633d45672d14bd798c478c45d1a17064701aa9 Author: bakkeby Date: Thu, 17 Oct 2019 19:06:39 +0200 Added capscolor, control clear, dpms, mediakeys, message, pam auth, quickcancel patches

Properly clear the last entered character

2017-03-25T20:16:01Z

commit 35633d45672d14bd798c478c45d1a17064701aa9 parent 2d2a21a90ad1b53594b1b90b97486189ec54afce Author: Tobias Stoeckmann Date: Sat, 25 Mar 2017 21:16:01 +0100 Properly clear the last entered character When enter is pressed, passwd[len] will be set to '\0'. Pressing backspace is supposed to remove the last entered character. But currently, the clearing has an off-by-one, as in setting passwd[len] to '\0' just like enter would do. You can also verify it by imagining len=1 and that it's impossible to clear passwd[0] by pressing backspace with the current code. Signed-off-by: Tobias Stoeckmann

rm trailing whitespace in README

2016-11-22T23:29:18Z

commit 2d2a21a90ad1b53594b1b90b97486189ec54afce parent 325581b935c74c321062d1f6873704411bcc5071 Author: Markus Teich Date: Wed, 23 Nov 2016 00:29:18 +0100 rm trailing whitespace in README

syntax fix

2016-11-22T23:28:43Z

commit 325581b935c74c321062d1f6873704411bcc5071 parent 0ff0d9f7a7156a0e0b41d5b208ae5625e3a15dab Author: Markus Teich Date: Wed, 23 Nov 2016 00:28:43 +0100 syntax fix

there can only be one window in the event

2016-11-22T23:28:25Z

commit 0ff0d9f7a7156a0e0b41d5b208ae5625e3a15dab parent 7a604ec1fae1eda36f210a28a2cf466583a9cb87 Author: Markus Teich Date: Wed, 23 Nov 2016 00:28:25 +0100 there can only be one window in the event

Fix resize with multiple monitors and portrait mode

2016-11-07T17:15:20Z

commit 7a604ec1fae1eda36f210a28a2cf466583a9cb87 parent fa1158958466f38cd35c9114023a0175e67ebb6f Author: Bob Uhl Date: Mon, 7 Nov 2016 10:15:20 -0700 Fix resize with multiple monitors and portrait mode When connecting/disconnecting a portrait monitor, the XRRScreenChangeNotifyEvent height & width are reversed due to the XRandR rotation; detect this and DTRT.

bump version

2016-11-20T00:07:11Z

commit fa1158958466f38cd35c9114023a0175e67ebb6f parent d5da84cf5adce2f30ed348b631861cc089f3b559 Author: Markus Teich Date: Sun, 20 Nov 2016 01:07:11 +0100 bump version

add arg.h and util.h to Makefile

2016-11-19T23:59:19Z

commit d5da84cf5adce2f30ed348b631861cc089f3b559 parent ae96836f90c3652fd0907e0632ddd4591d5716fa Author: Markus Teich Date: Sun, 20 Nov 2016 00:59:19 +0100 add arg.h and util.h to Makefile

clarify colors in config.def.h

2016-11-19T23:29:41Z

commit ae96836f90c3652fd0907e0632ddd4591d5716fa parent 7d31ff65a0b0388f788ca6932c815ab29e5fb10f Author: Markus Teich Date: Sun, 20 Nov 2016 00:29:41 +0100 clarify colors in config.def.h

move config.h inclusion after type declarations

2016-11-19T23:29:01Z

commit 7d31ff65a0b0388f788ca6932c815ab29e5fb10f parent 597469541c10fdb8920ed190b72763b0719e5cb5 Author: Markus Teich Date: Sun, 20 Nov 2016 00:29:01 +0100 move config.h inclusion after type declarations

Unboolify slock.c

2016-10-17T18:28:09Z

commit 597469541c10fdb8920ed190b72763b0719e5cb5 parent c96e725df0c449abb5f1f6a3b604f64fa69c4756 Author: Laslo Hunhold Date: Mon, 17 Oct 2016 20:28:09 +0200 Unboolify slock.c

Use explicit strcmp() instead of inlining it

2016-10-01T22:10:45Z

commit c96e725df0c449abb5f1f6a3b604f64fa69c4756 parent 6a1bd896356ae3b59053b5e458fdff62d076114b Author: FRIGN Date: Sun, 2 Oct 2016 00:10:45 +0200 Use explicit strcmp() instead of inlining it Makes it a tad more readable; the previous "optimization" will be done by the compiler anyway.

No need for oldc to be static

2016-10-01T22:03:18Z

commit 6a1bd896356ae3b59053b5e458fdff62d076114b parent b099d2fd1868a5497069b85e5af0e6148077a6ba Author: FRIGN Date: Sun, 2 Oct 2016 00:03:18 +0200 No need for oldc to be static

Use NUL character constant explicitly

2016-10-01T21:56:33Z

commit b099d2fd1868a5497069b85e5af0e6148077a6ba parent 0a43b78d00ebac574376ffd93223a751e21e265e Author: FRIGN Date: Sat, 1 Oct 2016 23:56:33 +0200 Use NUL character constant explicitly

Keep the line-lengths at bay

2016-10-01T21:50:49Z

commit 0a43b78d00ebac574376ffd93223a751e21e265e parent bd069b08c5fe4fea3c78f6991a849b19ed40cbe0 Author: FRIGN Date: Sat, 1 Oct 2016 23:50:49 +0200 Keep the line-lengths at bay This makes the code more readable and prevents wraparounds in the editor.

Add a section on security considerations

2016-09-28T18:20:51Z

commit bd069b08c5fe4fea3c78f6991a849b19ed40cbe0 parent 2d85c5baed4c4b4ecc19f7934fac1fc6a5b5c410 Author: FRIGN Date: Wed, 28 Sep 2016 20:20:51 +0200 Add a section on security considerations The section on security considerations sheds some light on the problems that we can't solve within slock but which the user has to solve in his X configuration.

remove confusing DPMS comment

2016-09-26T11:28:09Z

commit 2d85c5baed4c4b4ecc19f7934fac1fc6a5b5c410 parent a98fba8971ab4b8d8b1f18422b808a79434d8923 Author: Markus Teich Date: Mon, 26 Sep 2016 13:28:09 +0200 remove confusing DPMS comment FRIGN on hackers@suckless.org: What has been bugging me for quite a while is this DPMS comment that was added there for no reason. Every sane mind would agree that fiddling with DPMS makes no sense whatsoever. When I slock, my screen turns off after 10 minutes. So, if I don't like that, I disable DPMS. If I do, I just fiddle around with my mouse a bit and get the slock promt.

error out early on crypt() fail

2016-09-23T17:08:39Z

commit a98fba8971ab4b8d8b1f18422b808a79434d8923 parent dc2e8e839e4d72f5fec36c9a0474e6062a7a8f51 Author: Markus Teich Date: Fri, 23 Sep 2016 19:08:39 +0200 error out early on crypt() fail

Stop using $USER for shadow entries

2016-09-11T21:17:53Z

commit dc2e8e839e4d72f5fec36c9a0474e6062a7a8f51 parent 9a617db716641da8489e2062e04098220954bffe Author: FRIGN Date: Sun, 11 Sep 2016 23:17:53 +0200 Stop using $USER for shadow entries This was extremely bad practice, effectively making the program behave different depending on which architecture you are running it on. OpenBSD offers getpwuid_shadow, but there is no getspuid for getspnam, so we resort to using the pw_name entry in the struct passwd we filled earlier. This prevents slock from crashing when $USER is empty (easy to do). If you want to run slock as a different user, don't use $ USER="tom" slock but doas or sudo which were designed for this purpose.

Rename getpw() and pws to gethash() and hash

2016-09-11T21:10:57Z

commit 9a617db716641da8489e2062e04098220954bffe parent b00f444a4ea0d9ffa5cd7dcda71c97cdf05d322e Author: FRIGN Date: Sun, 11 Sep 2016 23:10:57 +0200 Rename getpw() and pws to gethash() and hash

Remove cleanup and deglobalize and rework data structures

2016-09-11T21:08:19Z

commit b00f444a4ea0d9ffa5cd7dcda71c97cdf05d322e parent cd3c546c37d91e24b8c55bab88bfcb920d8ea895 Author: FRIGN Date: Sun, 11 Sep 2016 23:08:19 +0200 Remove cleanup and deglobalize and rework data structures The cleanup removal is a joint-venture with Markus. We assume the X server does the cleanup, so we don't need it. The idea is that the fds are closed at exit and thus already indicate to the X server that the client has quit. Analogously the same applies to freeing memory sections previously allocated for the X server. We love XXXXXL burgers and therefore removed XUngrabPointer XUngrabKeyboard XFreeColors XFreePixmap XDestroyWindow Lines of Code. For a project like slock there is no need to carry around global state. By moving the three structures to main() it is now clear which functions modify which state, greatly improving the readability of the code, especially given slock is a suid program.

config.mk: be more explicative about FLAGS

2016-09-08T17:03:12Z

commit cd3c546c37d91e24b8c55bab88bfcb920d8ea895 parent 22eba05f3683c12fa6a5f898d08c33704c9fbb73 Author: Quentin Rameau Date: Thu, 8 Sep 2016 19:03:12 +0200 config.mk: be more explicative about FLAGS Group each *FLAG with its description and add a NetBSD specific.

Ensure Polyphemus-Mitigation and properly drop privileges

2016-09-07T11:32:29Z

commit 22eba05f3683c12fa6a5f898d08c33704c9fbb73 parent 04143fd68dbc656905714eff5c208fadb3464e25 Author: FRIGN Date: Wed, 7 Sep 2016 13:32:29 +0200 Ensure Polyphemus-Mitigation and properly drop privileges Don't hide privilege drops inside readpw() and actually make it configurable what you are dropping to in config.h. The privilege drop comes after opening the Display because the user "nobody" with "nogroup" can't do that. So why do I call this strategy the Polyphemus-Mitigation? """ After the giant returns in the evening and eats two more of the men, Odysseus offers Polyphemus some strong and undiluted wine given to him earlier on his journey. Drunk and unwary, the giant asks Odysseus his name, promising him a guest-gift if he answers. Odysseus tells him "Οὖτις", which means "nobody" and Polyphemus promises to eat this "Nobody" last of all. With that, he falls into a drunken sleep. Odysseus had meanwhile hardened a wooden stake in the fire and now drives it into Polyphemus' eye. When Polyphemus shouts for help from his fellow giants, saying that "Nobody" has hurt him, they think Polyphemus is being afflicted by divine power and recommend prayer as the answer. """ (source: https://en.wikipedia.org/wiki/Polyphemus)

Unify how we check passwords between different OSes

2016-09-07T11:02:42Z

commit 04143fd68dbc656905714eff5c208fadb3464e25 parent 9698224090ff2989659717815bfa076d5d436a70 Author: Quentin Rameau Date: Wed, 7 Sep 2016 13:02:42 +0200 Unify how we check passwords between different OSes

make error message prefix consistent

2016-09-07T08:04:06Z

commit 9698224090ff2989659717815bfa076d5d436a70 parent a55594fdd69fcfcc10b8c9624d5aba298969d713 Author: Markus Teich Date: Wed, 7 Sep 2016 10:04:06 +0200 make error message prefix consistent

increasing for loops are idiomatic

2016-09-02T09:49:02Z

commit a55594fdd69fcfcc10b8c9624d5aba298969d713 parent 03a87179919eebab7d38c548e3ff8e2911512468 Author: Markus Teich Date: Fri, 2 Sep 2016 11:49:02 +0200 increasing for loops are idiomatic

Localize running and failure inside readpw()

2016-09-01T11:47:19Z

commit 03a87179919eebab7d38c548e3ff8e2911512468 parent 39fb855aa100c5a5a8b7f3b6cc1fbb2135fe7dde Author: Quentin Rameau Date: Thu, 1 Sep 2016 13:47:19 +0200 Localize running and failure inside readpw() They are only needed there, so don't make them global.

Move screen unlocking inside cleanup()

2016-09-01T11:47:05Z

commit 39fb855aa100c5a5a8b7f3b6cc1fbb2135fe7dde parent e378f735d857f7da124177e3540912d920be5022 Author: Quentin Rameau Date: Thu, 1 Sep 2016 13:47:05 +0200 Move screen unlocking inside cleanup()

Re-introduce the waiting loop for input grabbing

2016-09-01T11:46:51Z

commit e378f735d857f7da124177e3540912d920be5022 parent 1f66885fbf36c726b7615060d3c98cbf74218d13 Author: Quentin Rameau Date: Thu, 1 Sep 2016 13:46:51 +0200 Re-introduce the waiting loop for input grabbing We actually “need” to wait a little for input to be released before locking for cases where slock is spawned from other graphical applications using keybindings. This undoes the misbehaviour I introduced in c2f9757, sorry for the mess.

Add cleanup() to do free(locks) + XCloseDisplay()

2016-09-01T11:46:19Z

commit 1f66885fbf36c726b7615060d3c98cbf74218d13 parent 137f0076c2986306109d637599b885bdaf92cd58 Author: Quentin Rameau Date: Thu, 1 Sep 2016 13:46:19 +0200 Add cleanup() to do free(locks) + XCloseDisplay()

Refactor dontkillme()

2016-08-22T23:45:46Z

commit 137f0076c2986306109d637599b885bdaf92cd58 parent a9eddbd94fb03a36186ef2b1e784468dfcddbc19 Author: FRIGN Date: Tue, 23 Aug 2016 01:45:46 +0200 Refactor dontkillme() - Use file pointers instead of raw I/O, inspired by Kernel code. - Use OOM_SCORE_ADJ_MIN from linux/oom.h instead of working with magic values. - Stricter error checking and descriptive error messages. The reasoning for using the constant rather than magic values lies in the fact that this ensures people get the message. With "-1000", a code reviewer would question if that is really the lowest possible number or just an arbitrary value. The kernel ABI probably won't change, but even in the case, we wouldn't have to modify the code. The OOM killer only is guaranteed to not kill you if you have OOM_SCORE_ADJ_MIN.

Convert manpage to mandoc and fix usage

2016-08-23T08:55:34Z

commit a9eddbd94fb03a36186ef2b1e784468dfcddbc19 parent d8bec0f6fdc8a246d78cb488a0068954b46fcb29 Author: FRIGN Date: Tue, 23 Aug 2016 10:55:34 +0200 Convert manpage to mandoc and fix usage In all honor, the previous usage was formally more correct, but for the sake of consistency across all the tools having the v-flag, I separated it from the command-string. Also, make use of the mandoc macros for the manpage. This makes it easier to maintain, extend and change in the future.

fix CVE-2016-6866

2016-08-30T22:59:06Z

commit d8bec0f6fdc8a246d78cb488a0068954b46fcb29 parent b87bfa234378bcfc1b13273c5089f07902de1725 Author: Markus Teich Date: Wed, 31 Aug 2016 00:59:06 +0200 fix CVE-2016-6866

Update bsd-auth string.

2016-08-30T22:56:13Z

commit b87bfa234378bcfc1b13273c5089f07902de1725 parent c2f975773d720e734dbdab9a1e9ae51b0972ae0c Author: Markus Teich Date: Wed, 31 Aug 2016 00:56:13 +0200 Update bsd-auth string. Thanks to Hiltjo for discovering this.

Exit as soon as possible on input grabbing error

2016-08-30T15:33:09Z

commit c2f975773d720e734dbdab9a1e9ae51b0972ae0c parent 3bb868e40873c568acdec74f7783c77f063aa396 Author: Quentin Rameau Date: Tue, 30 Aug 2016 17:33:09 +0200 Exit as soon as possible on input grabbing error We want to know at once if slock failed or not to lock the screen, not seing a black screen for a whole second (or two) and then die. Thanks to ^7heo for reporting this.

Refactor main()

2016-08-21T22:25:21Z

commit 3bb868e40873c568acdec74f7783c77f063aa396 parent a7afade1701a809f6a33b53525d59dd29b38d381 Author: FRIGN Date: Mon, 22 Aug 2016 00:25:21 +0200 Refactor main() - Add arg.h and fix usage Given slock is suid we don't want to have half-measures in place to parse the arguments in case the code is changed in the future with somebody not paying enough attention. Also, fix the usage string output to be more consistent across the suckless toolbase and make it reflect the manpage entry. - Comments Use proper block comments and add/change them where necessary to help in studying the code. - Error messages Consistently prepend them with "slock:" and fix wording and do a proper cleanup before quitting (XCloseDisplay and free the locks), making the die() semantics consistent with st's. - getpwuid() error reporting Properly present an error message if getpwuid() fails. - fork() error reporting Properly present an error message if fork() fails. If we cannot close the connection within the fork context we abort the operation and report an error. - execvp() error handling If execvp fails, we cannot call die() afterwards as this implies calling exit(). We must use _exit() to prevent the libc from doing now "illegal" cleanup-work.

clear passwords with explicit_bzero

2016-07-31T11:43:00Z

commit a7afade1701a809f6a33b53525d59dd29b38d381 parent 65b8d5278882310eed758e6fbfd6ab9676db883c Author: Hiltjo Posthuma Date: Sun, 31 Jul 2016 13:43:00 +0200 clear passwords with explicit_bzero Make sure to explicitly clear memory that is used for password input. memset is often optimized out by the compiler. Brought to attention by the OpenBSD community, see: https://marc.info/?t=146989502600003&r=1&w=2 Thread subject: x11/slock: clear passwords with explicit_bzero Changes: - explicit_bzero.c import from libressl-portable. - Makefile: add COMPATSRC for compatibility src. - config.mk: add separate *BSD section in config.mk to simply uncomment it on these platforms.

Revert "No need for usage()"

2016-02-15T13:15:45Z

commit 65b8d5278882310eed758e6fbfd6ab9676db883c parent ec46680fe10ffc69007b0a8b29d9e69c72704053 Author: Markus Teich Date: Mon, 15 Feb 2016 14:15:45 +0100 Revert "No need for usage()" This reverts most of commit a6dc051e3744ce5b14c54d2d246d3e8258207e76 and fixes some related stuff: - keep spelling fixes from original commit - make -h and -v also work when followed by more arguments - any unknown flag prints usage - fix output of -v to display "slock: version 1.3" instead of "slock: slock-1.3"

revert using argv0 and minor fixup

2016-02-15T13:00:56Z

commit ec46680fe10ffc69007b0a8b29d9e69c72704053 parent b02c4d452a7942d4be3c69e6f98dafd35a2e4e78 Author: Markus Teich Date: Mon, 15 Feb 2016 14:00:56 +0100 revert using argv0 and minor fixup - use hardcoded "slock" instead of argv[0] - add "slock: " to fprintf calls, where it was missing - revert `argc--, argv++` shifting

Use argv0 instead of passing "slock:" to die every time

2016-02-14T01:13:54Z

commit b02c4d452a7942d4be3c69e6f98dafd35a2e4e78 parent a6dc051e3744ce5b14c54d2d246d3e8258207e76 Author: FRIGN Date: Sun, 14 Feb 2016 02:13:54 +0100 Use argv0 instead of passing "slock:" to die every time

No need for usage()

2016-02-14T00:48:48Z

commit a6dc051e3744ce5b14c54d2d246d3e8258207e76 parent bdcbeab0d8ac0963c61ae1d9d1ed57d3effb8ec3 Author: FRIGN Date: Sun, 14 Feb 2016 01:48:48 +0100 No need for usage() There are 2 arguments why -v and -h are broken: 1) if you are running off git, -v will show the last stable release, effectively making this option useless. people running stable versions leave open an attack surface this way in case there are vulnerabilities found. 99% of the people are also using package managers to keep their software up to date, instead of running $TOOL -v to check how old it is. 2) -h is a sad excuse for not just looking at the manual page (man 1 slock). Given we accept a post_lock_command, we can't be as liberal and just intercept certain flags. I changed the manpage to reflect this change.

Clarify config.def.h

2016-02-14T00:32:02Z

commit bdcbeab0d8ac0963c61ae1d9d1ed57d3effb8ec3 parent 3abbffa4934a62146e995ee7c2cf3ba50991b4ad Author: FRIGN Date: Sun, 14 Feb 2016 01:32:02 +0100 Clarify config.def.h Clear up the wording a bit and explain what failonclear means.

Simplify the oom-taming-function

2016-02-14T00:28:37Z

commit 3abbffa4934a62146e995ee7c2cf3ba50991b4ad parent 6a52a85a1ac87b29048863d599a8b0f0ee712482 Author: FRIGN Date: Sun, 14 Feb 2016 01:28:37 +0100 Simplify the oom-taming-function There really is no need to source a defined variable from a linux header. The OOM-rank ranges from -1000 to 1000, so we can safely hardcode -1000, which is a sane thing to do given slock is suid and we don't want to play around too much here anyway. On another notice, let's not forget that this still is a shitty heuristic. The OOM-killer still can kill us (thus I also changed the wording in the error-message. We do not disable the OOM-killer, we're just hiding.

add slock.1 man page

2016-02-11T15:49:59Z

commit 6a52a85a1ac87b29048863d599a8b0f0ee712482 parent c28ac1ebf16e5d10a8e0416065e7e3980be1ca5c Author: Markus Teich Date: Thu, 11 Feb 2016 16:49:59 +0100 add slock.1 man page

Update license year

2016-02-11T15:30:52Z

commit c28ac1ebf16e5d10a8e0416065e7e3980be1ca5c parent aa6a3853412fe001b77d3ef42b450b9ae48aa34c Author: FRIGN Date: Thu, 11 Feb 2016 16:30:52 +0100 Update license year It actually was 2014 and not 2015.

Don't forget the E-Mail

2016-02-11T15:29:26Z

commit aa6a3853412fe001b77d3ef42b450b9ae48aa34c parent 6adeb1281e7df28777e304877059f4636c1389f3 Author: FRIGN Date: Thu, 11 Feb 2016 16:29:26 +0100 Don't forget the E-Mail

Add myself to License

2016-02-11T15:28:41Z

commit 6adeb1281e7df28777e304877059f4636c1389f3 parent f6582b68b03fe25fe0296b685af6b5924cca7df9 Author: FRIGN Date: Thu, 11 Feb 2016 16:28:41 +0100 Add myself to License forgot that a while ago

update copyright year in -v output

2016-02-11T15:26:12Z

commit f6582b68b03fe25fe0296b685af6b5924cca7df9 parent bfafc91da7b51be4e1543b64ee118fff2e3a4cfb Author: Markus Teich Date: Thu, 11 Feb 2016 16:26:12 +0100 update copyright year in -v output

prepare 1.3 release

2016-02-11T15:23:48Z

commit bfafc91da7b51be4e1543b64ee118fff2e3a4cfb parent 32149e404383d979edf58b878cff9c5d8a935259 Author: Markus Teich Date: Thu, 11 Feb 2016 16:23:48 +0100 prepare 1.3 release

remove .hgtags

2016-02-11T15:22:34Z

commit 32149e404383d979edf58b878cff9c5d8a935259 parent 1766ecdfd4db86e5d022a8fb951559714eb1e6a4 Author: Markus Teich Date: Thu, 11 Feb 2016 16:22:34 +0100 remove .hgtags

add hint for suid to oom error message

2016-01-29T21:11:18Z

commit 1766ecdfd4db86e5d022a8fb951559714eb1e6a4 parent 9dfe0ce531023bf63c0e518b07ee97cf0cac742a Author: Markus Teich Date: Fri, 29 Jan 2016 22:11:18 +0100 add hint for suid to oom error message

error messages on grab failure

2016-01-18T15:49:15Z

commit 9dfe0ce531023bf63c0e518b07ee97cf0cac742a parent 55e827af0fb94f6c2b9e76a7bfe7e98cf697dc7b Author: Markus Teich Date: Mon, 18 Jan 2016 16:49:15 +0100 error messages on grab failure

code style fix

2016-01-16T11:38:36Z

commit 55e827af0fb94f6c2b9e76a7bfe7e98cf697dc7b parent e867c38123175d6f050e051ee6b00f4737a9712a Author: Markus Teich Date: Sat, 16 Jan 2016 12:38:36 +0100 code style fix

add option to run command after screen is locked

2015-12-26T12:13:25Z

commit e867c38123175d6f050e051ee6b00f4737a9712a parent b95ee111c7625375716e848ec81af2f57ca35b02 Author: Markus Teich Date: Sat, 26 Dec 2015 13:13:25 +0100 add option to run command after screen is locked

Don't change to failure colour on success

2015-08-27T04:16:25Z

commit b95ee111c7625375716e848ec81af2f57ca35b02 parent 0edbd2e0164a8c6cbad415e38083469041f29996 Author: David Phillips Date: Thu, 27 Aug 2015 06:16:25 +0200 Don't change to failure colour on success

Slightly safer OOM killer disablement in linux

2015-06-19T11:42:15Z

commit 0edbd2e0164a8c6cbad415e38083469041f29996 parent 754195f8d75586e23d1cc69cad00710802e0cb5d Author: David Phillips Date: Fri, 19 Jun 2015 23:42:15 +1200 Slightly safer OOM killer disablement in linux

rework setting window color

2015-05-08T15:10:15Z

commit 754195f8d75586e23d1cc69cad00710802e0cb5d parent 10d4e479c5f6d91bf86e15be3a12c6b09c9808be Author: Markus Teich Date: Fri, 8 May 2015 17:10:15 +0200 rework setting window color

consistently use () with sizeof

2015-05-08T14:43:13Z

commit 10d4e479c5f6d91bf86e15be3a12c6b09c9808be parent b1289f30b79c9c5ea43a9e9c624406d7d0661692 Author: Markus Teich Date: Fri, 8 May 2015 16:43:13 +0200 consistently use () with sizeof

Option to not show failure color on clear

2015-05-06T16:18:50Z

commit b1289f30b79c9c5ea43a9e9c624406d7d0661692 parent f5ef1b8eb5555da11e81d92d8d05acd4aba1ef40 Author: Nick Currier Date: Wed, 6 May 2015 10:18:50 -0600 Option to not show failure color on clear