suckless/svkbd
1
0
Fork 0
mirror of git://git.suckless.org/svkbd synced 2024-12-18 04:04:44 +00:00
Code Issues Projects Releases Wiki Activity

typo fix, removing hover.

Browse Source
This commit is contained in:
Enno Boland (tox) 2010-05-16 12:17:09 +02:00
parent 6436823105
commit d002c1dd3a
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
svkbd.c
View File

@ -28,7 +28,6 @@ typedef unsigned long ulong;
typedef struct { typedef struct {
ulong norm[ColLast]; ulong norm[ColLast];
ulong press[ColLast]; ulong press[ColLast];
ulong hover[ColLast];
Drawable drawable; Drawable drawable;
GC gc; GC gc;
struct { struct {
@ -67,7 +66,6 @@ static Key *findkey(int x, int y);
static ulong getcolor(const char *colstr); static ulong getcolor(const char *colstr);
static void initfont(const char *fontstr); static void initfont(const char *fontstr);
static void leavenotify(XEvent *e); static void leavenotify(XEvent *e);
static void motionnotify(XEvent *e);
static void press(Key *k, KeySym mod); static void press(Key *k, KeySym mod);
static void run(void); static void run(void);
static void setup(void); static void setup(void);
@ -85,13 +83,11 @@ static void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify, [UnmapNotify] = unmapnotify,
[Expose] = expose, [Expose] = expose,
[LeaveNotify] = leavenotify, [LeaveNotify] = leavenotify,
[MotionNotify] = motionnotify,
}; };
static Display *dpy; static Display *dpy;
static DC dc; static DC dc;
static Window root, win; static Window root, win;
static Bool running = True; static Bool running = True;
static Key *hover = NULL;
static KeySym pressedmod = 0; static KeySym pressedmod = 0;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
@ -177,8 +173,6 @@ drawkey(Key *k) {
if(k->pressed) if(k->pressed)
col = dc.press; col = dc.press;
else if(hover == k)
col = dc.hover;
else else
col = dc.norm; col = dc.norm;
XSetForeground(dpy, dc.gc, col[ColBG]); XSetForeground(dpy, dc.gc, col[ColBG]);
@ -278,30 +272,7 @@ initfont(const char *fontstr) {
void void
leavenotify(XEvent *e) { leavenotify(XEvent *e) {
Key *oh = hover;
unpress(NULL); unpress(NULL);
if(!hover)
return;
hover = NULL;
drawkey(oh);
}
void
motionnotify(XEvent *e) {
XMotionEvent *ev = &e->xmotion;
Key *h = findkey(ev->x, ev->y), *oh;
if(h != hover) {
oh = hover;;
hover = h;
if(oh) {
drawkey(oh);
}
if(hover) {
drawkey(hover);
}
}
} }
void void
@ -353,8 +324,6 @@ setup(void) {
dc.norm[ColFG] = getcolor(normfgcolor); dc.norm[ColFG] = getcolor(normfgcolor);
dc.press[ColBG] = getcolor(pressbgcolor); dc.press[ColBG] = getcolor(pressbgcolor);
dc.press[ColFG] = getcolor(pressfgcolor); dc.press[ColFG] = getcolor(pressfgcolor);
dc.hover[ColBG] = getcolor(hovbgcolor);
dc.hover[ColFG] = getcolor(hovfgcolor);
dc.drawable = XCreatePixmap(dpy, root, ww, wh, DefaultDepth(dpy, screen)); dc.drawable = XCreatePixmap(dpy, root, ww, wh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0); dc.gc = XCreateGC(dpy, root, 0, 0);
if(!dc.font.set) if(!dc.font.set)
@ -363,9 +332,8 @@ setup(void) {
keys[i].pressed = 0; keys[i].pressed = 0;
win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0, dc.norm[ColFG], dc.norm[ColBG]); win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0, dc.norm[ColFG], dc.norm[ColBG]);
XSelectInput(dpy, win, StructureNotifyMask|PointerMotionMask| XSelectInput(dpy, win, StructureNotifyMask|ButtonReleaseMask|
ButtonReleaseMask|ButtonPressMask|ExposureMask| ButtonPressMask|ExposureMask|LeaveWindowMask);
LeaveWindowMask);
wmh = XAllocWMHints(); wmh = XAllocWMHints();
wmh->input = False; wmh->input = False;
wmh->flags = InputHint; wmh->flags = InputHint;
@ -443,7 +411,7 @@ updatekeys() {
int int
main(int argc, char *argv[]) { main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1])) if(argc == 2 && !strcmp("-v", argv[1]))
die("svkc-"VERSION", © 2006-2008 svkbd engineers, see LICENSE for details\n"); die("svkbd-"VERSION", © 2006-2010 svkbd engineers, see LICENSE for details\n");
else if(argc != 1) else if(argc != 1)
die("usage: svkbd [-v]\n"); die("usage: svkbd [-v]\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())