mirror of
https://github.com/alrayyes/dwm
synced 2023-11-14 15:56:31 +00:00
modified version of ewhmtags that merges properly
This commit is contained in:
parent
4434dbd998
commit
39a5687159
1
PKGBUILD
1
PKGBUILD
@ -20,6 +20,7 @@ _patches=(
|
||||
"https://dwm.suckless.org/patches/cyclelayouts/dwm-cyclelayouts-20180524-6.2.diff"
|
||||
"https://dwm.suckless.org/patches/gridmode/dwm-gridmode-20170909-ceac8c9.diff"
|
||||
"https://dwm.suckless.org/patches/selfrestart/dwm-r1615-selfrestart.diff"
|
||||
#"local-dwm-ewmhtags-20180101-db22360.diff"
|
||||
)
|
||||
|
||||
source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
|
||||
|
148
local-dwm-ewmhtags-20180101-db22360.diff
Normal file
148
local-dwm-ewmhtags-20180101-db22360.diff
Normal file
@ -0,0 +1,148 @@
|
||||
diff -up a/dwm.c b/dwm.c
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -56,6 +56,7 @@
|
||||
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
||||
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||
+#define TAGSLENGTH (LENGTH(tags))
|
||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||
|
||||
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
||||
@@ -80,7 +81,7 @@ enum { SchemeNorm, SchemeSel }; /* color
|
||||
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||
NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
|
||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||
- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||
+ NetWMWindowTypeDialog, NetClientList, NetDesktopNames, NetDesktopViewport, NetNumberOfDesktops, NetCurrentDesktop, NetLast }; /* EWMH atoms */
|
||||
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||
@@ -231,11 +232,15 @@ static void scan(void);
|
||||
static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
||||
static void sendmon(Client *c, Monitor *m);
|
||||
static void setclientstate(Client *c, long state);
|
||||
+static void setcurrentdesktop(void);
|
||||
+static void setdesktopnames(void);
|
||||
static void setfocus(Client *c);
|
||||
static void setfullscreen(Client *c, int fullscreen);
|
||||
static void setlayout(const Arg *arg);
|
||||
static void setmfact(const Arg *arg);
|
||||
+static void setnumdesktops(void);
|
||||
static void setup(void);
|
||||
+static void setviewport(void);
|
||||
static void seturgent(Client *c, int urg);
|
||||
static void showhide(Client *c);
|
||||
static void sigchld(int unused);
|
||||
@@ -251,6 +256,7 @@ static void toggleview(const Arg *arg);
|
||||
static void unfocus(Client *c, int setfocus);
|
||||
static void unmanage(Client *c, int destroyed);
|
||||
static void unmapnotify(XEvent *e);
|
||||
+static void updatecurrentdesktop(void);
|
||||
static void updatebarpos(Monitor *m);
|
||||
static void updatebars(void);
|
||||
static void updateclientlist(void);
|
||||
@@ -1652,6 +1658,16 @@ setclientstate(Client *c, long state)
|
||||
XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
|
||||
PropModeReplace, (unsigned char *)data, 2);
|
||||
}
|
||||
+void
|
||||
+setcurrentdesktop(void){
|
||||
+ long data[] = { 0 };
|
||||
+ XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
||||
+}
|
||||
+void setdesktopnames(void){
|
||||
+ XTextProperty text;
|
||||
+ Xutf8TextListToTextProperty(dpy, tags, TAGSLENGTH, XUTF8StringStyle, &text);
|
||||
+ XSetTextProperty(dpy, root, &text, netatom[NetDesktopNames]);
|
||||
+}
|
||||
|
||||
int
|
||||
sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
||||
@@ -1689,6 +1705,12 @@ sendevent(Window w, Atom proto, int mask
|
||||
}
|
||||
|
||||
void
|
||||
+setnumdesktops(void){
|
||||
+ long data[] = { TAGSLENGTH };
|
||||
+ XChangeProperty(dpy, root, netatom[NetNumberOfDesktops], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
||||
+}
|
||||
+
|
||||
+void
|
||||
setfocus(Client *c)
|
||||
{
|
||||
if (!c->neverfocus) {
|
||||
@@ -1797,6 +1819,10 @@ setup(void)
|
||||
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
||||
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
||||
+ netatom[NetDesktopViewport] = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False);
|
||||
+ netatom[NetNumberOfDesktops] = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False);
|
||||
+ netatom[NetCurrentDesktop] = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False);
|
||||
+ netatom[NetDesktopNames] = XInternAtom(dpy, "_NET_DESKTOP_NAMES", False);
|
||||
xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
||||
xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
||||
xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
||||
@@ -1824,6 +1850,10 @@ setup(void)
|
||||
/* EWMH support per view */
|
||||
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
|
||||
PropModeReplace, (unsigned char *) netatom, NetLast);
|
||||
+ setnumdesktops();
|
||||
+ setcurrentdesktop();
|
||||
+ setdesktopnames();
|
||||
+ setviewport();
|
||||
XDeleteProperty(dpy, root, netatom[NetClientList]);
|
||||
/* select events */
|
||||
wa.cursor = cursor[CurNormal]->cursor;
|
||||
@@ -1835,6 +1865,11 @@ setup(void)
|
||||
grabkeys();
|
||||
focus(NULL);
|
||||
}
|
||||
+void
|
||||
+setviewport(void){
|
||||
+ long data[] = { 0, 0 };
|
||||
+ XChangeProperty(dpy, root, netatom[NetDesktopViewport], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 2);
|
||||
+}
|
||||
|
||||
|
||||
void
|
||||
@@ -1983,6 +2018,7 @@ toggletag(const Arg *arg)
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
+ updatecurrentdesktop();
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1994,6 +2030,7 @@ toggleview(const Arg *arg)
|
||||
selmon->tagset[selmon->seltags] = newtagset;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
+ updatecurrentdesktop();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2109,6 +2146,15 @@ updateclientlist()
|
||||
XA_WINDOW, 32, PropModeAppend,
|
||||
(unsigned char *) &(c->win), 1);
|
||||
}
|
||||
+void updatecurrentdesktop(void){
|
||||
+ long rawdata[] = { selmon->tagset[selmon->seltags] };
|
||||
+ int i=0;
|
||||
+ while(*rawdata >> i+1){
|
||||
+ i++;
|
||||
+ }
|
||||
+ long data[] = { i };
|
||||
+ XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
||||
+}
|
||||
|
||||
int
|
||||
updategeom(void)
|
||||
@@ -2421,6 +2467,7 @@ view(const Arg *arg)
|
||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
+ updatecurrentdesktop();
|
||||
}
|
||||
|
||||
Client *
|
Loading…
Reference in New Issue
Block a user