#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;
}
{
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) {
{
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) {
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;
}
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;
}
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;
}
/* 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);
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;
}
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);
{
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;
}
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;
}