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

Merge pull request #58 from doomrobo/master

Browse Source 
grab_key now only fails once during the execution
This commit is contained in:
Sascha Kruse 2012-09-02 16:16:38 -07:00
commit ef478aeb27
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dunst.c
View File

@ -133,6 +133,8 @@ static int tear_down_error_handler(void)
int grab_key(keyboard_shortcut * ks) int grab_key(keyboard_shortcut * ks)
{ {
if (!ks->is_valid)
return 1;
Window root; Window root;
root = RootWindow(dc->dpy, DefaultScreen(dc->dpy)); root = RootWindow(dc->dpy, DefaultScreen(dc->dpy));
@ -144,6 +146,7 @@ int grab_key(keyboard_shortcut * ks)
if (tear_down_error_handler()) { if (tear_down_error_handler()) {
fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str); fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str);
ks->is_valid = False;
return 1; return 1;
} }
return 0; return 0;
@ -1726,6 +1729,13 @@ int main(int argc, char *argv[])
init_shortcut(&close_all_ks); init_shortcut(&close_all_ks);
init_shortcut(&history_ks); init_shortcut(&history_ks);
grab_key(&close_ks);
ungrab_key(&close_ks);
grab_key(&close_all_ks);
ungrab_key(&close_all_ks);
grab_key(&history_ks);
ungrab_key(&history_ks);
geometry.mask = XParseGeometry(geom, geometry.mask = XParseGeometry(geom,
&geometry.x, &geometry.y, &geometry.x, &geometry.y,
&geometry.w, &geometry.h); &geometry.w, &geometry.h);