add apps file matching on role. Includes new textProperty property on

FbWindow.

2 files changed, 33 insertions, 3 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 195eeea..47e1399 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.cc,v 1.31 2004/01/21 20:07:41 fluxgen Exp $
+// $Id: FbWindow.cc,v 1.32 2004/04/28 13:04:06 rathnor Exp $
 
 #include "FbWindow.hh"
 
@@ -32,6 +32,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
 #include <cassert>
@@ -342,6 +343,33 @@ void FbWindow::reparent(const FbWindow &parent, int x, int y) {
     updateGeometry();
 }
 
+std::string FbWindow::textProperty(Atom property) const {
+    XTextProperty text_prop;
+    char ** stringlist;
+    int count;
+    std::string ret;
+
+    if (XGetTextProperty(s_display, window(), &text_prop, property) == 0)
+        return "";
+
+    if (text_prop.value == 0 || text_prop.nitems == 0)
+        return "";
+
+    if (text_prop.encoding != XA_STRING) {
+        // still returns a "StringList" despite the different name
+        if (XmbTextPropertyToTextList(s_display, &text_prop, &stringlist, &count) == 0 || count == 0)
+            return "";
+    } else {
+        if (XTextPropertyToStringList(&text_prop, &stringlist, &count) == 0 || count == 0)
+            return "";
+
+    }
+
+    ret = stringlist[0];
+    XFreeStringList(stringlist);
+    return ret;
+}
+
 bool FbWindow::property(Atom property,
                         long long_offset, long long_length,
                         bool do_delete,
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index d44e36f..045356f 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.hh,v 1.28 2004/01/21 20:22:26 fluxgen Exp $
+// $Id: FbWindow.hh,v 1.29 2004/04/28 13:04:06 rathnor Exp $
 
 #ifndef FBTK_FBWINDOW_HH
 #define FBTK_FBWINDOW_HH
@@ -28,7 +28,7 @@
 
 #include <X11/Xlib.h>
 #include <memory>
-
+#include <string>
 
 namespace FbTk {
 
@@ -135,6 +135,8 @@ public:
                         unsigned char *data,
                         int nelements);
 
+    std::string textProperty(Atom property) const;
+
     /// @return parent FbWindow
     const FbWindow *parent() const { return m_parent; }
     /// @return real X window