[hackers] [dwm] applied Sylvain Laurent's EWMH fullscreen state patch, simplified his patch a bit || anselm

changeset: 1514:2a8d8d41e50b
tag: tip
user: anselm_AT_garbe.us
date: Thu May 27 08:19:08 2010 +0100
files: config.def.h dwm.c
description:
applied Sylvain Laurent's EWMH fullscreen state patch, simplified his patch a bit

diff -r 1456ca0c94b7 -r 2a8d8d41e50b config.def.h
--- a/config.def.h Sun Apr 11 18:42:32 2010 +0100
+++ b/config.def.h Thu May 27 08:19:08 2010 +0100
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
 static const char normbordercolor[] = "#cccccc";
 static const char normbgcolor[] = "#cccccc";
 static const char normfgcolor[] = "#000000";
diff -r 1456ca0c94b7 -r 2a8d8d41e50b dwm.c
--- a/dwm.c Sun Apr 11 18:42:32 2010 +0100
+++ b/dwm.c Thu May 27 08:19:08 2010 +0100
@@ -41,7 +41,6 @@
 #endif /* XINERAMA */
 
 /* macros */
-#define D if(1)
 #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
@@ -58,7 +57,8 @@
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+enum { NetSupported, NetWMName, NetWMState,
+ NetWMFullscreen, NetLast }; /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
@@ -162,6 +162,7 @@
 static void cleanup(void);
 static void cleanupmon(Monitor *mon);
 static void clearurgent(Client *c);
+static void clientmessage(XEvent *e);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
@@ -250,6 +251,7 @@
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
         [ButtonPress] = buttonpress,
+ [ClientMessage] = clientmessage,
         [ConfigureRequest] = configurerequest,
         [ConfigureNotify] = configurenotify,
         [DestroyNotify] = destroynotify,
@@ -1293,6 +1295,20 @@
 }
 
 void
+clientmessage(XEvent *e) {
+ XClientMessageEvent *cme = &e->xclient;
+
+ if(cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen]) {
+ if(cme->data.l[0])
+ XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
+ PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+ else
+ XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
+ PropModeReplace, (unsigned char*)0, 0);
+ }
+}
+
+void
 quit(const Arg *arg) {
         running = False;
 }
@@ -1392,6 +1408,7 @@
         XEvent ev;
         static const char *evname[LASTEvent] = {
                 [ButtonPress] = "buttonpress",
+ [ClientMessage] = "clientmessage",
                 [ConfigureRequest] = "configurerequest",
                 [ConfigureNotify] = "configurenotify",
                 [DestroyNotify] = "destroynotify",
@@ -1407,7 +1424,6 @@
         /* main event loop */
         XSync(dpy, False);
         while(running && !XNextEvent(dpy, &ev)) {
- D fprintf(stderr, "run event %s %ld\n", evname[ev.type], ev.xany.window);
                 if(handler[ev.type])
                         handler[ev.type](&ev); /* call handler */
         }
@@ -1510,6 +1526,8 @@
         wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
         netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
         netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
+ netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+ netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
         /* init cursors */
         cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
         cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
Received on Thu May 27 2010 - 07:19:15 UTC