X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=dab6d573d2fe75e8376156c3c6cd38459631064c;hb=3c5f6db04cb577fa3f547b45283eac7a0664be39;hp=5e47dd2863d84c799fd0ca53ad554976a65ed645;hpb=92d3f2342db3d3bfd5d41a6c3dc165efa7766ffa;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 5e47dd28..dab6d573 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "event.h" #include "openbox.h" #include "grab.h" @@ -8,38 +9,25 @@ #include "screen.h" #include "group.h" #include "prop.h" -#include "dispatch.h" #include "focus.h" -#include "parse.h" #include "stacking.h" +#include "popup.h" #include #include +#include -Client *focus_client = NULL; -GList **focus_order = NULL; /* these lists are created when screen_startup - sets the number of desktops */ +ObClient *focus_client; +GList **focus_order; /* these lists are created when screen_startup + sets the number of desktops */ -Window focus_backup = None; - -static Client *focus_cycle_target = NULL; +static ObClient *focus_cycle_target; +static Popup *focus_cycle_popup; void focus_startup() { - /* create the window which gets focus when no clients get it. Have to - make it override-redirect so we don't try manage it, since it is - mapped. */ - XSetWindowAttributes attrib; - - focus_client = NULL; - attrib.override_redirect = TRUE; - focus_backup = XCreateWindow(ob_display, ob_root, - -100, -100, 1, 1, 0, - CopyFromParent, InputOutput, CopyFromParent, - CWOverrideRedirect, &attrib); - XMapWindow(ob_display, focus_backup); - stacking_raise_internal(focus_backup); + focus_cycle_popup = popup_new(TRUE); /* start with nothing focused */ focus_set_client(NULL); @@ -52,16 +40,15 @@ void focus_shutdown() for (i = 0; i < screen_num_desktops; ++i) g_list_free(focus_order[i]); g_free(focus_order); - focus_order = NULL; - XDestroyWindow(ob_display, focus_backup); + popup_free(focus_cycle_popup); /* reset focus to root */ XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, event_lasttime); } -static void push_to_top(Client *client) +static void push_to_top(ObClient *client) { guint desktop; @@ -71,10 +58,14 @@ static void push_to_top(Client *client) focus_order[desktop] = g_list_prepend(focus_order[desktop], client); } -void focus_set_client(Client *client) +void focus_set_client(ObClient *client) { Window active; - Client *old; + ObClient *old; + +#ifdef DEBUG_FOCUS + ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0); +#endif /* uninstall the old colormap, and install the new one */ screen_install_colormap(focus_client, FALSE); @@ -82,7 +73,7 @@ void focus_set_client(Client *client) if (client == NULL) { /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot, + XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, event_lasttime); XSync(ob_display, FALSE); } @@ -98,14 +89,12 @@ void focus_set_client(Client *client) if (client != NULL) push_to_top(client); - /* set the NET_ACTIVE_WINDOW hint */ - active = client ? client->window : None; - PROP_SET32(ob_root, net_active_window, window, active); - - if (focus_client != NULL) - dispatch_client(Event_Client_Focus, focus_client, 0, 0); - if (old != NULL) - dispatch_client(Event_Client_Unfocus, old, 0, 0); + /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ + if (ob_state() != OB_STATE_EXITING) { + active = client ? client->window : None; + PROP_SET32(RootWindow(ob_display, ob_screen), + net_active_window, window, active); + } } static gboolean focus_under_pointer() @@ -113,25 +102,29 @@ static gboolean focus_under_pointer() int x, y; GList *it; - if (ob_pointer_pos(&x, &y)) { + if (screen_pointer_pos(&x, &y)) { 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 (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) + if (it != NULL) { + g_assert(WINDOW_IS_CLIENT(it->data)); return client_normal(it->data) && client_focus(it->data); + } } 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) +static ObClient *find_transient_recursive(ObClient *c, ObClient *top, ObClient *skip) { GSList *it; - Client *ret; + ObClient *ret; for (it = c->transients; it; it = it->next) { if (it->data == top) return NULL; @@ -142,9 +135,9 @@ static Client *find_transient_recursive(Client *c, Client *top, Client *skip) return NULL; } -static gboolean focus_fallback_transient(Client *top, Client *old) +static gboolean focus_fallback_transient(ObClient *top, ObClient *old) { - Client *target = find_transient_recursive(top, top, old); + ObClient *target = find_transient_recursive(top, top, old); if (!target) { /* make sure client_normal is true always */ if (!client_normal(top)) @@ -154,10 +147,10 @@ static gboolean focus_fallback_transient(Client *top, Client *old) return client_focus(target); } -void focus_fallback(FallbackType type) +void focus_fallback(ObFocusFallbackType type) { GList *it; - Client *old = NULL; + ObClient *old = NULL; old = focus_client; @@ -167,16 +160,16 @@ void focus_fallback(FallbackType type) */ focus_set_client(NULL); - if (!(type == Fallback_Desktop ? + if (!(type == OB_FOCUS_FALLBACK_DESKTOP ? config_focus_last_on_desktop : config_focus_last)) { if (config_focus_follow) focus_under_pointer(); return; } - if (type == Fallback_Unfocusing && old) { + if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ if (old->transient_for) { - if (old->transient_for == TRAN_GROUP) { + if (old->transient_for == OB_TRAN_GROUP) { for (it = focus_order[screen_desktop]; it; it = it->next) { GSList *sit; @@ -191,6 +184,7 @@ void focus_fallback(FallbackType type) } } +#if 0 /* try for group relations */ if (old->group) { GSList *sit; @@ -199,82 +193,91 @@ void focus_fallback(FallbackType type) for (sit = old->group->members; sit; sit = sit->next) if (sit->data == it->data) if (sit->data != old && client_normal(sit->data)) - if (client_focus(sit->data)) + if (client_can_focus(sit->data)) { + gboolean r = client_focus(sit->data); + assert(r); return; + } } +#endif } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - if (type != Fallback_Unfocusing || it->data != old) - if (client_normal(it->data) && client_focus(it->data)) + if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old) + if (client_normal(it->data) && + /* dont fall back to 'anonymous' fullscreen windows. theres no + checks for this is in transient/group fallbacks, so they can + be fallback targets there. */ + !((ObClient*)it->data)->fullscreen && + client_can_focus(it->data)) { + gboolean r = client_focus(it->data); + assert(r); return; + } - /* nothing to focus */ - focus_set_client(NULL); + /* nothing to focus, and already set it to none above */ } -static void popup_cycle(Client *c, gboolean show) +static void popup_cycle(ObClient *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); + popup_hide(focus_cycle_popup); } 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); + ObClient *p = c; + char *title; + + a = screen_physical_area_monitor(0); + popup_position(focus_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); +/* popup_size(focus_cycle_popup, a->height/2, a->height/16); + popup_show(focus_cycle_popup, c->title, + client_icon(c, a->height/16, a->height/16)); +*/ + /* XXX the size and the font extents need to be related on some level + */ + popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); + + /* use the transient's parent's title/icon */ + while (p->transient_for && p->transient_for != OB_TRAN_GROUP) + p = p->transient_for; + + if (p == c) + title = NULL; + else + title = g_strconcat((c->iconic ? c->icon_title : c->title), + " - ", + (p->iconic ? p->icon_title : p->title), + NULL); + + popup_show(focus_cycle_popup, + (title ? title : (c->iconic ? c->icon_title : c->title)), + client_icon(p, 48, 48)); + g_free(title); } } -Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, - gboolean cancel) +ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, + gboolean cancel) { - static Client *first = NULL; - static Client *t = NULL; + static ObClient *first = NULL; + static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; - Client *ft; + ObClient *ft; if (cancel) { - /*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_cycle_target) { - if (focus_cycle_target->iconic) - client_iconify(focus_cycle_target, FALSE, FALSE); - client_focus(focus_cycle_target); - stacking_raise(focus_cycle_target); - } + if (focus_cycle_target) + client_activate(focus_cycle_target, FALSE); goto done_cycle; } + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -294,15 +297,23 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, it = it->prev; if (it == NULL) it = g_list_last(list); } - ft = client_focus_target(it->data); - 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); + /*ft = client_focus_target(it->data);*/ + ft = it->data; + /* we don't use client_can_focus here, because that doesn't let you + focus an iconic window, but we want to be able to, so we just check + if the focus flags on the window allow it, and its on the current + desktop */ + if (ft->transients == NULL && client_normal(ft) && + ((ft->can_focus || ft->focus_notify) && + !ft->skip_taskbar && + (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) { + if (ft != focus_cycle_target) { /* prevents flicker */ + 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, config_focus_popup); return ft; } } while (it != start); @@ -313,11 +324,13 @@ done_cycle: focus_cycle_target = NULL; g_list_free(order); order = NULL; + popup_cycle(ft, FALSE); + return NULL; } -void focus_order_add_new(Client *c) +void focus_order_add_new(ObClient *c) { guint d, i; @@ -327,20 +340,20 @@ void focus_order_add_new(Client *c) 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) + if (focus_order[i] && ((ObClient*)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) + if (focus_order[d] && ((ObClient*)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) +void focus_order_remove(ObClient *c) { guint d, i; @@ -352,7 +365,7 @@ void focus_order_remove(Client *c) focus_order[d] = g_list_remove(focus_order[d], c); } -static void to_top(Client *c, guint d) +static void to_top(ObClient *c, guint d) { focus_order[d] = g_list_remove(focus_order[d], c); if (!c->iconic) { @@ -362,12 +375,12 @@ static void to_top(Client *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; - it && !((Client*)it->data)->iconic; it = it->next); + it && !((ObClient*)it->data)->iconic; it = it->next); g_list_insert_before(focus_order[d], it, c); } } -void focus_order_to_top(Client *c) +void focus_order_to_top(ObClient *c) { guint d, i; @@ -379,7 +392,7 @@ void focus_order_to_top(Client *c) to_top(c, d); } -static void to_bottom(Client *c, guint d) +static void to_bottom(ObClient *c, guint d) { focus_order[d] = g_list_remove(focus_order[d], c); if (c->iconic) { @@ -389,12 +402,12 @@ static void to_bottom(Client *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; - it && !((Client*)it->data)->iconic; it = it->next); + it && !((ObClient*)it->data)->iconic; it = it->next); g_list_insert_before(focus_order[d], it, c); } } -void focus_order_to_bottom(Client *c) +void focus_order_to_bottom(ObClient *c) { guint d, i;