X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=a79049106a85ceb0efc1d6282cab7bdc2f1d4811;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=6ba125ef3ca13d259c39c0c7b2969142ddf8b9d1;hpb=c6ad57fc734417deaba6c1634f4a7f81b9001604;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 6ba125ef..a7904910 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -22,11 +22,11 @@ GList **focus_order; /* these lists are created when screen_startup sets the number of desktops */ ObClient *focus_cycle_target; -static Popup *focus_cycle_popup; +static ObIconPopup *focus_cycle_popup; void focus_startup(gboolean reconfig) { - focus_cycle_popup = popup_new(TRUE); + focus_cycle_popup = icon_popup_new(TRUE); if (!reconfig) /* start with nothing focused */ @@ -37,7 +37,7 @@ void focus_shutdown(gboolean reconfig) { guint i; - popup_free(focus_cycle_popup); + icon_popup_free(focus_cycle_popup); if (!reconfig) { for (i = 0; i < screen_num_desktops; ++i) @@ -162,11 +162,8 @@ void focus_fallback(ObFocusFallbackType type) */ focus_set_client(NULL); - if (!(type == OB_FOCUS_FALLBACK_DESKTOP ? - config_focus_last_on_desktop : config_focus_last)) { - if (config_focus_follow) focus_under_pointer(); + if (config_focus_follow && focus_under_pointer()) return; - } if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ @@ -223,22 +220,22 @@ void focus_fallback(ObFocusFallbackType type) static void popup_cycle(ObClient *c, gboolean show) { if (!show) { - popup_hide(focus_cycle_popup); + icon_popup_hide(focus_cycle_popup); } else { Rect *a; 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)); + icon_popup_position(focus_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); +/* icon_popup_size(focus_cycle_popup, a->height/2, a->height/16); + icon_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); + icon_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) @@ -252,13 +249,26 @@ static void popup_cycle(ObClient *c, gboolean show) (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)); + icon_popup_show(focus_cycle_popup, + (title ? title : + (c->iconic ? c->icon_title : c->title)), + client_icon(p, 48, 48)); g_free(title); } } +static gboolean valid_focus_target(ObClient *ft) +{ + /* 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 */ + return (ft->transients == NULL && client_normal(ft) && + ((ft->can_focus || ft->focus_notify) && + !ft->skip_taskbar && + (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))); +} + void focus_cycle(gboolean forward, gboolean linear, gboolean dialog, gboolean done, gboolean cancel) { @@ -279,6 +289,9 @@ void focus_cycle(gboolean forward, gboolean linear, goto done_cycle; } + if (!focus_order[screen_desktop]) + goto done_cycle; + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -300,14 +313,7 @@ void focus_cycle(gboolean forward, gboolean linear, } /*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 (valid_focus_target(ft)) { if (ft != focus_cycle_target) { /* prevents flicker */ if (focus_cycle_target) frame_adjust_focus(focus_cycle_target->frame, FALSE); @@ -338,7 +344,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; - ObClient *ft; + ObClient *ft = NULL; if (cancel) { if (focus_cycle_target) @@ -351,10 +357,23 @@ void focus_directional_cycle(ObDirection dir, goto done_cycle; } + if (!focus_order[screen_desktop]) + goto done_cycle; + if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; - if ((ft = client_find_directional(focus_cycle_target, dir))) { + if (focus_cycle_target) + ft = client_find_directional(focus_cycle_target, dir); + else { + GList *it; + + for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) + if (valid_focus_target(it->data)) + ft = it->data; + } + + if (ft) { if (ft != focus_cycle_target) {/* prevents flicker */ if (focus_cycle_target) frame_adjust_focus(focus_cycle_target->frame, FALSE); @@ -362,9 +381,9 @@ void focus_directional_cycle(ObDirection dir, frame_adjust_focus(focus_cycle_target->frame, TRUE); } popup_cycle(ft, dialog); + if (dialog) + return; } - if (dialog) - return; done_cycle: if (done && focus_cycle_target)