X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=8d5e6c547755654b037779ebedd6cba3c3cc996f;hb=276b2be581c6cb138b439537761ff2ca42201805;hp=4fa123cbaf594ffb13493281ac92536632024669;hpb=380ddd2b9cd2ffd8d286855b0670e58a553b2b3d;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 4fa123cb..8d5e6c54 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,15 +34,17 @@ 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, -100, -100, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, CWOverrideRedirect, &attrib); - XMapWindow(ob_display, focus_backup); - stacking_raise_internal(focus_backup); + 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); @@ -81,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); @@ -104,7 +111,7 @@ void focus_set_client(Client *client) push_to_top(client); /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ - if (ob_state != State_Exiting) { + if (ob_state != OB_STATE_EXITING) { active = client ? client->window : None; PROP_SET32(ob_root, net_active_window, window, active); } @@ -122,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; } @@ -206,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; + } } } @@ -215,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) @@ -230,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); @@ -243,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); } } @@ -261,23 +290,19 @@ 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) 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); - if (focus_cycle_target->shaded) - client_shade(focus_cycle_target, FALSE); - client_focus(focus_cycle_target); - stacking_raise(focus_cycle_target); - } + if (focus_cycle_target) + client_activate(focus_cycle_target); goto done_cycle; } + if (!first) + grab_pointer(TRUE, None); + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -299,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); @@ -319,7 +348,10 @@ done_cycle: focus_cycle_target = NULL; g_list_free(order); order = NULL; + popup_cycle(ft, FALSE); + grab_pointer(FALSE, None); + return NULL; }