dwm-ewmhtags-6.1.diff (5092B)
1 diff -up dwm-6.1/dwm.c dwm-modified/dwm.c 2 --- dwm-6.1/dwm.c 2015-11-08 17:39:37.000000000 -0500 3 +++ dwm-modified/dwm.c 2017-12-31 16:54:23.549914920 -0500 4 @@ -55,6 +55,7 @@ 5 #define WIDTH(X) ((X)->w + 2 * (X)->bw) 6 #define HEIGHT(X) ((X)->h + 2 * (X)->bw) 7 #define TAGMASK ((1 << LENGTH(tags)) - 1) 8 +#define TAGSLENGTH (LENGTH(tags)) 9 #define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h) 10 11 /* enums */ 12 @@ -62,7 +63,7 @@ enum { CurNormal, CurResize, CurMove, Cu 13 enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */ 14 enum { NetSupported, NetWMName, NetWMState, 15 NetWMFullscreen, NetActiveWindow, NetWMWindowType, 16 - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ 17 + NetWMWindowTypeDialog, NetClientList, NetDesktopNames, NetDesktopViewport, NetNumberOfDesktops, NetCurrentDesktop, NetLast }; /* EWMH atoms */ 18 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ 19 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, 20 ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ 21 @@ -198,11 +199,15 @@ static void scan(void); 22 static int sendevent(Client *c, Atom proto); 23 static void sendmon(Client *c, Monitor *m); 24 static void setclientstate(Client *c, long state); 25 +static void setcurrentdesktop(void); 26 +static void setdesktopnames(void); 27 static void setfocus(Client *c); 28 static void setfullscreen(Client *c, int fullscreen); 29 static void setlayout(const Arg *arg); 30 static void setmfact(const Arg *arg); 31 +static void setnumdesktops(void); 32 static void setup(void); 33 +static void setviewport(void); 34 static void showhide(Client *c); 35 static void sigchld(int unused); 36 static void spawn(const Arg *arg); 37 @@ -216,6 +221,7 @@ static void toggleview(const Arg *arg); 38 static void unfocus(Client *c, int setfocus); 39 static void unmanage(Client *c, int destroyed); 40 static void unmapnotify(XEvent *e); 41 +static void updatecurrentdesktop(void); 42 static int updategeom(void); 43 static void updatebarpos(Monitor *m); 44 static void updatebars(void); 45 @@ -1448,6 +1454,18 @@ setclientstate(Client *c, long state) 46 XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, 47 PropModeReplace, (unsigned char *)data, 2); 48 } 49 +void 50 +setcurrentdesktop(void){ 51 + long data[] = { 0 }; 52 + XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); 53 +} 54 + 55 +void 56 +setdesktopnames(void){ 57 + XTextProperty text; 58 + Xutf8TextListToTextProperty(dpy, tags, TAGSLENGTH, XUTF8StringStyle, &text); 59 + XSetTextProperty(dpy, root, &text, netatom[NetDesktopNames]); 60 +} 61 62 int 63 sendevent(Client *c, Atom proto) 64 @@ -1542,6 +1560,11 @@ setmfact(const Arg *arg) 65 selmon->mfact = f; 66 arrange(selmon); 67 } 68 +void 69 +setnumdesktops(void){ 70 + long data[] = { TAGSLENGTH }; 71 + XChangeProperty(dpy, root, netatom[NetNumberOfDesktops], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); 72 +} 73 74 void 75 setup(void) 76 @@ -1575,6 +1598,10 @@ setup(void) 77 netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); 78 netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); 79 netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); 80 + netatom[NetDesktopViewport] = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False); 81 + netatom[NetNumberOfDesktops] = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False); 82 + netatom[NetCurrentDesktop] = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False); 83 + netatom[NetDesktopNames] = XInternAtom(dpy, "_NET_DESKTOP_NAMES", False); 84 /* init cursors */ 85 cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); 86 cursor[CurResize] = drw_cur_create(drw, XC_sizing); 87 @@ -1592,6 +1619,10 @@ setup(void) 88 /* EWMH support per view */ 89 XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, 90 PropModeReplace, (unsigned char *) netatom, NetLast); 91 + setnumdesktops(); 92 + setcurrentdesktop(); 93 + setdesktopnames(); 94 + setviewport(); 95 XDeleteProperty(dpy, root, netatom[NetClientList]); 96 /* select for events */ 97 wa.cursor = cursor[CurNormal]->cursor; 98 @@ -1604,6 +1635,12 @@ setup(void) 99 } 100 101 void 102 +setviewport(void){ 103 + long data[] = { 0, 0 }; 104 + XChangeProperty(dpy, root, netatom[NetDesktopViewport], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 2); 105 +} 106 + 107 +void 108 showhide(Client *c) 109 { 110 if (!c) 111 @@ -1737,6 +1774,7 @@ toggleview(const Arg *arg) 112 focus(NULL); 113 arrange(selmon); 114 } 115 + updatecurrentdesktop(); 116 } 117 118 void 119 @@ -1839,6 +1877,17 @@ updateclientlist() 120 (unsigned char *) &(c->win), 1); 121 } 122 123 +void 124 +updatecurrentdesktop(void){ 125 + long rawdata[] = { selmon->tagset[selmon->seltags] }; 126 + int i=0; 127 + while(*rawdata >> i+1){ 128 + i++; 129 + } 130 + long data[] = { i }; 131 + XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); 132 +} 133 + 134 int 135 updategeom(void) 136 { 137 @@ -2038,6 +2087,7 @@ view(const Arg *arg) 138 selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; 139 focus(NULL); 140 arrange(selmon); 141 + updatecurrentdesktop(); 142 } 143 144 Client *