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

fallback super intelligently with focus when the focused

Browse source
This commit is contained in:
Dana Jansens 2003-03-20 21:23:05 +00:00
parent ba2c6a23df
commit 2725bb5da1
1 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
plugins/focus.c
View file

@ -1,17 +1,18 @@
#include "../kernel/dispatch.h" #include "../kernel/dispatch.h"
#include "../kernel/screen.h" #include "../kernel/screen.h"
#include "../kernel/client.h" #include "../kernel/client.h"
#include "../kernel/frame.h"
#include "../kernel/focus.h" #include "../kernel/focus.h"
#include "../kernel/stacking.h" #include "../kernel/stacking.h"
#include "../kernel/openbox.h" #include "../kernel/openbox.h"
static int skip_enter = 0; static int skip_enter = 0;
static void focus_fallback(guint desk, gboolean warp) static void focus_fallback(gboolean warp)
{ {
GList *it; GList *it;
for (it = focus_order[desk]; it != NULL; it = it->next) for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
if (client_focus(it->data)) { if (client_focus(it->data)) {
if (warp) { /* XXX make this configurable */ if (warp) { /* XXX make this configurable */
XEvent e; XEvent e;
@ -37,6 +38,29 @@ static void focus_fallback(guint desk, gboolean warp)
} }
} }
static void focus_under_pointer()
{
Window w;
int i, x, y;
guint u;
GList *it;
if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u))
{
for (it = stacking_list; it != NULL; it = it->next) {
Client *c = it->data;
if (c->desktop == screen_desktop &&
RECT_CONTAINS(c->frame->area, x, y))
break;
}
if (it != NULL) {
client_focus(it->data);
return;
}
}
focus_fallback(FALSE);
}
static void events(ObEvent *e, void *foo) static void events(ObEvent *e, void *foo)
{ {
switch (e->type) { switch (e->type) {
@ -46,19 +70,28 @@ static void events(ObEvent *e, void *foo)
client_focus(e->data.c.client); client_focus(e->data.c.client);
break; break;
case Event_Ob_Desktop: case Event_Client_Unmapped:
/* focus the next available target */ if (ob_state == State_Exiting) break;
focus_fallback(e->data.o.num[0], TRUE);
if (e->data.c.client->focused) {
/* if sloppy focus... */
focus_under_pointer();
/* otherwise... */
/*
/\* nothing is left with focus! *\/
if (focus_client == NULL)
/\* focus the next available target *\/
focus_fallback(screen_desktop, FALSE);
*/
}
break; break;
case Event_Client_Unfocus: case Event_Ob_Desktop:
/* dont do this shit with sloppy focus... */ /* focus the next available target if moving from the current
/* desktop. */
/\* nothing is left with focus! *\/ if ((unsigned)e->data.o.num[1] == screen_desktop)
if (focus_client == NULL) focus_fallback(TRUE);
/\* focus the next available target *\/
focus_fallback(screen_desktop, FALSE);
*/
break; break;
case Event_X_EnterNotify: case Event_X_EnterNotify:
@ -77,7 +110,7 @@ void plugin_startup()
{ {
dispatch_register(Event_Client_Mapped | dispatch_register(Event_Client_Mapped |
Event_Ob_Desktop | Event_Ob_Desktop |
Event_Client_Unfocus | Event_Client_Unmapped |
Event_X_EnterNotify, Event_X_EnterNotify,
(EventHandler)events, NULL); (EventHandler)events, NULL);
} }