move the code to find the window under the pointer out of focus.c to client.c
Dana Jansens danakj@orodu.net
3 files changed,
26 insertions(+),
16 deletions(-)
M
openbox/client.c
→
openbox/client.c
@@ -3017,3 +3017,24 @@ g_assert_not_reached();
} return dest; } + +ObClient* client_under_pointer() +{ + int x, y; + GList *it; + ObClient *ret = NULL; + + if (screen_pointer_pos(&x, &y)) { + for (it = stacking_list; it != NULL; it = it->next) { + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *c = WINDOW_AS_CLIENT(it->data); + if (c->desktop == screen_desktop && + RECT_CONTAINS(c->frame->area, x, y)) { + ret = c; + break; + } + } + } + } + return ret; +}
M
openbox/client.h
→
openbox/client.h
@@ -519,4 +519,6 @@ guint client_monitor(ObClient *self);
void client_update_sm_client_id(ObClient *self); +ObClient* client_under_pointer(); + #endif
M
openbox/focus.c
→
openbox/focus.c
@@ -119,23 +119,10 @@ }
static gboolean focus_under_pointer() { - int x, y; - GList *it; + ObClient *c; - if (screen_pointer_pos(&x, &y)) { - for (it = stacking_list; it != NULL; it = it->next) { - if (WINDOW_IS_CLIENT(it->data)) { - ObClient *c = WINDOW_AS_CLIENT(it->data); - if (c->desktop == screen_desktop && - RECT_CONTAINS(c->frame->area, x, y)) - break; - } - } - if (it != NULL) { - g_assert(WINDOW_IS_CLIENT(it->data)); - return client_normal(it->data) && client_focus(it->data); - } - } + if ((c = client_under_pointer())) + return client_normal(c) && client_focus(c); return FALSE; }