X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/27d8d248275ca3eb63882202dcc21ecf2f81e72a..0cb05bdb75ac13f010d51e267007ca1c869763ec:/slock.c
diff --git a/slock.c b/slock.c
index 6541b70..8490dae 100644
--- a/slock.c
+++ b/slock.c
@@ -1,31 +1,45 @@
-/* (C)opyright MMIV-MMV 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 <pwd.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#if HAVE_SHADOW_H
-#include <shadow.h>
-#endif
#include <sys/types.h>
#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
-const char *
+static void
+die(const char *errstr, ...) {
+ va_list ap;
+
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+ exit(EXIT_FAILURE);
+}
+
+#ifndef HAVE_BSD_AUTH
+static const char *
get_password() { /* only run as root */
const char *rval;
struct passwd *pw;
- if(geteuid() != 0) {
- fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
- exit(EXIT_FAILURE);
- }
+ if(geteuid() != 0)
+ die("slock: cannot retrieve password entry (make sure to suid slock)\n");
pw = getpwuid(getuid());
endpwent();
rval = pw->pw_passwd;
@@ -38,72 +52,94 @@ get_password() { /* only run as root */
rval = sp->sp_pwdp;
}
#endif
+
/* drop privileges */
- if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
- fputs("slock: cannot drop privileges\n",stdout);
- exit(EXIT_FAILURE);
- }
+ if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+ die("slock: cannot drop privileges\n");
return rval;
}
+#endif
int
main(int argc, char **argv) {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
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 w;
+ Window root, w;
XColor black, dummy;
XEvent ev;
XSetWindowAttributes wa;
+ CARD16 standby, suspend, off;
- if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
- fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
- exit(EXIT_SUCCESS);
- }
+ if((argc == 2) && !strcmp("-v", argv[1]))
+ die("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
+ else if(argc != 1)
+ die("usage: slock [-v]\n");
+
+#ifndef HAVE_BSD_AUTH
pws = get_password();
- if(!(dpy = XOpenDisplay(0))) {
- fputs("slock: cannot open display\n", stderr);
- exit(EXIT_FAILURE);
- }
+#endif
+
+ if(!(dpy = XOpenDisplay(0)))
+ die("slock: cannot open display\n");
screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
/* init */
- len = 0;
-
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);
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);
+ if(DPMSCapable(dpy)) { /* save and customize DPMS settings */
+ DPMSGetTimeouts(dpy, &standby, &suspend, &off);
+ DPMSSetTimeouts(dpy, 10, 30, 90);
+ }
+
/* main event loop */
- while(running && !XNextEvent(dpy, &ev))
+ 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(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))
@@ -111,7 +147,12 @@ main(int argc, char **argv) {
switch(ksym) {
case XK_Return:
passwd[len] = 0;
- if((running = strcmp(crypt(passwd, pws), pws)) != 0)
+#ifdef HAVE_BSD_AUTH
+ running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+#else
+ running = strcmp(crypt(passwd, pws), pws);
+#endif
+ if (running != 0)
XBell(dpy, 100);
len = 0;
break;
@@ -120,16 +161,20 @@ main(int argc, char **argv) {
break;
case XK_BackSpace:
if(len)
- --len;
+ --len;
break;
default:
- if(num && !iscntrl((int) buf[0])) {
- memcpy(passwd + len,buf,num);
+ if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
+ memcpy(passwd + len, buf, num);
len += num;
}
break;
}
}
+ }
+ if(DPMSCapable(dpy)) { /* restore DPMS settings */
+ DPMSSetTimeouts(dpy, standby, suspend, off);
+ }
XUngrabPointer(dpy, CurrentTime);
XFreePixmap(dpy, pmap);
XDestroyWindow(dpy, w);