X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=5e47dd2863d84c799fd0ca53ad554976a65ed645;hb=02c7f2e8afbfe5ebc589415a87a2ac156c9ef5af;hp=8afbdcb6f6fc942569679db9e6701d5b03c6f4f4;hpb=c99bb4a049d29d2546074365ab76cecad4d1f65b;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 8afbdcb6..5e47dd28 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,6 +1,9 @@ #include "event.h" #include "openbox.h" +#include "grab.h" +#include "framerender.h" #include "client.h" +#include "config.h" #include "frame.h" #include "screen.h" #include "group.h" @@ -8,7 +11,7 @@ #include "dispatch.h" #include "focus.h" #include "parse.h" -#include "engine.h" +#include "stacking.h" #include #include @@ -18,43 +21,8 @@ GList **focus_order = NULL; /* these lists are created when screen_startup sets the number of desktops */ Window focus_backup = None; -gboolean focus_new = TRUE; -gboolean focus_follow = FALSE; -static gboolean focus_last = TRUE; -static gboolean focus_last_on_desktop = TRUE; -static gboolean noreorder = 0; - -static void parse_assign(char *name, ParseToken *value) -{ - if (!g_ascii_strcasecmp(name, "focusnew")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - focus_new = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "followmouse")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - focus_follow = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "focuslast")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - focus_last = value->data.bool; - } - } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) { - if (value->type != TOKEN_BOOL) - yyerror("invalid value"); - else { - focus_last_on_desktop = value->data.bool; - } - } else - yyerror("invalid option"); - parse_free_token(value); -} +static Client *focus_cycle_target = NULL; void focus_startup() { @@ -64,22 +32,17 @@ void focus_startup() XSetWindowAttributes attrib; focus_client = NULL; - focus_new = TRUE; - focus_follow = FALSE; - focus_last = TRUE; - focus_last_on_desktop = TRUE; attrib.override_redirect = TRUE; focus_backup = XCreateWindow(ob_display, ob_root, -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, CWOverrideRedirect, &attrib); - XMapRaised(ob_display, focus_backup); + XMapWindow(ob_display, focus_backup); + stacking_raise_internal(focus_backup); /* start with nothing focused */ focus_set_client(NULL); - - parse_reg_section("focus", NULL, parse_assign); } void focus_shutdown() @@ -124,13 +87,15 @@ void focus_set_client(Client *client) XSync(ob_display, FALSE); } + /* in the middle of cycling..? kill it. */ + if (focus_cycle_target) + focus_cycle(TRUE, TRUE, TRUE, TRUE); + old = focus_client; focus_client = client; /* move to the top of the list */ - if (noreorder) - --noreorder; - else if (client != NULL) + if (client != NULL) push_to_top(client); /* set the NET_ACTIVE_WINDOW hint */ @@ -145,12 +110,10 @@ void focus_set_client(Client *client) static gboolean focus_under_pointer() { - Window w; - int i, x, y; - guint u; + int x, y; GList *it; - if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) { + if (ob_pointer_pos(&x, &y)) { for (it = stacking_list; it != NULL; it = it->next) { Client *c = it->data; if (c->desktop == screen_desktop && @@ -163,6 +126,34 @@ static gboolean focus_under_pointer() return FALSE; } +/* finds the first transient that isn't 'skip' and ensure's that client_normal + is true for it */ +static Client *find_transient_recursive(Client *c, Client *top, Client *skip) +{ + GSList *it; + Client *ret; + + for (it = c->transients; it; it = it->next) { + if (it->data == top) return NULL; + ret = find_transient_recursive(it->data, top, skip); + if (ret && ret != skip && client_normal(ret)) return ret; + if (it->data != skip && client_normal(it->data)) return it->data; + } + return NULL; +} + +static gboolean focus_fallback_transient(Client *top, Client *old) +{ + Client *target = find_transient_recursive(top, top, old); + if (!target) { + /* make sure client_normal is true always */ + if (!client_normal(top)) + return FALSE; + target = top; /* no transient, keep the top */ + } + return client_focus(target); +} + void focus_fallback(FallbackType type) { GList *it; @@ -176,24 +167,40 @@ void focus_fallback(FallbackType type) */ focus_set_client(NULL); - if (!(type == Fallback_Desktop ? focus_last_on_desktop : focus_last)) { - if (focus_follow) focus_under_pointer(); + if (!(type == Fallback_Desktop ? + config_focus_last_on_desktop : config_focus_last)) { + if (config_focus_follow) focus_under_pointer(); return; } - if (type == Fallback_Unfocusing && old && old->transient_for) { - if (old->transient_for == TRAN_GROUP) { - for (it = focus_order[screen_desktop]; it != NULL; it = it->next) { - GSList *sit; + if (type == Fallback_Unfocusing && old) { + /* try for transient relations */ + if (old->transient_for) { + if (old->transient_for == TRAN_GROUP) { + for (it = focus_order[screen_desktop]; it; it = it->next) { + GSList *sit; + + for (sit = old->group->members; sit; sit = sit->next) + if (sit->data == it->data) + if (focus_fallback_transient(sit->data, old)) + return; + } + } else { + if (focus_fallback_transient(old->transient_for, old)) + return; + } + } + /* try for group relations */ + if (old->group) { + GSList *sit; + + for (it = focus_order[screen_desktop]; it != NULL; it = it->next) for (sit = old->group->members; sit; sit = sit->next) - if (sit->data == it->data && client_focus(sit->data)) - return; - } - } else { - if (client_normal(old->transient_for)) - if (client_focus(old->transient_for)) - return; + if (sit->data == it->data) + if (sit->data != old && client_normal(sit->data)) + if (client_focus(sit->data)) + return; } } @@ -206,8 +213,45 @@ void focus_fallback(FallbackType type) focus_set_client(NULL); } +static void popup_cycle(Client *c, gboolean show) +{ + XSetWindowAttributes attrib; + static Window coords = None; + + if (coords == None) { + attrib.override_redirect = TRUE; + coords = XCreateWindow(ob_display, ob_root, + 0, 0, 1, 1, 0, render_depth, InputOutput, + render_visual, CWOverrideRedirect, &attrib); + g_assert(coords != None); + + grab_pointer(TRUE, None); + + XMapWindow(ob_display, coords); + } + + if (!show) { + XDestroyWindow(ob_display, coords); + coords = None; + + grab_pointer(FALSE, None); + } else { + Rect *a; + Size s; + + a = screen_area(c->desktop); + + framerender_size_popup_label(c->title, &s); + XMoveResizeWindow(ob_display, coords, + a->x + (a->width - s.width) / 2, + a->y + (a->height - s.height) / 2, + s.width, s.height); + framerender_popup_label(coords, &s, c->title); + } +} + Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, - gboolean cancel) + gboolean cancel) { static Client *first = NULL; static Client *t = NULL; @@ -216,21 +260,28 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, Client *ft; if (cancel) { - if (first) client_focus(first); + /*if (first) client_focus(first); XXX*/ + if (focus_cycle_target) + frame_adjust_focus(focus_cycle_target->frame, FALSE); + if (focus_client) + frame_adjust_focus(focus_client->frame, TRUE); goto done_cycle; } else if (done) { - if (focus_client) { - push_to_top(focus_client); /* move to top of focus_order */ - stacking_raise(focus_client); + if (focus_cycle_target) { + if (focus_cycle_target->iconic) + client_iconify(focus_cycle_target, FALSE, FALSE); + client_focus(focus_cycle_target); + stacking_raise(focus_cycle_target); } goto done_cycle; } if (!first) first = focus_client; + if (!focus_cycle_target) focus_cycle_target = focus_client; if (linear) list = client_list; else list = focus_order[screen_desktop]; - start = it = g_list_find(list, focus_client); + start = it = g_list_find(list, focus_cycle_target); if (!start) /* switched desktops or something? */ start = it = forward ? g_list_last(list) : g_list_first(list); if (!start) goto done_cycle; @@ -238,24 +289,119 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, do { if (forward) { it = it->next; - if (it == NULL) it = list; + if (it == NULL) it = g_list_first(list); } else { it = it->prev; if (it == NULL) it = g_list_last(list); } ft = client_focus_target(it->data); - if (ft == it->data && focus_client != ft && client_normal(ft) && - client_focus(ft)) { - noreorder++; /* avoid reordering the focus_order */ + if (ft == it->data && client_normal(ft) && + (ft->can_focus || ft->focus_notify) && + (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) { + if (focus_cycle_target) + frame_adjust_focus(focus_cycle_target->frame, FALSE); + focus_cycle_target = ft; + frame_adjust_focus(focus_cycle_target->frame, TRUE); + popup_cycle(ft, TRUE); return ft; } } while (it != start); - return NULL; done_cycle: t = NULL; first = NULL; + focus_cycle_target = NULL; g_list_free(order); order = NULL; + popup_cycle(ft, FALSE); return NULL; } + +void focus_order_add_new(Client *c) +{ + guint d, i; + + if (c->iconic) + focus_order_to_top(c); + else { + d = c->desktop; + if (d == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) { + if (focus_order[i] && ((Client*)focus_order[i]->data)->iconic) + focus_order[i] = g_list_insert(focus_order[i], c, 0); + else + focus_order[i] = g_list_insert(focus_order[i], c, 1); + } + } else + if (focus_order[d] && ((Client*)focus_order[d]->data)->iconic) + focus_order[d] = g_list_insert(focus_order[d], c, 0); + else + focus_order[d] = g_list_insert(focus_order[d], c, 1); + } +} + +void focus_order_remove(Client *c) +{ + guint d, i; + + d = c->desktop; + if (d == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + focus_order[i] = g_list_remove(focus_order[i], c); + } else + focus_order[d] = g_list_remove(focus_order[d], c); +} + +static void to_top(Client *c, guint d) +{ + focus_order[d] = g_list_remove(focus_order[d], c); + if (!c->iconic) { + focus_order[d] = g_list_prepend(focus_order[d], c); + } else { + GList *it; + + /* insert before first iconic window */ + for (it = focus_order[d]; + it && !((Client*)it->data)->iconic; it = it->next); + g_list_insert_before(focus_order[d], it, c); + } +} + +void focus_order_to_top(Client *c) +{ + guint d, i; + + d = c->desktop; + if (d == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + to_top(c, i); + } else + to_top(c, d); +} + +static void to_bottom(Client *c, guint d) +{ + focus_order[d] = g_list_remove(focus_order[d], c); + if (c->iconic) { + focus_order[d] = g_list_append(focus_order[d], c); + } else { + GList *it; + + /* insert before first iconic window */ + for (it = focus_order[d]; + it && !((Client*)it->data)->iconic; it = it->next); + g_list_insert_before(focus_order[d], it, c); + } +} + +void focus_order_to_bottom(Client *c) +{ + guint d, i; + + d = c->desktop; + if (d == DESKTOP_ALL) { + for (i = 0; i < screen_num_desktops; ++i) + to_bottom(c, i); + } else + to_bottom(c, d); +}