segfault no more on root clicks

[chaz/openbox] / src / frame.hh

diff --git a/src/frame.hh b/src/frame.hh
index 85c863e78e7dc69ab9841f76cab0162841dc3b64..1d7ebd6c29a116def3c71ae98a96f3c2a6d94b0f 100644 (file)
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -29,11 +29,13 @@ namespace ob {
   parent with the SubstructureRedirectMask so that structure events for the
   client are sent to the window manager.
 */
-class OBFrame : public otk::OtkWidget {
+class OBFrame : public otk::OtkWidget, public OBWidget {
 public:
 
   //! The event mask to grab on frame windows
-  static const long event_mask = EnterWindowMask | LeaveWindowMask;
+  static const long event_mask = EnterWindowMask | LeaveWindowMask |
+                                 ButtonPressMask | ButtonReleaseMask |
+                                 ButtonMotionMask;
 
 private:
   OBClient *_client;
@@ -110,6 +112,27 @@ public:
   */
   void frameGravity(int &x, int &y);
 
+  //! Gets the window id of the frame's "plate" subelement
+  inline Window plate() const { return _plate.getWindow(); }
+  //! Gets the window id of the frame's "titlebar" subelement
+  inline Window titlebar() const { return _titlebar.getWindow(); }
+  //! Gets the window id of the frame's "label" subelement
+  inline Window label() const { return _label.getWindow(); }
+  //! Gets the window id of the frame's "close button" subelement
+  inline Window button_close() const { return _button_close.getWindow(); }
+  //! Gets the window id of the frame's "iconify button" subelement
+  inline Window button_iconify() const { return _button_iconify.getWindow(); }
+  //! Gets the window id of the frame's "maximize button" subelement
+  inline Window button_max() const { return _button_max.getWindow(); }
+  //! Gets the window id of the frame's "sticky button" subelement
+  inline Window button_stick() const { return _button_stick.getWindow(); }
+  //! Gets the window id of the frame's "handle" subelement
+  inline Window handle() const { return _handle.getWindow(); }
+  //! Gets the window id of the frame's "left grip" subelement
+  inline Window grip_left() const { return _grip_left.getWindow(); }
+  //! Gets the window id of the frame's "right grip" subelement
+  inline Window grip_right() const { return _grip_right.getWindow(); }
+
 };
 
 }