in synch mode, chew up 100% cpu, cuz we cant select on the display's fd

[chaz/openbox] / otk / property.hh

diff --git a/otk/property.hh b/otk/property.hh
index 72b6c505970a2a3e03853336820d7c297f52132e..e3588c043effc8aef8e99eb0796395e689055fbb 100644 (file)
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -33,9 +33,7 @@ public:
     Atom_String,   //!< The atom which represents ascii strings
     Atom_Utf8,     //!< The atom which represents utf8-encoded strings
     
-#ifdef    HAVE_GETPID
-    blackbox_pid,
-#endif // HAVE_GETPID
+    openbox_pid,
 
     // window hints
     wm_colormap_windows,
@@ -47,6 +45,7 @@ public:
     wm_name,
     wm_icon_name,
     wm_class,
+    wm_window_role,
     motif_wm_hints,
     blackbox_attributes,
     blackbox_change_attributes,
@@ -129,6 +128,7 @@ public:
     net_wm_action_close,
 
     net_wm_state_modal,
+    net_wm_state_sticky,
     net_wm_state_maximized_vert,
     net_wm_state_maximized_horz,
     net_wm_state_shaded,
@@ -136,26 +136,32 @@ public:
     net_wm_state_skip_pager,
     net_wm_state_hidden,
     net_wm_state_fullscreen,
+    net_wm_state_above,
+    net_wm_state_below,
 
     kde_net_system_tray_windows,
     kde_net_wm_system_tray_window_for,
     kde_net_wm_window_type_override,
  
+#ifndef DOXYGEN_IGNORE
     // constant for how many atoms exist in the enumerator
     NUM_ATOMS
+#endif
   };
 
   //! The possible types/encodings of strings
   enum StringType {
     ascii, //!< Standard 8-bit ascii string
     utf8,  //!< Utf8-encoded string
+#ifndef DOXYGEN_IGNORE
     NUM_STRING_TYPE
+#endif
   };
 
 private:
   //! The value of all atoms on the X server that exist in the
   //! OBProperty::Atoms enum
-  Atom                  _atoms[NUM_ATOMS];
+  Atom _atoms[NUM_ATOMS];
 
   //! Gets the value of an Atom from the X server, creating it if nessesary
   Atom create(const char *name) const;
@@ -181,7 +187,7 @@ public:
   //! Destroys the OBAtom object
   virtual ~OBProperty();
 
-  //! Sets a property on a window to a new value
+  //! Sets a single-value property on a window to a new value
   /*!
     @param win The window id of the window on which to set the property's value
     @param atom A member of the OBProperty::Atoms enum that specifies which
@@ -191,7 +197,7 @@ public:
     @param value The value to set the property to
   */
   void set(Window win, Atoms atom, Atoms type, unsigned long value) const;
-  //! Sets a property on a window to a new value
+  //! Sets an multiple-value property on a window to a new value
   /*!
     @param win The window id of the window on which to set the property's value
     @param atom A member of the OBProperty::Atoms enum that specifies which
@@ -204,7 +210,7 @@ public:
   */
   void set(Window win, Atoms atom, Atoms type,
            unsigned long value[], int elements) const;
-  //! Sets a property on a window to a new value
+  //! Sets a string property on a window to a new value
   /*!
     @param win The window id of the window on which to set the property's value
     @param atom A member of the OBProperty::Atoms enum that specifies which
@@ -215,7 +221,7 @@ public:
   */
   void set(Window win, Atoms atom, StringType type,
            const std::string &value) const;
-  //! Sets a property on a window to a new value
+  //! Sets a string-array property on a window to a new value
   /*!
     @param win The window id of the window on which to set the property's value
     @param atom A member of the OBProperty::Atoms enum that specifies which
@@ -313,7 +319,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;
   }