#include <glib.h>
#include <assert.h>
-ObClient *focus_client = NULL;
+ObClient *focus_client;
GList **focus_order = NULL; /* these lists are created when screen_startup
sets the number of desktops */
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,
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(RootWindow(ob_display, ob_screen),
net_active_window, window, active);
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);