From ff79c382c5d1c83c8e771223cbb99bc0e87be697 Mon Sep 17 00:00:00 2001
From: "arg@mig29" <unknown>
Date: Tue, 31 Oct 2006 08:43:25 +0100
Subject: [PATCH] small fix of Vincent's patch
---
config.mk | 2 +-
slock.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/config.mk b/config.mk
index 0ece512..bc27ece 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# slock version
-VERSION = 0.2
+VERSION = 0.3
# Customize below to fit your system
diff --git a/slock.c b/slock.c
index 6541b70..62fcac9 100644
--- a/slock.c
+++ b/slock.c
@@ -2,6 +2,9 @@
* See LICENSE file for license details.
*/
#define _XOPEN_SOURCE 500
+#if HAVE_SHADOW_H
+#include <shadow.h>
+#endif
#include <ctype.h>
#include <pwd.h>
@@ -9,9 +12,6 @@
#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>
@@ -75,8 +75,6 @@ main(int argc, char **argv) {
screen = DefaultScreen(dpy);
/* init */
- len = 0;
-
wa.override_redirect = 1;
wa.background_pixel = BlackPixel(dpy, screen);
w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
@@ -96,6 +94,7 @@ main(int argc, char **argv) {
GrabModeAsync, CurrentTime) != GrabSuccess); len--)
usleep(1000);
running = running && (len > 0);
+ len = 0;
XMapRaised(dpy, w);
XSync(dpy, False);
@@ -120,11 +119,11 @@ 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);
+ memcpy(passwd + len, buf, num);
len += num;
}
break;