move ob_pointer_pos to screen_pointer_pos
Dana Jansens danakj@orodu.net
5 files changed,
13 insertions(+),
14 deletions(-)
M
openbox/focus.c
→
openbox/focus.c
@@ -111,7 +111,7 @@ {
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);
M
openbox/openbox.c
→
openbox/openbox.c
@@ -542,16 +542,6 @@ }
} } -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)
M
openbox/openbox.h
→
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
M
openbox/screen.c
→
openbox/screen.c
@@ -807,3 +807,13 @@ if (sn_busy_cnt != cnt)
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); +}
M
openbox/screen.h
→
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