Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
48a7ab2225 | ||
|
d8ea936899 | ||
|
8322f22871 | ||
|
d83a9a1d01 | ||
|
ae8cce24d3 | ||
|
663fdb326a | ||
|
48f386ce9d | ||
|
6725bb2a3a | ||
|
11642443f5 | ||
|
e521638027 | ||
|
227cc94733 |
3
.hgtags
3
.hgtags
@@ -1,2 +1,5 @@
|
|||||||
0a95c73c7374fbc2342b6040d9f35ddf597729e1 0.1
|
0a95c73c7374fbc2342b6040d9f35ddf597729e1 0.1
|
||||||
da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
|
da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
|
||||||
|
f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
|
||||||
|
4c2cf4d6a2d0e08cbe280ec50ef76c9aecfc0fbe 0.4
|
||||||
|
bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5
|
||||||
|
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
|||||||
MIT/X Consortium License
|
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
|
Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
copy of this software and associated documentation files (the "Software"),
|
copy of this software and associated documentation files (the "Software"),
|
||||||
|
2
Makefile
2
Makefile
@@ -1,5 +1,5 @@
|
|||||||
# slock - simple screen locker
|
# slock - simple screen locker
|
||||||
# (C)opyright MMVI Anselm R. Garbe
|
# (C)opyright MMVI-MMVII Anselm R. Garbe
|
||||||
|
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
# slock version
|
# slock version
|
||||||
VERSION = 0.3
|
VERSION = 0.6
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ LDFLAGS = ${LIBS}
|
|||||||
#LDFLAGS = -g ${LIBS}
|
#LDFLAGS = -g ${LIBS}
|
||||||
|
|
||||||
# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
|
# 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
|
# compiler and linker
|
||||||
CC = cc
|
CC = cc
|
||||||
|
38
slock.c
38
slock.c
@@ -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.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
#define _XOPEN_SOURCE 500
|
#define _XOPEN_SOURCE 500
|
||||||
@@ -58,7 +58,7 @@ main(int argc, char **argv) {
|
|||||||
Display *dpy;
|
Display *dpy;
|
||||||
KeySym ksym;
|
KeySym ksym;
|
||||||
Pixmap pmap;
|
Pixmap pmap;
|
||||||
Window w;
|
Window root, w;
|
||||||
XColor black, dummy;
|
XColor black, dummy;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
XSetWindowAttributes wa;
|
XSetWindowAttributes wa;
|
||||||
@@ -73,36 +73,42 @@ main(int argc, char **argv) {
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
screen = DefaultScreen(dpy);
|
screen = DefaultScreen(dpy);
|
||||||
|
root = RootWindow(dpy, screen);
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
wa.override_redirect = 1;
|
wa.override_redirect = 1;
|
||||||
wa.background_pixel = BlackPixel(dpy, screen);
|
wa.background_pixel = BlackPixel(dpy, screen);
|
||||||
w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
|
w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
|
||||||
DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
|
|
||||||
0, DefaultDepth(dpy, screen), CopyFromParent,
|
0, DefaultDepth(dpy, screen), CopyFromParent,
|
||||||
DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
|
DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
|
||||||
|
|
||||||
XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
|
XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
|
||||||
pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
|
pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
|
||||||
invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
|
invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
|
||||||
XDefineCursor(dpy, w, invisible);
|
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);
|
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);
|
XSync(dpy, False);
|
||||||
|
|
||||||
/* main event loop */
|
/* main event loop */
|
||||||
while(running && !XNextEvent(dpy, &ev))
|
while(running && !XNextEvent(dpy, &ev))
|
||||||
if(ev.type == KeyPress) {
|
if(ev.type == KeyPress) {
|
||||||
buf[0] = 0;
|
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)
|
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|
||||||
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|
||||||
|| IsPrivateKeypadKey(ksym))
|
|| IsPrivateKeypadKey(ksym))
|
||||||
@@ -122,7 +128,7 @@ main(int argc, char **argv) {
|
|||||||
--len;
|
--len;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if(num && !iscntrl((int) buf[0])) {
|
if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
|
||||||
memcpy(passwd + len, buf, num);
|
memcpy(passwd + len, buf, num);
|
||||||
len += num;
|
len += num;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user