X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=cwmcc%2Froot_props.c;h=3ba243c86de13bf9860735df0841bfc11730b13f;hb=c4af950903820221bc8617de81231de32eef4f07;hp=bc963c83bcfcd08d9127972c4084853979eaf2d8;hpb=949946a9b4054ebb46e2eca8bd7685dc9bb5765c;p=chaz%2Fopenbox

diff --git a/cwmcc/root_props.c b/cwmcc/root_props.c
index bc963c83..3ba243c8 100644
--- a/cwmcc/root_props.c
+++ b/cwmcc/root_props.c
@@ -3,47 +3,43 @@
 #include "prop.h"
 #include "root_props.h"
 
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#endif
+#include <string.h>
 
-void cwmcc_root_get_supported(Window win, Atom **atoms)
+void cwmcc_root_get_supported(Window win, Atom **atoms, gulong *num)
 {
-    gulong num;
-
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_supported),
-                          CWMCC_ATOM(type, atom), atoms, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_supported),
+                                CWMCC_ATOM(type, atom), atoms, num)) {
         g_warning("Failed to read NET_SUPPORTED from 0x%lx", win);
         *atoms = NULL;
+        *num = 0;
     }
 }
 
-void cwmcc_root_get_client_list(Window win, Window **windows)
+void cwmcc_root_get_client_list(Window win, Window **windows, gulong *num)
 {
-    gulong num;
-
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_client_list),
-                          CWMCC_ATOM(type, window), windows, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_client_list),
+                                CWMCC_ATOM(type, window), windows, num)) {
         g_warning("Failed to read NET_CLIENT_LIST from 0x%lx", win);
         *windows = NULL;
+        *num = 0;
     }
 }
 
-void cwmcc_root_get_client_list_stacking(Window win, Window **windows)
+void cwmcc_root_get_client_list_stacking(Window win, Window **windows,
+                                         gulong *num)
 {
-    gulong num;
-
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_client_list_stacking),
-                          CWMCC_ATOM(type, window), windows, &num)) {
+    if (!cwmcc_prop_get_array32(win,CWMCC_ATOM(root, net_client_list_stacking),
+                                CWMCC_ATOM(type, window), windows, num)) {
         g_warning("Failed to read NET_CLIENT_LIST_STACKING from 0x%lx", win);
         *windows = NULL;
+        *num = 0;
     }
 }
 
 void cwmcc_root_get_number_of_desktops(Window win, gulong *desktops)
 {
-    if (!prop_get32(win, CWMCC_ATOM(root, net_number_of_desktops),
-                    CWMCC_ATOM(type, cardinal), desktops)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, net_number_of_desktops),
+                          CWMCC_ATOM(type, cardinal), desktops)) {
         g_warning("Failed to read NET_NUMBER_OF_DESKTOPS from 0x%lx", win);
         *desktops = 1;
     }
@@ -53,8 +49,8 @@ void cwmcc_root_get_desktop_geometry(Window win, gulong *w, gulong *h)
 {
     gulong *data = NULL, num;
 
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_desktop_geometry),
-                    CWMCC_ATOM(type, cardinal), &data, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_desktop_geometry),
+                                CWMCC_ATOM(type, cardinal), &data, &num)) {
         g_warning("Failed to read NET_DESKTOP_GEOMETRY from 0x%lx", win);
         *w = *h = 0;
     } else if (num != 2) {
@@ -71,8 +67,8 @@ void cwmcc_root_get_desktop_viewport(Window win, gulong *x, gulong *y)
 {
     gulong *data = NULL, num;
 
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_desktop_viewport),
-                    CWMCC_ATOM(type, cardinal), &data, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_desktop_viewport),
+                                CWMCC_ATOM(type, cardinal), &data, &num)) {
         g_warning("Failed to read NET_DESKTOP_VIEWPORT from 0x%lx", win);
         *x = *y = 0;
     } else if (num != 2) {
@@ -87,8 +83,8 @@ void cwmcc_root_get_desktop_viewport(Window win, gulong *x, gulong *y)
 
 void cwmcc_root_get_current_desktop(Window win, gulong *desktop)
 {
-    if (!prop_get32(win, CWMCC_ATOM(root, net_current_desktop),
-                    CWMCC_ATOM(type, cardinal), desktop)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, net_current_desktop),
+                          CWMCC_ATOM(type, cardinal), desktop)) {
         g_warning("Failed to read NET_CURRENT_DESKTOP from 0x%lx", win);
         *desktop = 0;
     }
@@ -96,8 +92,8 @@ void cwmcc_root_get_current_desktop(Window win, gulong *desktop)
 
 void cwmcc_root_get_desktop_names(Window win, char ***names)
 {
-    if (!prop_get_strings_utf8(win,
-                               CWMCC_ATOM(root, net_desktop_names), names)) {
+    if (!cwmcc_prop_get_strings_utf8(win, CWMCC_ATOM(root, net_desktop_names),
+                                     names)) {
         g_warning("Failed to read NET_DESKTOP_NAMES from 0x%lx", win);
         *names = NULL;
     }
@@ -105,8 +101,8 @@ void cwmcc_root_get_desktop_names(Window win, char ***names)
 
 void cwmcc_root_get_active_window(Window win, Window *window)
 {
-    if (!prop_get32(win, CWMCC_ATOM(root, net_active_window),
-                    CWMCC_ATOM(type, window), window)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, net_active_window),
+                          CWMCC_ATOM(type, window), window)) {
         g_warning("Failed to read NET_ACTIVE_WINDOW from 0x%lx", win);
         *window = None;
     }
@@ -120,8 +116,8 @@ void cwmcc_root_get_workarea(Window win, int **x, int **y, int **w, int **h)
     /* need the number of desktops */
     cwmcc_root_get_number_of_desktops(win, &desks);
 
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_workarea),
-                    CWMCC_ATOM(type, cardinal), &data, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_workarea),
+                                CWMCC_ATOM(type, cardinal), &data, &num)) {
         g_warning("Failed to read NET_DESKTOP_LAYOUT from 0x%lx", win);
     } else if (num != 4 * desks) {
         g_warning("Read invalid NET_DESKTOP_LAYOUT from 0x%lx", win);
@@ -141,8 +137,8 @@ void cwmcc_root_get_workarea(Window win, int **x, int **y, int **w, int **h)
 
 void cwmcc_root_get_supporting_wm_check(Window win, Window *window)
 {
-    if (!prop_get32(win, CWMCC_ATOM(root, net_supporting_wm_check),
-                    CWMCC_ATOM(type, window), window)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, net_supporting_wm_check),
+                          CWMCC_ATOM(type, window), window)) {
         g_warning("Failed to read NET_SUPPORTING_WM_CHECK from 0x%lx", win);
         *window = None;
     }
@@ -162,8 +158,8 @@ void cwmcc_root_get_desktop_layout(Window win,
     layout->rows = 1;
     layout->columns = desks;
 
-    if (!prop_get_array32(win, CWMCC_ATOM(root, net_desktop_layout),
-                    CWMCC_ATOM(type, cardinal), &data, &num)) {
+    if (!cwmcc_prop_get_array32(win, CWMCC_ATOM(root, net_desktop_layout),
+                                CWMCC_ATOM(type, cardinal), &data, &num)) {
         g_warning("Failed to read NET_DESKTOP_LAYOUT from 0x%lx", win);
     } else if (num != 4) {
         g_warning("Read invalid NET_DESKTOP_LAYOUT from 0x%lx", win);
@@ -203,8 +199,8 @@ void cwmcc_root_get_showing_desktop(Window win, gboolean *showing)
 {
     gulong a;
 
-    if (!prop_get32(win, CWMCC_ATOM(root, net_showing_desktop),
-                    CWMCC_ATOM(type, cardinal), &a)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, net_showing_desktop),
+                          CWMCC_ATOM(type, cardinal), &a)) {
         g_warning("Failed to read NET_SHOWING_DESKTOP from 0x%lx", win);
         a = FALSE;
     }
@@ -213,8 +209,8 @@ void cwmcc_root_get_showing_desktop(Window win, gboolean *showing)
 
 void cwmcc_root_get_openbox_pid(Window win, gulong *pid)
 {
-    if (!prop_get32(win, CWMCC_ATOM(root, openbox_pid),
-                    CWMCC_ATOM(type, cardinal), pid)) {
+    if (!cwmcc_prop_get32(win, CWMCC_ATOM(root, openbox_pid),
+                          CWMCC_ATOM(type, cardinal), pid)) {
         g_warning("Failed to read OPENBOX_PID from 0x%lx", win);
         *pid = 0;
     }