1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
|
--- wmctrl-1.07.orig/main.c
+++ wmctrl-1.07/main.c
@@ -31,6 +31,7 @@
#include <string.h>
#include <locale.h>
#include <X11/Xlib.h>
+#include <X11/Xmd.h>
#include <X11/Xatom.h>
#include <X11/cursorfont.h>
#include <X11/Xmu/WinUtil.h>
@@ -477,8 +478,8 @@
Window *sup_window = NULL;
gchar *wm_name = NULL;
gchar *wm_class = NULL;
- unsigned long *wm_pid = NULL;
- unsigned long *showing_desktop = NULL;
+ CARD32 *wm_pid = NULL;
+ CARD32 *showing_desktop = NULL;
gboolean name_is_utf8 = TRUE;
gchar *name_out;
gchar *class_out;
@@ -517,13 +518,13 @@
/* WM_PID */
- if (! (wm_pid = (unsigned long *)get_property(disp, *sup_window,
+ if (! (wm_pid = (CARD32 *)get_property(disp, *sup_window,
XA_CARDINAL, "_NET_WM_PID", NULL))) {
p_verbose("Cannot get pid of the window manager (_NET_WM_PID).\n");
}
/* _NET_SHOWING_DESKTOP */
- if (! (showing_desktop = (unsigned long *)get_property(disp, DefaultRootWindow(disp),
+ if (! (showing_desktop = (CARD32 *)get_property(disp, DefaultRootWindow(disp),
XA_CARDINAL, "_NET_SHOWING_DESKTOP", NULL))) {
p_verbose("Cannot get the _NET_SHOWING_DESKTOP property.\n");
}
@@ -678,13 +679,13 @@
}/*}}}*/
static int window_to_desktop (Display *disp, Window win, int desktop) {/*{{{*/
- unsigned long *cur_desktop = NULL;
+ CARD32 *cur_desktop = NULL;
Window root = DefaultRootWindow(disp);
if (desktop == -1) {
- if (! (cur_desktop = (unsigned long *)get_property(disp, root,
+ if (! (cur_desktop = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_NET_CURRENT_DESKTOP", NULL))) {
- if (! (cur_desktop = (unsigned long *)get_property(disp, root,
+ if (! (cur_desktop = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_WIN_WORKSPACE", NULL))) {
fputs("Cannot get current desktop properties. "
"(_NET_CURRENT_DESKTOP or _WIN_WORKSPACE property)"
@@ -702,12 +703,12 @@
static int activate_window (Display *disp, Window win, /* {{{ */
gboolean switch_desktop) {
- unsigned long *desktop;
+ CARD32 *desktop;
/* desktop ID */
- if ((desktop = (unsigned long *)get_property(disp, win,
+ if ((desktop = (CARD32 *)get_property(disp, win,
XA_CARDINAL, "_NET_WM_DESKTOP", NULL)) == NULL) {
- if ((desktop = (unsigned long *)get_property(disp, win,
+ if ((desktop = (CARD32 *)get_property(disp, win,
XA_CARDINAL, "_WIN_WORKSPACE", NULL)) == NULL) {
p_verbose("Cannot find desktop ID of the window.\n");
}
@@ -1016,16 +1017,16 @@
}/*}}}*/
static int list_desktops (Display *disp) {/*{{{*/
- unsigned long *num_desktops = NULL;
- unsigned long *cur_desktop = NULL;
+ CARD32 *num_desktops = NULL;
+ CARD32 *cur_desktop = NULL;
unsigned long desktop_list_size = 0;
- unsigned long *desktop_geometry = NULL;
+ CARD32 *desktop_geometry = NULL;
unsigned long desktop_geometry_size = 0;
gchar **desktop_geometry_str = NULL;
- unsigned long *desktop_viewport = NULL;
+ CARD32 *desktop_viewport = NULL;
unsigned long desktop_viewport_size = 0;
gchar **desktop_viewport_str = NULL;
- unsigned long *desktop_workarea = NULL;
+ CARD32 *desktop_workarea = NULL;
unsigned long desktop_workarea_size = 0;
gchar **desktop_workarea_str = NULL;
gchar *list = NULL;
@@ -1036,9 +1037,9 @@
gchar **names = NULL;
gboolean names_are_utf8 = TRUE;
- if (! (num_desktops = (unsigned long *)get_property(disp, root,
+ if (! (num_desktops = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_NET_NUMBER_OF_DESKTOPS", NULL))) {
- if (! (num_desktops = (unsigned long *)get_property(disp, root,
+ if (! (num_desktops = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_WIN_WORKSPACE_COUNT", NULL))) {
fputs("Cannot get number of desktops properties. "
"(_NET_NUMBER_OF_DESKTOPS or _WIN_WORKSPACE_COUNT)"
@@ -1047,9 +1048,9 @@
}
}
- if (! (cur_desktop = (unsigned long *)get_property(disp, root,
+ if (! (cur_desktop = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_NET_CURRENT_DESKTOP", NULL))) {
- if (! (cur_desktop = (unsigned long *)get_property(disp, root,
+ if (! (cur_desktop = (CARD32 *)get_property(disp, root,
XA_CARDINAL, "_WIN_WORKSPACE", NULL))) {
fputs("Cannot get current desktop properties. "
"(_NET_CURRENT_DESKTOP or _WIN_WORKSPACE property)"
@@ -1074,21 +1075,21 @@
}
/* common size of all desktops */
- if (! (desktop_geometry = (unsigned long *)get_property(disp, DefaultRootWindow(disp),
+ if (! (desktop_geometry = (CARD32 *)get_property(disp, DefaultRootWindow(disp),
XA_CARDINAL, "_NET_DESKTOP_GEOMETRY", &desktop_geometry_size))) {
p_verbose("Cannot get common size of all desktops (_NET_DESKTOP_GEOMETRY).\n");
}
/* desktop viewport */
- if (! (desktop_viewport = (unsigned long *)get_property(disp, DefaultRootWindow(disp),
+ if (! (desktop_viewport = (CARD32 *)get_property(disp, DefaultRootWindow(disp),
XA_CARDINAL, "_NET_DESKTOP_VIEWPORT", &desktop_viewport_size))) {
p_verbose("Cannot get common size of all desktops (_NET_DESKTOP_VIEWPORT).\n");
}
/* desktop workarea */
- if (! (desktop_workarea = (unsigned long *)get_property(disp, DefaultRootWindow(disp),
+ if (! (desktop_workarea = (CARD32 *)get_property(disp, DefaultRootWindow(disp),
XA_CARDINAL, "_NET_WORKAREA", &desktop_workarea_size))) {
- if (! (desktop_workarea = (unsigned long *)get_property(disp, DefaultRootWindow(disp),
+ if (! (desktop_workarea = (CARD32 *)get_property(disp, DefaultRootWindow(disp),
XA_CARDINAL, "_WIN_WORKAREA", &desktop_workarea_size))) {
p_verbose("Cannot get _NET_WORKAREA property.\n");
}
@@ -1301,16 +1302,16 @@
gchar *title_out = get_output_str(title_utf8, TRUE);
gchar *client_machine;
gchar *class_out = get_window_class(disp, client_list[i]); /* UTF8 */
- unsigned long *pid;
- unsigned long *desktop;
+ CARD32 *pid;
+ CARD32 *desktop;
int x, y, junkx, junky;
unsigned int wwidth, wheight, bw, depth;
Window junkroot;
/* desktop ID */
- if ((desktop = (unsigned long *)get_property(disp, client_list[i],
+ if ((desktop = (CARD32 *)get_property(disp, client_list[i],
XA_CARDINAL, "_NET_WM_DESKTOP", NULL)) == NULL) {
- desktop = (unsigned long *)get_property(disp, client_list[i],
+ desktop = (CARD32 *)get_property(disp, client_list[i],
XA_CARDINAL, "_WIN_WORKSPACE", NULL);
}
@@ -1319,7 +1320,7 @@
XA_STRING, "WM_CLIENT_MACHINE", NULL);
/* pid */
- pid = (unsigned long *)get_property(disp, client_list[i],
+ pid = (CARD32 *)get_property(disp, client_list[i],
XA_CARDINAL, "_NET_WM_PID", NULL);
/* geometry */
|