11 Commits
0.3 ... 0.6

Author SHA1 Message Date
Anselm R. Garbe
48a7ab2225 grab on the root window, it is correct, all lockers do that 2007-03-07 10:57:23 +01:00
Anselm R. Garbe
d8ea936899 Added tag 0.5 for changeset bd24ea7fcca2 2007-03-05 11:28:53 +01:00
Anselm R. Garbe
8322f22871 grab on the slock window instead on the root window 2007-03-02 21:50:05 +01:00
Anselm R. Garbe
d83a9a1d01 made slock more readable, added root variable because we intend to call RootWindow(...) quite a lot 2007-02-21 22:16:23 +01:00
Anselm R. Garbe
ae8cce24d3 made slock more aggressive, DenisG please recheck 2007-02-21 21:25:53 +01:00
Anselm R. Garbe
663fdb326a foobar 2007-02-01 13:52:36 +01:00
Anselm R. Garbe
48f386ce9d Added tag 0.4 for changeset 4c2cf4d6a2d0 2007-01-13 14:10:56 +01:00
Anselm R. Garbe
6725bb2a3a fixed a potential buffer overflow bug on the stack (thanks to Ghassan Misherg) 2007-01-13 14:09:41 +01:00
arg@mig29
11642443f5 thanks to Jack for this hint 2006-12-08 10:53:35 +01:00
arg@mig29
e521638027 fixed sizeof stuff 2006-11-26 15:50:18 +01:00
arg@mig29
227cc94733 Added tag 0.3 for changeset f9157b1864388ad8f1920e5fde7c5849e73d8327 2006-11-03 11:35:48 +01:00
5 changed files with 29 additions and 20 deletions

View File

@@ -1,2 +1,5 @@
0a95c73c7374fbc2342b6040d9f35ddf597729e1 0.1
da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
4c2cf4d6a2d0e08cbe280ec50ef76c9aecfc0fbe 0.4
bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5

View File

@@ -1,6 +1,6 @@
MIT/X Consortium License
(C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
(C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

View File

@@ -1,5 +1,5 @@
# slock - simple screen locker
# (C)opyright MMVI Anselm R. Garbe
# (C)opyright MMVI-MMVII Anselm R. Garbe
include config.mk

View File

@@ -1,5 +1,5 @@
# slock version
VERSION = 0.3
VERSION = 0.6
# Customize below to fit your system
@@ -21,7 +21,7 @@ LDFLAGS = ${LIBS}
#LDFLAGS = -g ${LIBS}
# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
# On OpenBSD remove -lcrypt from LIBS
# On OpenBSD and Darwin remove -lcrypt from LIBS
# compiler and linker
CC = cc

38
slock.c
View File

@@ -1,4 +1,4 @@
/* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#define _XOPEN_SOURCE 500
@@ -58,7 +58,7 @@ main(int argc, char **argv) {
Display *dpy;
KeySym ksym;
Pixmap pmap;
Window w;
Window root, w;
XColor black, dummy;
XEvent ev;
XSetWindowAttributes wa;
@@ -73,36 +73,42 @@ main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
/* init */
wa.override_redirect = 1;
wa.background_pixel = BlackPixel(dpy, screen);
w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
XDefineCursor(dpy, w, invisible);
running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess;
len = 10;
for(len = 10; len && (XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
GrabModeAsync, CurrentTime) != GrabSuccess); len--)
usleep(1000);
running = running && (len > 0);
len = 0;
XMapRaised(dpy, w);
for(len = 1000; len; len--) {
if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess)
break;
usleep(1000);
}
if((running = running && (len > 0))) {
for(len = 1000; len; len--) {
if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
break;
usleep(1000);
}
running = (len > 0);
}
len = 0;
XSync(dpy, False);
/* main event loop */
while(running && !XNextEvent(dpy, &ev))
if(ev.type == KeyPress) {
buf[0] = 0;
num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|| IsPrivateKeypadKey(ksym))
@@ -122,7 +128,7 @@ main(int argc, char **argv) {
--len;
break;
default:
if(num && !iscntrl((int) buf[0])) {
if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
memcpy(passwd + len, buf, num);
len += num;
}