+#include "debug.h"
#include "event.h"
#include "openbox.h"
#include "grab.h"
#include <glib.h>
#include <assert.h>
-ObClient *focus_client = NULL;
-GList **focus_order = NULL; /* these lists are created when screen_startup
- sets the number of desktops */
+ObClient *focus_client;
+GList **focus_order; /* these lists are created when screen_startup
+ sets the number of desktops */
-static ObClient *focus_cycle_target = NULL;
-static Popup *focus_cycle_popup = NULL;
+static ObClient *focus_cycle_target;
+static Popup *focus_cycle_popup;
void focus_startup()
{
- focus_client = NULL;
-
focus_cycle_popup = popup_new(TRUE);
/* start with nothing focused */
for (i = 0; i < screen_num_desktops; ++i)
g_list_free(focus_order[i]);
g_free(focus_order);
- focus_order = NULL;
popup_free(focus_cycle_popup);
- focus_cycle_popup = NULL;
/* reset focus to root */
XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
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 */
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)
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);
}
}
+#if 0
/* try for group relations */
if (old->group) {
GSList *sit;
return;
}
}
+#endif
}
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
*/
/* XXX the size and the font extents need to be related on some level
*/
- popup_size(focus_cycle_popup, 320, 48);
+ 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)
}
ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
- gboolean cancel)
+ gboolean cancel)
{
static ObClient *first = NULL;
static ObClient *t = NULL;
goto done_cycle;
} else if (done) {
if (focus_cycle_target)
- client_activate(focus_cycle_target);
+ client_activate(focus_cycle_target, FALSE);
goto done_cycle;
}
- if (!first)
- grab_pointer(TRUE, None);
if (!first) first = focus_client;
if (!focus_cycle_target) focus_cycle_target = focus_client;
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 (ft != focus_cycle_target) { /* prevents flicker */
if (focus_cycle_target)
order = NULL;
popup_cycle(ft, FALSE);
- grab_pointer(FALSE, None);
return NULL;
}