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)
screen_install_colormap(focus_client, FALSE);
screen_install_colormap(client, TRUE);
- if (client == NULL) {
+ if (!client) {
/* when nothing will be focused, send focus to the backup target */
XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
event_lasttime);
old = focus_client;
focus_client = client;
- /* move to the top of the list */
- if (client != NULL)
- push_to_top(client);
+ if (old) {
+ /* focus state can affect the stacking layer */
+ client_calc_layer(old);
+ }
+ if (client) {
+ /* focus state can affect the stacking layer */
+ client_calc_layer(client);
- /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
- if (ob_state() != OB_STATE_EXITING) {
- active = client ? client->window : None;
- PROP_SET32(RootWindow(ob_display, ob_screen),
- net_active_window, window, active);
+ /* move to the top of the list */
+ push_to_top(client);
}
+
+ /* set the NET_ACTIVE_WINDOW hint */
+ active = client ? client->window : None;
+ PROP_SET32(RootWindow(ob_display, ob_screen),
+ net_active_window, window, active);
}
static gboolean focus_under_pointer()
*/
focus_set_client(NULL);
- if (!(type == OB_FOCUS_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 == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
/* try for transient relations */
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)
(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);
}
}
+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)
{
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;
}
/*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->skip_taskbar &&
- (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);
gboolean dialog, gboolean done, gboolean cancel)
{
static ObClient *first = NULL;
- ObClient *ft;
+ ObClient *ft = NULL;
if (cancel) {
if (focus_cycle_target)
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 ((ft = client_find_directional(focus_cycle_target, dir))) {
+ 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);
frame_adjust_focus(focus_cycle_target->frame, TRUE);
}
popup_cycle(ft, dialog);
+ if (dialog)
+ return;
}
- if (dialog)
- return;
done_cycle:
if (done && focus_cycle_target)
/* 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);
}
}