Attachment #99721 for bug #52835

Lines 33-39 int Link Here

(-)skippy-xd-0.5.0-original/src/clientwin.c (-2 / +2 lines)
33	clientwin_validate_func(dlist l, void data)	33	clientwin_validate_func(dlist l, void data)
34	{	34	{
35	ClientWin cw = (ClientWin )l->data;	35	ClientWin cw = (ClientWin )l->data;
36	CARD32 desktop = ((CARD32)data),	36	unsigned long desktop = ((unsigned long)data),
37	w_desktop = wm_get_window_desktop(cw->mainwin->dpy, cw->client.window);	37	w_desktop = wm_get_window_desktop(cw->mainwin->dpy, cw->client.window);
38		38
39	#ifdef XINERAMA	39	#ifdef XINERAMA
Lines 43-49 clientwin_validate_func(dlist l, void Link Here
43	return 0;	43	return 0;
44	#endif	44	#endif
45		45
46	return (w_desktop == (CARD32)-1 \|\| desktop == w_desktop) &&	46	return (w_desktop == (unsigned long)-1 \|\| desktop == w_desktop) &&
47	wm_validate_window(cw->mainwin->dpy, cw->client.window);	47	wm_validate_window(cw->mainwin->dpy, cw->client.window);
48	}	48	}
49		49

Lines 83-89 update_clients(MainWin mw, dlist clien Link Here

(-)skippy-xd-0.5.0-original/src/skippy.c (-1 / +1 lines)
83	static dlist *	83	static dlist *
84	do_layout(MainWin mw, dlist clients, Window focus, Window leader)	84	do_layout(MainWin mw, dlist clients, Window focus, Window leader)
85	{	85	{
86	CARD32 desktop = wm_get_current_desktop(mw->dpy);	86	unsigned long desktop = wm_get_current_desktop(mw->dpy);
87	unsigned int width, height;	87	unsigned int width, height;
88	float factor;	88	float factor;
89	int xoff, yoff;	89	int xoff, yoff;




		return 0;
	
	for(i = 0; i < items_read; i++)
		l = dlist_add(l, (void*)((unsigned long*)data)[i]);
	
	XFree(data);
	

	return rootpmap;
}

unsigned long
wm_get_current_desktop(Display *dpy)
{
	unsigned long desktop = 0;
	unsigned char *data;
	int status, real_format;
	Atom real_type;

	if(status != Success)
		return 0;
	if(items_read)
		desktop = ((unsigned long*)data)[0];
	XFree(data);
	
	return desktop;

	if(WM_PERSONALITY == WM_PERSONALITY_NETWM && NETWM_HAS_FULLSCREEN)
	{
		Atom props[6];
		unsigned long desktop = (unsigned long)-1;
		
		props[0] = _NET_WM_STATE_FULLSCREEN;
		props[1] = _NET_WM_STATE_SKIP_TASKBAR;

		
		return result;
	} else {
		unsigned long attr;
		
		status = XGetWindowProperty(dpy, win, _WIN_STATE,
		                  0L, 1L, False, XA_CARDINAL, &real_type, &real_format,

				XFree(data);
			return 0;
		}
		attr = (((unsigned long*)data)[0]) & (WIN_STATE_MINIMIZED |
		                             WIN_STATE_SHADED |
		                             WIN_STATE_HIDDEN);
		if(attr)

					XFree(data);
				return 1; /* If there's no _WIN_HINTS, assume it's 0, thus valid */
			}
			attr = ((unsigned long*)data)[0];
			if(attr & WIN_HINTS_SKIP_TASKBAR)
				result = 0;
			XFree(data);

	}
}

unsigned long
wm_get_window_desktop(Display *dpy, Window win)
{
	int status, real_format;
	Atom real_type;
	unsigned long items_read, items_left;
	unsigned char *data;
	unsigned long desktop = 0;
	
	if(WM_PERSONALITY == WM_PERSONALITY_GNOME)
	{

		if(status == Success)
		{
			if(items_read)
				desktop = (((unsigned long*)data)[0] & WIN_STATE_STICKY) ? (unsigned long)-1 : 0;
			
			XFree(data);
			

		return wm_get_current_desktop(dpy);
	
	if(items_read)
		desktop = ((unsigned long*)data)[0];
	else
		desktop = wm_get_current_desktop(dpy);
	




void wm_use_netwm_fullscreen(Bool b);
dlist *wm_get_stack(Display *dpy);
Pixmap wm_get_root_pmap(Display *dpy);
unsigned long wm_get_current_desktop(Display *dpy);
FcChar8 *wm_get_window_title(Display *dpy, Window window, int *length_return);
Window wm_get_group_leader(Display *dpy, Window window);
void wm_set_fullscreen(Display *dpy, Window window, int x, int y, unsigned int width, unsigned int height);
int wm_validate_window(Display *dpy, Window win);
unsigned long wm_get_window_desktop(Display *dpy, Window win);
Window wm_get_focused(Display *dpy);
void wm_ignore_skip_taskbar(Bool b);


Return to bug 52835

Lines 258-264 wm_get_stack(Display *dpy) Link Here

(-)skippy-xd-0.5.0-original/src/wm.c (-12 / +12 lines)
258	return 0;	258	return 0;
259		259
260	for(i = 0; i < items_read; i++)	260	for(i = 0; i < items_read; i++)
261	l = dlist_add(l, (void)((CARD32)data)[i]);	261	l = dlist_add(l, (void)((unsigned long)data)[i]);
262		262
263	XFree(data);	263	XFree(data);
264		264
Lines 293-302 wm_get_root_pmap(Display *dpy) Link Here
293	return rootpmap;	293	return rootpmap;
294	}	294	}
295		295
296	CARD32	296	unsigned long
297	wm_get_current_desktop(Display *dpy)	297	wm_get_current_desktop(Display *dpy)
298	{	298	{
299	CARD32 desktop = 0;	299	unsigned long desktop = 0;
300	unsigned char *data;	300	unsigned char *data;
301	int status, real_format;	301	int status, real_format;
302	Atom real_type;	302	Atom real_type;
Lines 309-315 wm_get_current_desktop(Display *dpy) Link Here
309	if(status != Success)	309	if(status != Success)
310	return 0;	310	return 0;
311	if(items_read)	311	if(items_read)
312	desktop = ((CARD32*)data)[0];	312	desktop = ((unsigned long*)data)[0];
313	XFree(data);	313	XFree(data);
314		314
315	return desktop;	315	return desktop;
Lines 411-417 wm_set_fullscreen(Display *dpy, Window w Link Here
411	if(WM_PERSONALITY == WM_PERSONALITY_NETWM && NETWM_HAS_FULLSCREEN)	411	if(WM_PERSONALITY == WM_PERSONALITY_NETWM && NETWM_HAS_FULLSCREEN)
412	{	412	{
413	Atom props[6];	413	Atom props[6];
414	CARD32 desktop = (CARD32)-1;	414	unsigned long desktop = (unsigned long)-1;
415		415
416	props[0] = _NET_WM_STATE_FULLSCREEN;	416	props[0] = _NET_WM_STATE_FULLSCREEN;
417	props[1] = _NET_WM_STATE_SKIP_TASKBAR;	417	props[1] = _NET_WM_STATE_SKIP_TASKBAR;
Lines 482-488 wm_validate_window(Display *dpy, Window Link Here
482		482
483	return result;	483	return result;
484	} else {	484	} else {
485	CARD32 attr;	485	unsigned long attr;
486		486
487	status = XGetWindowProperty(dpy, win, _WIN_STATE,	487	status = XGetWindowProperty(dpy, win, _WIN_STATE,
488	0L, 1L, False, XA_CARDINAL, &real_type, &real_format,	488	0L, 1L, False, XA_CARDINAL, &real_type, &real_format,
Lines 493-499 wm_validate_window(Display *dpy, Window Link Here
493	XFree(data);	493	XFree(data);
494	return 0;	494	return 0;
495	}	495	}
496	attr = (((CARD32*)data)[0]) & (WIN_STATE_MINIMIZED \|	496	attr = (((unsigned long*)data)[0]) & (WIN_STATE_MINIMIZED \|
497	WIN_STATE_SHADED \|	497	WIN_STATE_SHADED \|
498	WIN_STATE_HIDDEN);	498	WIN_STATE_HIDDEN);
499	if(attr)	499	if(attr)
Lines 513-519 wm_validate_window(Display *dpy, Window Link Here
513	XFree(data);	513	XFree(data);
514	return 1; /* If there's no _WIN_HINTS, assume it's 0, thus valid */	514	return 1; /* If there's no _WIN_HINTS, assume it's 0, thus valid */
515	}	515	}
516	attr = ((CARD32*)data)[0];	516	attr = ((unsigned long*)data)[0];
517	if(attr & WIN_HINTS_SKIP_TASKBAR)	517	if(attr & WIN_HINTS_SKIP_TASKBAR)
518	result = 0;	518	result = 0;
519	XFree(data);	519	XFree(data);
Lines 523-536 wm_validate_window(Display *dpy, Window Link Here
523	}	523	}
524	}	524	}
525		525
526	CARD32	526	unsigned long
527	wm_get_window_desktop(Display *dpy, Window win)	527	wm_get_window_desktop(Display *dpy, Window win)
528	{	528	{
529	int status, real_format;	529	int status, real_format;
530	Atom real_type;	530	Atom real_type;
531	unsigned long items_read, items_left;	531	unsigned long items_read, items_left;
532	unsigned char *data;	532	unsigned char *data;
533	CARD32 desktop = 0;	533	unsigned long desktop = 0;
534		534
535	if(WM_PERSONALITY == WM_PERSONALITY_GNOME)	535	if(WM_PERSONALITY == WM_PERSONALITY_GNOME)
536	{	536	{
Lines 540-546 wm_get_window_desktop(Display *dpy, Wind Link Here
540	if(status == Success)	540	if(status == Success)
541	{	541	{
542	if(items_read)	542	if(items_read)
543	desktop = (((CARD32*)data)[0] & WIN_STATE_STICKY) ? (CARD32)-1 : 0;	543	desktop = (((unsigned long*)data)[0] & WIN_STATE_STICKY) ? (unsigned long)-1 : 0;
544		544
545	XFree(data);	545	XFree(data);
546		546
Lines 558-564 wm_get_window_desktop(Display *dpy, Wind Link Here
558	return wm_get_current_desktop(dpy);	558	return wm_get_current_desktop(dpy);
559		559
560	if(items_read)	560	if(items_read)
561	desktop = ((CARD32*)data)[0];	561	desktop = ((unsigned long*)data)[0];
562	else	562	else
563	desktop = wm_get_current_desktop(dpy);	563	desktop = wm_get_current_desktop(dpy);
564		564

Lines 66-77 char wm_check(Display *dpy); Link Here

(-)skippy-xd-0.5.0-original/src/wm.h (-2 / +2 lines)
66	void wm_use_netwm_fullscreen(Bool b);	66	void wm_use_netwm_fullscreen(Bool b);
67	dlist wm_get_stack(Display dpy);	67	dlist wm_get_stack(Display dpy);
68	Pixmap wm_get_root_pmap(Display *dpy);	68	Pixmap wm_get_root_pmap(Display *dpy);
69	CARD32 wm_get_current_desktop(Display *dpy);	69	unsigned long wm_get_current_desktop(Display *dpy);
70	FcChar8 wm_get_window_title(Display dpy, Window window, int *length_return);	70	FcChar8 wm_get_window_title(Display dpy, Window window, int *length_return);
71	Window wm_get_group_leader(Display *dpy, Window window);	71	Window wm_get_group_leader(Display *dpy, Window window);
72	void wm_set_fullscreen(Display *dpy, Window window, int x, int y, unsigned int width, unsigned int height);	72	void wm_set_fullscreen(Display *dpy, Window window, int x, int y, unsigned int width, unsigned int height);
73	int wm_validate_window(Display *dpy, Window win);	73	int wm_validate_window(Display *dpy, Window win);
74	CARD32 wm_get_window_desktop(Display *dpy, Window win);	74	unsigned long wm_get_window_desktop(Display *dpy, Window win);
75	Window wm_get_focused(Display *dpy);	75	Window wm_get_focused(Display *dpy);
76	void wm_ignore_skip_taskbar(Bool b);	76	void wm_ignore_skip_taskbar(Bool b);
77		77