nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

focus windows when entering/leaving enter-the-desktop mode

Browse source
This commit is contained in:
Dana Jansens 2003-03-21 17:22:38 +00:00
parent 001233837e
commit c5e902a7b1
1 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
plugins/focus.c
View file

@ -35,15 +35,9 @@ static gboolean focus_under_pointer()
return FALSE; return FALSE;
} }
static void focus_fallback(gboolean switching_desks) static void chew_enter_events()
{ {
GList *it;
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
if (client_normal(it->data) && client_focus(it->data)) {
if (switching_desks) {
XEvent e; XEvent e;
Client *c = it->data;
/* XXX... not anymore /* XXX... not anymore
skip the next enter event from the desktop switch so focus skip the next enter event from the desktop switch so focus
@ -55,10 +49,25 @@ static void focus_fallback(gboolean switching_desks)
XXX this is rude to other plugins...can this be done XXX this is rude to other plugins...can this be done
better? count the events in the queue? */ better? count the events in the queue? */
while (XCheckTypedEvent(ob_display, EnterNotify, &e)); while (XCheckTypedEvent(ob_display, EnterNotify, &e));
/* XPutBackEvent(ob_display, &e); /*
{
XPutBackEvent(ob_display, &e);
g_message("skip"); g_message("skip");
++skip_enter; ++skip_enter;
}*/ }
*/
}
static void focus_fallback(gboolean switching_desks)
{
GList *it;
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
if (client_normal(it->data) && client_focus(it->data)) {
if (switching_desks) {
Client *c = it->data;
chew_enter_events();
if (warp_on_desk_switch) { if (warp_on_desk_switch) {
/* I have to do this warp twice! Otherwise windows dont get /* I have to do this warp twice! Otherwise windows dont get
@ -73,6 +82,19 @@ static void focus_fallback(gboolean switching_desks)
} }
} }
static void focus_desktop()
{
GList *it;
for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
Client *client = it->data;
if (client->type == Type_Desktop && client->frame->visible)
if (client_focus(client))
break;
}
chew_enter_events();
}
static void event(ObEvent *e, void *foo) static void event(ObEvent *e, void *foo)
{ {
switch (e->type) { switch (e->type) {
@ -100,6 +122,14 @@ static void event(ObEvent *e, void *foo)
focus_fallback(TRUE); focus_fallback(TRUE);
break; break;
case Event_Ob_ShowDesktop:
if (!e->data.o.num[0]) { /* hiding the desktop, showing the clients */
if (!follow_mouse || !focus_under_pointer())
focus_fallback(TRUE);
} else /* hiding clients, showing the desktop */
focus_desktop();
break;
case Event_X_EnterNotify: case Event_X_EnterNotify:
/* if (skip_enter) { /* if (skip_enter) {
if (e->data.x.client != NULL) if (e->data.x.client != NULL)
@ -123,7 +153,8 @@ void plugin_startup()
dispatch_register(Event_Client_Mapped | dispatch_register(Event_Client_Mapped |
Event_Ob_Desktop | Event_Ob_Desktop |
Event_Client_Unmapped | Event_Client_Unmapped |
Event_X_EnterNotify, Event_X_EnterNotify |
Event_Ob_ShowDesktop,
(EventHandler)event, NULL); (EventHandler)event, NULL);
} }