85 lines
1.9 KiB
Diff
85 lines
1.9 KiB
Diff
|
--- src/wmspec.c
|
||
|
|
+++ src/wmspec.c
|
||
|
|
@@ -322,15 +322,15 @@
|
||
|
|
void
|
||
|
|
wNETWMUpdateDesktop(WScreen *scr)
|
||
|
|
{
|
||
|
|
- CARD32 *views, sizes[2];
|
||
|
|
+ long *views, sizes[2];
|
||
|
|
int count, i;
|
||
|
|
|
||
|
|
if (scr->workspace_count==0)
|
||
|
|
return;
|
||
|
|
|
||
|
|
count = scr->workspace_count * 2;
|
||
|
|
- views = wmalloc(sizeof(CARD32) * count);
|
||
|
|
- /*memset(views, 0, sizeof(CARD32) * count);*/
|
||
|
|
+ views = wmalloc(sizeof(long) * count);
|
||
|
|
+ /*memset(views, 0, sizeof(long) * count);*/
|
||
|
|
|
||
|
|
#ifdef VIRTUAL_DESKTOP
|
||
|
|
sizes[0] = scr->workspaces[scr->current_workspace]->width;
|
||
|
|
@@ -370,7 +370,7 @@
|
||
|
|
0, 1, &count);
|
||
|
|
if (prop)
|
||
|
|
{
|
||
|
|
- int desktop= *(CARD32*)prop;
|
||
|
|
+ int desktop= *(long*)prop;
|
||
|
|
XFree(prop);
|
||
|
|
return desktop;
|
||
|
|
}
|
||
|
|
@@ -487,7 +487,7 @@
|
||
|
|
static void
|
||
|
|
updateShowDesktop(WScreen * scr, Bool show)
|
||
|
|
{
|
||
|
|
- CARD32 foo;
|
||
|
|
+ long foo;
|
||
|
|
|
||
|
|
foo = (show == True);
|
||
|
|
XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
|
||
|
|
@@ -660,7 +660,7 @@
|
||
|
|
void
|
||
|
|
wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
|
||
|
|
{
|
||
|
|
- CARD32 *area;
|
||
|
|
+ long *area;
|
||
|
|
int count, i;
|
||
|
|
|
||
|
|
/* XXX: not Xinerama compatible,
|
||
|
|
@@ -670,7 +670,7 @@
|
||
|
|
return;
|
||
|
|
|
||
|
|
count = scr->workspace_count * 4;
|
||
|
|
- area = wmalloc(sizeof(CARD32) * count);
|
||
|
|
+ area = wmalloc(sizeof(long) * count);
|
||
|
|
for (i=0; i<scr->workspace_count; i++) {
|
||
|
|
area[4*i + 0] = usableArea.x1;
|
||
|
|
area[4*i + 1] = usableArea.y1;
|
||
|
|
@@ -793,7 +793,7 @@
|
||
|
|
static void
|
||
|
|
updateWorkspaceCount(WScreen *scr) /* changeable */
|
||
|
|
{
|
||
|
|
- CARD32 count;
|
||
|
|
+ long count;
|
||
|
|
|
||
|
|
count = scr->workspace_count;
|
||
|
|
|
||
|
|
@@ -805,7 +805,7 @@
|
||
|
|
static void
|
||
|
|
updateCurrentWorkspace(WScreen *scr) /* changeable */
|
||
|
|
{
|
||
|
|
- CARD32 count;
|
||
|
|
+ long count;
|
||
|
|
|
||
|
|
count = scr->current_workspace;
|
||
|
|
|
||
|
|
@@ -852,7 +852,7 @@
|
||
|
|
static void
|
||
|
|
updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
|
||
|
|
{
|
||
|
|
- CARD32 l;
|
||
|
|
+ long l;
|
||
|
|
|
||
|
|
if (del) {
|
||
|
|
XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
|