desktop/dwm: Add new options to slackbuild. Fix 6.2 update patch.

11 files changed, 180 insertions, 823 deletions

diff --git a/desktop/dwm/README b/desktop/dwm/README
index 17f58ac0a275..89a5d486f679 100644
--- a/desktop/dwm/README
+++ b/desktop/dwm/README
@@ -22,3 +22,32 @@ OPTIONS
 Use the system tray patch:
 
   SYSTRAY=yes sh dwm.SlackBuild
+
+Use Mod4 (Windows key) instead of Mod1 (alt):
+
+  MOD4=yes sh dwm.SlackBuild
+
+Use rofi instead of dmenu:
+
+  ROFI=yes sh dwm.SlackBuild
+
+The ROFI option also installs dwm.rasi rofi theme to
+/usr/share/rofi/themes.  This is set to use the same
+font as dwm, so if you have patched the dwm font then you
+may also want to adjust it to match.
+
+
+OPTIIONAL
+
+st
+
+A good minimal terminal with fontconfig support.  Think
+"urxvt", but without perl support and the need to specify
+fallback fonts manually.
+
+rofi
+
+A good replacement for dmenu, which caches commands hit rate
+so that the most used ones are listed first and saves a lot
+of extra typing.  Cache can be cleared by deleting
+~/.cache/rofi-*.runcache
diff --git a/desktop/dwm/README.CONFIG b/desktop/dwm/README.CONFIG
index 2114820081d9..6c96c7c999b7 100644
--- a/desktop/dwm/README.CONFIG
+++ b/desktop/dwm/README.CONFIG
@@ -60,7 +60,7 @@ https://asciinema.org/a/7886
 
 Example:
 
-$ cd dwm-6.1
+$ cd dwm-6.2
 $ cp config.def.h config.h
 $ vi config.h
 [make customizations]
diff --git a/desktop/dwm/doinst.sh b/desktop/dwm/doinst.sh
new file mode 100644
index 000000000000..7d86f3bb3396
--- /dev/null
+++ b/desktop/dwm/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config usr/share/rofi/themes/dwm.rasi.new
diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index a02627a47322..82e636191b1c 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -37,7 +37,7 @@
 
 PRGNAM=dwm
 VERSION=${VERSION:-6.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -81,7 +81,13 @@ if [ -e "$CWD/config.h" ]; then
 fi
 
 SYSTRAY=${SYSTRAY:-no}
-[ "$SYSTRAY" = "yes" ] && patch -p1 <$CWD/patches/dwm-systray-20190208-cb3f58a.diff
+[ "$SYSTRAY" = "yes" ] && patch -p1 <$CWD/sbo-patches/dwm-systray-20190208-cb3f58a.diff
+
+MOD4=${MOD4:-no}
+[ "$MOD4" = "yes" ] && patch -p1 <$CWD/sbo-patches/use-mod4.patch
+
+ROFI=${ROFI:-no}
+[ "$ROFI" = "yes" ] && patch -p1 <$CWD/sbo-patches/replace-dmenu-rofi.patch
 
 mv config.def.h config.h
 
@@ -103,7 +109,7 @@ find -L . \
 #done
 
 # Reverse commit to continue support for fontconfig 2.11.1
-patch -R -p1 <$CWD/patches/0001-Prepare-6.2-release.patch
+patch -R -p1 <$CWD/sbo-patches/0001-Prepare-6.2-release.patch
 
 ## Fix options for our compilers,
 ## thanks to Brenton Earl.
@@ -130,17 +136,23 @@ make install \
 mkdir -p $PKG/etc/X11/xinit
 install -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm
 
+if [ "$ROFI" = "yes" ]; then
+  install -m 0644 -D $CWD/dwm.rasi.new $PKG/usr/share/rofi/themes/dwm.rasi.new
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README $CWD/README.CONFIG $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README $CWD/README.CONFIG \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/dwm/dwm.rasi.new b/desktop/dwm/dwm.rasi.new
new file mode 100644
index 000000000000..b5eeb75f87f4
--- /dev/null
+++ b/desktop/dwm/dwm.rasi.new
@@ -0,0 +1,48 @@
+/**
+ * ROFI Color theme based on dwm colours
+ * User: dive
+ * License: WTF
+ */
+* {
+    background-color:      #222222;
+    border-color:          #222222;
+    text-color:            #bbbbbb;
+    /* slightly larger than dwm/dmenu font because it looks too small,
+    on my system at least. */
+    font: "monospace 13";
+ }
+
+configuration {
+    display-run: "";
+}
+
+#window {
+    anchor:     north;
+    location:   north;
+    width:      100%;
+    children:   [ horibox ];
+}
+
+#horibox {
+    orientation: horizontal;
+    children:   [ prompt, entry, listview ];
+}
+
+#listview {
+    layout:     horizontal;
+    spacing:    0.5em;
+}
+
+#entry {
+    expand:     false;
+    width:      18em;
+}
+
+#element {
+    padding: 1px 5px;
+}
+#element selected {
+    background-color:      #005577;
+    text-color:            #eeeeee;
+}
+/* vim: syn=css expandtab
diff --git a/desktop/dwm/patches/0001-Prepare-6.2-release.patch b/desktop/dwm/patches/0001-Prepare-6.2-release.patch
deleted file mode 100644
index 7897361d5078..000000000000
--- a/desktop/dwm/patches/0001-Prepare-6.2-release.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From cb3f58ad06993f7ef3a7d8f61468012e2b786cab Mon Sep 17 00:00:00 2001
-From: Anselm R Garbe <anselm@garbe.ca>
-Date: Sat, 2 Feb 2019 04:50:42 -0800
-Subject: [PATCH] Prepare 6.2 release.
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="------------false"
-
-This is a multi-part message in MIME format.
---------------false
-Content-Type: text/plain; charset=UTF-8; format=fixed
-Content-Transfer-Encoding: 8bit
-
----
- LICENSE   |  2 +-
- config.mk |  2 +-
- drw.c     | 16 +++++++++++++++-
- 3 files changed, 17 insertions(+), 3 deletions(-)
-
-
---------------false
-Content-Type: text/x-patch; name="0001-Prepare-6.2-release.patch"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="0001-Prepare-6.2-release.patch"
-
-diff --git a/LICENSE b/LICENSE
-index 954cdc9..d221f09 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,6 +1,6 @@
- MIT/X Consortium License
- 
--© 2006-2017 Anselm R Garbe <anselm@garbe.us>
-+© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
- © 2006-2009 Jukka Salmi <jukka at salmi dot ch>
- © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
-diff --git a/config.mk b/config.mk
-index 25e2685..6d36cb7 100644
---- a/config.mk
-+++ b/config.mk
-@@ -1,5 +1,5 @@
- # dwm version
--VERSION = 6.1
-+VERSION = 6.2
- 
- # Customize below to fit your system
- 
-diff --git a/drw.c b/drw.c
-index c638323..8fd1ca4 100644
---- a/drw.c
-+++ b/drw.c
-@@ -132,6 +132,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
- 		die("no font specified.");
- 	}
- 
-+	/* Do not allow using color fonts. This is a workaround for a BadLength
-+	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
-+	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-+	 * https://lists.suckless.org/dev/1701/30932.html
-+	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
-+	 * and lots more all over the internet.
-+	 */
-+	FcBool iscol;
-+	if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
-+		XftFontClose(drw->dpy, xfont);
-+		return NULL;
-+	}
-+
- 	font = ecalloc(1, sizeof(Fnt));
- 	font->xfont = xfont;
- 	font->pattern = pattern;
-@@ -200,7 +213,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
- 	Clr *ret;
- 
- 	/* need at least two colors for a scheme */
--	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
-+	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
- 		return NULL;
- 
- 	for (i = 0; i < clrcount; i++)
-@@ -337,6 +350,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
- 			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
- 			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
- 			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-+			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
- 
- 			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
- 			FcDefaultSubstitute(fcpattern);
-
---------------false--
-
-
diff --git a/desktop/dwm/patches/dwm-6.1-systray.diff b/desktop/dwm/patches/dwm-6.1-systray.diff
deleted file mode 100644
index 58aca75df9e8..000000000000
--- a/desktop/dwm/patches/dwm-6.1-systray.diff
+++ /dev/null
@@ -1,690 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..8393a58 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -13,6 +13,10 @@ static const char selbgcolor[]      = "#005577";
- static const char selfgcolor[]      = "#eeeeee";
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
- static const unsigned int snap      = 32;       /* snap pixel */
-+static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-+static const unsigned int systrayspacing = 2;   /* systray spacing */
-+static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, 0: display systray on the last monitor*/
-+static const int showsystray        = 1;        /* 0 means no systray */
- static const int showbar            = 1;        /* 0 means no bar */
- static const int topbar             = 1;        /* 0 means bottom bar */
- 
-diff --git a/dwm.c b/dwm.c
-index 0362114..1bbce1d 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,12 +57,30 @@
- #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X)                (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
- 
-+#define SYSTEM_TRAY_REQUEST_DOCK    0
-+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
-+
-+/* XEMBED messages */
-+#define XEMBED_EMBEDDED_NOTIFY      0
-+#define XEMBED_WINDOW_ACTIVATE      1
-+#define XEMBED_FOCUS_IN             4
-+#define XEMBED_MODALITY_ON         10
-+
-+#define XEMBED_MAPPED              (1 << 0)
-+#define XEMBED_WINDOW_ACTIVATE      1
-+#define XEMBED_WINDOW_DEACTIVATE    2
-+
-+#define VERSION_MAJOR               0
-+#define VERSION_MINOR               0
-+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
-+
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
- enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
--enum { NetSupported, NetWMName, NetWMState,
--       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
--       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-+enum { NetSupported, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation,
-+	   NetWMName, NetWMState, NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-+	   NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
- enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
- enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-        ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-@@ -141,6 +159,12 @@ typedef struct {
- 	int monitor;
- } Rule;
- 
-+typedef struct Systray   Systray;
-+struct Systray {
-+	Window win;
-+	Client *icons;
-+};
-+
- /* function declarations */
- static void applyrules(Client *c);
- static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-@@ -170,8 +194,10 @@ static void focus(Client *c);
- static void focusin(XEvent *e);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
-+static Atom getatomprop(Client *c, Atom prop);
- static int getrootptr(int *x, int *y);
- static long getstate(Window w);
-+static unsigned int getsystraywidth();
- static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void grabbuttons(Client *c, int focused);
- static void grabkeys(void);
-@@ -189,13 +215,16 @@ static void pop(Client *);
- static void propertynotify(XEvent *e);
- static void quit(const Arg *arg);
- static Monitor *recttomon(int x, int y, int w, int h);
-+static void removesystrayicon(Client *i);
- static void resize(Client *c, int x, int y, int w, int h, int interact);
-+static void resizebarwin(Monitor *m);
- static void resizeclient(Client *c, int x, int y, int w, int h);
- static void resizemouse(const Arg *arg);
-+static void resizerequest(XEvent *e);
- static void restack(Monitor *m);
- static void run(void);
- static void scan(void);
--static int sendevent(Client *c, Atom proto);
-+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 setfocus(Client *c);
-@@ -206,6 +235,7 @@ static void setup(void);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static Monitor *systraytomon(Monitor *m);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *);
-@@ -223,18 +253,24 @@ static void updateclientlist(void);
- static void updatenumlockmask(void);
- static void updatesizehints(Client *c);
- static void updatestatus(void);
-+static void updatesystray(void);
-+static void updatesystrayicongeom(Client *i, int w, int h);
-+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
- static void updatewindowtype(Client *c);
- static void updatetitle(Client *c);
- static void updatewmhints(Client *c);
- static void view(const Arg *arg);
- static Client *wintoclient(Window w);
- static Monitor *wintomon(Window w);
-+static Client *wintosystrayicon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
- 
- /* variables */
-+static Systray *systray = NULL;
-+static unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
- static const char broken[] = "broken";
- static char stext[256];
- static int screen;
-@@ -256,9 +292,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
- 	[MapRequest] = maprequest,
- 	[MotionNotify] = motionnotify,
- 	[PropertyNotify] = propertynotify,
-+	[ResizeRequest] = resizerequest,
- 	[UnmapNotify] = unmapnotify
- };
--static Atom wmatom[WMLast], netatom[NetLast];
-+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
- static int running = 1;
- static Cur *cursor[CurLast];
- static ClrScheme scheme[SchemeLast];
-@@ -479,6 +516,11 @@ cleanup(void)
- 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
- 	while (mons)
- 		cleanupmon(mons);
-+	if (showsystray) {
-+		XUnmapWindow(dpy, systray->win);
-+		XDestroyWindow(dpy, systray->win);
-+		free(systray);
-+	}
- 	for (i = 0; i < CurLast; i++)
- 		drw_cur_free(drw, cursor[i]);
- 	for (i = 0; i < SchemeLast; i++) {
-@@ -524,9 +566,50 @@ clearurgent(Client *c)
- void
- clientmessage(XEvent *e)
- {
-+	XWindowAttributes wa;
-+	XSetWindowAttributes swa;
- 	XClientMessageEvent *cme = &e->xclient;
- 	Client *c = wintoclient(cme->window);
- 
-+	if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
-+		/* add systray icons */
-+		if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
-+			if (!(c = (Client *)calloc(1, sizeof(Client))))
-+				die("fatal: could not malloc() %u bytes\n", sizeof(Client));
-+			c->win = cme->data.l[2];
-+			c->mon = selmon;
-+			c->next = systray->icons;
-+			systray->icons = c;
-+			XGetWindowAttributes(dpy, c->win, &wa);
-+			c->x = c->oldx = c->y = c->oldy = 0;
-+			c->w = c->oldw = wa.width;
-+			c->h = c->oldh = wa.height;
-+			c->oldbw = wa.border_width;
-+			c->bw = 0;
-+			c->isfloating = True;
-+			/* reuse tags field as mapped status */
-+			c->tags = 1;
-+			updatesizehints(c);
-+			updatesystrayicongeom(c, wa.width, wa.height);
-+			XAddToSaveSet(dpy, c->win);
-+			XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
-+			XReparentWindow(dpy, c->win, systray->win, 0, 0);
-+			/* use parents background color */
-+			swa.background_pixel  = scheme[SchemeNorm].bg->pix;
-+			XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
-+			sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+			/* FIXME not sure if I have to send these events, too */
-+			sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+			sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+			sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
-+			XSync(dpy, False);
-+			resizebarwin(selmon);
-+			updatesystray();
-+			setclientstate(c, NormalState);
-+		}
-+		return;
-+	}
-+
- 	if (!c)
- 		return;
- 	if (cme->message_type == netatom[NetWMState]) {
-@@ -576,8 +659,7 @@ configurenotify(XEvent *e)
- 		if (updategeom() || dirty) {
- 			drw_resize(drw, sw, bh);
- 			updatebars();
--			for (m = mons; m; m = m->next)
--				XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-+			resizebarwin(m);
- 			focus(NULL);
- 			arrange(NULL);
- 		}
-@@ -661,6 +743,11 @@ destroynotify(XEvent *e)
- 
- 	if ((c = wintoclient(ev->window)))
- 		unmanage(c, 1);
-+	else if ((c = wintosystrayicon(ev->window))) {
-+		removesystrayicon(c);
-+		resizebarwin(selmon);
-+		updatesystray();
-+	}
- }
- 
- void
-@@ -710,6 +797,7 @@ drawbar(Monitor *m)
- 
- 	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
- 
-+	resizebarwin(m);
- 	for (c = m->clients; c; c = c->next) {
- 		occ |= c->tags;
- 		if (c->isurgent)
-@@ -732,6 +820,9 @@ drawbar(Monitor *m)
- 	if (m == selmon) { /* status is only drawn on selected monitor */
- 		w = TEXTW(stext);
- 		x = m->ww - w;
-+		if (showsystray && m == systraytomon(m)) {
-+			x -= getsystraywidth();
-+		}
- 		if (x < xx) {
- 			x = xx;
- 			w = m->ww - xx;
-@@ -760,6 +851,7 @@ drawbars(void)
- 
- 	for (m = mons; m; m = m->next)
- 		drawbar(m);
-+	updatesystray();
- }
- 
- void
-@@ -787,8 +879,11 @@ expose(XEvent *e)
- 	Monitor *m;
- 	XExposeEvent *ev = &e->xexpose;
- 
--	if (ev->count == 0 && (m = wintomon(ev->window)))
-+	if (ev->count == 0 && (m = wintomon(ev->window))) {
- 		drawbar(m);
-+		if (m == selmon)
-+			updatesystray();
-+	}
- }
- 
- void
-@@ -875,10 +970,17 @@ getatomprop(Client *c, Atom prop)
- 	unsigned long dl;
- 	unsigned char *p = NULL;
- 	Atom da, atom = None;
-+	/* FIXME getatomprop should return the number of items and a pointer to
-+	 * the stored data instead of this workaround */
-+	Atom req = XA_ATOM;
-+	if (prop == xatom[XembedInfo])
-+		req = xatom[XembedInfo];
- 
--	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-+	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
- 	                      &da, &di, &dl, &dl, &p) == Success && p) {
- 		atom = *(Atom *)p;
-+		if (da == xatom[XembedInfo] && dl == 2)
-+			atom = ((Atom *)p)[1];
- 		XFree(p);
- 	}
- 	return atom;
-@@ -912,6 +1014,15 @@ getstate(Window w)
- 	return result;
- }
- 
-+unsigned int
-+getsystraywidth() {
-+	unsigned int w = 0;
-+	Client *i;
-+	if (showsystray)
-+		for (i = systray->icons; i; w += i->w + systrayspacing, i = i->next);
-+	return w ? w + systrayspacing : 1;
-+}
-+
- int
- gettextprop(Window w, Atom atom, char *text, unsigned int size)
- {
-@@ -1018,7 +1129,7 @@ killclient(const Arg *arg)
- {
- 	if (!selmon->sel)
- 		return;
--	if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-+	if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
- 		XGrabServer(dpy);
- 		XSetErrorHandler(xerrordummy);
- 		XSetCloseDownMode(dpy, DestroyAll);
-@@ -1105,6 +1216,12 @@ maprequest(XEvent *e)
- {
- 	static XWindowAttributes wa;
- 	XMapRequestEvent *ev = &e->xmaprequest;
-+	Client *i;
-+	if ((i = wintosystrayicon(ev->window))) {
-+		sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
-+		resizebarwin(selmon);
-+		updatesystray();
-+	}
- 
- 	if (!XGetWindowAttributes(dpy, ev->window, &wa))
- 		return;
-@@ -1232,6 +1349,16 @@ propertynotify(XEvent *e)
- 	Window trans;
- 	XPropertyEvent *ev = &e->xproperty;
- 
-+	if ((c = wintosystrayicon(ev->window))) {
-+		if (ev->atom == XA_WM_NORMAL_HINTS) {
-+			updatesizehints(c);
-+			updatesystrayicongeom(c, c->w, c->h);
-+		}
-+		else
-+			updatesystrayiconstate(c, ev);
-+		resizebarwin(selmon);
-+		updatesystray();
-+	}
- 	if ((ev->window == root) && (ev->atom == XA_WM_NAME))
- 		updatestatus();
- 	else if (ev->state == PropertyDelete)
-@@ -1283,6 +1410,19 @@ recttomon(int x, int y, int w, int h)
- }
- 
- void
-+removesystrayicon(Client *i) {
-+	Client **ii;
-+
-+	if (!showsystray || !i)
-+		return;
-+	for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
-+	if (ii)
-+		*ii = i->next;
-+	free(i);
-+}
-+
-+
-+void
- resize(Client *c, int x, int y, int w, int h, int interact)
- {
- 	if (applysizehints(c, &x, &y, &w, &h, interact))
-@@ -1290,6 +1430,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
- }
- 
- void
-+resizebarwin(Monitor *m) {
-+	unsigned int w = m->ww;
-+	if (showsystray && m == systraytomon(m))
-+		w -= getsystraywidth();
-+	XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-+}
-+
-+void
- resizeclient(Client *c, int x, int y, int w, int h)
- {
- 	XWindowChanges wc;
-@@ -1362,6 +1510,18 @@ resizemouse(const Arg *arg)
- }
- 
- void
-+resizerequest(XEvent *e) {
-+	XResizeRequestEvent *ev = &e->xresizerequest;
-+	Client *i;
-+
-+	if ((i = wintosystrayicon(ev->window))) {
-+		updatesystrayicongeom(i, ev->width, ev->height);
-+		resizebarwin(selmon);
-+		updatesystray();
-+	}
-+}
-+
-+void
- restack(Monitor *m)
- {
- 	Client *c;
-@@ -1450,26 +1610,36 @@ setclientstate(Client *c, long state)
- }
- 
- int
--sendevent(Client *c, Atom proto)
-+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
- {
- 	int n;
--	Atom *protocols;
-+	Atom *protocols, mt;
- 	int exists = 0;
- 	XEvent ev;
- 
--	if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
--		while (!exists && n--)
--			exists = protocols[n] == proto;
--		XFree(protocols);
-+	if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
-+		mt = wmatom[WMProtocols];
-+		if (XGetWMProtocols(dpy, w, &protocols, &n)) {
-+			while(!exists && n--)
-+				exists = protocols[n] == proto;
-+			XFree(protocols);
-+		}
-+	}
-+	else {
-+		exists = True;
-+		mt = proto;
- 	}
- 	if (exists) {
- 		ev.type = ClientMessage;
--		ev.xclient.window = c->win;
--		ev.xclient.message_type = wmatom[WMProtocols];
-+		ev.xclient.window = w;
-+		ev.xclient.message_type = mt;
- 		ev.xclient.format = 32;
--		ev.xclient.data.l[0] = proto;
--		ev.xclient.data.l[1] = CurrentTime;
--		XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-+		ev.xclient.data.l[0] = d0;
-+		ev.xclient.data.l[1] = d1;
-+		ev.xclient.data.l[2] = d2;
-+		ev.xclient.data.l[3] = d3;
-+		ev.xclient.data.l[4] = d4;
-+		XSendEvent(dpy, w, False, mask, &ev);
- 	}
- 	return exists;
- }
-@@ -1483,7 +1653,7 @@ setfocus(Client *c)
- 		                XA_WINDOW, 32, PropModeReplace,
- 		                (unsigned char *) &(c->win), 1);
- 	}
--	sendevent(c, wmatom[WMTakeFocus]);
-+	sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
- }
- 
- void
-@@ -1569,12 +1739,18 @@ setup(void)
- 	wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
- 	netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
- 	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-+	netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
-+	netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
-+	netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", 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);
- 	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);
-+	xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
-+	xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
-+	xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
- 	/* init cursors */
- 	cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
- 	cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-@@ -1586,6 +1762,8 @@ setup(void)
- 	scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
- 	scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
- 	scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-+	/* init system tray */
-+	updatesystray();
- 	/* init bars */
- 	updatebars();
- 	updatestatus();
-@@ -1645,6 +1823,22 @@ spawn(const Arg *arg)
- 	}
- }
- 
-+Monitor *
-+systraytomon(Monitor *m) {
-+	Monitor *t;
-+	int i, n;
-+	if (!systraypinning) {
-+		if (!m)
-+			return selmon;
-+		return m == selmon ? m : NULL;
-+	}
-+	for (n = 1, t = mons; t && t->next; n++, t = t->next);
-+	for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next);
-+	if (systraypinningfailfirst && n < systraypinning)
-+		return mons;
-+	return t;
-+}
-+
- void
- tag(const Arg *arg)
- {
-@@ -1694,7 +1888,18 @@ togglebar(const Arg *arg)
- {
- 	selmon->showbar = !selmon->showbar;
- 	updatebarpos(selmon);
--	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-+	resizebarwin(selmon);
-+	if (showsystray) {
-+		XWindowChanges wc;
-+		if (!selmon->showbar)
-+			wc.y = -bh;
-+		else if (selmon->showbar) {
-+			wc.y = 0;
-+			if (!selmon->topbar)
-+				wc.y = selmon->mh - bh;
-+		}
-+		XConfigureWindow(dpy, systray->win, CWY, &wc);
-+	}
- 	arrange(selmon);
- }
- 
-@@ -1790,11 +1995,17 @@ unmapnotify(XEvent *e)
- 		else
- 			unmanage(c, 0);
- 	}
-+	else if ((c = wintosystrayicon(ev->window))) {
-+		removesystrayicon(c);
-+		resizebarwin(selmon);
-+		updatesystray();
-+	}
- }
- 
- void
- updatebars(void)
- {
-+	unsigned int w;
- 	Monitor *m;
- 	XSetWindowAttributes wa = {
- 		.override_redirect = True,
-@@ -1804,10 +2015,15 @@ updatebars(void)
- 	for (m = mons; m; m = m->next) {
- 		if (m->barwin)
- 			continue;
--		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-+		w = m->ww;
-+		if (showsystray && m == systraytomon(m))
-+			w -= getsystraywidth();
-+		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
- 		                          CopyFromParent, DefaultVisual(dpy, screen),
- 		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- 		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-+		if (showsystray && m == systraytomon(m))
-+			XMapRaised(dpy, systray->win);
- 		XMapRaised(dpy, m->barwin);
- 	}
- }
-@@ -1998,6 +2214,117 @@ updatestatus(void)
- }
- 
- void
-+updatesystrayicongeom(Client *i, int w, int h) {
-+	if (i) {
-+		i->h = bh;
-+		if (w == h)
-+			i->w = bh;
-+		else if (h == bh)
-+			i->w = w;
-+		else
-+			i->w = (int) ((float)bh * ((float)w / (float)h));
-+		applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
-+		/* force icons into the systray dimenons if they don't want to */
-+		if (i->h > bh) {
-+			if (i->w == i->h)
-+				i->w = bh;
-+			else
-+				i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
-+			i->h = bh;
-+		}
-+	}
-+}
-+
-+void
-+updatesystrayiconstate(Client *i, XPropertyEvent *ev) {
-+	long flags;
-+	int code = 0;
-+
-+	if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
-+			!(flags = getatomprop(i, xatom[XembedInfo])))
-+		return;
-+
-+	if (flags & XEMBED_MAPPED && !i->tags) {
-+		i->tags = 1;
-+		code = XEMBED_WINDOW_ACTIVATE;
-+		XMapRaised(dpy, i->win);
-+		setclientstate(i, NormalState);
-+	}
-+	else if (!(flags & XEMBED_MAPPED) && i->tags) {
-+		i->tags = 0;
-+		code = XEMBED_WINDOW_DEACTIVATE;
-+		XUnmapWindow(dpy, i->win);
-+		setclientstate(i, WithdrawnState);
-+	}
-+	else
-+		return;
-+	sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
-+			systray->win, XEMBED_EMBEDDED_VERSION);
-+}
-+
-+void
-+updatesystray(void) {
-+	XSetWindowAttributes wa;
-+	XWindowChanges wc;
-+	Client *i;
-+	Monitor *m = systraytomon(NULL);
-+	unsigned int x = m->mx + m->mw;
-+	unsigned int w = 1;
-+
-+	if (!showsystray)
-+		return;
-+	if (!systray) {
-+		/* init systray */
-+		if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
-+			die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
-+		systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel].bg->pix);
-+		wa.event_mask        = ButtonPressMask | ExposureMask;
-+		wa.override_redirect = True;
-+		wa.background_pixel  = scheme[SchemeNorm].bg->pix;
-+		XSelectInput(dpy, systray->win, SubstructureNotifyMask);
-+		XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
-+				PropModeReplace, (unsigned char *)&systrayorientation, 1);
-+		XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
-+		XMapRaised(dpy, systray->win);
-+		XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
-+		if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
-+			sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
-+			XSync(dpy, False);
-+		}
-+		else {
-+			fprintf(stderr, "dwm: unable to obtain system tray.\n");
-+			free(systray);
-+			systray = NULL;
-+			return;
-+		}
-+	}
-+	for (w = 0, i = systray->icons; i; i = i->next) {
-+		/* make sure the background color stays the same */
-+		wa.background_pixel  = scheme[SchemeNorm].bg->pix;
-+		XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
-+		XMapRaised(dpy, i->win);
-+		w += systrayspacing;
-+		i->x = w;
-+		XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
-+		w += i->w;
-+		if (i->mon != m)
-+			i->mon = m;
-+	}
-+	w = w ? w + systrayspacing : 1;
-+	x -= w;
-+	XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
-+	wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
-+	wc.stack_mode = Above; wc.sibling = m->barwin;
-+	XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
-+	XMapWindow(dpy, systray->win);
-+	XMapSubwindows(dpy, systray->win);
-+	/* redraw background */
-+	XSetForeground(dpy, drw->gc, scheme[SchemeNorm].bg->pix);
-+	XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
-+	XSync(dpy, False);
-+}
-+
-+void
- updatewindowtype(Client *c)
- {
- 	Atom state = getatomprop(c, netatom[NetWMState]);
-@@ -2070,6 +2397,16 @@ wintomon(Window w)
- 	return selmon;
- }
- 
-+Client *
-+wintosystrayicon(Window w) {
-+	Client *i = NULL;
-+
-+	if (!showsystray || !w)
-+		return i;
-+	for (i = systray->icons; i && i->win != w; i = i->next);
-+	return i;
-+}
-+
- /* There's no way to check accesses to destroyed windows, thus those cases are
-  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
-  * default error handler, which may call exit.  */
diff --git a/desktop/dwm/patches/0001-Prepare-6.2-release-2.patch b/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch
index b62c3180e320..22da3facea0d 100644
--- a/desktop/dwm/patches/0001-Prepare-6.2-release-2.patch
+++ b/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch
@@ -1,39 +1,3 @@
-From cb3f58ad06993f7ef3a7d8f61468012e2b786cab Mon Sep 17 00:00:00 2001
-From: Anselm R Garbe <anselm@garbe.ca>
-Date: Sat, 2 Feb 2019 04:50:42 -0800
-Subject: [PATCH] Prepare 6.2 release.
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="------------false"
-
-This is a multi-part message in MIME format.
---------------false
-Content-Type: text/plain; charset=UTF-8; format=fixed
-Content-Transfer-Encoding: 8bit
-
----
- LICENSE   |  2 +-
- config.mk |  2 +-
- drw.c     | 16 +++++++++++++++-
- 3 files changed, 17 insertions(+), 3 deletions(-)
-
-
---------------false
-Content-Type: text/x-patch; name="0001-Prepare-6.2-release.patch"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="0001-Prepare-6.2-release.patch"
-
-diff --git a/LICENSE b/LICENSE
-index 954cdc9..d221f09 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,6 +1,6 @@
- MIT/X Consortium License
- 
--© 2006-2017 Anselm R Garbe <anselm@garbe.us>
-+© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
- © 2006-2009 Jukka Salmi <jukka at salmi dot ch>
- © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 diff --git a/drw.c b/drw.c
 index c638323..8fd1ca4 100644
 --- a/drw.c
diff --git a/desktop/dwm/patches/dwm-systray-20190208-cb3f58a.diff b/desktop/dwm/sbo-patches/dwm-systray-20190208-cb3f58a.diff
index ea946fdd0a2a..ea946fdd0a2a 100644
--- a/desktop/dwm/patches/dwm-systray-20190208-cb3f58a.diff
+++ b/desktop/dwm/sbo-patches/dwm-systray-20190208-cb3f58a.diff
diff --git a/desktop/dwm/sbo-patches/replace-dmenu-rofi.patch b/desktop/dwm/sbo-patches/replace-dmenu-rofi.patch
new file mode 100644
index 000000000000..18c7905c1b95
--- /dev/null
+++ b/desktop/dwm/sbo-patches/replace-dmenu-rofi.patch
@@ -0,0 +1,60 @@
+diff -Naur dwm-6.2/config.def.h b/config.def.h
+--- dwm-6.2/config.def.h	2019-02-02 12:55:28.000000000 +0000
++++ b/config.def.h	2019-04-13 21:19:41.455638523 +0100
+@@ -6,7 +6,6 @@
+ static const int showbar            = 1;        /* 0 means no bar */
+ static const int topbar             = 1;        /* 0 means bottom bar */
+ static const char *fonts[]          = { "monospace:size=10" };
+-static const char dmenufont[]       = "monospace:size=10";
+ static const char col_gray1[]       = "#222222";
+ static const char col_gray2[]       = "#444444";
+ static const char col_gray3[]       = "#bbbbbb";
+@@ -55,13 +54,12 @@
+ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+ 
+ /* commands */
+-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
++static const char *roficmd[] = { "rofi", "-sort", "-show", "run", "-theme", "dwm", NULL };
+ static const char *termcmd[]  = { "st", NULL };
+ 
+ static Key keys[] = {
+ 	/* modifier                     key        function        argument */
+-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
++	{ MODKEY,                       XK_p,      spawn,          {.v = roficmd } },
+ 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+ 	{ MODKEY,                       XK_b,      togglebar,      {0} },
+ 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+diff -Naur dwm-6.2/dwm.1 b/dwm.1
+--- dwm-6.2/dwm.1	2019-02-02 12:55:28.000000000 +0000
++++ b/dwm.1	2019-04-13 21:12:25.685674235 +0100
+@@ -62,7 +62,7 @@
+ .TP
+ .B Mod1\-p
+ Spawn
+-.BR dmenu(1)
++.BR rofi(1)
+ for launching other programs.
+ .TP
+ .B Mod1\-,
+@@ -156,7 +156,7 @@
+ dwm is customized by creating a custom config.h and (re)compiling the source
+ code. This keeps it fast, secure and simple.
+ .SH SEE ALSO
+-.BR dmenu (1),
++.BR rofi (1),
+ .BR st (1)
+ .SH ISSUES
+ Java applications which use the XToolkit/XAWT backend may draw grey windows
+diff -Naur dwm-6.2/dwm.c b/dwm.c
+--- dwm-6.2/dwm.c	2019-02-02 12:55:28.000000000 +0000
++++ b/dwm.c	2019-04-13 21:12:10.143211844 +0100
+@@ -1639,8 +1639,6 @@
+ void
+ spawn(const Arg *arg)
+ {
+-	if (arg->v == dmenucmd)
+-		dmenumon[0] = '0' + selmon->num;
+ 	if (fork() == 0) {
+ 		if (dpy)
+ 			close(ConnectionNumber(dpy));
diff --git a/desktop/dwm/sbo-patches/use-mod4.patch b/desktop/dwm/sbo-patches/use-mod4.patch
new file mode 100644
index 000000000000..649e39cd3dc5
--- /dev/null
+++ b/desktop/dwm/sbo-patches/use-mod4.patch
@@ -0,0 +1,12 @@
+diff -Naur dwm-6.2/config.def.h b/config.def.h
+--- dwm-6.2/config.def.h	2019-02-02 12:55:28.000000000 +0000
++++ b/config.def.h	2019-04-14 14:04:30.190258413 +0100
+@@ -44,7 +44,7 @@
+ };
+ 
+ /* key definitions */
+-#define MODKEY Mod1Mask
++#define MODKEY  Mod4Mask
+ #define TAGKEYS(KEY,TAG) \
+ 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+ 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \