M src/actions.cc → src/actions.cc

@@ -13,7 +13,7 @@ 
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
 
 OBActions::OBActions()
-  : _button(0), _enter_win(0)
+  : _button(0)
 {
 
   // XXX: load a configuration out of somewhere
@@ -28,6 +28,8 @@ 
 
 void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
+  OtkEventHandler::buttonPressHandler(e);
+  
   // XXX: run the PRESS guile hook
   printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n",
          (long)e.window, e.state, e.button, e.time);
@@ -40,6 +42,8 @@ 
 
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
+  OtkEventHandler::buttonReleaseHandler(e);
+  
   // XXX: run the RELEASE guile hook
   printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n",
          (long)e.window, e.state, e.button, e.time);
@@ -82,24 +86,21 @@ }
 }
 
 
-void OBActions::enter(Window win, unsigned int modifiers)
+void OBActions::enterHandler(const XCrossingEvent &e)
 {
-  _enter_win = win;
-
-  (void)modifiers;
+  OtkEventHandler::enterHandler(e);
+  
   // XXX: run the ENTER guile hook
-  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers);
-
+  printf("GUILE: ENTER: win %lx modifiers %u\n", (long)e.window, e.state);
 }
 
 
-void OBActions::leave(unsigned int modifiers)
+void OBActions::leaveHandler(const XCrossingEvent &e)
 {
-  (void)modifiers;
-  // XXX: run the LEAVE guile hook
-  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)_enter_win, modifiers);
+  OtkEventHandler::leaveHandler(e);
 
-  _enter_win = 0;
+  // XXX: run the LEAVE guile hook
+  printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)e.window, e.state);
 }
 
 

M src/actions.hh → src/actions.hh

@@ -35,8 +35,6 @@ //! The last 2 button release processed for CLICKs
   MouseButtonAction _release;
   //! The mouse button currently being watched from a press for a CLICK
   unsigned int _button;
-  //! The window the last enter action occured on (where the mouse is located)
-  Window _enter_win;
 
   void insertPress(Window win, unsigned int button, Time time);
   
@@ -47,21 +45,8 @@ 
   virtual void buttonPressHandler(const XButtonEvent &e);
   virtual void buttonReleaseHandler(const XButtonEvent &e);
   
-
-
-
-  //! Notify that a mouse enter action has occured on a window.
-  /*!
-    @param win The window on which the action was performed.
-    @param modifiers The modifier state for the action.
-  */
-  void enter(Window win, unsigned int modifiers);
-
-  //! Notify that a mouse leave action has occured on a window.
-  /*!
-    @param modifiers The modifier state for the action.
-  */
-  void leave(unsigned int modifiers);
+  virtual void enterHandler(const XCrossingEvent &e);
+  virtual void leaveHandler(const XCrossingEvent &e);
 
   //! Notify that a mouse drag is taking place.
   /*!

M src/frame.hh → src/frame.hh

@@ -30,6 +30,11 @@ parent with the SubstructureRedirectMask so that structure events for the
   client are sent to the window manager.
 */
 class OBFrame : public otk::OtkWidget {
+public:
+
+  //! The event mask to grab on frame windows
+  static const long event_mask = EnterWindowMask | LeaveWindowMask;
+
 private:
   OBClient *_client;
   const otk::ScreenInfo *_screen;