#include "event.h"
#include "openbox.h"
+#include "framerender.h"
#include "client.h"
#include "config.h"
#include "frame.h"
#include "focus.h"
#include "parse.h"
#include "stacking.h"
+#include "popup.h"
#include <X11/Xlib.h>
#include <glib.h>
Window focus_backup = None;
static Client *focus_cycle_target = NULL;
+static Popup *focus_cycle_popup = NULL;
void focus_startup()
{
XSetWindowAttributes attrib;
focus_client = NULL;
+ focus_cycle_popup = popup_new(TRUE);
attrib.override_redirect = TRUE;
focus_backup = XCreateWindow(ob_display, ob_root,
-100, -100, 1, 1, 0,
CopyFromParent, InputOutput, CopyFromParent,
CWOverrideRedirect, &attrib);
- XMapWindow(ob_display, focus_backup);
- stacking_raise_internal(focus_backup);
+ XMapRaised(ob_display, focus_backup);
/* start with nothing focused */
focus_set_client(NULL);
g_free(focus_order);
focus_order = NULL;
+ popup_free(focus_cycle_popup);
+ focus_cycle_popup = NULL;
+
XDestroyWindow(ob_display, focus_backup);
/* reset focus to root */
if (client != NULL)
push_to_top(client);
- /* set the NET_ACTIVE_WINDOW hint */
- active = client ? client->window : None;
- PROP_SET32(ob_root, net_active_window, window, active);
+ /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
+ if (ob_state != State_Exiting) {
+ active = client ? client->window : None;
+ PROP_SET32(ob_root, net_active_window, window, active);
+ }
if (focus_client != NULL)
dispatch_client(Event_Client_Focus, focus_client, 0, 0);
Client *ret;
for (it = c->transients; it; it = it->next) {
- g_message("looking");
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;
- g_message("not found");
}
return NULL;
}
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
if (type != Fallback_Unfocusing || it->data != old)
- if (client_normal(it->data) && client_focus(it->data))
+ if (client_normal(it->data) &&
+ /* dont fall back to 'anonymous' fullscreen windows. theres no
+ checks for this is in transient/group fallbacks. */
+ !((Client*)it->data)->fullscreen &&
+ client_focus(it->data))
return;
/* nothing to focus */
focus_set_client(NULL);
}
+static void popup_cycle(Client *c, gboolean show)
+{
+ if (!show) {
+ popup_hide(focus_cycle_popup);
+ } else {
+ Rect *a;
+
+ a = screen_area(c->desktop);
+ 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));
+*/
+ /* XXX the size and the font extents need to be related on some level
+ */
+ popup_size(focus_cycle_popup, 320, 48);
+
+ /* use the transient's parent's title/icon */
+ while (c->transient_for && c->transient_for != TRAN_GROUP)
+ c = c->transient_for;
+
+ popup_show(focus_cycle_popup, (c->iconic ? c->icon_title : c->title),
+ client_icon(c, 48, 48));
+ }
+}
+
Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
gboolean cancel)
{
frame_adjust_focus(focus_client->frame, TRUE);
goto done_cycle;
} else if (done) {
- if (focus_cycle_target) {
- client_focus(focus_cycle_target);
- stacking_raise(focus_cycle_target);
- }
+ if (focus_cycle_target)
+ client_activate(focus_cycle_target);
goto done_cycle;
}
if (!first) first = focus_client;
do {
if (forward) {
it = it->next;
- if (it == NULL) it = list;
+ if (it == NULL) it = g_list_first(list);
} else {
it = it->prev;
if (it == NULL) it = g_list_last(list);
}
- ft = client_focus_target(it->data);
- if (ft == it->data && client_normal(ft) && client_focusable(ft)) {
- if (focus_cycle_target)
- frame_adjust_focus(focus_cycle_target->frame, FALSE);
- else if (focus_client)
- frame_adjust_focus(focus_client->frame, FALSE);
- focus_cycle_target = ft;
- frame_adjust_focus(focus_cycle_target->frame, TRUE);
+ /*ft = client_focus_target(it->data);*/
+ ft = it->data;
+ if (ft->transients == NULL && /*ft == it->data &&*/client_normal(ft) &&
+ (ft->can_focus || ft->focus_notify) &&
+ (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) {
+ 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;
}
} while (it != start);
- return NULL;
done_cycle:
t = NULL;
focus_cycle_target = NULL;
g_list_free(order);
order = NULL;
+ popup_cycle(ft, FALSE);
return NULL;
}
+
+void focus_order_add_new(Client *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] && ((Client*)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] && ((Client*)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);
+ }
+}
+
+void focus_order_remove(Client *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);
+}
+
+static void to_top(Client *c, guint d)
+{
+ focus_order[d] = g_list_remove(focus_order[d], c);
+ if (!c->iconic) {
+ focus_order[d] = g_list_prepend(focus_order[d], c);
+ } else {
+ GList *it;
+
+ /* insert before first iconic window */
+ for (it = focus_order[d];
+ it && !((Client*)it->data)->iconic; it = it->next);
+ g_list_insert_before(focus_order[d], it, c);
+ }
+}
+
+void focus_order_to_top(Client *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(Client *c, guint d)
+{
+ focus_order[d] = g_list_remove(focus_order[d], c);
+ if (c->iconic) {
+ focus_order[d] = g_list_append(focus_order[d], c);
+ } else {
+ GList *it;
+
+ /* insert before first iconic window */
+ for (it = focus_order[d];
+ it && !((Client*)it->data)->iconic; it = it->next);
+ g_list_insert_before(focus_order[d], it, c);
+ }
+}
+
+void focus_order_to_bottom(Client *c)
+{
+ 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);
+}