#include "focus.h"
#include "stacking.h"
#include "popup.h"
+#include "render/render.h"
#include <X11/Xlib.h>
#include <glib.h>
#include <assert.h>
-ObClient *focus_client;
+ObClient *focus_client, *focus_hilite;
GList **focus_order; /* these lists are created when screen_startup
sets the number of desktops */
ObClient *focus_cycle_target;
+struct {
+ InternalWindow top;
+ InternalWindow left;
+ InternalWindow right;
+ InternalWindow bottom;
+} focus_indicator;
+
+RrAppearance *a_focus_indicator;
+RrColor *color_white;
+
static ObIconPopup *focus_cycle_popup;
-static void focus_cycle_destructor(ObClient *c)
+static void focus_cycle_destructor(ObClient *client, gpointer data)
{
/* end cycling if the target disappears */
- if (focus_cycle_target == c)
+ if (focus_cycle_target == client)
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
}
+static Window createWindow(Window parent, gulong mask,
+ XSetWindowAttributes *attrib)
+{
+ return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
+ RrDepth(ob_rr_inst), InputOutput,
+ RrVisual(ob_rr_inst), mask, attrib);
+
+}
+
void focus_startup(gboolean reconfig)
{
focus_cycle_popup = icon_popup_new(TRUE);
if (!reconfig) {
- client_add_destructor((GDestroyNotify) focus_cycle_destructor);
+ XSetWindowAttributes attr;
+
+ client_add_destructor(focus_cycle_destructor, NULL);
/* start with nothing focused */
focus_set_client(NULL);
+
+ focus_indicator.top.obwin.type = Window_Internal;
+ focus_indicator.left.obwin.type = Window_Internal;
+ focus_indicator.right.obwin.type = Window_Internal;
+ focus_indicator.bottom.obwin.type = Window_Internal;
+
+ attr.save_under = True;
+ attr.override_redirect = True;
+ attr.background_pixel = BlackPixel(ob_display, ob_screen);
+ focus_indicator.top.win =
+ createWindow(RootWindow(ob_display, ob_screen),
+ CWOverrideRedirect | CWBackPixel | CWSaveUnder,
+ &attr);
+ focus_indicator.left.win =
+ createWindow(RootWindow(ob_display, ob_screen),
+ CWOverrideRedirect | CWBackPixel | CWSaveUnder,
+ &attr);
+ focus_indicator.right.win =
+ createWindow(RootWindow(ob_display, ob_screen),
+ CWOverrideRedirect | CWBackPixel | CWSaveUnder,
+ &attr);
+ focus_indicator.bottom.win =
+ createWindow(RootWindow(ob_display, ob_screen),
+ CWOverrideRedirect | CWBackPixel | CWSaveUnder,
+ &attr);
+
+ stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.top));
+ stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.left));
+ stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right));
+ stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
+
+ 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 = 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;
+ a_focus_indicator->texture[1].data.lineart.color = color_white;
+ a_focus_indicator->texture[2].type = RR_TEXTURE_LINE_ART;
+ a_focus_indicator->texture[2].data.lineart.color = color_white;
+ a_focus_indicator->texture[3].type = RR_TEXTURE_LINE_ART;
+ a_focus_indicator->texture[3].data.lineart.color = color_white;
}
}
icon_popup_free(focus_cycle_popup);
if (!reconfig) {
- client_remove_destructor((GDestroyNotify) focus_cycle_destructor);
+ 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, RevertToPointerRoot,
- event_lasttime);
+ XSetInputFocus(ob_display, PointerRoot, RevertToNone, event_lasttime);
+
+ RrColorFree(color_white);
+
+ RrAppearanceFree(a_focus_indicator);
+
+ XDestroyWindow(ob_display, focus_indicator.top.win);
+ XDestroyWindow(ob_display, focus_indicator.left.win);
+ XDestroyWindow(ob_display, focus_indicator.right.win);
+ XDestroyWindow(ob_display, focus_indicator.bottom.win);
}
}
screen_install_colormap(client, TRUE);
if (client == NULL) {
- /* when nothing will be focused, send focus to the backup target */
- XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
+#ifdef DEBUG_FOCUS
+ ob_debug("actively focusing NONWINDOW\n");
+#endif
+ /* when nothing will be focused, send focus to the backup target */
+ XSetInputFocus(ob_display, screen_support_win, RevertToNone,
event_lasttime);
XSync(ob_display, FALSE);
}
}
}
-static gboolean focus_under_pointer()
-{
- ObClient *c;
-
- if ((c = client_under_pointer()))
- return client_normal(c) && client_focus(c);
- return FALSE;
-}
-
/* 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)
+static ObClient *find_transient_recursive(ObClient *c, ObClient *top,
+ ObClient *skip)
{
GSList *it;
ObClient *ret;
- for (it = c->transients; it; it = it->next) {
+ for (it = c->transients; it; it = g_slist_next(it)) {
if (it->data == top) return NULL;
ret = find_transient_recursive(it->data, top, skip);
if (ret && ret != skip && client_normal(ret)) return ret;
return NULL;
}
-static gboolean focus_fallback_transient(ObClient *top, ObClient *old)
+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 FALSE;
+ return NULL;
target = top; /* no transient, keep the top */
}
- return client_focus(target);
+ if (client_can_focus(target))
+ return target;
+ else
+ return NULL;
}
-void focus_fallback(ObFocusFallbackType type)
+ObClient* focus_fallback_target(ObFocusFallbackType type)
{
GList *it;
ObClient *old = NULL;
+ ObClient *target = NULL;
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
- at all for them.
- */
- focus_set_client(NULL);
-
- if (!config_focus_last && config_focus_follow)
- if (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;
-
- for (sit = old->group->members; sit; sit = sit->next)
- if (sit->data == it->data)
- if (focus_fallback_transient(sit->data, old))
- return;
+ gboolean trans = FALSE;
+
+ if (!config_focus_follow || config_focus_last)
+ 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 = g_list_next(it))
+ {
+ GSList *sit;
+
+ for (sit = old->group->members; sit;
+ sit = g_slist_next(sit))
+ {
+ 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;
}
- } else {
- if (focus_fallback_transient(old->transient_for, old))
- return;
}
}
+ }
+
+ if (config_focus_follow && !config_focus_last) {
+ if ((target = client_under_pointer()))
+ if (client_normal(target) && client_can_focus(target))
+ return target;
+ }
#if 0
/* try for group relations */
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)) {
- gboolean r = client_focus(sit->data);
- assert(r);
- return;
- }
+ if (client_can_focus(sit->data))
+ return sit->data;
}
#endif
- }
- for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+ for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
- if (client_normal(it->data) && client_can_focus(it->data)) {
- gboolean r = client_focus(it->data);
- assert(r);
- return;
- }
+ if (client_normal(it->data) && client_can_focus(it->data))
+ return it->data;
+
+ return NULL;
+}
+
+void focus_fallback(ObFocusFallbackType type)
+{
+ ObClient *new;
+
+ /* 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
+ at all for them.
+ */
+ focus_set_client(NULL);
- /* nothing to focus, and already set it to none above */
+ if ((new = focus_fallback_target(type)))
+ client_focus(new);
}
static void popup_cycle(ObClient *c, gboolean show)
{
- if (!show || !config_dialog_focus) {
+ if (!show) {
icon_popup_hide(focus_cycle_popup);
} else {
Rect *a;
ObClient *p = c;
- char *title;
+ gchar *title = NULL;
a = screen_physical_area_monitor(0);
icon_popup_position(focus_cycle_popup, CenterGravity,
while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
p = p->transient_for;
- if (p == c)
- title = NULL;
- else
+/*
+ if (p != c)
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 :
}
}
+void focus_cycle_draw_indicator()
+{
+ if (!focus_cycle_target) {
+ XUnmapWindow(ob_display, focus_indicator.top.win);
+ XUnmapWindow(ob_display, focus_indicator.left.win);
+ XUnmapWindow(ob_display, focus_indicator.right.win);
+ XUnmapWindow(ob_display, focus_indicator.bottom.win);
+ } else {
+ /*
+ if (focus_cycle_target)
+ frame_adjust_focus(focus_cycle_target->frame, FALSE);
+ frame_adjust_focus(focus_cycle_target->frame, TRUE);
+ */
+ 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);
+
+ x = focus_cycle_target->frame->area.x;
+ y = focus_cycle_target->frame->area.y;
+ w = focus_cycle_target->frame->area.width;
+ h = wt;
+
+ XMoveResizeWindow(ob_display, focus_indicator.top.win,
+ x, y, w, h);
+ a_focus_indicator->texture[0].data.lineart.x1 = 0;
+ a_focus_indicator->texture[0].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[0].data.lineart.x2 = 0;
+ a_focus_indicator->texture[0].data.lineart.y2 = 0;
+ a_focus_indicator->texture[1].data.lineart.x1 = 0;
+ a_focus_indicator->texture[1].data.lineart.y1 = 0;
+ a_focus_indicator->texture[1].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[1].data.lineart.y2 = 0;
+ a_focus_indicator->texture[2].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y1 = 0;
+ a_focus_indicator->texture[2].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[3].data.lineart.x1 = (wl-1);
+ a_focus_indicator->texture[3].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[3].data.lineart.x2 = w - wr;
+ a_focus_indicator->texture[3].data.lineart.y2 = h-1;
+ RrPaint(a_focus_indicator, focus_indicator.top.win,
+ w, h);
+
+ x = focus_cycle_target->frame->area.x;
+ y = focus_cycle_target->frame->area.y;
+ w = wl;
+ h = focus_cycle_target->frame->area.height;
+
+ XMoveResizeWindow(ob_display, focus_indicator.left.win,
+ x, y, w, h);
+ a_focus_indicator->texture[0].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[0].data.lineart.y1 = 0;
+ a_focus_indicator->texture[0].data.lineart.x2 = 0;
+ a_focus_indicator->texture[0].data.lineart.y2 = 0;
+ a_focus_indicator->texture[1].data.lineart.x1 = 0;
+ a_focus_indicator->texture[1].data.lineart.y1 = 0;
+ a_focus_indicator->texture[1].data.lineart.x2 = 0;
+ a_focus_indicator->texture[1].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x1 = 0;
+ a_focus_indicator->texture[2].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[3].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[3].data.lineart.y1 = wt-1;
+ a_focus_indicator->texture[3].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[3].data.lineart.y2 = h - wb;
+ RrPaint(a_focus_indicator, focus_indicator.left.win,
+ w, h);
+
+ x = focus_cycle_target->frame->area.x +
+ focus_cycle_target->frame->area.width - wr;
+ y = focus_cycle_target->frame->area.y;
+ w = wr;
+ h = focus_cycle_target->frame->area.height ;
+
+ XMoveResizeWindow(ob_display, focus_indicator.right.win,
+ x, y, w, h);
+ a_focus_indicator->texture[0].data.lineart.x1 = 0;
+ a_focus_indicator->texture[0].data.lineart.y1 = 0;
+ a_focus_indicator->texture[0].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[0].data.lineart.y2 = 0;
+ a_focus_indicator->texture[1].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[1].data.lineart.y1 = 0;
+ a_focus_indicator->texture[1].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[1].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x2 = 0;
+ a_focus_indicator->texture[2].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[3].data.lineart.x1 = 0;
+ a_focus_indicator->texture[3].data.lineart.y1 = wt-1;
+ a_focus_indicator->texture[3].data.lineart.x2 = 0;
+ a_focus_indicator->texture[3].data.lineart.y2 = h - wb;
+ RrPaint(a_focus_indicator, focus_indicator.right.win,
+ w, h);
+
+ x = focus_cycle_target->frame->area.x;
+ y = focus_cycle_target->frame->area.y +
+ focus_cycle_target->frame->area.height - wb;
+ w = focus_cycle_target->frame->area.width;
+ h = wb;
+
+ XMoveResizeWindow(ob_display, focus_indicator.bottom.win,
+ x, y, w, h);
+ a_focus_indicator->texture[0].data.lineart.x1 = 0;
+ a_focus_indicator->texture[0].data.lineart.y1 = 0;
+ a_focus_indicator->texture[0].data.lineart.x2 = 0;
+ a_focus_indicator->texture[0].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[1].data.lineart.x1 = 0;
+ a_focus_indicator->texture[1].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[1].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[1].data.lineart.y2 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x1 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y1 = h-1;
+ a_focus_indicator->texture[2].data.lineart.x2 = w-1;
+ a_focus_indicator->texture[2].data.lineart.y2 = 0;
+ a_focus_indicator->texture[3].data.lineart.x1 = wl-1;
+ a_focus_indicator->texture[3].data.lineart.y1 = 0;
+ a_focus_indicator->texture[3].data.lineart.x2 = w - wr;
+ a_focus_indicator->texture[3].data.lineart.y2 = 0;
+ RrPaint(a_focus_indicator, focus_indicator.bottom.win,
+ w, h);
+
+ XMapWindow(ob_display, focus_indicator.top.win);
+ XMapWindow(ob_display, focus_indicator.left.win);
+ XMapWindow(ob_display, focus_indicator.right.win);
+ XMapWindow(ob_display, focus_indicator.bottom.win);
+ }
+}
+
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)));
+ 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_taskbar &&
+ (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,
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) {
+ } else if (done)
goto done_cycle;
- }
if (!focus_order[screen_desktop])
goto done_cycle;
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 */
- 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();
}
popup_cycle(ft, dialog);
return;
g_list_free(order);
order = NULL;
+ focus_cycle_draw_indicator();
popup_cycle(ft, FALSE);
return;
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) {
+ } else if (done)
goto done_cycle;
- }
if (!focus_order[screen_desktop])
goto done_cycle;
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) {
first = NULL;
focus_cycle_target = NULL;
+ focus_cycle_draw_indicator();
popup_cycle(ft, FALSE);
return;
d = c->desktop;
if (d == DESKTOP_ALL) {
for (i = 0; i < screen_num_desktops; ++i) {
+ g_assert(!g_list_find(focus_order[i], c));
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)
+ } else {
+ g_assert(!g_list_find(focus_order[d], c));
+ 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);
+ }
}
}
/* insert before first iconic window */
for (it = focus_order[d];
- it && !((ObClient*)it->data)->iconic; it = it->next);
+ it && !((ObClient*)it->data)->iconic; it = g_list_next(it));
focus_order[d] = g_list_insert_before(focus_order[d], it, c);
}
}
/* insert before first iconic window */
for (it = focus_order[d];
- it && !((ObClient*)it->data)->iconic; it = it->next);
+ it && !((ObClient*)it->data)->iconic; it = g_list_next(it));
g_list_insert_before(focus_order[d], it, c);
}
}
projects / chaz / openbox / blobdiff