18 Commits
0.8 ... 1.0

Author SHA1 Message Date
anselm@garbe.us
34f5edb29e preparing 1.0 2012-02-11 10:51:26 +01:00
anselm@garbe.us
0b13628462 select for SubstructureRedirectMask as well 2012-02-09 20:56:34 +01:00
anselm@garbe.us
7a217cb7c4 fixed missing new lines 2012-02-09 20:18:49 +01:00
anselm@garbe.us
5d433c7cf5 typo fix 2012-02-05 16:41:31 +01:00
anselm@garbe.us
d6e9e7d9e3 added XRaiseWindow workaround when new clients are launched 2012-02-05 16:38:58 +01:00
garbeam@gmail.com
f013cb264e applied Michaels patch 2012-01-24 22:10:02 +01:00
anselm@garbe.us
5a5c581285 added dummy error handler to prevent X from terminating slock just in case 2012-01-22 18:58:10 +01:00
Anselm R Garbe
ede2935e10 applied Markus' patch to die in case /etc/passwd is unavailable 2011-04-21 08:22:47 +00:00
Anselm R Garbe
732d2b3bf5 applied Fernando Silveira's multiscreen patch for old style multihead setups 2009-11-26 12:53:26 +00:00
a@null
0cb05bdb75 applied Ali Gholami Rudi's patch regarding DPMS timeout customization and persistence 2008-12-12 19:34:43 +00:00
Anselm R Garbe
cadc8a7472 Added tag 0.9 for changeset 1e8a77601cb9 2008-07-29 19:23:21 +01:00
Anselm R Garbe
a6a3471dd9 fix 2008-07-29 19:17:24 +01:00
Anselm R Garbe
75dd779245 prepared release 2008-07-29 19:14:53 +01:00
Anselm R Garbe
1460b14f45 removed useless chars, prepared release 2008-07-29 19:08:18 +01:00
Anselm R Garbe
c0fdcb8afc s/d// 2008-04-09 23:42:50 +01:00
Anselm R Garbe
cc36050e44 yet another DPMS fix, still trying to prevent the error handler 2008-04-09 23:42:19 +01:00
Anselm R Garbe
049ccf9a90 fixed DPMS crashing issue 2008-04-08 09:55:46 +01:00
Anselm R Garbe
4ed35d22dc Added tag 0.8 for changeset c0eb8221ba49 2008-03-13 16:59:24 +00:00
6 changed files with 184 additions and 97 deletions

View File

@@ -5,3 +5,5 @@ f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5
dd226a81c09adfa86db232419b3000b7e406df68 0.6
c4635bb35a4581261f0187b347d5e596dd390ca3 0.7
c0eb8221ba49c6d10becc93c063c45196a3bb1ba 0.8
1e8a77601cb9c872921bbfc47909d9339027b295 0.9

View File

@@ -1,6 +1,6 @@
MIT/X Consortium License
© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
© 2006-2012 Anselm R Garbe <anselm@garbe.us>
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
# © 2006-2007 Anselm R. Garbe, Sander van Dijk
# See LICENSE file for copyright and license details.
include config.mk
@@ -13,7 +13,6 @@ options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}"
@echo "LD = ${LD}"
.c.o:
@echo CC $<
@@ -22,9 +21,8 @@ options:
${OBJ}: config.mk
slock: ${OBJ}
@echo LD $@
@${LD} -o $@ ${OBJ} ${LDFLAGS}
@strip $@
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
clean:
@echo cleaning

4
README
View File

@@ -13,8 +13,8 @@ Installation
Edit config.mk to match your local setup (slock is installed into
the /usr/local namespace by default).
Afterwards enter the following command to build and install slock (if
necessary as root):
Afterwards enter the following command to build and install slock
(if necessary as root):
make clean install

View File

@@ -1,5 +1,5 @@
# slock version
VERSION = 0.8
VERSION = 1.0
# Customize below to fit your system
@@ -14,17 +14,15 @@ INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
# flags
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
LDFLAGS = ${LIBS}
#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
#LDFLAGS = -g ${LIBS}
CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
# On *BSD remove -DHAVE_SHADOW_H from CFLAGS and add -DHAVE_BSD_AUTH
# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH
# On OpenBSD and Darwin remove -lcrypt from LIBS
# compiler and linker
CC = cc
LD = ${CC}
# Install mode. On BSD systems MODE=2755 and GROUP=auth
# On others MODE=4755 and GROUP=root

235
slock.c
View File

@@ -1,11 +1,11 @@
/* © 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
* See LICENSE file for license details. */
/* See LICENSE file for license details. */
#define _XOPEN_SOURCE 500
#if HAVE_SHADOW_H
#include <shadow.h>
#endif
#include <ctype.h>
#include <errno.h>
#include <pwd.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -16,15 +16,24 @@
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/dpms.h>
#if HAVE_BSD_AUTH
#include <login_cap.h>
#include <bsd_auth.h>
#endif
void
eprint(const char *errstr, ...) {
typedef struct {
int screen;
Window root, win;
Pixmap pmap;
} Lock;
static Lock **locks;
static int nscreens;
static Bool running = True;
static void
die(const char *errstr, ...) {
va_list ap;
va_start(ap, errstr);
@@ -34,14 +43,14 @@ eprint(const char *errstr, ...) {
}
#ifndef HAVE_BSD_AUTH
const char *
get_password() { /* only run as root */
static const char *
getpw(void) { /* only run as root */
const char *rval;
struct passwd *pw;
if(geteuid() != 0)
eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
pw = getpwuid(getuid());
if(!pw)
die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
endpwent();
rval = pw->pw_passwd;
@@ -49,6 +58,8 @@ get_password() { /* only run as root */
{
struct spwd *sp;
sp = getspnam(getenv("USER"));
if(!sp)
die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
endspent();
rval = sp->sp_pwdp;
}
@@ -56,81 +67,41 @@ get_password() { /* only run as root */
/* drop privileges */
if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
eprint("slock: cannot drop privileges\n");
die("slock: cannot drop privileges");
return rval;
}
#endif
int
main(int argc, char **argv) {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
static void
#ifdef HAVE_BSD_AUTH
readpw(Display *dpy)
#else
readpw(Display *dpy, const char *pws)
#endif
{
char buf[32], passwd[256];
int num, screen;
#ifndef HAVE_BSD_AUTH
const char *pws;
#endif
unsigned int len;
Bool running = True;
Cursor invisible;
Display *dpy;
KeySym ksym;
Pixmap pmap;
Window root, w;
XColor black, dummy;
XEvent ev;
XSetWindowAttributes wa;
if((argc == 2) && !strcmp("-v", argv[1]))
eprint("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
else if(argc != 1)
eprint("usage: slock [-v]\n");
#ifndef HAVE_BSD_AUTH
pws = get_password();
#endif
if(!(dpy = XOpenDisplay(0)))
eprint("slock: cannot open display\n");
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
/* init */
wa.override_redirect = 1;
wa.background_pixel = BlackPixel(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);
XMapRaised(dpy, w);
for(len = 1000; len; len--) {
if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
GrabModeAsync, GrabModeAsync, 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);
running = True;
/* main event loop */
/* As "slock" stands for "Simple X display locker", the DPMS settings
* had been removed and you can set it with "xset" or some other
* utility. This way the user can easily set a customized DPMS
* timeout. */
while(running && !XNextEvent(dpy, &ev)) {
if(len == 0)
DPMSForceLevel(dpy, DPMSModeOff);
if(ev.type == KeyPress) {
buf[0] = 0;
num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
if(IsKeypadKey(ksym)) {
if(ksym == XK_KP_Enter)
ksym = XK_Return;
else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
ksym = (ksym - XK_KP_0) + XK_0;
}
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|| IsPrivateKeypadKey(ksym))
@@ -138,14 +109,12 @@ main(int argc, char **argv) {
switch(ksym) {
case XK_Return:
passwd[len] = 0;
#ifdef HAVE_BSD_AUTH
running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
#else
running = strcmp(crypt(passwd, pws), pws);
#endif
if (running != 0)
if(running != False)
XBell(dpy, 100);
len = 0;
break;
@@ -164,10 +133,130 @@ main(int argc, char **argv) {
break;
}
}
else for(screen = 0; screen < nscreens; screen++)
XRaiseWindow(dpy, locks[screen]->win);
}
}
static void
unlockscreen(Display *dpy, Lock *lock) {
if(dpy == NULL || lock == NULL)
return;
XUngrabPointer(dpy, CurrentTime);
XFreePixmap(dpy, pmap);
XDestroyWindow(dpy, w);
XFreePixmap(dpy, lock->pmap);
XDestroyWindow(dpy, lock->win);
free(lock);
}
static Lock *
lockscreen(Display *dpy, int screen) {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned int len;
Lock *lock;
XColor black, dummy;
XSetWindowAttributes wa;
Cursor invisible;
if(dpy == NULL || screen < 0)
return NULL;
lock = malloc(sizeof(Lock));
if(lock == NULL)
return NULL;
lock->screen = screen;
lock->root = RootWindow(dpy, lock->screen);
/* init */
wa.override_redirect = 1;
wa.background_pixel = BlackPixel(dpy, lock->screen);
lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
0, DefaultDepth(dpy, lock->screen), CopyFromParent,
DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), "black", &black, &dummy);
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &black, &black, 0, 0);
XDefineCursor(dpy, lock->win, invisible);
XMapRaised(dpy, lock->win);
for(len = 1000; len; len--) {
if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
break;
usleep(1000);
}
if(running && (len > 0)) {
for(len = 1000; len; len--) {
if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
== GrabSuccess)
break;
usleep(1000);
}
running = (len > 0);
}
if(!running) {
unlockscreen(dpy, lock);
lock = NULL;
}
else
XSelectInput(dpy, lock->root, SubstructureNotifyMask);
return lock;
}
static void
usage(void) {
fprintf(stderr, "usage: slock [-v]\n");
exit(EXIT_FAILURE);
}
int
main(int argc, char **argv) {
#ifndef HAVE_BSD_AUTH
const char *pws;
#endif
Display *dpy;
int screen;
if((argc == 2) && !strcmp("-v", argv[1]))
die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
else if(argc != 1)
usage();
if(!getpwuid(getuid()))
die("slock: no passwd entry for you");
#ifndef HAVE_BSD_AUTH
pws = getpw();
#endif
if(!(dpy = XOpenDisplay(0)))
die("slock: cannot open display");
/* Get the number of screens in display "dpy" and blank them all. */
nscreens = ScreenCount(dpy);
locks = malloc(sizeof(Lock *) * nscreens);
if(locks == NULL)
die("slock: malloc: %s", strerror(errno));
for(screen = 0; screen < nscreens; screen++)
locks[screen] = lockscreen(dpy, screen);
XSync(dpy, False);
/* Everything is now blank. Now wait for the correct password. */
#ifdef HAVE_BSD_AUTH
readpw(dpy);
#else
readpw(dpy, pws);
#endif
/* Password ok, unlock everything and quit. */
for(screen = 0; screen < nscreens; screen++)
unlockscreen(dpy, locks[screen]);
free(locks);
XCloseDisplay(dpy);
return 0;
}