X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=523c7b5d057cf262181a65f38bffe2f20c71475a;hb=5f5160b40c89c28a7e86dc66c08d1788bb6b0f1d;hp=b64d3e0071e4332feeff8b3fa25e4c83e04bd5a8;hpb=e4be1f860bc579fd4a0d9dee6a6ca590030a791e;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index b64d3e00..523c7b5d 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -1,3 +1,22 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + focus.c for the Openbox window manager + Copyright (c) 2003 Ben 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include "debug.h" #include "event.h" #include "openbox.h" #include "grab.h" @@ -8,7 +27,6 @@ #include "screen.h" #include "group.h" #include "prop.h" -#include "dispatch.h" #include "focus.h" #include "stacking.h" #include "popup.h" @@ -17,56 +35,37 @@ #include #include -ObClient *focus_client = NULL; -GList **focus_order = NULL; /* these lists are created when screen_startup - sets the number of desktops */ - -Window focus_backup = None; +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 = NULL; -static Popup *focus_cycle_popup = NULL; +static ObIconPopup *focus_cycle_popup; -void focus_startup() +void focus_startup(gboolean reconfig) { - /* create the window which gets focus when no clients get it. Have to - make it override-redirect so we don't try manage it, since it is - mapped. */ - XSetWindowAttributes attrib; - - focus_client = NULL; - - attrib.override_redirect = TRUE; - focus_backup = XCreateWindow(ob_display, ob_root, - -100, -100, 1, 1, 0, - CopyFromParent, InputOutput, CopyFromParent, - CWOverrideRedirect, &attrib); - XMapRaised(ob_display, focus_backup); + focus_cycle_popup = icon_popup_new(TRUE); - /* 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); + 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); - focus_order = NULL; + icon_popup_free(focus_cycle_popup); - popup_free(focus_cycle_popup); - focus_cycle_popup = NULL; - - XDestroyWindow(ob_display, focus_backup); + 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) @@ -85,7 +84,7 @@ void focus_set_client(ObClient *client) ObClient *old; #ifdef DEBUG_FOCUS - g_message("focus_set_client 0x%lx", client ? client->window : 0); + ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0); #endif /* uninstall the old colormap, and install the new one */ @@ -94,14 +93,14 @@ void focus_set_client(ObClient *client) if (client == NULL) { /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot, + XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, event_lasttime); XSync(ob_display, FALSE); } /* in the middle of cycling..? kill it. */ if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE); old = focus_client; focus_client = client; @@ -111,15 +110,11 @@ void focus_set_client(ObClient *client) push_to_top(client); /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ - if (ob_state != OB_STATE_EXITING) { + if (ob_state() != OB_STATE_EXITING) { active = client ? client->window : None; - PROP_SET32(ob_root, net_active_window, window, active); + PROP_SET32(RootWindow(ob_display, ob_screen), + net_active_window, window, active); } - - if (focus_client != NULL) - dispatch_client(Event_Client_Focus, focus_client, 0, 0); - if (old != NULL) - dispatch_client(Event_Client_Unfocus, old, 0, 0); } static gboolean focus_under_pointer() @@ -127,7 +122,7 @@ static gboolean focus_under_pointer() int x, y; GList *it; - if (ob_pointer_pos(&x, &y)) { + if (screen_pointer_pos(&x, &y)) { for (it = stacking_list; it != NULL; it = it->next) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = WINDOW_AS_CLIENT(it->data); @@ -172,7 +167,7 @@ static gboolean focus_fallback_transient(ObClient *top, ObClient *old) return client_focus(target); } -void focus_fallback(FallbackType type) +void focus_fallback(ObFocusFallbackType type) { GList *it; ObClient *old = NULL; @@ -185,13 +180,10 @@ void focus_fallback(FallbackType type) */ focus_set_client(NULL); - if (!(type == 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 == Fallback_Unfocusing && old) { + if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ if (old->transient_for) { if (old->transient_for == OB_TRAN_GROUP) { @@ -209,6 +201,7 @@ void focus_fallback(FallbackType type) } } +#if 0 /* try for group relations */ if (old->group) { GSList *sit; @@ -223,10 +216,11 @@ void focus_fallback(FallbackType type) return; } } +#endif } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - if (type != Fallback_Unfocusing || it->data != old) + if (type != OB_FOCUS_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, so they can @@ -244,22 +238,22 @@ void focus_fallback(FallbackType 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, 320, 48); + 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) @@ -273,15 +267,28 @@ 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 done, - gboolean cancel) +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) { static ObClient *first = NULL; static ObClient *t = NULL; @@ -294,14 +301,14 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, 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); + } else if (done && dialog) { goto done_cycle; } - if (!first) - grab_pointer(TRUE, None); + + if (!focus_order[screen_desktop]) + goto done_cycle; if (!first) first = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client; @@ -324,25 +331,22 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, } /*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->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); focus_cycle_target = ft; frame_adjust_focus(focus_cycle_target->frame, TRUE); } - popup_cycle(ft, config_focus_popup); - return ft; + popup_cycle(ft, dialog); + 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; @@ -350,9 +354,68 @@ done_cycle: order = NULL; popup_cycle(ft, FALSE); - grab_pointer(FALSE, None); - return NULL; + return; +} + +void focus_directional_cycle(ObDirection dir, + gboolean dialog, gboolean done, gboolean cancel) +{ + static ObClient *first = NULL; + 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 (!focus_order[screen_desktop]) + goto done_cycle; + + if (!first) first = focus_client; + if (!focus_cycle_target) focus_cycle_target = focus_client; + + 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); + focus_cycle_target = ft; + frame_adjust_focus(focus_cycle_target->frame, TRUE); + } + } + if (focus_cycle_target) { + popup_cycle(focus_cycle_target, 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) @@ -401,7 +464,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); } }