X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=197948e98c286c619a01cbd24036d16d45aac0d3;hb=939fbcfd31e07a6e0f1cdbfcef9b04f63e6af700;hp=2533f27efa29fbbffd65503244cdd6e815a5fe2e;hpb=e2389fab7874a14043da56b98777450bacc549ef;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 2533f27e..197948e9 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- focus.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,8 +38,7 @@ #include ObClient *focus_client, *focus_hilite; -GList **focus_order; /* these lists are created when screen_startup - sets the number of desktops */ +GList *focus_order; ObClient *focus_cycle_target; struct { @@ -49,23 +49,24 @@ struct { } focus_indicator; RrAppearance *a_focus_indicator; -RrColor *color_black; RrColor *color_white; static ObIconPopup *focus_cycle_popup; static void focus_cycle_destructor(ObClient *client, gpointer data) { - /* end cycling if the target disappears */ + /* end cycling if the target disappears. CurrentTime is fine, time won't + be used + */ if (focus_cycle_target == client) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); } -static Window createWindow(Window parent, unsigned long mask, - XSetWindowAttributes *attrib) +static Window createWindow(Window parent, gulong mask, + XSetWindowAttributes *attrib) { return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - RrDepth(ob_rr_inst), InputOutput, + RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attrib); } @@ -107,13 +108,13 @@ void focus_startup(gboolean reconfig) stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right)); stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom)); - color_black = RrColorNew(ob_rr_inst, 0, 0, 0); color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff); a_focus_indicator = RrAppearanceNew(ob_rr_inst, 4); a_focus_indicator->surface.grad = RR_SURFACE_SOLID; a_focus_indicator->surface.relief = RR_RELIEF_FLAT; - a_focus_indicator->surface.primary = color_black; + a_focus_indicator->surface.primary = RrColorNew(ob_rr_inst, + 0, 0, 0); a_focus_indicator->texture[0].type = RR_TEXTURE_LINE_ART; a_focus_indicator->texture[0].data.lineart.color = color_white; a_focus_indicator->texture[1].type = RR_TEXTURE_LINE_ART; @@ -127,21 +128,14 @@ void focus_startup(gboolean reconfig) void focus_shutdown(gboolean reconfig) { - guint i; - icon_popup_free(focus_cycle_popup); if (!reconfig) { client_remove_destructor(focus_cycle_destructor); - 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, RevertToNone, event_lasttime); + XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime); - RrColorFree(color_black); RrColorFree(color_white); RrAppearanceFree(a_focus_indicator); @@ -155,12 +149,8 @@ void focus_shutdown(gboolean reconfig) static void push_to_top(ObClient *client) { - guint desktop; - - desktop = client->desktop; - if (desktop == DESKTOP_ALL) desktop = screen_desktop; - focus_order[desktop] = g_list_remove(focus_order[desktop], client); - focus_order[desktop] = g_list_prepend(focus_order[desktop], client); + focus_order = g_list_remove(focus_order, client); + focus_order = g_list_prepend(focus_order, client); } void focus_set_client(ObClient *client) @@ -168,27 +158,27 @@ void focus_set_client(ObClient *client) Window active; ObClient *old; -#ifdef DEBUG_FOCUS - ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0); -#endif + ob_debug_type(OB_DEBUG_FOCUS, + "focus_set_client 0x%lx\n", client ? client->window : 0); /* uninstall the old colormap, and install the new one */ screen_install_colormap(focus_client, FALSE); screen_install_colormap(client, TRUE); if (client == NULL) { -#ifdef DEBUG_FOCUS - ob_debug("actively focusing NONWINDOW\n"); -#endif + ob_debug_type(OB_DEBUG_FOCUS, "actively focusing NONWINDOW\n"); + /* when nothing will be focused, send focus to the backup target */ XSetInputFocus(ob_display, screen_support_win, RevertToNone, - event_lasttime); + event_curtime); XSync(ob_display, FALSE); } - /* in the middle of cycling..? kill it. */ + /* in the middle of cycling..? kill it. CurrentTime is fine, time won't + be used. + */ if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); old = focus_client; focus_client = client; @@ -202,88 +192,28 @@ void focus_set_client(ObClient *client) active = client ? client->window : None; PROP_SET32(RootWindow(ob_display, ob_screen), net_active_window, window, active); - } -} -/* finds the first transient that isn't 'skip' and ensure's that client_normal - is true for it */ -static ObClient *find_transient_recursive(ObClient *c, ObClient *top, ObClient *skip) -{ - GSList *it; - ObClient *ret; - - for (it = c->transients; it; it = it->next) { - if (it->data == top) return NULL; - ret = find_transient_recursive(it->data, top, skip); - if (ret && ret != skip && client_normal(ret)) return ret; - if (it->data != skip && client_normal(it->data)) return it->data; + /* remove hiliting from the window when it gets focused */ + if (client != NULL) + client_hilite(client, FALSE); } - return NULL; } -static ObClient* focus_fallback_transient(ObClient *top, ObClient *old) -{ - ObClient *target = find_transient_recursive(top, top, old); - if (!target) { - /* make sure client_normal is true always */ - if (!client_normal(top)) - return NULL; - target = top; /* no transient, keep the top */ - } - if (client_can_focus(target)) - return target; - else - return NULL; -} - -ObClient* focus_fallback_target(ObFocusFallbackType type) +ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old) { GList *it; - ObClient *old = NULL; ObClient *target = NULL; + ObClient *desktop = NULL; - old = focus_client; - - if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { - if (old->transient_for) { - gboolean trans = FALSE; - - if (!config_focus_follow) - trans = TRUE; - else { - if ((target = client_under_pointer()) && - client_search_transient - (client_search_top_transient(target), old)) - { - trans = TRUE; - } - } - - /* try for transient relations */ - if (trans) { - if (old->transient_for == OB_TRAN_GROUP) { - for (it = focus_order[screen_desktop]; it; it = it->next) { - GSList *sit; - - for (sit = old->group->members; sit; sit = sit->next) - if (sit->data == it->data) - if ((target = - focus_fallback_transient(sit->data, old))) - return target; - } - } else { - if ((target = - focus_fallback_transient(old->transient_for, old))) - return target; - } - } - } - } - - if (config_focus_follow) { + ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n"); + if (config_focus_follow && !config_focus_last) + { if ((target = client_under_pointer())) - if (client_normal(target) && client_can_focus(target)) - return target; + if (allow_refocus || target != old) + if (client_normal(target) && client_can_focus(target)) { + ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n"); + return target; + } } #if 0 @@ -291,8 +221,8 @@ ObClient* focus_fallback_target(ObFocusFallbackType type) if (old->group) { GSList *sit; - for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - for (sit = old->group->members; sit; sit = sit->next) + for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) + for (sit = old->group->members; sit; sit = g_slist_next(sit)) if (sit->data == it->data) if (sit->data != old && client_normal(sit->data)) if (client_can_focus(sit->data)) @@ -300,17 +230,51 @@ ObClient* focus_fallback_target(ObFocusFallbackType type) } #endif - for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old) - if (client_normal(it->data) && client_can_focus(it->data)) - return it->data; + ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n"); + if (allow_refocus && old && old->desktop == DESKTOP_ALL) + return old; + + + ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n"); + for (it = focus_order; it; it = g_list_next(it)) + if (allow_refocus || it->data != old) { + ObClient *c = it->data; + /* fallback focus to a window if: + 1. it is actually focusable, cuz if it's not then we're sending + focus off to nothing + 2. it is validated. if the window is about to disappear, then + don't try focus it. + 3. it is visible on the current desktop. this ignores + omnipresent windows, which are problematic in their own rite. + 4. it's not iconic + 5. it is a normal type window, don't fall back onto a dock or + a splashscreen or a desktop window (save the desktop as a + backup fallback though) + */ + if (client_can_focus(c) && c->desktop == screen_desktop && + !c->iconic) + { + if (client_normal(c)) { + ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n"); + return it->data; + } else if (c->type == OB_CLIENT_TYPE_DESKTOP && !desktop) + desktop = c; + } + } - return NULL; + /* as a last resort fallback to the desktop window if there is one. + (if there's more than one, then the one most recently focused.) + */ + return desktop; } -void focus_fallback(ObFocusFallbackType type) +void focus_fallback(gboolean allow_refocus) { ObClient *new; + ObClient *old; + + /* save this before moving focus away to nothing */ + old = focus_client; /* unfocus any focused clients.. they can be focused by Pointer events and such, and then when I try focus them, I won't get a FocusIn event @@ -318,7 +282,7 @@ void focus_fallback(ObFocusFallbackType type) */ focus_set_client(NULL); - if ((new = focus_fallback_target(type))) + if ((new = focus_fallback_target(allow_refocus, old))) client_focus(new); } @@ -329,7 +293,7 @@ static void popup_cycle(ObClient *c, gboolean show) } else { Rect *a; ObClient *p = c; - char *title; + gchar *title = NULL; a = screen_physical_area_monitor(0); icon_popup_position(focus_cycle_popup, CenterGravity, @@ -346,14 +310,13 @@ static void popup_cycle(ObClient *c, gboolean show) 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), + if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title))) + title = g_strdup(p->iconic ? p->icon_title : p->title); + /*title = g_strconcat((c->iconic ? c->icon_title : c->title), " - ", (p->iconic ? p->icon_title : p->title), NULL); - + */ icon_popup_show(focus_cycle_popup, (title ? title : (c->iconic ? c->icon_title : c->title)), @@ -375,12 +338,13 @@ void focus_cycle_draw_indicator() frame_adjust_focus(focus_cycle_target->frame, FALSE); frame_adjust_focus(focus_cycle_target->frame, TRUE); */ - int x, y, w, h; - int wt, wl, wr, wb; + gint x, y, w, h; + gint wt, wl, wr, wb; wt = wl = wr = wb = MAX(3, - ob_rr_theme->handle_height + - ob_rr_theme->bwidth * 2); + MAX(1, MAX(ob_rr_theme->paddingx, + ob_rr_theme->paddingy)) * 2 + + ob_rr_theme->fbwidth * 2); x = focus_cycle_target->frame->area.x; y = focus_cycle_target->frame->area.y; @@ -501,19 +465,35 @@ static gboolean valid_focus_target(ObClient *ft) 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->type == OB_CLIENT_TYPE_NORMAL || - ft->type == OB_CLIENT_TYPE_DIALOG || - (!client_has_group_siblings(ft) && - (ft->type == OB_CLIENT_TYPE_TOOLBAR || - ft->type == OB_CLIENT_TYPE_MENU || - ft->type == OB_CLIENT_TYPE_UTILITY))) && - !ft->transients && - ((ft->can_focus || ft->focus_notify) && - !ft->skip_taskbar && - (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))); + if ((ft->type == OB_CLIENT_TYPE_NORMAL || + ft->type == OB_CLIENT_TYPE_DIALOG || + (!client_has_group_siblings(ft) && + (ft->type == OB_CLIENT_TYPE_TOOLBAR || + ft->type == OB_CLIENT_TYPE_MENU || + ft->type == OB_CLIENT_TYPE_UTILITY))) && + ((ft->can_focus || ft->focus_notify) && + !ft->skip_pager && + (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) && + ft == client_focus_target(ft)) + return TRUE; +/* + { + GSList *it; + + for (it = ft->transients; it; it = g_slist_next(it)) { + ObClient *c = it->data; + + if (c->frame->visible) + return FALSE; + } + return TRUE; + } +*/ + + return FALSE; } -void focus_cycle(gboolean forward, gboolean linear, +void focus_cycle(gboolean forward, gboolean linear, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; @@ -522,27 +502,26 @@ void focus_cycle(gboolean forward, gboolean linear, GList *it, *start, *list; ObClient *ft = NULL; - 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 (interactive) { + if (cancel) { + focus_cycle_target = NULL; + goto done_cycle; + } else if (done) + goto done_cycle; - if (!focus_order[screen_desktop]) - goto done_cycle; + if (!focus_order) + goto done_cycle; - if (!first) first = focus_client; - if (!focus_cycle_target) focus_cycle_target = focus_client; + if (!first) first = focus_client; - if (linear) list = client_list; - else list = focus_order[screen_desktop]; + if (linear) list = client_list; + else list = focus_order; + } else { + if (!focus_order) + goto done_cycle; + list = client_list; + } + if (!focus_cycle_target) focus_cycle_target = focus_client; start = it = g_list_find(list, focus_cycle_target); if (!start) /* switched desktops or something? */ @@ -559,18 +538,24 @@ void focus_cycle(gboolean forward, gboolean linear, } ft = it->data; if (valid_focus_target(ft)) { - if (ft != focus_cycle_target) { /* prevents flicker */ + if (interactive) { + if (ft != focus_cycle_target) { /* prevents flicker */ + focus_cycle_target = ft; + focus_cycle_draw_indicator(); + } + popup_cycle(ft, dialog); + return; + } else if (ft != focus_cycle_target) { focus_cycle_target = ft; - focus_cycle_draw_indicator(); + done = TRUE; + break; } - popup_cycle(ft, dialog); - return; } } while (it != start); done_cycle: if (done && focus_cycle_target) - client_activate(focus_cycle_target, FALSE); + client_activate(focus_cycle_target, FALSE, TRUE); t = NULL; first = NULL; @@ -578,30 +563,30 @@ done_cycle: g_list_free(order); order = NULL; - focus_cycle_draw_indicator(); - popup_cycle(ft, FALSE); + if (interactive) { + focus_cycle_draw_indicator(); + popup_cycle(ft, FALSE); + } return; } -void focus_directional_cycle(ObDirection dir, +void focus_directional_cycle(ObDirection dir, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; ObClient *ft = NULL; + if (!interactive) + return; + 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) { + } else if (done) goto done_cycle; - } - if (!focus_order[screen_desktop]) + if (!focus_order) goto done_cycle; if (!first) first = focus_client; @@ -612,17 +597,15 @@ void focus_directional_cycle(ObDirection dir, else { GList *it; - for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) + for (it = focus_order; 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); focus_cycle_target = ft; - frame_adjust_focus(focus_cycle_target->frame, TRUE); + focus_cycle_draw_indicator(); } } if (focus_cycle_target) { @@ -634,11 +617,12 @@ void focus_directional_cycle(ObDirection dir, done_cycle: if (done && focus_cycle_target) - client_activate(focus_cycle_target, FALSE); + client_activate(focus_cycle_target, FALSE, TRUE); first = NULL; focus_cycle_target = NULL; + focus_cycle_draw_indicator(); popup_cycle(ft, FALSE); return; @@ -646,89 +630,61 @@ done_cycle: void focus_order_add_new(ObClient *c) { - guint d, i; - if (c->iconic) focus_order_to_top(c); else { - d = c->desktop; - if (d == DESKTOP_ALL) { - for (i = 0; i < screen_num_desktops; ++i) { - 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] && ((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); + g_assert(!g_list_find(focus_order, c)); + /* if there are any iconic windows, put this above them in the order, + but if there are not, then put it under the currently focused one */ + if (focus_order && ((ObClient*)focus_order->data)->iconic) + focus_order = g_list_insert(focus_order, c, 0); + else + focus_order = g_list_insert(focus_order, c, 1); } } void focus_order_remove(ObClient *c) { - guint d, i; - - d = c->desktop; - if (d == DESKTOP_ALL) { - for (i = 0; i < screen_num_desktops; ++i) - focus_order[i] = g_list_remove(focus_order[i], c); - } else - focus_order[d] = g_list_remove(focus_order[d], c); + focus_order = g_list_remove(focus_order, c); } -static void to_top(ObClient *c, guint d) +void focus_order_to_top(ObClient *c) { - focus_order[d] = g_list_remove(focus_order[d], c); + focus_order = g_list_remove(focus_order, c); if (!c->iconic) { - focus_order[d] = g_list_prepend(focus_order[d], c); + focus_order = g_list_prepend(focus_order, c); } else { GList *it; /* insert before first iconic window */ - for (it = focus_order[d]; - it && !((ObClient*)it->data)->iconic; it = it->next); - focus_order[d] = g_list_insert_before(focus_order[d], it, c); + for (it = focus_order; + it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); + focus_order = g_list_insert_before(focus_order, it, c); } } -void focus_order_to_top(ObClient *c) -{ - guint d, i; - - d = c->desktop; - if (d == DESKTOP_ALL) { - for (i = 0; i < screen_num_desktops; ++i) - to_top(c, i); - } else - to_top(c, d); -} - -static void to_bottom(ObClient *c, guint d) +void focus_order_to_bottom(ObClient *c) { - focus_order[d] = g_list_remove(focus_order[d], c); + focus_order = g_list_remove(focus_order, c); if (c->iconic) { - focus_order[d] = g_list_append(focus_order[d], c); + focus_order = g_list_append(focus_order, c); } else { GList *it; /* 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); + for (it = focus_order; + it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); + focus_order = g_list_insert_before(focus_order, it, c); } } -void focus_order_to_bottom(ObClient *c) +ObClient *focus_order_find_first(guint desktop) { - guint d, i; - - d = c->desktop; - if (d == DESKTOP_ALL) { - for (i = 0; i < screen_num_desktops; ++i) - to_bottom(c, i); - } else - to_bottom(c, d); + GList *it; + for (it = focus_order; it; it = g_list_next(it)) { + ObClient *c = it->data; + if (c->desktop == desktop || c->desktop == DESKTOP_ALL) + return c; + } + return NULL; }