X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=59aa1a19a20e2af7a22fb61f36723866dd597dab;hb=a765df7fa67ec4346179ade2cfb8f337286c88d7;hp=6059f00d830a3e51df13ca8d86be03dab04b371a;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 6059f00d..59aa1a19 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -117,6 +117,20 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
     (openbox->findHandler(e.window));
   if (!w) return;
 
+  // run the RELEASE python hook
+  // kill off the Button1Mask etc, only want the modifiers
+  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+  int screen;
+  Client *c = openbox->findClient(e.window);
+  if (c)
+    screen = c->screen();
+  else
+    screen = otk::display->findScreen(e.root)->screen();
+  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+                 MouseAction::Release);
+  openbox->bindings()->fireButton(&data);
+
   // not for the button we're watching?
   if (_button != e.button) return;
 
@@ -133,17 +147,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
     return;
 
   // run the CLICK python hook
-  // kill off the Button1Mask etc, only want the modifiers
-  unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
-                                  Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-  int screen;
-  Client *c = openbox->findClient(e.window);
-  if (c)
-    screen = c->screen();
-  else
-    screen = otk::display->findScreen(e.root)->screen();
-  MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
-                 MouseAction::Click);
+  data.action = MouseAction::Click;
   openbox->bindings()->fireButton(&data);
     
 
@@ -226,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,