X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=9c29345f7c484b29ad3a87132d15ea1def95520d;hb=52d751ecd67bc063df51c815aa6980a55e2f4eb7;hp=a15e1b165b6e5a8b9190c0fba50fca768ea3483a;hpb=2c6c0757fa497f4c1e0648bcbb1927c0fa12862f;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index a15e1b16..9c29345f 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -20,32 +20,34 @@ ObClient *focus_client; GList **focus_order; /* these lists are created when screen_startup sets the number of desktops */ +ObClient *focus_cycle_target; -static ObClient *focus_cycle_target; -static Popup *focus_cycle_popup; +static ObIconPopup *focus_cycle_popup; -void focus_startup() +void focus_startup(gboolean reconfig) { + focus_cycle_popup = icon_popup_new(TRUE); - focus_cycle_popup = popup_new(TRUE); - - /* start with nothing focused */ - focus_set_client(NULL); + if (!reconfig) + /* start with nothing focused */ + focus_set_client(NULL); } -void focus_shutdown() +void focus_shutdown(gboolean reconfig) { guint i; - for (i = 0; i < screen_num_desktops; ++i) - g_list_free(focus_order[i]); - g_free(focus_order); + icon_popup_free(focus_cycle_popup); - popup_free(focus_cycle_popup); + if (!reconfig) { + for (i = 0; i < screen_num_desktops; ++i) + g_list_free(focus_order[i]); + g_free(focus_order); - /* reset focus to root */ - XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, - event_lasttime); + /* reset focus to root */ + XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, + event_lasttime); + } } static void push_to_top(ObClient *client) @@ -221,22 +223,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) @@ -250,15 +252,16 @@ 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); } } -ObClient *focus_cycle(gboolean forward, gboolean linear, - gboolean dialog, gboolean done, gboolean cancel) +void focus_cycle(gboolean forward, gboolean linear, + gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; static ObClient *t = NULL; @@ -271,10 +274,9 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, frame_adjust_focus(focus_cycle_target->frame, FALSE); if (focus_client) frame_adjust_focus(focus_client->frame, TRUE); + focus_cycle_target = NULL; goto done_cycle; - } else if (done) { - if (focus_cycle_target) - client_activate(focus_cycle_target, FALSE); + } else if (done && dialog) { goto done_cycle; } @@ -314,11 +316,14 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, frame_adjust_focus(focus_cycle_target->frame, TRUE); } popup_cycle(ft, dialog); - return ft; + return; } } while (it != start); done_cycle: + if (done && focus_cycle_target) + client_activate(focus_cycle_target, FALSE); + t = NULL; first = NULL; focus_cycle_target = NULL; @@ -327,7 +332,51 @@ done_cycle: popup_cycle(ft, FALSE); - return NULL; + return; +} + +void focus_directional_cycle(ObDirection dir, + gboolean dialog, gboolean done, gboolean cancel) +{ + static ObClient *first = NULL; + ObClient *ft; + + if (cancel) { + if (focus_cycle_target) + frame_adjust_focus(focus_cycle_target->frame, FALSE); + if (focus_client) + frame_adjust_focus(focus_client->frame, TRUE); + focus_cycle_target = NULL; + goto done_cycle; + } else if (done && dialog) { + 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 (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, dialog); + } + if (dialog) + return; + +done_cycle: + if (done && focus_cycle_target) + client_activate(focus_cycle_target, FALSE); + + first = NULL; + focus_cycle_target = NULL; + + popup_cycle(ft, FALSE); + + return; } void focus_order_add_new(ObClient *c) @@ -376,7 +425,7 @@ static void to_top(ObClient *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; it && !((ObClient*)it->data)->iconic; it = it->next); - g_list_insert_before(focus_order[d], it, c); + focus_order[d] = g_list_insert_before(focus_order[d], it, c); } }