slock

commit 433e9618820375b603f46c272ee2ca4740c8100f
parent 06e06a1507143728cf3909a23191d423331e64a4
Author: Stein Gunnar Bakkeby <bakkeby@gmail.com>
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
Diffstat:
M
slock.c
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/slock.c b/slock.c
@@ -393,13 +393,11 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 			#endif // MEDIAKEYS_PATCH
 			default:
 				#if CONTROLCLEAR_PATCH
-				if (controlkeyclear && iscntrl((int)buf[0]))
+				if (controlkeyclear && iscntrl((int)buf[0]) && !num)
 					continue;
-				if (num && (len + num < sizeof(passwd)))
-				#else
+				#endif // CONTROLCLEAR_PATCH
 				if (num && !iscntrl((int)buf[0]) &&
 				    (len + num < sizeof(passwd)))
-				#endif // CONTROLCLEAR_PATCH
 				{
 					memcpy(passwd + len, buf, num);
 					len += num;