X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=5a799a584c8fd7ab9c674fcd5ec5b0a72e9011ff;hb=f14d74a3acf9d29fb9b4219d1f418a416d0fa612;hp=c3675cc3c20f276999e7c79a929fdf2d0afe7ba2;hpb=9e77a88d269bfafb78e56a646bfacebdd6ff4c5a;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index c3675cc3..5a799a58 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -74,7 +74,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
   // run the PRESS python hook
   WidgetBase *w = dynamic_cast<WidgetBase*>
     (openbox->findHandler(e.window));
-  assert(w); // everything should be a widget
+  if (!w) return;
 
   // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
@@ -84,7 +84,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
                  MousePress);
   openbox->bindings()->fireButton(&data);
@@ -113,7 +113,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   
   WidgetBase *w = dynamic_cast<WidgetBase*>
     (openbox->findHandler(e.window));
-  assert(w); // everything should be a widget
+  if (!w) return;
 
   // not for the button we're watching?
   if (_button != e.button) return;
@@ -122,7 +122,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
 
   // find the area of the window
   XWindowAttributes attr;
-  if (!XGetWindowAttributes(otk::Display::display, e.window, &attr)) return;
+  if (!XGetWindowAttributes(**otk::display, e.window, &attr)) return;
 
   // if not on the window any more, it isnt a CLICK
   if (!(e.same_screen && e.x >= 0 && e.y >= 0 &&
@@ -138,7 +138,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
                  MouseClick);
   openbox->bindings()->fireButton(&data);
@@ -179,7 +179,7 @@ void Actions::enterHandler(const XCrossingEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   EventData data(screen, c, EventEnterWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
@@ -195,7 +195,7 @@ void Actions::leaveHandler(const XCrossingEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   EventData data(screen, c, EventLeaveWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
@@ -209,7 +209,7 @@ void Actions::keyPressHandler(const XKeyEvent &e)
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   openbox->bindings()->
-    fireKey(otk::Display::findScreen(e.root)->screen(),
+    fireKey(otk::display->findScreen(e.root)->screen(),
             state, e.keycode, e.time);
 }
 
@@ -224,9 +224,9 @@ void Actions::motionHandler(const XMotionEvent &e)
   
   // compress changes to a window into a single change
   XEvent ce;
-  while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) {
+  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
     if (ce.xmotion.window != e.window) {
-      XPutBackEvent(otk::Display::display, &ce);
+      XPutBackEvent(**otk::display, &ce);
       break;
     } else {
       x_root = e.x_root;
@@ -236,7 +236,7 @@ void Actions::motionHandler(const XMotionEvent &e)
 
   WidgetBase *w = dynamic_cast<WidgetBase*>
     (openbox->findHandler(e.window));
-  assert(w); // everything should be a widget
+  if (!w) return;
 
   // run the MOTION python hook
   // kill off the Button1Mask etc, only want the modifiers
@@ -248,7 +248,7 @@ void Actions::motionHandler(const XMotionEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
                  x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
   openbox->bindings()->fireButton(&data);