X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus.c;h=dfa9c42dc93ee648157820906d78cc03d8d2b3ab;hb=702995014a0ef567e98899bda931901d98461341;hp=6177bc9a68455946c1557cd0a9ba42572cc6cd8f;hpb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 6177bc9a..dfa9c42d 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "event.h"
 #include "openbox.h"
 #include "grab.h"
@@ -17,7 +18,7 @@
 #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 */
 
@@ -27,8 +28,6 @@ static Popup *focus_cycle_popup = NULL;
 void focus_startup()
 {
 
-    focus_client = NULL;
-
     focus_cycle_popup = popup_new(TRUE);
 
     /* start with nothing focused */
@@ -42,10 +41,8 @@ void focus_shutdown()
     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,
@@ -68,7 +65,7 @@ void focus_set_client(ObClient *client)
     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 */
@@ -94,7 +91,7 @@ void focus_set_client(ObClient *client)
         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);
@@ -111,7 +108,7 @@ static gboolean focus_under_pointer()
     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);