X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=b5d97336c90dc87d1ee3f9d18fa5bc09fc2d5134;hb=198d98986bdf224ed29361541d19841339953088;hp=857f6d09e61942b86127edf5e5d85c873fa1773e;hpb=c49c2a8e408f7482f2b977d6cf97517684476ed7;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 857f6d09..b5d97336 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -19,16 +19,15 @@
 
 #include "openbox.h"
 #include "config.h"
-#include "xerror.h"
 #include "actions.h"
 #include "event.h"
 #include "client.h"
-#include "prop.h"
 #include "grab.h"
 #include "frame.h"
 #include "translate.h"
 #include "mouse.h"
 #include "gettext.h"
+#include "obt/display.h"
 
 #include <glib.h>
 
@@ -203,11 +202,11 @@ static gboolean fire_binding(ObMouseAction a, ObFrameContext context,
     return TRUE;
 }
 
-void mouse_replay_pointer()
+void mouse_replay_pointer(void)
 {
     if (replay_pointer_needed) {
         /* replay the pointer event before any windows move */
-        XAllowEvents(ob_display, ReplayPointer, event_curtime);
+        XAllowEvents(obt_display, ReplayPointer, event_curtime);
         replay_pointer_needed = FALSE;
     }
 }
@@ -287,10 +286,10 @@ void mouse_event(ObClient *client, XEvent *e)
             Window wjunk;
             guint ujunk, b, w, h;
             /* this can cause errors to occur when the window closes */
-            xerror_set_ignore(TRUE);
-            junk1 = XGetGeometry(ob_display, e->xbutton.window,
+            obt_display_ignore_errors(TRUE);
+            junk1 = XGetGeometry(obt_display, e->xbutton.window,
                                  &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
-            xerror_set_ignore(FALSE);
+            obt_display_ignore_errors(FALSE);
             if (junk1) {
                 if (e->xbutton.x >= (signed)-b &&
                     e->xbutton.y >= (signed)-b &&