awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

grabkeys does not need display/screen as arg

This commit is contained in:
Julien Danjou 2007-10-15 18:17:33 +02:00
parent 3592e8e448
commit 5b130bd18d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awesome.c
View File

@ -194,7 +194,7 @@ setup(awesome_config *awesomeconf)
XSelectInput(awesomeconf->display, RootWindow(awesomeconf->display, awesomeconf->phys_screen), wa.event_mask); 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 /** Startup Error handler to check if another window manager

16
event.c
View File

@ -428,7 +428,7 @@ handle_event_mappingnotify(XEvent * e, awesome_config *awesomeconf)
XRefreshKeyboardMapping(ev); XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard) if(ev->request == MappingKeyboard)
for(screen = 0; screen < ScreenCount(e->xany.display); screen++) for(screen = 0; screen < ScreenCount(e->xany.display); screen++)
grabkeys(e->xany.display, screen, &awesomeconf[screen]); grabkeys(&awesomeconf[screen]);
} }
void void
@ -521,20 +521,20 @@ handle_event_randr_screen_change_notify(XEvent *e,
} }
void void
grabkeys(Display *disp, int screen, awesome_config *awesomeconf) grabkeys(awesome_config *awesomeconf)
{ {
int i; int i;
KeyCode code; 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++) 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; continue;
XGrabKey(disp, code, awesomeconf->keys[i].mod, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync);
XGrabKey(disp, code, awesomeconf->keys[i].mod | LockMask, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod | LockMask, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True, GrabModeAsync, GrabModeAsync);
XGrabKey(disp, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask, RootWindow(disp, screen), True, GrabModeAsync, GrabModeAsync); XGrabKey(awesomeconf->display, code, awesomeconf->keys[i].mod | awesomeconf->numlockmask, RootWindow(awesomeconf->display, awesomeconf->phys_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 | awesomeconf->numlockmask | LockMask, RootWindow(awesomeconf->display, awesomeconf->phys_screen), True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
} }
} }

2
event.h
View File

@ -25,7 +25,7 @@
#include "config.h" #include "config.h"
Client * get_client_bywin(Client **list, Window w); 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_buttonpress(XEvent *, awesome_config *);
void handle_event_configurerequest(XEvent *, awesome_config *); void handle_event_configurerequest(XEvent *, awesome_config *);