From 5b130bd18dbea68a03d108a49da4e18511a40312 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 15 Oct 2007 18:17:33 +0200 Subject: [PATCH] grabkeys does not need display/screen as arg --- awesome.c | 2 +- event.c | 16 ++++++++-------- event.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/awesome.c b/awesome.c index fadfb68c0..6f6658fa2 100644 --- a/awesome.c +++ b/awesome.c @@ -194,7 +194,7 @@ setup(awesome_config *awesomeconf) XSelectInput(awesomeconf->display, RootWindow(awesomeconf->display, awesomeconf->phys_screen), wa.event_mask); - grabkeys(awesomeconf->display, awesomeconf->phys_screen, awesomeconf); + grabkeys(awesomeconf); } /** Startup Error handler to check if another window manager diff --git a/event.c b/event.c index 8f3fdf8b9..6037b5541 100644 --- a/event.c +++ b/event.c @@ -428,7 +428,7 @@ handle_event_mappingnotify(XEvent * e, awesome_config *awesomeconf) XRefreshKeyboardMapping(ev); if(ev->request == MappingKeyboard) for(screen = 0; screen < ScreenCount(e->xany.display); screen++) - grabkeys(e->xany.display, screen, &awesomeconf[screen]); + grabkeys(&awesomeconf[screen]); } void @@ -521,20 +521,20 @@ handle_event_randr_screen_change_notify(XEvent *e, } void -grabkeys(Display *disp, int screen, awesome_config *awesomeconf) +grabkeys(awesome_config *awesomeconf) { int i; KeyCode code; - XUngrabKey(disp, AnyKey, AnyModifier, RootWindow(disp, screen)); + XUngrabKey(awesomeconf->display, AnyKey, AnyModifier, RootWindow(awesomeconf->display, awesomeconf->phys_screen)); for(i = 0; i < awesomeconf->nkeys; i++) { - if((code = XKeysymToKeycode(disp, awesomeconf->keys[i].keysym)) == NoSymbol) + if((code = XKeysymToKeycode(awesomeconf->display, awesomeconf->keys[i].keysym)) == NoSymbol) continue; - XGrabKey(disp, code, awesomeconf->keys[i].mod, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); - XGrabKey(disp, code, awesomeconf->keys[i].mod | LockMask, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); - XGrabKey(disp, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); - XGrabKey(disp, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask | LockMask, RootWindow(disp, screen), True, + XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync); + XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod | LockMask, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync); + XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync); + XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask | LockMask, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync); } } diff --git a/event.h b/event.h index 49101d592..97e0bc420 100644 --- a/event.h +++ b/event.h @@ -25,7 +25,7 @@ #include "config.h" Client * get_client_bywin(Client **list, Window w); -void grabkeys(Display *, int, awesome_config *); /* grab all keys defined in config */ +void grabkeys(awesome_config *); /* grab all keys defined in config */ void handle_event_buttonpress(XEvent *, awesome_config *); void handle_event_configurerequest(XEvent *, awesome_config *);