pinosaur
/
slock.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yet another DPMS fix, still trying to prevent the error handler
[slock.git]
/
slock.c
diff --git
a/slock.c
b/slock.c
index
2dc9648
..
12cd8ee
100644
(file)
--- a/
slock.c
+++ b/
slock.c
@@
-1,5
+1,4
@@
-/* © 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>
#define _XOPEN_SOURCE 500
#if HAVE_SHADOW_H
#include <shadow.h>
@@
-126,11
+125,18
@@
main(int argc, char **argv) {
/* main event loop */
while(running && !XNextEvent(dpy, &ev)) {
/* main event loop */
while(running && !XNextEvent(dpy, &ev)) {
- if(len == 0)
+ if(len == 0 && DPMSCapable(dpy)) {
+ DPMSEnabled(dpy);
DPMSForceLevel(dpy, DPMSModeOff);
DPMSForceLevel(dpy, DPMSModeOff);
+ }
if(ev.type == KeyPress) {
buf[0] = 0;
num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
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))
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|| IsPrivateKeypadKey(ksym))