moving strut into its own .hh. adding OBClient class

3 files changed, 31 insertions, 1 deletions

diff --git a/otk/property.cc b/otk/property.cc
index 3ce90225..f76469d0 100644
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -139,6 +139,7 @@ OBProperty::OBProperty()
   _atoms[net_wm_state_skip_pager] = create("_NET_WM_STATE_SKIP_PAGER");
   _atoms[net_wm_state_hidden] = create("_NET_WM_STATE_HIDDEN");
   _atoms[net_wm_state_fullscreen] = create("_NET_WM_STATE_FULLSCREEN");
+  _atoms[net_wm_state_floating] = create("_NET_WM_STATE_FLOATING");
   
   _atoms[kde_net_system_tray_windows] = create("_KDE_NET_SYSTEM_TRAY_WINDOWS");
   _atoms[kde_net_wm_system_tray_window_for] =
diff --git a/otk/property.hh b/otk/property.hh
index 215f941f..6894c786 100644
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -136,6 +136,7 @@ public:
     net_wm_state_skip_pager,
     net_wm_state_hidden,
     net_wm_state_fullscreen,
+    net_wm_state_floating,
 
     kde_net_system_tray_windows,
     kde_net_wm_system_tray_window_for,
@@ -317,7 +318,7 @@ public:
              value to return
     @return The value of the specified Atom
   */
-  inline Atom atom(Atoms a) {
+  inline Atom atom(Atoms a) const {
     assert(a >= 0 && a < NUM_ATOMS); Atom ret = _atoms[a]; assert(ret != 0);
     return ret;
   }
diff --git a/otk/strut.hh b/otk/strut.hh
new file mode 100644
index 00000000..494cc4f1
--- /dev/null
+++ b/otk/strut.hh
@@ -0,0 +1,28 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+#ifndef __strut_hh
+#define __strut_hh
+
+/*! @file strut.hh
+  @brief The Strut struct defines a margin on 4 sides
+*/
+
+namespace otk {
+
+//! Defines a margin on 4 sides
+struct Strut {
+  //! The margin on the top of the Strut
+  unsigned int top;
+  //! The margin on the bottom of the Strut
+  unsigned int bottom;
+  //! The margin on the left of the Strut
+  unsigned int left;
+  //! The margin on the right of the Strut
+  unsigned int right;
+
+  //! Constructs a new Strut with no margins
+  Strut(void): top(0), bottom(0), left(0), right(0) {}
+};
+
+}
+
+#endif // __strut_hh