Attachment #52532 for bug #83927




void
wNETWMUpdateDesktop(WScreen *scr)
{
    long *views, sizes[2];
    int count, i;

    if (scr->workspace_count==0)
        return;

    count = scr->workspace_count * 2;
    views = wmalloc(sizeof(long) * count);
    /*memset(views, 0, sizeof(long) * count);*/

#ifdef VIRTUAL_DESKTOP
    sizes[0] = scr->workspaces[scr->current_workspace]->width;

                               0, 1, &count);
    if (prop)
    {
        int desktop= *(long*)prop;
        XFree(prop);
        return desktop;
    }

static void
updateShowDesktop(WScreen * scr, Bool show)
{
    long foo;

    foo = (show == True);
    XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,

void
wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
{
    long *area;
    int count, i;

    /* XXX: not Xinerama compatible,

        return;

    count = scr->workspace_count * 4;
    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;

static void
updateWorkspaceCount(WScreen *scr) /* changeable */
{
    long count;

    count = scr->workspace_count;


static void
updateCurrentWorkspace(WScreen *scr) /* changeable */
{
    long count;

    count = scr->current_workspace;


static void
updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
{
    long l;

    if (del) {
        XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);

Return to bug 83927

Lines 314-328 Link Here

(-)WindowMaker-0.91.0/src/wmspec.c.sav (-10 / +10 lines)
314	void	314	void
315	wNETWMUpdateDesktop(WScreen *scr)	315	wNETWMUpdateDesktop(WScreen *scr)
316	{	316	{
317	CARD32 *views, sizes[2];	317	long *views, sizes[2];
318	int count, i;	318	int count, i;
319		319
320	if (scr->workspace_count==0)	320	if (scr->workspace_count==0)
321	return;	321	return;
322		322
323	count = scr->workspace_count * 2;	323	count = scr->workspace_count * 2;
324	views = wmalloc(sizeof(CARD32) * count);	324	views = wmalloc(sizeof(long) * count);
325	/memset(views, 0, sizeof(CARD32) count);*/	325	/memset(views, 0, sizeof(long) count);*/
326		326
327	#ifdef VIRTUAL_DESKTOP	327	#ifdef VIRTUAL_DESKTOP
328	sizes[0] = scr->workspaces[scr->current_workspace]->width;	328	sizes[0] = scr->workspaces[scr->current_workspace]->width;
Lines 362-368 Link Here
362	0, 1, &count);	362	0, 1, &count);
363	if (prop)	363	if (prop)
364	{	364	{
365	int desktop= (CARD32)prop;	365	int desktop= (long)prop;
366	XFree(prop);	366	XFree(prop);
367	return desktop;	367	return desktop;
368	}	368	}
Lines 426-432 Link Here
426	static void	426	static void
427	updateShowDesktop(WScreen * scr, Bool show)	427	updateShowDesktop(WScreen * scr, Bool show)
428	{	428	{
429	CARD32 foo;	429	long foo;
430		430
431	foo = (show == True);	431	foo = (show == True);
432	XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,	432	XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
Lines 599-605 Link Here
599	void	599	void
600	wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)	600	wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
601	{	601	{
602	CARD32 *area;	602	long *area;
603	int count, i;	603	int count, i;
604		604
605	/* XXX: not Xinerama compatible,	605	/* XXX: not Xinerama compatible,
Lines 609-615 Link Here
609	return;	609	return;
610		610
611	count = scr->workspace_count * 4;	611	count = scr->workspace_count * 4;
612	area = wmalloc(sizeof(CARD32) * count);	612	area = wmalloc(sizeof(long) * count);
613	for (i=0; i<scr->workspace_count; i++) {	613	for (i=0; i<scr->workspace_count; i++) {
614	area[4*i + 0] = usableArea.x1;	614	area[4*i + 0] = usableArea.x1;
615	area[4*i + 1] = usableArea.y1;	615	area[4*i + 1] = usableArea.y1;
Lines 732-738 Link Here
732	static void	732	static void
733	updateWorkspaceCount(WScreen scr) / changeable */	733	updateWorkspaceCount(WScreen scr) / changeable */
734	{	734	{
735	CARD32 count;	735	long count;
736		736
737	count = scr->workspace_count;	737	count = scr->workspace_count;
738		738
Lines 744-750 Link Here
744	static void	744	static void
745	updateCurrentWorkspace(WScreen scr) / changeable */	745	updateCurrentWorkspace(WScreen scr) / changeable */
746	{	746	{
747	CARD32 count;	747	long count;
748		748
749	count = scr->current_workspace;	749	count = scr->current_workspace;
750		750
Lines 791-797 Link Here
791	static void	791	static void
792	updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)	792	updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
793	{	793	{
794	CARD32 l;	794	long l;
795		795
796	if (del) {	796	if (del) {
797	XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);	797	XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);