X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=b557cd33d6603d6017de35a97044bf024726acb2;hb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;hp=f77acc2fb79c194c855f7c4eb4a62fb03ea65062;hpb=3b39804835c1edc5df63ac42d39dd4741087a975;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index f77acc2f..b557cd33 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -45,7 +45,7 @@ void Actions::insertPress(const XButtonEvent &e)
   }
   _posqueue[0] = a;
   a->button = e.button;
-  a->pos.setPoint(e.x_root, e.y_root);
+  a->pos = otk::Point(e.x_root, e.y_root);
 
   Client *c = openbox->findClient(e.window);
   if (c) a->clientarea = c->area();
@@ -153,7 +153,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
 
   // XXX: dont load this every time!!@*
   long dblclick;
-  if (!python_get_long("double_click_delay", &dblclick))
+  if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick))
     dblclick = 300;
 
   if (e.time - _release.time < (unsigned)dblclick &&
@@ -230,7 +230,7 @@ void Actions::keyReleaseHandler(const XKeyEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
 
   // remove from the state the mask of the modifier being released, if it is
-  // a modifier key being released (XXX this is a little ugly..)
+  // a modifier key being released (this is a little ugly..)
   const XModifierKeymap *map = otk::display->modifierMap();
   const int mask_table[] = {
     ShiftMask, LockMask, ControlMask, Mod1Mask,
@@ -264,14 +264,9 @@ void Actions::motionHandler(const XMotionEvent &e)
   
   // compress changes to a window into a single change
   XEvent ce;
-  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
-    if (ce.xmotion.window != e.window) {
-      XPutBackEvent(**otk::display, &ce);
-      break;
-    } else {
-      x_root = e.x_root;
-      y_root = e.y_root;
-    }
+  while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+    x_root = e.x_root;
+    y_root = e.y_root;
   }
 
   WidgetBase *w = dynamic_cast<WidgetBase*>
@@ -283,7 +278,7 @@ void Actions::motionHandler(const XMotionEvent &e)
     int dx = x_root - _posqueue[0]->pos.x();
     int dy = y_root - _posqueue[0]->pos.y();
     // XXX: dont get this from python every time!
-    if (!python_get_long("drag_threshold", &threshold))
+    if (!python_get_long("DRAG_THRESHOLD", &threshold))
       threshold = 0;
     if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
       return; // not at the threshold yet