pinosaur
/
slock.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88d9684
)
applied Eckehard Bern's dualcolor patch to slock
author
anselm@garbe.us
<unknown>
Sat, 17 Mar 2012 17:03:25 +0000
(18:03 +0100)
committer
anselm@garbe.us
<unknown>
Sat, 17 Mar 2012 17:03:25 +0000
(18:03 +0100)
config.mk
patch
|
blob
|
history
slock.c
patch
|
blob
|
history
diff --git
a/config.mk
b/config.mk
index
f438ed4
..
addb499
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-1,5
+1,5
@@
# slock version
# slock version
-VERSION = 1.0
+VERSION = 1.0
-tip
# Customize below to fit your system
# Customize below to fit your system
@@
-14,7
+14,7
@@
INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
# flags
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-DCOLOR1=\"black\" -DCOLOR2=\"\#005577\"
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
diff --git
a/slock.c
b/slock.c
index
96d4379
..
12b8d4d
100644
(file)
--- a/
slock.c
+++ b/
slock.c
@@
-26,6
+26,7
@@
typedef struct {
int screen;
Window root, win;
Pixmap pmap;
int screen;
Window root, win;
Pixmap pmap;
+ unsigned long colors[2];
} Lock;
static Lock **locks;
} Lock;
static Lock **locks;
@@
-81,11
+82,11
@@
readpw(Display *dpy, const char *pws)
{
char buf[32], passwd[256];
int num, screen;
{
char buf[32], passwd[256];
int num, screen;
- unsigned int len;
+ unsigned int len
, llen
;
KeySym ksym;
XEvent ev;
KeySym ksym;
XEvent ev;
- len = 0;
+ len =
llen =
0;
running = True;
/* As "slock" stands for "Simple X display locker", the DPMS settings
running = True;
/* As "slock" stands for "Simple X display locker", the DPMS settings
@@
-132,6
+133,18
@@
readpw(Display *dpy, const char *pws)
}
break;
}
}
break;
}
+ if(llen == 0 && len != 0) {
+ for(screen = 0; screen < nscreens; screen++) {
+ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
+ XClearWindow(dpy, locks[screen]->win);
+ }
+ } else if(llen != 0 && len == 0) {
+ for(screen = 0; screen < nscreens; screen++) {
+ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
+ XClearWindow(dpy, locks[screen]->win);
+ }
+ }
+ llen = len;
}
else for(screen = 0; screen < nscreens; screen++)
XRaiseWindow(dpy, locks[screen]->win);
}
else for(screen = 0; screen < nscreens; screen++)
XRaiseWindow(dpy, locks[screen]->win);
@@
-144,6
+157,7
@@
unlockscreen(Display *dpy, Lock *lock) {
return;
XUngrabPointer(dpy, CurrentTime);
return;
XUngrabPointer(dpy, CurrentTime);
+ XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
XFreePixmap(dpy, lock->pmap);
XDestroyWindow(dpy, lock->win);
XFreePixmap(dpy, lock->pmap);
XDestroyWindow(dpy, lock->win);
@@
-155,7
+169,7
@@
lockscreen(Display *dpy, int screen) {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned int len;
Lock *lock;
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned int len;
Lock *lock;
- XColor
black
, dummy;
+ XColor
color
, dummy;
XSetWindowAttributes wa;
Cursor invisible;
XSetWindowAttributes wa;
Cursor invisible;
@@
-176,9
+190,12
@@
lockscreen(Display *dpy, int 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);
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);
+ XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
+ lock->colors[1] = color.pixel;
+ XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
+ lock->colors[0] = color.pixel;
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
- invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &
black, &black
, 0, 0);
+ invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &
color, &color
, 0, 0);
XDefineCursor(dpy, lock->win, invisible);
XMapRaised(dpy, lock->win);
for(len = 1000; len; len--) {
XDefineCursor(dpy, lock->win, invisible);
XMapRaised(dpy, lock->win);
for(len = 1000; len; len--) {