X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=12d30d27e8fffe46d1ab02e24ad1b5dd4e64e375;hb=6357583c396382dd6ed8ac42004177f204fabe62;hp=6f5b04d12a124fb9053133b693a363f85d01795d;hpb=ac779e65ac243e44bde4a3eaf11736e2671d7a2d;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 6f5b04d1..12d30d27 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,5 +1,6 @@ #include "event.h" #include "openbox.h" +#include "grab.h" #include "framerender.h" #include "client.h" #include "config.h" @@ -9,12 +10,12 @@ #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 @@ -33,7 +34,6 @@ void focus_startup() XSetWindowAttributes attrib; focus_client = NULL; - focus_cycle_popup = popup_new(TRUE); attrib.override_redirect = TRUE; focus_backup = XCreateWindow(ob_display, ob_root, @@ -42,6 +42,10 @@ void focus_startup() CWOverrideRedirect, &attrib); XMapRaised(ob_display, focus_backup); + /* do this *after* focus_backup is created, since it is used for + stacking */ + focus_cycle_popup = popup_new(TRUE); + /* start with nothing focused */ focus_set_client(NULL); } @@ -80,6 +84,10 @@ void focus_set_client(Client *client) Window active; Client *old; +#ifdef DEBUG_FOCUS + g_message("focus_set_client 0x%lx", client ? client->window : 0); +#endif + /* uninstall the old colormap, and install the new one */ screen_install_colormap(focus_client, FALSE); screen_install_colormap(client, TRUE); @@ -121,13 +129,17 @@ static gboolean focus_under_pointer() if (ob_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)) { + Client *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; } @@ -205,8 +217,11 @@ 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; + } } } @@ -214,13 +229,16 @@ void focus_fallback(FallbackType type) if (type != 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. */ + checks for this is in transient/group fallbacks, so they can + be fallback targets there. */ !((Client*)it->data)->fullscreen && - client_focus(it->data)) + 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) @@ -229,8 +247,10 @@ static void popup_cycle(Client *c, gboolean show) popup_hide(focus_cycle_popup); } else { Rect *a; + Client *p = c; + char *title; - a = screen_area(c->desktop); + 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); @@ -242,11 +262,21 @@ static void popup_cycle(Client *c, gboolean show) popup_size(focus_cycle_popup, 320, 48); /* use the transient's parent's title/icon */ - while (c->transient_for && c->transient_for != TRAN_GROUP) - c = c->transient_for; - - popup_show(focus_cycle_popup, (c->iconic ? c->icon_title : c->title), - client_icon(c, 48, 48)); + while (p->transient_for && p->transient_for != 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); } } @@ -260,7 +290,6 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, Client *ft; if (cancel) { - /*if (first) client_focus(first); XXX*/ if (focus_cycle_target) frame_adjust_focus(focus_cycle_target->frame, FALSE); if (focus_client) @@ -295,9 +324,13 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, } /*ft = client_focus_target(it->data);*/ ft = it->data; - if (ft->transients == NULL && /*ft == it->data &&*/client_normal(ft) && - (ft->can_focus || ft->focus_notify) && - (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) { + /* 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->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);