Can check CARDINAL properties in CLIENT PATTERNS

Introduces a new member function, FbWindow::cardinalProperty()

This change also changes other code that previously used
FbWindow::property() to do the same thing as the new function; this
reduces code duplication.

There are still some bits of code (Ewmh.cc, extractNetWmIcon()) that use
FbWindow::property() to retrieve XA_CARDINAL values, but as the new
method is designed for getting a _single_ property, and that code uses
FbWindow::property() to retrieve the number of values present, and then
grab all of them; it's a different use case.  I opted to not try to make
cardinalProperty() into some monolithic all-purpose cardinal method;
FbWindow::property() works just fine for that.

This change also adds an optional (default=NULL) boolean to
FbWindow::textProperty and friends that allows the caller to determine
whether or not a value was actually retrieved.  This was necessary for
integrating FbWindow::cardinalProperty with the codebase, and it seemed
to fit with FbWindow::textProperty as well.  Prior to this change, if
you got a return value of "", you wouldn't know if you successfully
retrieved the value which happened to be blank, or if you failed to
retrieve the value.  Now, you can pass the address of a boolean if you
so choose in order to differentiate these situations; the same applies
to the new FbWindow::cardinalProperty().

1 files changed, 10 insertions, 20 deletions

diff --git a/src/Gnome.cc b/src/Gnome.cc
index 91a0aef..0c3b6f1 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -98,40 +98,30 @@ void Gnome::initForScreen(BScreen &screen) {
 
 void Gnome::setupFrame(FluxboxWindow &win) {
     // load gnome state (take queues from the main window of the frame)
-    Atom ret_type;
-    int fmt;
-    unsigned long nitems, bytes_after;
-    long flags, *data = 0;
-
-    if (win.winClient().property(m_gnome_wm_win_state, 0, 1, False, XA_CARDINAL,
-                                 &ret_type, &fmt, &nitems, &bytes_after,
-                                 (unsigned char **) &data) && data) {
-        flags = *data;
+    long flags;
+    bool exists;
+    flags=win.winClient().cardinalProperty(m_gnome_wm_win_state,&exists);
+    if (exists) {
         setState(&win, flags);
-        XFree (data);
     } else {
         updateState(win);
     }
 
     // load gnome layer atom
-    if (win.winClient().property(m_gnome_wm_win_layer, 0, 1, False, XA_CARDINAL,
-                                 &ret_type, &fmt, &nitems, &bytes_after,
-                                 (unsigned char **) &data) && data) {
-        flags = *data;
+    flags=win.winClient().cardinalProperty(m_gnome_wm_win_layer,&exists);
+    if (exists) {
         setLayer(&win, flags);
-        XFree (data);
     } else {
         updateLayer(win);
     }
 
     // load gnome workspace atom
-    if (win.winClient().property(m_gnome_wm_win_workspace, 0, 1, False, XA_CARDINAL,
-                                 &ret_type, &fmt, &nitems, &bytes_after,
-                                 (unsigned char **) &data) && data) {
-        unsigned int workspace_num = *data;
+    flags=win.winClient().cardinalProperty(m_gnome_wm_win_workspace,&exists);
+    if (exists)
+    {
+        unsigned int workspace_num = flags;
         if (win.workspaceNumber() != workspace_num)
             win.setWorkspace(workspace_num);
-        XFree (data);
     } else {
         updateWorkspace(win);
     }