godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Event: Replace event big switch by array of function pointer to handle events

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-06-05 12:22:18 +02:00
parent ecda7adcf7
commit 73a0d7ed01
8 changed files with 100 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
src/event.c
View File

@ -33,11 +33,11 @@
#include "wmfs.h"
/** ButtonPress handle event
* \param ev XButtonEvent pointer
*/
static void
buttonpress(XButtonEvent *ev)
buttonpress(XEvent *e)
{
XButtonEvent *ev = &e->xbutton;
Client *c;
int i, j, n;
@ -160,11 +160,11 @@ buttonpress(XButtonEvent *ev)
}
/* ClientMessage handle event
*\param ev XClientMessageEvent pointer
*/
static void
clientmessageevent(XClientMessageEvent *ev)
clientmessageevent(XEvent *e)
{
XClientMessageEvent *ev = &e->xclient;
Client *c;
Systray *sy;
int s, i, mess_t = 0;
@ -287,22 +287,18 @@ clientmessageevent(XClientMessageEvent *ev)
}
/** ConfigureRequesthandle events
* \param ev XConfigureRequestEvent pointer
*/
static void
configureevent(XConfigureRequestEvent *ev)
configureevent(XEvent *e)
{
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
Client *c;
/* Check part */
if((c = client_gb_win(ev->window))
|| (c = client_gb_win(ev->window)))
{
CHECK(!(c->flags & LMaxFlag));
CHECK(!(c->flags & MaxFlag));
CHECK(!(c->flags & FSSFlag));
}
CHECK(!(c->flags & (LMaxFlag | MaxFlag | FSSFlag)));
if((c = client_gb_win(ev->window)))
{
@ -340,11 +336,11 @@ configureevent(XConfigureRequestEvent *ev)
}
/** DestroyNotify handle event
* \param ev XDestroyWindowEvent pointer
*/
static void
destroynotify(XDestroyWindowEvent *ev)
destroynotify(XEvent *e)
{
XDestroyWindowEvent *ev = &e->xdestroywindow;
Client *c;
Systray *s;
@ -364,11 +360,11 @@ destroynotify(XDestroyWindowEvent *ev)
}
/** EnterNotify handle event
* \param ev XCrossingEvent pointer
*/
static void
enternotify(XCrossingEvent *ev)
enternotify(XEvent *e)
{
XCrossingEvent *ev = &e->xcrossing;
Client *c;
int n;
@ -397,11 +393,11 @@ enternotify(XCrossingEvent *ev)
}
/** ExposeEvent handle event
* \param ev XExposeEvent pointer
*/
static void
expose(XExposeEvent *ev)
expose(XEvent *e)
{
XExposeEvent *ev = &e->xexpose;
Client *c;
int i, sc;
@ -427,26 +423,24 @@ expose(XExposeEvent *ev)
}
/** FocusChange handle event
* \param ev XFocusChangeEvent pointer
* \return
*/
static void
focusin(XFocusChangeEvent *ev)
focusin(XEvent *e)
{
if(sel && ev->window != sel->win)
if(sel && e->xfocus.window != sel->win)
client_focus(sel);
return;
}
/** KeyPress handle event
* \param ev XKeyPressedEvent pointer
*/
static void
keypress(XKeyPressedEvent *ev)
keypress(XEvent *e)
{
int i;
XKeyPressedEvent *ev = &e->xkey;
KeySym keysym;
int i;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < conf.nkeybind; ++i)
@ -460,11 +454,11 @@ keypress(XKeyPressedEvent *ev)
}
/** MappingNotify handle event
* \param ev XMappingEvent pointer
*/
static void
mappingnotify(XMappingEvent *ev)
mappingnotify(XEvent *e)
{
XMappingEvent *ev = &e->xmapping;
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
@ -474,11 +468,11 @@ mappingnotify(XMappingEvent *ev)
}
/** MapNotify handle event
* \param ev XMapEvent pointer
*/
static void
mapnotify(XMapEvent *ev)
mapnotify(XEvent *e)
{
XMapEvent *ev = &e->xmap;
Client *c;
Systray *s;
@ -497,11 +491,11 @@ mapnotify(XMapEvent *ev)
}
/** MapRequest handle event
* \param ev XMapRequestEvent pointer
*/
static void
maprequest(XMapRequestEvent *ev)
maprequest(XEvent *e)
{
XMapRequestEvent *ev = &e->xmaprequest;
XWindowAttributes at;
Systray *s;
@ -520,11 +514,11 @@ maprequest(XMapRequestEvent *ev)
}
/** PropertyNotify handle event
* \param ev XPropertyEvent pointer
*/
static void
propertynotify(XPropertyEvent *ev)
propertynotify(XEvent *e)
{
XPropertyEvent *ev = &e->xproperty;
Client *c;
Systray *s;
Window trans;
@ -574,10 +568,9 @@ propertynotify(XPropertyEvent *ev)
}
/** XReparentEvent handle event
* \param ev XReparentEvent pointer
*/
static void
reparentnotify(XReparentEvent *ev)
reparentnotify(XEvent *ev)
{
(void)ev;
@ -585,13 +578,12 @@ reparentnotify(XReparentEvent *ev)
}
/** SelectionClearEvent handle event
* \param ev XSelectionClearEvent pointer
*/
static void
selectionclearevent(XSelectionClearEvent *ev)
selectionclearevent(XEvent *ev)
{
/* Getting selection if lost it */
if(ev->window == traywin)
if(ev->xselectionclear.window == traywin)
systray_acquire();
systray_update();
@ -600,11 +592,11 @@ selectionclearevent(XSelectionClearEvent *ev)
}
/** UnmapNotify handle event
* \param ev XUnmapEvent pointer
*/
static void
unmapnotify(XUnmapEvent *ev)
unmapnotify(XEvent *e)
{
XUnmapEvent *ev = &e->xunmap;
Client *c;
Systray *s;
@ -626,11 +618,11 @@ unmapnotify(XUnmapEvent *ev)
}
/** XMotionNotify handle event
* \param ev XMotionEvent pointer
*/
static void
motionnotify(XMotionEvent *ev)
motionnotify(XEvent *e)
{
XMotionEvent *ev = &e->xmotion;
Client *c;
if(!conf.focus_fmouse || !conf.focus_fmov)
@ -643,6 +635,23 @@ motionnotify(XMotionEvent *ev)
return;
}
/** XRandr handle event
*/
#ifdef HAVE_XRANDR
static void
xrandrevent(XEvent *e)
{
/* Update xrandr configuration */
XRRUpdateConfiguration(e);
/* Reload WMFS to update the screen(s) geometry changement */
quit();
for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
execvp(argv_global, all_argv);
}
#endif /* HAVE_XRANDR */
/** Key grabbing function
*/
void
@ -664,49 +673,39 @@ grabkeys(void)
return;
}
/** Event handle function: execute every function
* handle by event
* \param ev Event
*/
/** Make event handle function pointer array
*/
void
getevent(XEvent ev)
event_make_array(void)
{
int i = LASTEvent;
switch(ev.type)
{
case ButtonPress: buttonpress(&ev.xbutton); break;
case ClientMessage: clientmessageevent(&ev.xclient); break;
case ConfigureRequest: configureevent(&ev.xconfigurerequest); break;
case DestroyNotify: destroynotify(&ev.xdestroywindow); break;
case EnterNotify: enternotify(&ev.xcrossing); break;
case Expose: expose(&ev.xexpose); break;
case FocusIn: focusin(&ev.xfocus); break;
case KeyPress: keypress(&ev.xkey); break;
case MapNotify: mapnotify(&ev.xmap); break;
case MapRequest: maprequest(&ev.xmaprequest); break;
case MappingNotify: mappingnotify(&ev.xmapping); break;
case MotionNotify: motionnotify(&ev.xmotion); break;
case PropertyNotify: propertynotify(&ev.xproperty); break;
case ReparentNotify: reparentnotify(&ev.xreparent); break;
case SelectionClear: selectionclearevent(&ev.xselectionclear); break;
case UnmapNotify: unmapnotify(&ev.xunmap); break;
default:
/* Fill array with non-used function (do nothing) */
while(i--)
event_handle[i] = reparentnotify;
event_handle[ButtonPress] = buttonpress;
event_handle[ClientMessage] = clientmessageevent;
event_handle[ConfigureRequest] = configureevent;
event_handle[DestroyNotify] = destroynotify;
event_handle[EnterNotify] = enternotify;
event_handle[Expose] = expose;
event_handle[FocusIn] = focusin;
event_handle[KeyPress] = keypress;
event_handle[MapNotify] = mapnotify;
event_handle[MapRequest] = maprequest;
event_handle[MappingNotify] = mappingnotify;
event_handle[MotionNotify] = motionnotify;
event_handle[PropertyNotify] = propertynotify;
event_handle[ReparentNotify] = reparentnotify;
event_handle[SelectionClear] = selectionclearevent;
event_handle[UnmapNotify] = unmapnotify;
#ifdef HAVE_XRANDR
/* Check Xrandr event */
if(ev.type == xrandr_event)
{
/* Update xrandr configuration */
XRRUpdateConfiguration(&ev);
/* Reload WMFS to update the screen(s) geometry changement */
quit();
for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
execvp(argv_global, all_argv);
}
event_handle[xrandr_event] = xrandrevent;
#endif /* HAVE_XRANDR */
break;
}
return;
}

4
src/infobar.c
View File

@ -148,7 +148,9 @@ infobar_draw_layout(int sc)
if(!conf.layout_placement)
barwin_move(infobar[sc].layout_button, infobar[sc].tags_board->geo.width + (PAD >> 1), 0);
w = ((conf.layout_button_width > 0) ? (uint)conf.layout_button_width : (textw(tags[sc][seltag[sc]].layout.symbol) + PAD));
w = ((conf.layout_button_width > 0)
? (uint)conf.layout_button_width
: (textw(tags[sc][seltag[sc]].layout.symbol) + PAD));
barwin_resize(infobar[sc].layout_button, w, infobar[sc].geo.height);
barwin_refresh_color(infobar[sc].layout_button);

1
src/init.c
View File

@ -214,6 +214,7 @@ init(void)
init_status();
ewmh_update_current_tag_prop();
grabkeys();
event_make_array();
return;
}

5
src/launcher.c
View File

@ -354,8 +354,9 @@ launcher_execute(Launcher *launcher)
barwin_draw_text(bw, 1 + textw(launcher->prompt) + textw(" "), FHINFOBAR - 1, buf);
barwin_refresh(bw);
}
else
getevent(ev);
else if(ev.type < LASTEvent)
HANDLE_EVENT(&ev);
XNextEvent(dpy, &ev);
}

4
src/menu.c
View File

@ -221,9 +221,11 @@ menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
break;
default:
getevent(*ev);
if(ev->type < LASTEvent)
HANDLE_EVENT(ev);
break;
}
XNextEvent(dpy, ev);
return quit;

5
src/mouse.c
View File

@ -184,9 +184,8 @@ mouse_move(Client *c)
mouse_dragborder(geo, gci);
}
}
else if(ev.type == MapRequest
|| ev.type == ConfigureRequest)
getevent(ev);
else if((ev.type == MapRequest || ev.type == ConfigureRequest) && ev.type < LASTEvent)
HANDLE_EVENT(&ev);
}
while(ev.type != ButtonRelease);

12
src/wmfs.c
View File

@ -190,19 +190,21 @@ mainloop(void)
XEvent ev;
pthread_t th_status;
if (estatus && conf.status_timing == 0)
if(estatus && !conf.status_timing)
conf.status_pid = spawn(conf.status_path);
else if (estatus && pthread_create(&th_status, NULL, thread_status, NULL) != 0) {
else if(estatus && pthread_create(&th_status, NULL, thread_status, NULL) != 0)
{
warnx("pthread_create");
estatus = False;
}
while (!exiting && !XNextEvent(dpy, &ev)) {
getevent(ev);
while(!exiting && !XNextEvent(dpy, &ev))
{
HANDLE_EVENT(&ev);
wait_childs_and_status();
}
if (estatus)
if(estatus)
pthread_join(th_status, NULL);
return;

6
src/wmfs.h
View File

@ -100,8 +100,9 @@
win = XCreateWindow(dpy, (parent), (x), (y), (w), (h), (b), CopyFromParent, \
InputOutput, CopyFromParent, (mask), (at)); \
XSetWindowBackground(dpy, win, (col)); \
} while (/* CONSTCOND */ 0)
} while(/* CONSTCOND */ 0)
#define HANDLE_EVENT(e) event_handle[(e)->type](e);
#define ATOM(a) XInternAtom(dpy, (a), False)
#define FRAMEW(w) ((w) + (BORDH << 1))
#define FRAMEH(h) ((h) + (BORDH + TBARH))
@ -258,7 +259,7 @@ uint color_shade(uint, double);
/* event.c */
void grabkeys(void);
void getevent(XEvent ev);
void event_make_array(void);
/* menu.c */
void menu_init(Menu *menu, char *name, int nitem, uint bg_f, char *fg_f, uint bg_n, char *fg_n);
@ -474,6 +475,7 @@ Client *clients;
Client *sel;
/* Other */
void (*event_handle[LASTEvent])(XEvent*);
extern const func_name_list_t func_list[];
extern const func_name_list_t layout_list[];
uint numlockmask;