oops extra menu_layout

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 0285f40d0a2cae5439d8f0d3ed09e60877a84f2d..a04e4d401e64a4e6e12c1f6db7cb282447467fc8 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -17,7 +17,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 +27,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 +40,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,
@@ -111,7 +107,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);