X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=1d4a5bb691a3ce4cbe4fbaef8dd62da6277a04fa;hb=7175ac2b5aec7aface6a2f86df32dd0386e0cc05;hp=fba1eaf1f27f3694b177e2a92c5fc1115940d5c4;hpb=a9a5f0d7510be5dbf8ae1db99e6c1c01035503d9;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index fba1eaf1..1d4a5bb6 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -71,6 +71,7 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
     (Openbox::instance->findHandler(e.window));
   assert(w); // everything should be a widget
 
+  // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   ButtonData *data = new_button_data(e.window, e.time, state, e.button,
@@ -108,6 +109,7 @@ void OBActions::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);
   ButtonData *data = new_button_data(e.window, e.time, state, e.button,
@@ -168,6 +170,7 @@ void OBActions::keyPressHandler(const XKeyEvent &e)
 {
   OtkEventHandler::keyPressHandler(e);
 
+  // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
@@ -199,6 +202,7 @@ void OBActions::motionHandler(const XMotionEvent &e)
   assert(w); // everything should be a widget
 
   // run the MOTION python hook
+  // kill off the Button1Mask etc, only want the modifiers
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   unsigned int button = _posqueue[0]->button;
@@ -213,28 +217,19 @@ void OBActions::motionHandler(const XMotionEvent &e)
 void OBActions::mapRequestHandler(const XMapRequestEvent &e)
 {
   OtkEventHandler::mapRequestHandler(e);
-
-  EventData *data = new_event_data(e.window, EventNewWindow, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_DECREF((PyObject*)data);
+  // do this in OBScreen::manageWindow
 }
 
 void OBActions::unmapHandler(const XUnmapEvent &e)
 {
   OtkEventHandler::unmapHandler(e);
-
-  EventData *data = new_event_data(e.window, EventCloseWindow, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_DECREF((PyObject*)data);
+  // do this in OBScreen::unmanageWindow
 }
 
 void OBActions::destroyHandler(const XDestroyWindowEvent &e)
 {
   OtkEventHandler::destroyHandler(e);
-
-  EventData *data = new_event_data(e.window, EventCloseWindow, 0);
-  Openbox::instance->bindings()->fireEvent(data);
-  Py_DECREF((PyObject*)data);
+  // do this in OBScreen::unmanageWindow
 }
 
 }