summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/focus.c2
-rw-r--r--openbox/openbox.c10
-rw-r--r--openbox/openbox.h3
-rw-r--r--openbox/screen.c10
-rw-r--r--openbox/screen.h2
5 files changed, 13 insertions, 14 deletions
diff --git a/openbox/focus.c b/openbox/focus.c
index 0285f40d..9a8cc3ef 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -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);
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 747f3840..40e3ef8b 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -542,16 +542,6 @@ static void parse_args(int argc, char **argv)
}
}
-gboolean ob_pointer_pos(int *x, int *y)
-{
- Window w;
- int i;
- guint u;
-
- return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
- &w, &w, x, y, &i, &i, &u);
-}
-
#ifdef USE_SM
static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
Bool shutdown, int interact_style, Bool fast)
diff --git a/openbox/openbox.h b/openbox/openbox.h
index 73f84364..f5129ecc 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -38,7 +38,4 @@ Cursor ob_cursor(ObCursor cursor);
KeyCode ob_keycode(ObKey key);
-/* cuz i have nowhere better to put it right now... */
-gboolean ob_pointer_pos(int *x, int *y);
-
#endif
diff --git a/openbox/screen.c b/openbox/screen.c
index 4b25a035..58c5b2e5 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -807,3 +807,13 @@ static void sn_event_func(SnMonitorEvent *ev, void *data)
set_root_cursor();
}
#endif
+
+gboolean screen_pointer_pos(int *x, int *y)
+{
+ Window w;
+ int i;
+ guint u;
+
+ return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),
+ &w, &w, x, y, &i, &i, &u);
+}
diff --git a/openbox/screen.h b/openbox/screen.h
index 7008854a..1c687036 100644
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -70,4 +70,6 @@ Rect *screen_area(guint desktop);
Rect *screen_area_monitor(guint desktop, guint head);
+gboolean screen_pointer_pos(int *x, int *y);
+
#endif