move ob_pointer_pos to screen_pointer_pos

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 6177bc9a68455946c1557cd0a9ba42572cc6cd8f..9a8cc3ef03e0a4d0769b1f6aaaa4f27d1ce79d47 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -94,7 +94,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 +111,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);