git.stevedylan.dev

removed support for the NetSupportingWmCheck stuff, netbeans, argouml and others also don't work with compiz, so it is Suns problem to provide a fix 4380db46

Anselm R. Garbe · 2007-11-17 18:59 1 file(s) · +3 −14

dwm.c +3 −14

enum { BarTop, BarBot, BarOff };			/* bar position */
enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
enum { NetSupported, NetWMCheck, NetWMName, NetLast };	/* EWMH atoms */
enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */

/* typedefs */

setup(void) {
	int d;
	unsigned int i, j, mask;
	Atom utf8string;
	Window w;
	XModifierKeymap *modmap;
	XSetWindowAttributes wa;

	/* init atoms */
	utf8string = XInternAtom(dpy, "UTF8_STRING", False);
	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
	wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
	netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
			PropModeReplace, (unsigned char *) netatom, NetLast);

	/* init cursors */
	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);

	/* multihead support */
	selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);

	/* EWMH properties */
	XChangeProperty(dpy, barwin, netatom[NetWMCheck], XA_WINDOW, 32,
			PropModeReplace, (unsigned char *) &barwin, 1);
	/* HACK: dwm identifies itself as LookingGlass to workaround the XToolkit bug of Sun JDK */
	XChangeProperty(dpy, barwin, netatom[NetWMName], utf8string, 8,
			PropModeReplace, (unsigned char *) "LG3D", 4);
	XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
			PropModeReplace, (unsigned char *) &barwin, 1);
	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
			PropModeReplace, (unsigned char *) netatom, NetLast);
}

void

53	53		enum { BarTop, BarBot, BarOff }; /* bar position */
54	54		enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
55	55		enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
56		-	enum { NetSupported, NetWMCheck, NetWMName, NetLast }; /* EWMH atoms */
	56	+	enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
57	57		enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
58	58
59	59		/* typedefs */

1427	1427		setup(void) {
1428	1428		int d;
1429	1429		unsigned int i, j, mask;
1430		-	Atom utf8string;
1431	1430		Window w;
1432	1431		XModifierKeymap *modmap;
1433	1432		XSetWindowAttributes wa;
1434	1433
1435	1434		/* init atoms */
1436		-	utf8string = XInternAtom(dpy, "UTF8_STRING", False);
1437	1435		wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
1438	1436		wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
1439	1437		wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
1440	1438		wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
1441	1439		netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
1442		-	netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
1443	1440		netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
	1441	+	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
	1442	+	PropModeReplace, (unsigned char *) netatom, NetLast);
1444	1443
1445	1444		/* init cursors */
1446	1445		cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);

1516	1515		/* multihead support */
1517	1516		selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
1518	1517
1519		-	/* EWMH properties */
1520		-	XChangeProperty(dpy, barwin, netatom[NetWMCheck], XA_WINDOW, 32,
1521		-	PropModeReplace, (unsigned char *) &barwin, 1);
1522		-	/* HACK: dwm identifies itself as LookingGlass to workaround the XToolkit bug of Sun JDK */
1523		-	XChangeProperty(dpy, barwin, netatom[NetWMName], utf8string, 8,
1524		-	PropModeReplace, (unsigned char *) "LG3D", 4);
1525		-	XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
1526		-	PropModeReplace, (unsigned char *) &barwin, 1);
1527		-	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
1528		-	PropModeReplace, (unsigned char *) netatom, NetLast);
1529	1518		}
1530	1519
1531	1520		void