+/* -*- 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"
static ObIconPopup *focus_cycle_popup;
+static void focus_cycle_destructor(ObClient *client, gpointer data)
+{
+ /* end cycling if the target disappears */
+ if (focus_cycle_target == client)
+ focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
+}
+
void focus_startup(gboolean reconfig)
{
focus_cycle_popup = icon_popup_new(TRUE);
- if (!reconfig)
+ if (!reconfig) {
+ client_add_destructor(focus_cycle_destructor, NULL);
+
/* start with nothing focused */
focus_set_client(NULL);
+ }
}
void focus_shutdown(gboolean reconfig)
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);
static gboolean focus_under_pointer()
{
- int x, y;
- GList *it;
+ ObClient *c;
- 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);
- if (c->desktop == screen_desktop &&
- RECT_CONTAINS(c->frame->area, x, y))
- break;
- }
- }
- if (it != NULL) {
- g_assert(WINDOW_IS_CLIENT(it->data));
- return client_normal(it->data) && client_focus(it->data);
- }
- }
+ if ((c = client_under_pointer()))
+ return client_normal(c) && client_focus(c);
return FALSE;
}
*/
focus_set_client(NULL);
- if (config_focus_follow && focus_under_pointer())
- return;
-
if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
- /* try for transient relations */
if (old->transient_for) {
- if (old->transient_for == OB_TRAN_GROUP) {
- for (it = focus_order[screen_desktop]; it; it = it->next) {
- GSList *sit;
+ gboolean trans = FALSE;
- for (sit = old->group->members; sit; sit = sit->next)
- if (sit->data == it->data)
- if (focus_fallback_transient(sit->data, old))
- return;
+ if (!config_focus_follow)
+ trans = TRUE;
+ else {
+ ObClient *c;
+
+ if ((c = client_under_pointer()) &&
+ client_search_transient(client_search_top_transient(c),
+ old))
+ trans = TRUE;
+ }
+
+ g_message("trans %d", trans);
+
+ /* 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 (focus_fallback_transient(sit->data, old))
+ return;
+ }
+ } else {
+ if (focus_fallback_transient(old->transient_for, old))
+ return;
}
- } else {
- if (focus_fallback_transient(old->transient_for, old))
- return;
}
}
+ }
+
+ if (config_focus_follow)
+ if (focus_under_pointer())
+ return;
#if 0
/* try for group relations */
}
}
#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) &&
- /* dont fall back to 'anonymous' fullscreen windows. theres no
- checks for this is in transient/group fallbacks, so they can
- be fallback targets there. */
- !((ObClient*)it->data)->fullscreen &&
- client_can_focus(it->data)) {
+ if (client_normal(it->data) && client_can_focus(it->data)) {
gboolean r = client_focus(it->data);
assert(r);
return;
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) &&
+ return (!ft->transients && client_normal(ft) &&
((ft->can_focus || ft->focus_notify) &&
!ft->skip_taskbar &&
(ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
static ObClient *t = NULL;
static GList *order = NULL;
GList *it, *start, *list;
- ObClient *ft;
+ ObClient *ft = NULL;
if (cancel) {
if (focus_cycle_target)
it = it->prev;
if (it == NULL) it = g_list_last(list);
}
- /*ft = client_focus_target(it->data);*/
ft = it->data;
if (valid_focus_target(ft)) {
if (ft != focus_cycle_target) { /* prevents flicker */
focus_cycle_target = ft;
frame_adjust_focus(focus_cycle_target->frame, TRUE);
}
- popup_cycle(ft, dialog);
+ }
+ 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);
projects / chaz / openbox / blobdiff