nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configurable keyboard shortcuts

Browse Source
This commit is contained in:
Sascha Kruse 2011-09-09 00:20:58 +02:00
parent c7c46243a7
commit 3e5bf33b59
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dunst.c
View File

@ -13,8 +13,6 @@
#include "draw.h" #include "draw.h"
#define KEY_MASK ControlMask
#define KEY XK_space
#define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh)) #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
@ -50,6 +48,8 @@ static msg_queue_t *msgqueuehead = NULL;
static time_t now; static time_t now;
static int loop = True; static int loop = True;
static int visible = False; static int visible = False;
static KeySym key = NoSymbol;
static KeySym mask = 0;
/* list functions */ /* list functions */
@ -152,7 +152,7 @@ handleXEvents(void) {
} }
break; break;
case KeyPress: case KeyPress:
if(XLookupKeysym(&ev.xkey, 0) == KEY) { if(XLookupKeysym(&ev.xkey, 0) == key) {
next_win(); next_win();
} }
} }
@ -262,8 +262,8 @@ setup(void) {
resizedc(dc, mw, mh); resizedc(dc, mw, mh);
/* grab keys */ /* grab keys */
code = XKeysymToKeycode(dc->dpy, KEY); code = XKeysymToKeycode(dc->dpy, key);
XGrabKey(dc->dpy, code, KEY_MASK, root, True, GrabModeAsync, GrabModeAsync); XGrabKey(dc->dpy, code, mask, root, True, GrabModeAsync, GrabModeAsync);
} }
void void
@ -300,7 +300,7 @@ main(int argc, char *argv[]) {
usage(EXIT_SUCCESS); usage(EXIT_SUCCESS);
/* options */ /* options */
else if(i == argc) { else if(i == argc-1) {
printf("Option needs an argument\n"); printf("Option needs an argument\n");
usage(1); usage(1);
} }
@ -327,6 +327,38 @@ main(int argc, char *argv[]) {
msgqueuehead = append(msgqueuehead, argv[++i]); msgqueuehead = append(msgqueuehead, argv[++i]);
loop = False; loop = False;
} }
else if(!strcmp(argv[i], "-key")) {
key = XStringToKeysym(argv[i+1]);
if(key == NoSymbol) {
fprintf(stderr, "Unable to grab key: %s.\n", argv[i+1]);
exit(EXIT_FAILURE);
}
i++;
}
else if(!strcmp(argv[i], "-mod")) {
if(!strcmp(argv[i+1], "ctrl")) {
mask |= ControlMask;
}
else if(!strcmp(argv[i+1], "shift")) {
mask |= ShiftMask;
}
else if(!strcmp(argv[i+1], "mod1")) {
mask |= Mod1Mask;
}
else if(!strcmp(argv[i+1], "mod2")) {
mask |= Mod2Mask;
}
else if(!strcmp(argv[i+1], "mod3")) {
mask |= Mod3Mask;
}
else if(!strcmp(argv[i+1], "mod4")) {
mask |= Mod4Mask;
} else {
fprintf(stderr, "Unable to find mask: %s\n", argv[i+1]);
fprintf(stderr, "See manpage for list of available masks\n");
}
i++;
}
else else
usage(EXIT_FAILURE); usage(EXIT_FAILURE);
} }