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

Replace motionnotify event by enternotify to manage focus (with NotifyAncestor exception)

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-09-20 23:57:29 +02:00
parent 3921a957c5
commit c2d75ff9c8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wmfs2/src/event.c
View File

@ -35,21 +35,21 @@ event_buttonpress(XEvent *e)
} }
} }
/*
static void static void
event_enternotify(XEvent *e) event_enternotify(XEvent *e)
{ {
XCrossingEvent *ev = &e->xcrossing; XCrossingEvent *ev = &e->xcrossing;
struct client *c; struct client *c;
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) if((ev->mode != NotifyNormal
|| ev->detail == NotifyInferior
|| ev->detail == NotifyAncestor)
&& ev->window != W->root) && ev->window != W->root)
return; return;
if((c = client_gb_win(ev->window))) if((c = client_gb_win(ev->window)))
client_focus(c); client_focus(c);
} }
*/
static void static void
event_clientmessageevent(XEvent *e) event_clientmessageevent(XEvent *e)
@ -183,16 +183,17 @@ event_unmapnotify(XEvent *e)
client_remove(c); client_remove(c);
} }
/*
static void static void
event_motionnotify(XEvent *e) event_motionnotify(XEvent *e)
{ {
XMotionEvent *ev = &e->xmotion; XMotionEvent *ev = &e->xmotion;
struct client *c; struct client *c;
/* Option follow mouvement */
if((c = client_gb_win(ev->subwindow)) && c != c->tag->sel) if((c = client_gb_win(ev->subwindow)) && c != c->tag->sel)
client_focus(c); client_focus(c);
} }
*/
static void static void
event_keypress(XEvent *e) event_keypress(XEvent *e)
@ -242,14 +243,14 @@ event_init(void)
event_handle[ClientMessage] = event_clientmessageevent; event_handle[ClientMessage] = event_clientmessageevent;
event_handle[ConfigureRequest] = event_configureevent; event_handle[ConfigureRequest] = event_configureevent;
event_handle[DestroyNotify] = event_destroynotify; event_handle[DestroyNotify] = event_destroynotify;
/*event_handle[EnterNotify] = event_enternotify; use motion instead */ event_handle[EnterNotify] = event_enternotify;
event_handle[Expose] = event_expose; event_handle[Expose] = event_expose;
event_handle[FocusIn] = event_focusin; event_handle[FocusIn] = event_focusin;
event_handle[KeyPress] = event_keypress; event_handle[KeyPress] = event_keypress;
/*event_handle[MapNotify] = event_mapnotify;*/ /*event_handle[MapNotify] = event_mapnotify;*/
event_handle[MapRequest] = event_maprequest; event_handle[MapRequest] = event_maprequest;
event_handle[MappingNotify] = event_mappingnotify; event_handle[MappingNotify] = event_mappingnotify;
event_handle[MotionNotify] = event_motionnotify; /*event_handle[MotionNotify] = event_motionnotify;*/
event_handle[PropertyNotify] = event_propertynotify; event_handle[PropertyNotify] = event_propertynotify;
/*event_handle[ReparentNotify] = event_reparentnotify;*/ /*event_handle[ReparentNotify] = event_reparentnotify;*/
/*event_handle[SelectionClear] = event_selectionclearevent;*/ /*event_handle[SelectionClear] = event_selectionclearevent;*/

3
wmfs2/src/tag.c
View File

@ -93,9 +93,8 @@ tag_client(struct tag *t, struct client *c)
SLIST_REMOVE(&c->tag->clients, c, client, tnext); SLIST_REMOVE(&c->tag->clients, c, client, tnext);
/* TODO: Focus next client */
if(c->tag->sel == c) if(c->tag->sel == c)
c->tag->sel = NULL; client_focus(client_next(c));
} }
/* /*