From 8e670fbeb2a628452d1bd21b1c5f6010d3aa9feb Mon Sep 17 00:00:00 2001 From: Andriy Cherniy Date: Sat, 6 Apr 2024 16:32:32 +0300 Subject: [PATCH] initial commit --- .gitignore | 4 + IPCClient.c | 66 + IPCClient.h | 61 + LICENSE | 38 + Makefile | 55 + README | 48 + config.def.h | 226 ++ config.h | 225 ++ config.mk | 44 + drw.c | 450 +++ drw.h | 58 + dwm | Bin 0 -> 110456 bytes dwm-msg | Bin 0 -> 17416 bytes dwm-msg.c | 548 +++ dwm.1 | 182 + dwm.c | 3363 +++++++++++++++++ dwm.png | Bin 0 -> 373 bytes ipc.c | 1202 ++++++ ipc.h | 320 ++ ...dwm-actualfullscreen-20211013-cb3f58a.diff | 68 + ...bar-polybar-tray-fix-20200810-bb2e722.diff | 445 +++ patches/dwm-attachbelow-6.2.diff | 96 + patches/dwm-cfacts-20200913-61bb8b2.diff | 117 + patches/dwm-cfacts-vanitygaps-6.4_combo.diff | 1018 +++++ patches/dwm-deck-6.2.diff | 77 + ...m-focusonnetactive-2017-12-24-3756f7f.diff | 55 + patches/dwm-hide_vacant_tags-6.3.diff | 39 + patches/dwm-ipc-20201106-f04cac6.diff | 3246 ++++++++++++++++ ...selflickerfix-2022042627-d93ff48803f0.diff | 53 + patches/dwm-pertag-20200914-61bb8b2.diff | 177 + patches/dwm-restartsig-20180523-6.2.diff | 139 + ...-restoreafterrestart-20220709-d3f93c7.diff | 101 + patches/dwm-stacker-6.2.diff | 197 + patches/dwm-swallow-6.3.diff | 412 ++ patches/dwm-systray-6.4.diff | 746 ++++ patches/dwm-xresources-20210827-138b405.diff | 240 ++ transient.c | 42 + util.c | 171 + util.h | 18 + vanitygaps.c | 822 ++++ yajl_dumps.c | 351 ++ yajl_dumps.h | 65 + 42 files changed, 15585 insertions(+) create mode 100644 .gitignore create mode 100644 IPCClient.c create mode 100644 IPCClient.h create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 README create mode 100644 config.def.h create mode 100644 config.h create mode 100644 config.mk create mode 100644 drw.c create mode 100644 drw.h create mode 100755 dwm create mode 100755 dwm-msg create mode 100644 dwm-msg.c create mode 100644 dwm.1 create mode 100644 dwm.c create mode 100644 dwm.png create mode 100644 ipc.c create mode 100644 ipc.h create mode 100644 patches/dwm-actualfullscreen-20211013-cb3f58a.diff create mode 100644 patches/dwm-anybar-polybar-tray-fix-20200810-bb2e722.diff create mode 100644 patches/dwm-attachbelow-6.2.diff create mode 100644 patches/dwm-cfacts-20200913-61bb8b2.diff create mode 100644 patches/dwm-cfacts-vanitygaps-6.4_combo.diff create mode 100644 patches/dwm-deck-6.2.diff create mode 100644 patches/dwm-focusonnetactive-2017-12-24-3756f7f.diff create mode 100644 patches/dwm-hide_vacant_tags-6.3.diff create mode 100644 patches/dwm-ipc-20201106-f04cac6.diff create mode 100644 patches/dwm-noborderselflickerfix-2022042627-d93ff48803f0.diff create mode 100644 patches/dwm-pertag-20200914-61bb8b2.diff create mode 100644 patches/dwm-restartsig-20180523-6.2.diff create mode 100644 patches/dwm-restoreafterrestart-20220709-d3f93c7.diff create mode 100644 patches/dwm-stacker-6.2.diff create mode 100644 patches/dwm-swallow-6.3.diff create mode 100644 patches/dwm-systray-6.4.diff create mode 100644 patches/dwm-xresources-20210827-138b405.diff create mode 100644 transient.c create mode 100644 util.c create mode 100644 util.h create mode 100644 vanitygaps.c create mode 100644 yajl_dumps.c create mode 100644 yajl_dumps.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..17d2060 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.o +*~ +*.orig +*.rej diff --git a/IPCClient.c b/IPCClient.c new file mode 100644 index 0000000..0d3eefb --- /dev/null +++ b/IPCClient.c @@ -0,0 +1,66 @@ +#include "IPCClient.h" + +#include +#include + +#include "util.h" + +IPCClient * +ipc_client_new(int fd) +{ + IPCClient *c = (IPCClient *)malloc(sizeof(IPCClient)); + + if (c == NULL) return NULL; + + // Initialize struct + memset(&c->event, 0, sizeof(struct epoll_event)); + + c->buffer_size = 0; + c->buffer = NULL; + c->fd = fd; + c->event.data.fd = fd; + c->next = NULL; + c->prev = NULL; + c->subscriptions = 0; + + return c; +} + +void +ipc_list_add_client(IPCClientList *list, IPCClient *nc) +{ + DEBUG("Adding client with fd %d to list\n", nc->fd); + + if (*list == NULL) { + // List is empty, point list at first client + *list = nc; + } else { + IPCClient *c; + // Go to last client in list + for (c = *list; c && c->next; c = c->next) + ; + c->next = nc; + nc->prev = c; + } +} + +void +ipc_list_remove_client(IPCClientList *list, IPCClient *c) +{ + IPCClient *cprev = c->prev; + IPCClient *cnext = c->next; + + if (cprev != NULL) cprev->next = c->next; + if (cnext != NULL) cnext->prev = c->prev; + if (c == *list) *list = c->next; +} + +IPCClient * +ipc_list_get_client(IPCClientList list, int fd) +{ + for (IPCClient *c = list; c; c = c->next) { + if (c->fd == fd) return c; + } + + return NULL; +} diff --git a/IPCClient.h b/IPCClient.h new file mode 100644 index 0000000..307dfba --- /dev/null +++ b/IPCClient.h @@ -0,0 +1,61 @@ +#ifndef IPC_CLIENT_H_ +#define IPC_CLIENT_H_ + +#include +#include +#include + +typedef struct IPCClient IPCClient; +/** + * This structure contains the details of an IPC Client and pointers for a + * linked list + */ +struct IPCClient { + int fd; + int subscriptions; + + char *buffer; + uint32_t buffer_size; + + struct epoll_event event; + IPCClient *next; + IPCClient *prev; +}; + +typedef IPCClient *IPCClientList; + +/** + * Allocate memory for new IPCClient with the specified file descriptor and + * initialize struct. + * + * @param fd File descriptor of IPC client + * + * @return Address to allocated IPCClient struct + */ +IPCClient *ipc_client_new(int fd); + +/** + * Add an IPC Client to the specified list + * + * @param list Address of the list to add the client to + * @param nc Address of the IPCClient + */ +void ipc_list_add_client(IPCClientList *list, IPCClient *nc); + +/** + * Remove an IPCClient from the specified list + * + * @param list Address of the list to remove the client from + * @param c Address of the IPCClient + */ +void ipc_list_remove_client(IPCClientList *list, IPCClient *c); + +/** + * Get an IPCClient from the specified IPCClient list + * + * @param list List to remove the client from + * @param fd File descriptor of the IPCClient + */ +IPCClient *ipc_list_get_client(IPCClientList list, int fd); + +#endif // IPC_CLIENT_H_ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..995172f --- /dev/null +++ b/LICENSE @@ -0,0 +1,38 @@ +MIT/X Consortium License + +© 2006-2019 Anselm R Garbe +© 2006-2009 Jukka Salmi +© 2006-2007 Sander van Dijk +© 2007-2011 Peter Hartlich +© 2007-2009 Szabolcs Nagy +© 2007-2009 Christof Musik +© 2007-2009 Premysl Hruby +© 2007-2008 Enno Gottox Boland +© 2008 Martin Hurton +© 2008 Neale Pickett +© 2009 Mate Nagy +© 2010-2016 Hiltjo Posthuma +© 2010-2012 Connor Lane Smith +© 2011 Christoph Lohmann <20h@r-36.net> +© 2015-2016 Quentin Rameau +© 2015-2016 Eric Pruitt +© 2016-2017 Markus Teich +© 2020-2022 Chris Down + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0456754 --- /dev/null +++ b/Makefile @@ -0,0 +1,55 @@ +# dwm - dynamic window manager +# See LICENSE file for copyright and license details. + +include config.mk + +SRC = drw.c dwm.c util.c +OBJ = ${SRC:.c=.o} + +all: options dwm dwm-msg + +options: + @echo dwm build options: + @echo "CFLAGS = ${CFLAGS}" + @echo "LDFLAGS = ${LDFLAGS}" + @echo "CC = ${CC}" + +.c.o: + ${CC} -c ${CFLAGS} $< + +${OBJ}: config.h config.mk + +config.h: + cp config.def.h $@ + +dwm: ${OBJ} + ${CC} -o $@ ${OBJ} ${LDFLAGS} + +dwm-msg: dwm-msg.o + ${CC} -o $@ $< ${LDFLAGS} + +clean: + rm -f dwm dwm-msg ${OBJ} dwm-${VERSION}.tar.gz + +dist: clean + mkdir -p dwm-${VERSION} + cp -R LICENSE Makefile README config.def.h config.mk\ + dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION} + tar -cf dwm-${VERSION}.tar dwm-${VERSION} + gzip dwm-${VERSION}.tar + rm -rf dwm-${VERSION} + +install: all + mkdir -p ${DESTDIR}${PREFIX}/bin + cp -f dwm dwm-msg ${DESTDIR}${PREFIX}/bin + chmod 755 ${DESTDIR}${PREFIX}/bin/dwm + chmod 755 ${DESTDIR}${PREFIX}/bin/dwm-msg + mkdir -p ${DESTDIR}${MANPREFIX}/man1 + sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 + chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 + +uninstall: + rm -f ${DESTDIR}${PREFIX}/bin/dwm\ + ${DESTDIR}${MANPREFIX}/man1/dwm.1 + +.PHONY: all options clean dist install uninstall diff --git a/README b/README new file mode 100644 index 0000000..95d4fd0 --- /dev/null +++ b/README @@ -0,0 +1,48 @@ +dwm - dynamic window manager +============================ +dwm is an extremely fast, small, and dynamic window manager for X. + + +Requirements +------------ +In order to build dwm you need the Xlib header files. + + +Installation +------------ +Edit config.mk to match your local setup (dwm is installed into +the /usr/local namespace by default). + +Afterwards enter the following command to build and install dwm (if +necessary as root): + + make clean install + + +Running dwm +----------- +Add the following line to your .xinitrc to start dwm using startx: + + exec dwm + +In order to connect dwm to a specific display, make sure that +the DISPLAY environment variable is set correctly, e.g.: + + DISPLAY=foo.bar:1 exec dwm + +(This will start dwm on display :1 of the host foo.bar.) + +In order to display status info in the bar, you can do something +like this in your .xinitrc: + + while xsetroot -name "`date` `uptime | sed 's/.*,//'`" + do + sleep 1 + done & + exec dwm + + +Configuration +------------- +The configuration of dwm is done by creating a custom config.h +and (re)compiling the source code. diff --git a/config.def.h b/config.def.h new file mode 100644 index 0000000..d2cf432 --- /dev/null +++ b/config.def.h @@ -0,0 +1,226 @@ +/* See LICENSE file for copyright and license details. */ + +#define SESSION_FILE "/tmp/dwm-session" + +/* appearance */ +static unsigned int borderpx = 1; /* border pixel of windows */ +static unsigned int snap = 32; /* snap pixel */ +static unsigned int gappih = 20; /* horiz inner gap between windows */ +static unsigned int gappiv = 10; /* vert inner gap between windows */ +static unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ +static unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ +static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ +static unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ +static int swallowfloating = 0; /* 1 means swallow floating windows by default */ +static unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ +static unsigned int systrayspacing = 2; /* systray spacing */ +static int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ +static int showsystray = 1; /* 0 means no systray */ +static int showbar = 1; /* 0 means no bar */ +static int topbar = 1; /* 0 means bottom bar */ +static int usealtbar = 1; /* 1 means use non-dwm status bar */ +static char *altbarclass = "Polybar"; /* Alternate bar class name */ +static char *alttrayname = "tray"; /* Polybar tray instance name */ +static char *altbarcmd = "$HOME/bar.sh"; /* Alternate bar launch command */ + +static char font[] = "monospace:size=10"; +static char dmenufont[] = "monospace:size=10"; +static const char *fonts[] = { font }; +static char normbgcolor[] = "#222222"; +static char normbordercolor[] = "#444444"; +static char normfgcolor[] = "#bbbbbb"; +static char selfgcolor[] = "#eeeeee"; +static char selbordercolor[] = "#005577"; +static char selbgcolor[] = "#005577"; + +static char *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, + [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, +}; + +#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ +#include "vanitygaps.c" + + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +static const Rule rules[] = { + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ + /* class instance title tags mask isfloating isterminal noswallow monitor */ + { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, + { "St", NULL, NULL, 0, 0, 1, 0, -1 }, + { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ +}; + +/* layout(s) */ +static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const int nmaster = 1; /* number of clients in master area */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ +static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ + +#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ +#include "vanitygaps.c" + +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "[M]", monocle }, + { "[@]", spiral }, + { "[\\]", dwindle }, + { "H[]", deck }, + { "TTT", bstack }, + { "===", bstackhoriz }, + { "HHH", grid }, + { "###", nrowgrid }, + { "---", horizgrid }, + { ":::", gaplessgrid }, + { "|M|", centeredmaster }, + { ">M>", centeredfloatingmaster }, + { "><>", NULL }, /* no layout function means floating behavior */ + { "[D]", deck }, + { NULL, NULL }, +}; + +/* key definitions */ +#define MODKEY Mod1Mask +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ + { MOD, XK_q, ACTION##stack, {.i = 0 } }, \ + { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ + { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ + { MOD, XK_x, ACTION##stack, {.i = -1 } }, + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + +/* commands */ +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; +static const char *termcmd[] = { "st", NULL }; + +/* + * Xresources preferences to load at startup + */ +ResourcePref resources[] = { + {"font", STRING, &font}, + {"dmenufont", STRING, &dmenufont}, + {"normbgcolor", STRING, &normbgcolor}, + {"normbordercolor", STRING, &normbordercolor}, + {"normfgcolor", STRING, &normfgcolor}, + {"selbgcolor", STRING, &selbgcolor}, + {"selbordercolor", STRING, &selbordercolor}, + {"selfgcolor", STRING, &selfgcolor}, + {"borderpx", INTEGER, &borderpx}, + {"snap", INTEGER, &snap}, + {"showbar", INTEGER, &showbar}, + {"topbar", INTEGER, &topbar}, + {"nmaster", INTEGER, &nmaster}, + {"resizehints", INTEGER, &resizehints}, + {"mfact", FLOAT, &mfact}, +}; + +static const Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, + { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, + { MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} }, + { MODKEY, XK_Return, zoom, {0} }, + { MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_o, incrogaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_6, incrihgaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_7, incrivgaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_8, incrohgaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_9, incrovgaps, {.i = +1 } }, + { MODKEY|Mod4Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } }, + { MODKEY|Mod4Mask, XK_0, togglegaps, {0} }, + { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY|ShiftMask, XK_r, quit, {1} }, +}; + +/* button definitions */ +/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static const Button buttons[] = { + /* click event mask button function argument */ + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, +}; + +static const char *ipcsockpath = "/tmp/dwm.sock"; +static IPCCommand ipccommands[] = { + IPCCOMMAND( view, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( toggleview, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( tag, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( toggletag, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( tagmon, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( focusmon, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( focusstack, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( zoom, 1, {ARG_TYPE_NONE} ), + IPCCOMMAND( incnmaster, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( killclient, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( togglefloating, 1, {ARG_TYPE_NONE} ), + IPCCOMMAND( setmfact, 1, {ARG_TYPE_FLOAT} ), + IPCCOMMAND( setlayoutsafe, 1, {ARG_TYPE_PTR} ), + IPCCOMMAND( quit, 1, {ARG_TYPE_NONE} ) +}; + diff --git a/config.h b/config.h new file mode 100644 index 0000000..d79a0db --- /dev/null +++ b/config.h @@ -0,0 +1,225 @@ +/* See LICENSE file for copyright and license details. */ +#include +/* appearance */ +static int swallowfloating = 0; /* 1 means swallow floating windows by default */ +static unsigned int borderpx = 2; /* border pixel of windows */ +static unsigned int snap = 32; /* snap pixel */ +static unsigned int gappih = 20; /* horiz inner gap between windows */ +static unsigned int gappiv = 10; /* vert inner gap between windows */ +static unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ +static unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ +static const int attachbelow = 1; /* 1 means attach after the currently active window */ +static int smartgaps = 1; /* 1 means no outer gap when there is only one window */ +static int showbar = 1; /* 0 means no bar */ +static int topbar = 0; /* 0 means bottom bar */ +static unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ +static unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ +static unsigned int systrayspacing = 2; /* systray spacing */ +static int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ +static int showsystray = 0; /* 0 means no systray */ +static int usealtbar = 1; /* 1 means use non-dwm status bar */ +static char *altbarclass = "Polybar"; /* Alternate bar class name */ +static char *alttrayname = "tray"; /* Polybar tray instance name */ +static char *altbarcmd = "$HOME/.config/polybar/bar.sh"; /* Alternate bar launch command */ + +// static char font[] = "Iosevka:style=medium:size=12"; +// static char dmenufont[] = "Iosevka:style=medium:size=12"; +static char font[] = "CozetteVector:size=12"; +static char dmenufont[] = "CozetteVector:size=12"; +static const char *fonts[] = { font, "Symbols Nerd Font:size=12" }; +static char normbgcolor[] = "#222222"; +static char normbordercolor[] = "#444444"; +static char normfgcolor[] = "#bbbbbb"; +static char selfgcolor[] = "#eeeeee"; +static char selbordercolor[] = "#005577"; +static char selbgcolor[] = "#005577"; + +static char *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, + [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, +}; + + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +static const Rule rules[] = { + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ + /* class instance title tags mask isfloating isterminal noswallow monitor */ + { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, + { "Alacritty", NULL, NULL, 0, 0, 1, 0, -1 }, +}; + +/* layout(s) */ +static float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static int nmaster = 1; /* number of clients in master area */ +static int resizehints = 1; /* 1 means respect size hints in tiled resizals */ +static int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ + +#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ +#include "vanitygaps.c" + +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, + { "[D]", deck }, +}; + +/* + * Xresources preferences to load at startup + */ +ResourcePref resources[] = { + {"color0", STRING, &normbordercolor}, + {"color8", STRING, &selbordercolor}, + {"color0", STRING, &normbgcolor}, + {"color4", STRING, &normfgcolor}, + {"color0", STRING, &selfgcolor}, + {"color4", STRING, &selbgcolor}, + {"borderpx", INTEGER, &borderpx}, + {"snap", INTEGER, &snap}, + {"showbar", INTEGER, &showbar}, + {"topbar", INTEGER, &topbar}, + {"nmaster", INTEGER, &nmaster}, + {"resizehints", INTEGER, &resizehints}, + {"mfact", FLOAT, &mfact}, + {"gappih", INTEGER, &gappih}, + {"gappiv", INTEGER, &gappiv}, + {"gappoh", INTEGER, &gappoh}, + {"gappov", INTEGER, &gappov}, + {"swallowfloating", INTEGER, &swallowfloating}, + {"smartgaps", INTEGER, &smartgaps}, +}; + +/* key definitions */ +#define MODKEY Mod4Mask +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +#define STACKKEYS(MOD,ACTION) \ + { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ + { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ + { MOD, XK_v, ACTION##stack, {.i = 0 } }, \ + /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */ + /* { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ */ + /* { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ */ + /* { MOD, XK_x, ACTION##stack, {.i = -1 } }, */ + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } +#define TERM(args) { .v = (const char*[]){ "alacritty", "-e", args, NULL }} + +/* commands */ +static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; +static const char *termcmd[] = { "alacritty", NULL }; + +static const Key keys[] = { + STACKKEYS(MODKEY, focus) + STACKKEYS(MODKEY|ShiftMask, push) + /* modifier key function argument */ + { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + // { MODKEY, XK_j, focusstack, {.i = +1 } }, + // { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_o, incnmaster, {.i = +1 } }, + { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, + { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, + { MODKEY, XK_space, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_q, killclient, {0} }, + { MODKEY, XK_f, togglefullscr, {0} }, + /* Layouts */ + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[3]} }, + + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_Left, focusmon, {.i = -1 } }, + { MODKEY, XK_Right, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_Left, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_Right, tagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY|ShiftMask, XK_r, quit, {1} }, + + /* Applications */ + { MODKEY, XK_w, spawn, SHCMD("brave") }, + { MODKEY, XK_p, spawn, SHCMD("prismlauncher") }, + { MODKEY|ShiftMask, XK_p, spawn, TERM("ncspot") }, + { MODKEY, XK_e, spawn, SHCMD("thunderbird") }, + { MODKEY|ShiftMask, XK_e, spawn, SHCMD("evisual") }, + { MODKEY|ShiftMask, XK_d, spawn, SHCMD("dwm-discord") }, + { MODKEY|ShiftMask, XK_t, spawn, SHCMD("telegram-desktop") }, + + /* Utilities */ + { MODKEY, XK_BackSpace, spawn, SHCMD("sysact") }, + { 0, XK_Print, spawn, SHCMD("maim | tee ~/pictures/$(date +%s).png | xclip -selection clipboard -t image/png") }, + { 0|ControlMask, XK_Print, spawn, SHCMD("maim -s | tee ~/pictures/$(date +%s).png | xclip -selection clipboard -t image/png") }, + { MODKEY, XK_grave, spawn, {.v = (const char *[]){"dmenuunicode", NULL}}}, + + /* Media Keys */ + { 0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") }, + { 0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") }, + { 0, XF86XK_AudioNext, spawn, SHCMD("playerctl next") }, + { 0, XF86XK_AudioMute, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")}, + { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+")}, + { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-")}, +}; + +/* button definitions */ +/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static const Button buttons[] = { + /* click event mask button function argument */ + { ClkLtSymbol, 0, Button1, setlayout, {0} }, + { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, +}; + +static const char *ipcsockpath = "/tmp/dwm.sock"; +static IPCCommand ipccommands[] = { + IPCCOMMAND( view, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( toggleview, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( tag, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( toggletag, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( tagmon, 1, {ARG_TYPE_UINT} ), + IPCCOMMAND( focusmon, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( focusstack, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( zoom, 1, {ARG_TYPE_NONE} ), + IPCCOMMAND( incnmaster, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( killclient, 1, {ARG_TYPE_SINT} ), + IPCCOMMAND( togglefloating, 1, {ARG_TYPE_NONE} ), + IPCCOMMAND( setmfact, 1, {ARG_TYPE_FLOAT} ), + IPCCOMMAND( setlayoutsafe, 1, {ARG_TYPE_PTR} ), + IPCCOMMAND( quit, 1, {ARG_TYPE_NONE} ) +}; + +#define SESSION_FILE "/tmp/dwm-session" diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..b741b2e --- /dev/null +++ b/config.mk @@ -0,0 +1,44 @@ +# dwm version +VERSION = 6.4 + +# Customize below to fit your system + +# paths +PREFIX = /usr/local +MANPREFIX = ${PREFIX}/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# Xinerama, comment if you don't want it +XINERAMALIBS = -lXinerama +XINERAMAFLAGS = -DXINERAMA + +# freetype +FREETYPELIBS = -lfontconfig -lXft +FREETYPEINC = /usr/include/freetype2 +# OpenBSD (uncomment) +#FREETYPEINC = ${X11INC}/freetype2 +#MANPREFIX = ${PREFIX}/man +#KVMLIB = -lkvm + +# yajl +YAJLLIBS = -lyajl +YAJLINC = /usr/include/yajl + +# includes and libs +INCS = -I${X11INC} -I${FREETYPEINC} -I${YAJLINC} +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${YAJLLIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB} + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +LDFLAGS = ${LIBS} + +# Solaris +#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" +#LDFLAGS = ${LIBS} + +# compiler and linker +CC = cc diff --git a/drw.c b/drw.c new file mode 100644 index 0000000..f8a82f5 --- /dev/null +++ b/drw.c @@ -0,0 +1,450 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include + +#include "drw.h" +#include "util.h" + +#define UTF_INVALID 0xFFFD +#define UTF_SIZ 4 + +static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; +static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; +static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; +static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; + +static long +utf8decodebyte(const char c, size_t *i) +{ + for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) + if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) + return (unsigned char)c & ~utfmask[*i]; + return 0; +} + +static size_t +utf8validate(long *u, size_t i) +{ + if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) + *u = UTF_INVALID; + for (i = 1; *u > utfmax[i]; ++i) + ; + return i; +} + +static size_t +utf8decode(const char *c, long *u, size_t clen) +{ + size_t i, j, len, type; + long udecoded; + + *u = UTF_INVALID; + if (!clen) + return 0; + udecoded = utf8decodebyte(c[0], &len); + if (!BETWEEN(len, 1, UTF_SIZ)) + return 1; + for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { + udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); + if (type) + return j; + } + if (j < len) + return 0; + *u = udecoded; + utf8validate(u, len); + + return len; +} + +Drw * +drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) +{ + Drw *drw = ecalloc(1, sizeof(Drw)); + + drw->dpy = dpy; + drw->screen = screen; + drw->root = root; + drw->w = w; + drw->h = h; + drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); + drw->gc = XCreateGC(dpy, root, 0, NULL); + XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); + + return drw; +} + +void +drw_resize(Drw *drw, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + drw->w = w; + drw->h = h; + if (drw->drawable) + XFreePixmap(drw->dpy, drw->drawable); + drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); +} + +void +drw_free(Drw *drw) +{ + XFreePixmap(drw->dpy, drw->drawable); + XFreeGC(drw->dpy, drw->gc); + drw_fontset_free(drw->fonts); + free(drw); +} + +/* This function is an implementation detail. Library users should use + * drw_fontset_create instead. + */ +static Fnt * +xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) +{ + Fnt *font; + XftFont *xfont = NULL; + FcPattern *pattern = NULL; + + if (fontname) { + /* Using the pattern found at font->xfont->pattern does not yield the + * same substitution results as using the pattern returned by + * FcNameParse; using the latter results in the desired fallback + * behaviour whereas the former just results in missing-character + * rectangles being drawn, at least with some fonts. */ + if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { + fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); + return NULL; + } + if (!(pattern = FcNameParse((FcChar8 *) fontname))) { + fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); + XftFontClose(drw->dpy, xfont); + return NULL; + } + } else if (fontpattern) { + if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { + fprintf(stderr, "error, cannot load font from pattern.\n"); + return NULL; + } + } else { + die("no font specified."); + } + + font = ecalloc(1, sizeof(Fnt)); + font->xfont = xfont; + font->pattern = pattern; + font->h = xfont->ascent + xfont->descent; + font->dpy = drw->dpy; + + return font; +} + +static void +xfont_free(Fnt *font) +{ + if (!font) + return; + if (font->pattern) + FcPatternDestroy(font->pattern); + XftFontClose(font->dpy, font->xfont); + free(font); +} + +Fnt* +drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) +{ + Fnt *cur, *ret = NULL; + size_t i; + + if (!drw || !fonts) + return NULL; + + for (i = 1; i <= fontcount; i++) { + if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { + cur->next = ret; + ret = cur; + } + } + return (drw->fonts = ret); +} + +void +drw_fontset_free(Fnt *font) +{ + if (font) { + drw_fontset_free(font->next); + xfont_free(font); + } +} + +void +drw_clr_create(Drw *drw, Clr *dest, const char *clrname) +{ + if (!drw || !dest || !clrname) + return; + + if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), + DefaultColormap(drw->dpy, drw->screen), + clrname, dest)) + die("error, cannot allocate color '%s'", clrname); +} + +/* Wrapper to create color schemes. The caller has to call free(3) on the + * returned color scheme when done using it. */ +Clr * +drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount) +{ + size_t i; + Clr *ret; + + /* need at least two colors for a scheme */ + if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) + return NULL; + + for (i = 0; i < clrcount; i++) + drw_clr_create(drw, &ret[i], clrnames[i]); + return ret; +} + +void +drw_setfontset(Drw *drw, Fnt *set) +{ + if (drw) + drw->fonts = set; +} + +void +drw_setscheme(Drw *drw, Clr *scm) +{ + if (drw) + drw->scheme = scm; +} + +void +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) +{ + if (!drw || !drw->scheme) + return; + XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); + if (filled) + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); +} + +int +drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) +{ + int i, ty, ellipsis_x = 0; + unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; + XftDraw *d = NULL; + Fnt *usedfont, *curfont, *nextfont; + int utf8strlen, utf8charlen, render = x || y || w || h; + long utf8codepoint = 0; + const char *utf8str; + FcCharSet *fccharset; + FcPattern *fcpattern; + FcPattern *match; + XftResult result; + int charexists = 0, overflow = 0; + /* keep track of a couple codepoints for which we have no match. */ + enum { nomatches_len = 64 }; + static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; + static unsigned int ellipsis_width = 0; + + if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) + return 0; + + if (!render) { + w = invert ? invert : ~invert; + } else { + XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + d = XftDrawCreate(drw->dpy, drw->drawable, + DefaultVisual(drw->dpy, drw->screen), + DefaultColormap(drw->dpy, drw->screen)); + x += lpad; + w -= lpad; + } + + usedfont = drw->fonts; + if (!ellipsis_width && render) + ellipsis_width = drw_fontset_getwidth(drw, "..."); + while (1) { + ew = ellipsis_len = utf8strlen = 0; + utf8str = text; + nextfont = NULL; + while (*text) { + utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); + for (curfont = drw->fonts; curfont; curfont = curfont->next) { + charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); + if (charexists) { + drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); + if (ew + ellipsis_width <= w) { + /* keep track where the ellipsis still fits */ + ellipsis_x = x + ew; + ellipsis_w = w - ew; + ellipsis_len = utf8strlen; + } + + if (ew + tmpw > w) { + overflow = 1; + /* called from drw_fontset_getwidth_clamp(): + * it wants the width AFTER the overflow + */ + if (!render) + x += tmpw; + else + utf8strlen = ellipsis_len; + } else if (curfont == usedfont) { + utf8strlen += utf8charlen; + text += utf8charlen; + ew += tmpw; + } else { + nextfont = curfont; + } + break; + } + } + + if (overflow || !charexists || nextfont) + break; + else + charexists = 0; + } + + if (utf8strlen) { + if (render) { + ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; + XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], + usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); + } + x += ew; + w -= ew; + } + if (render && overflow) + drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); + + if (!*text || overflow) { + break; + } else if (nextfont) { + charexists = 0; + usedfont = nextfont; + } else { + /* Regardless of whether or not a fallback font is found, the + * character must be drawn. */ + charexists = 1; + + for (i = 0; i < nomatches_len; ++i) { + /* avoid calling XftFontMatch if we know we won't find a match */ + if (utf8codepoint == nomatches.codepoint[i]) + goto no_match; + } + + fccharset = FcCharSetCreate(); + FcCharSetAddChar(fccharset, utf8codepoint); + + if (!drw->fonts->pattern) { + /* Refer to the comment in xfont_create for more information. */ + die("the first font in the cache must be loaded from a font string."); + } + + fcpattern = FcPatternDuplicate(drw->fonts->pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); + + FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); + FcDefaultSubstitute(fcpattern); + match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); + + FcCharSetDestroy(fccharset); + FcPatternDestroy(fcpattern); + + if (match) { + usedfont = xfont_create(drw, NULL, match); + if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { + for (curfont = drw->fonts; curfont->next; curfont = curfont->next) + ; /* NOP */ + curfont->next = usedfont; + } else { + xfont_free(usedfont); + nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; +no_match: + usedfont = drw->fonts; + } + } + } + } + if (d) + XftDrawDestroy(d); + + return x + (render ? w : 0); +} + +void +drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); + XSync(drw->dpy, False); +} + +unsigned int +drw_fontset_getwidth(Drw *drw, const char *text) +{ + if (!drw || !drw->fonts || !text) + return 0; + return drw_text(drw, 0, 0, 0, 0, 0, text, 0); +} + +unsigned int +drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) +{ + unsigned int tmp = 0; + if (drw && drw->fonts && text && n) + tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); + return MIN(n, tmp); +} + +void +drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) +{ + XGlyphInfo ext; + + if (!font || !text) + return; + + XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); + if (w) + *w = ext.xOff; + if (h) + *h = font->h; +} + +Cur * +drw_cur_create(Drw *drw, int shape) +{ + Cur *cur; + + if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) + return NULL; + + cur->cursor = XCreateFontCursor(drw->dpy, shape); + + return cur; +} + +void +drw_cur_free(Drw *drw, Cur *cursor) +{ + if (!cursor) + return; + + XFreeCursor(drw->dpy, cursor->cursor); + free(cursor); +} diff --git a/drw.h b/drw.h new file mode 100644 index 0000000..bdbf950 --- /dev/null +++ b/drw.h @@ -0,0 +1,58 @@ +/* See LICENSE file for copyright and license details. */ + +typedef struct { + Cursor cursor; +} Cur; + +typedef struct Fnt { + Display *dpy; + unsigned int h; + XftFont *xfont; + FcPattern *pattern; + struct Fnt *next; +} Fnt; + +enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */ +typedef XftColor Clr; + +typedef struct { + unsigned int w, h; + Display *dpy; + int screen; + Window root; + Drawable drawable; + GC gc; + Clr *scheme; + Fnt *fonts; +} Drw; + +/* Drawable abstraction */ +Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); +void drw_resize(Drw *drw, unsigned int w, unsigned int h); +void drw_free(Drw *drw); + +/* Fnt abstraction */ +Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); +void drw_fontset_free(Fnt* set); +unsigned int drw_fontset_getwidth(Drw *drw, const char *text); +unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); +void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); + +/* Colorscheme abstraction */ +void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); +Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount); + +/* Cursor abstraction */ +Cur *drw_cur_create(Drw *drw, int shape); +void drw_cur_free(Drw *drw, Cur *cursor); + +/* Drawing context manipulation */ +void drw_setfontset(Drw *drw, Fnt *set); +void drw_setscheme(Drw *drw, Clr *scm); + +/* Drawing functions */ +void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); +int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); + +/* Map functions */ +void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/dwm b/dwm new file mode 100755 index 0000000000000000000000000000000000000000..b25e38cd178c4b9f5b3f2023d3531f555e4c18d7 GIT binary patch literal 110456 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define IPC_MAGIC "DWM-IPC" +// clang-format off +#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C' } +// clang-format on +#define IPC_MAGIC_LEN 7 // Not including null char + +#define IPC_EVENT_TAG_CHANGE "tag_change_event" +#define IPC_EVENT_CLIENT_FOCUS_CHANGE "client_focus_change_event" +#define IPC_EVENT_LAYOUT_CHANGE "layout_change_event" +#define IPC_EVENT_MONITOR_FOCUS_CHANGE "monitor_focus_change_event" +#define IPC_EVENT_FOCUSED_TITLE_CHANGE "focused_title_change_event" +#define IPC_EVENT_FOCUSED_STATE_CHANGE "focused_state_change_event" + +#define YSTR(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str)) +#define YINT(num) yajl_gen_integer(gen, num) +#define YDOUBLE(num) yajl_gen_double(gen, num) +#define YBOOL(v) yajl_gen_bool(gen, v) +#define YNULL() yajl_gen_null(gen) +#define YARR(body) \ + { \ + yajl_gen_array_open(gen); \ + body; \ + yajl_gen_array_close(gen); \ + } +#define YMAP(body) \ + { \ + yajl_gen_map_open(gen); \ + body; \ + yajl_gen_map_close(gen); \ + } + +typedef unsigned long Window; + +const char *DEFAULT_SOCKET_PATH = "/tmp/dwm.sock"; +static int sock_fd = -1; +static unsigned int ignore_reply = 0; + +typedef enum IPCMessageType { + IPC_TYPE_RUN_COMMAND = 0, + IPC_TYPE_GET_MONITORS = 1, + IPC_TYPE_GET_TAGS = 2, + IPC_TYPE_GET_LAYOUTS = 3, + IPC_TYPE_GET_DWM_CLIENT = 4, + IPC_TYPE_SUBSCRIBE = 5, + IPC_TYPE_EVENT = 6 +} IPCMessageType; + +// Every IPC message must begin with this +typedef struct dwm_ipc_header { + uint8_t magic[IPC_MAGIC_LEN]; + uint32_t size; + uint8_t type; +} __attribute((packed)) dwm_ipc_header_t; + +static int +recv_message(uint8_t *msg_type, uint32_t *reply_size, uint8_t **reply) +{ + uint32_t read_bytes = 0; + const int32_t to_read = sizeof(dwm_ipc_header_t); + char header[to_read]; + char *walk = header; + + // Try to read header + while (read_bytes < to_read) { + ssize_t n = read(sock_fd, header + read_bytes, to_read - read_bytes); + + if (n == 0) { + if (read_bytes == 0) { + fprintf(stderr, "Unexpectedly reached EOF while reading header."); + fprintf(stderr, + "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", + read_bytes, to_read); + return -2; + } else { + fprintf(stderr, "Unexpectedly reached EOF while reading header."); + fprintf(stderr, + "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", + read_bytes, to_read); + return -3; + } + } else if (n == -1) { + return -1; + } + + read_bytes += n; + } + + // Check if magic string in header matches + if (memcmp(walk, IPC_MAGIC, IPC_MAGIC_LEN) != 0) { + fprintf(stderr, "Invalid magic string. Got '%.*s', expected '%s'\n", + IPC_MAGIC_LEN, walk, IPC_MAGIC); + return -3; + } + + walk += IPC_MAGIC_LEN; + + // Extract reply size + memcpy(reply_size, walk, sizeof(uint32_t)); + walk += sizeof(uint32_t); + + // Extract message type + memcpy(msg_type, walk, sizeof(uint8_t)); + walk += sizeof(uint8_t); + + (*reply) = malloc(*reply_size); + + // Extract payload + read_bytes = 0; + while (read_bytes < *reply_size) { + ssize_t n = read(sock_fd, *reply + read_bytes, *reply_size - read_bytes); + + if (n == 0) { + fprintf(stderr, "Unexpectedly reached EOF while reading payload."); + fprintf(stderr, "Read %" PRIu32 " bytes, expected %" PRIu32 " bytes.\n", + read_bytes, *reply_size); + free(*reply); + return -2; + } else if (n == -1) { + if (errno == EINTR || errno == EAGAIN) continue; + free(*reply); + return -1; + } + + read_bytes += n; + } + + return 0; +} + +static int +read_socket(IPCMessageType *msg_type, uint32_t *msg_size, char **msg) +{ + int ret = -1; + + while (ret != 0) { + ret = recv_message((uint8_t *)msg_type, msg_size, (uint8_t **)msg); + + if (ret < 0) { + // Try again (non-fatal error) + if (ret == -1 && (errno == EINTR || errno == EAGAIN)) continue; + + fprintf(stderr, "Error receiving response from socket. "); + fprintf(stderr, "The connection might have been lost.\n"); + exit(2); + } + } + + return 0; +} + +static ssize_t +write_socket(const void *buf, size_t count) +{ + size_t written = 0; + + while (written < count) { + const ssize_t n = + write(sock_fd, ((uint8_t *)buf) + written, count - written); + + if (n == -1) { + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) + continue; + else + return n; + } + written += n; + } + return written; +} + +static void +connect_to_socket() +{ + struct sockaddr_un addr; + + int sock = socket(AF_UNIX, SOCK_STREAM, 0); + + // Initialize struct to 0 + memset(&addr, 0, sizeof(struct sockaddr_un)); + + addr.sun_family = AF_UNIX; + strcpy(addr.sun_path, DEFAULT_SOCKET_PATH); + + connect(sock, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)); + + sock_fd = sock; +} + +static int +send_message(IPCMessageType msg_type, uint32_t msg_size, uint8_t *msg) +{ + dwm_ipc_header_t header = { + .magic = IPC_MAGIC_ARR, .size = msg_size, .type = msg_type}; + + size_t header_size = sizeof(dwm_ipc_header_t); + size_t total_size = header_size + msg_size; + + uint8_t buffer[total_size]; + + // Copy header to buffer + memcpy(buffer, &header, header_size); + // Copy message to buffer + memcpy(buffer + header_size, msg, header.size); + + write_socket(buffer, total_size); + + return 0; +} + +static int +is_float(const char *s) +{ + size_t len = strlen(s); + int is_dot_used = 0; + int is_minus_used = 0; + + // Floats can only have one decimal point in between or digits + // Optionally, floats can also be below zero (negative) + for (int i = 0; i < len; i++) { + if (isdigit(s[i])) + continue; + else if (!is_dot_used && s[i] == '.' && i != 0 && i != len - 1) { + is_dot_used = 1; + continue; + } else if (!is_minus_used && s[i] == '-' && i == 0) { + is_minus_used = 1; + continue; + } else + return 0; + } + + return 1; +} + +static int +is_unsigned_int(const char *s) +{ + size_t len = strlen(s); + + // Unsigned int can only have digits + for (int i = 0; i < len; i++) { + if (isdigit(s[i])) + continue; + else + return 0; + } + + return 1; +} + +static int +is_signed_int(const char *s) +{ + size_t len = strlen(s); + + // Signed int can only have digits and a negative sign at the start + for (int i = 0; i < len; i++) { + if (isdigit(s[i])) + continue; + else if (i == 0 && s[i] == '-') { + continue; + } else + return 0; + } + + return 1; +} + +static void +flush_socket_reply() +{ + IPCMessageType reply_type; + uint32_t reply_size; + char *reply; + + read_socket(&reply_type, &reply_size, &reply); + + free(reply); +} + +static void +print_socket_reply() +{ + IPCMessageType reply_type; + uint32_t reply_size; + char *reply; + + read_socket(&reply_type, &reply_size, &reply); + + printf("%.*s\n", reply_size, reply); + fflush(stdout); + free(reply); +} + +static int +run_command(const char *name, char *args[], int argc) +{ + const unsigned char *msg; + size_t msg_size; + + yajl_gen gen = yajl_gen_alloc(NULL); + + // Message format: + // { + // "command": "", + // "args": [ ... ] + // } + // clang-format off + YMAP( + YSTR("command"); YSTR(name); + YSTR("args"); YARR( + for (int i = 0; i < argc; i++) { + if (is_signed_int(args[i])) { + long long num = atoll(args[i]); + YINT(num); + } else if (is_float(args[i])) { + float num = atof(args[i]); + YDOUBLE(num); + } else { + YSTR(args[i]); + } + } + ) + ) + // clang-format on + + yajl_gen_get_buf(gen, &msg, &msg_size); + + send_message(IPC_TYPE_RUN_COMMAND, msg_size, (uint8_t *)msg); + + if (!ignore_reply) + print_socket_reply(); + else + flush_socket_reply(); + + yajl_gen_free(gen); + + return 0; +} + +static int +get_monitors() +{ + send_message(IPC_TYPE_GET_MONITORS, 1, (uint8_t *)""); + print_socket_reply(); + return 0; +} + +static int +get_tags() +{ + send_message(IPC_TYPE_GET_TAGS, 1, (uint8_t *)""); + print_socket_reply(); + + return 0; +} + +static int +get_layouts() +{ + send_message(IPC_TYPE_GET_LAYOUTS, 1, (uint8_t *)""); + print_socket_reply(); + + return 0; +} + +static int +get_dwm_client(Window win) +{ + const unsigned char *msg; + size_t msg_size; + + yajl_gen gen = yajl_gen_alloc(NULL); + + // Message format: + // { + // "client_window_id": "" + // } + // clang-format off + YMAP( + YSTR("client_window_id"); YINT(win); + ) + // clang-format on + + yajl_gen_get_buf(gen, &msg, &msg_size); + + send_message(IPC_TYPE_GET_DWM_CLIENT, msg_size, (uint8_t *)msg); + + print_socket_reply(); + + yajl_gen_free(gen); + + return 0; +} + +static int +subscribe(const char *event) +{ + const unsigned char *msg; + size_t msg_size; + + yajl_gen gen = yajl_gen_alloc(NULL); + + // Message format: + // { + // "event": "", + // "action": "subscribe" + // } + // clang-format off + YMAP( + YSTR("event"); YSTR(event); + YSTR("action"); YSTR("subscribe"); + ) + // clang-format on + + yajl_gen_get_buf(gen, &msg, &msg_size); + + send_message(IPC_TYPE_SUBSCRIBE, msg_size, (uint8_t *)msg); + + if (!ignore_reply) + print_socket_reply(); + else + flush_socket_reply(); + + yajl_gen_free(gen); + + return 0; +} + +static void +usage_error(const char *prog_name, const char *format, ...) +{ + va_list args; + va_start(args, format); + + fprintf(stderr, "Error: "); + vfprintf(stderr, format, args); + fprintf(stderr, "\nusage: %s [...]\n", prog_name); + fprintf(stderr, "Try '%s help'\n", prog_name); + + va_end(args); + exit(1); +} + +static void +print_usage(const char *name) +{ + printf("usage: %s [options] [...]\n", name); + puts(""); + puts("Commands:"); + puts(" run_command [args...] Run an IPC command"); + puts(""); + puts(" get_monitors Get monitor properties"); + puts(""); + puts(" get_tags Get list of tags"); + puts(""); + puts(" get_layouts Get list of layouts"); + puts(""); + puts(" get_dwm_client Get dwm client proprties"); + puts(""); + puts(" subscribe [events...] Subscribe to specified events"); + puts(" Options: " IPC_EVENT_TAG_CHANGE ","); + puts(" " IPC_EVENT_LAYOUT_CHANGE ","); + puts(" " IPC_EVENT_CLIENT_FOCUS_CHANGE ","); + puts(" " IPC_EVENT_MONITOR_FOCUS_CHANGE ","); + puts(" " IPC_EVENT_FOCUSED_TITLE_CHANGE ","); + puts(" " IPC_EVENT_FOCUSED_STATE_CHANGE); + puts(""); + puts(" help Display this message"); + puts(""); + puts("Options:"); + puts(" --ignore-reply Don't print reply messages from"); + puts(" run_command and subscribe."); + puts(""); +} + +int +main(int argc, char *argv[]) +{ + const char *prog_name = argv[0]; + + connect_to_socket(); + if (sock_fd == -1) { + fprintf(stderr, "Failed to connect to socket\n"); + return 1; + } + + int i = 1; + if (i < argc && strcmp(argv[i], "--ignore-reply") == 0) { + ignore_reply = 1; + i++; + } + + if (i >= argc) usage_error(prog_name, "Expected an argument, got none"); + + if (strcmp(argv[i], "help") == 0) + print_usage(prog_name); + else if (strcmp(argv[i], "run_command") == 0) { + if (++i >= argc) usage_error(prog_name, "No command specified"); + // Command name + char *command = argv[i]; + // Command arguments are everything after command name + char **command_args = argv + ++i; + // Number of command arguments + int command_argc = argc - i; + run_command(command, command_args, command_argc); + } else if (strcmp(argv[i], "get_monitors") == 0) { + get_monitors(); + } else if (strcmp(argv[i], "get_tags") == 0) { + get_tags(); + } else if (strcmp(argv[i], "get_layouts") == 0) { + get_layouts(); + } else if (strcmp(argv[i], "get_dwm_client") == 0) { + if (++i < argc) { + if (is_unsigned_int(argv[i])) { + Window win = atol(argv[i]); + get_dwm_client(win); + } else + usage_error(prog_name, "Expected unsigned integer argument"); + } else + usage_error(prog_name, "Expected the window id"); + } else if (strcmp(argv[i], "subscribe") == 0) { + if (++i < argc) { + for (int j = i; j < argc; j++) subscribe(argv[j]); + } else + usage_error(prog_name, "Expected event name"); + // Keep listening for events forever + while (1) { + print_socket_reply(); + } + } else + usage_error(prog_name, "Invalid argument '%s'", argv[i]); + + return 0; +} diff --git a/dwm.1 b/dwm.1 new file mode 100644 index 0000000..ea91f78 --- /dev/null +++ b/dwm.1 @@ -0,0 +1,182 @@ +.TH DWM 1 dwm\-VERSION +.SH NAME +dwm \- dynamic window manager +.SH SYNOPSIS +.B dwm +.RB [ \-v ] +.SH DESCRIPTION +dwm is a dynamic window manager for X. It manages windows in tiled, monocle +and floating layouts. Either layout can be applied dynamically, optimising the +environment for the application in use and the task performed. +.P +In tiled layouts windows are managed in a master and stacking area. The master +area on the left contains one window by default, and the stacking area on the +right contains all other windows. The number of master area windows can be +adjusted from zero to an arbitrary number. In monocle layout all windows are +maximised to the screen size. In floating layout windows can be resized and +moved freely. Dialog windows are always managed floating, regardless of the +layout applied. +.P +Windows are grouped by tags. Each window can be tagged with one or multiple +tags. Selecting certain tags displays all windows with these tags. +.P +Each screen contains a small status bar which displays all available tags, the +layout, the title of the focused window, and the text read from the root window +name property, if the screen is focused. A floating window is indicated with an +empty square and a maximised floating window is indicated with a filled square +before the windows title. The selected tags are indicated with a different +color. The tags of the focused window are indicated with a filled square in the +top left corner. The tags which are applied to one or more windows are +indicated with an empty square in the top left corner. +.P +The attach below patch makes newly spawned windows attach after the currently +selected window +.P +dwm draws a small border around windows to indicate the focus state. +.SH OPTIONS +.TP +.B \-v +prints version information to stderr, then exits. +.SH USAGE +.SS Status bar +.TP +.B X root window name +is read and displayed in the status text area. It can be set with the +.BR xsetroot (1) +command. +.TP +.B Button1 +click on a tag label to display all windows with that tag, click on the layout +label toggles between tiled and floating layout. +.TP +.B Button3 +click on a tag label adds/removes all windows with that tag to/from the view. +.TP +.B Mod1\-Button1 +click on a tag label applies that tag to the focused window. +.TP +.B Mod1\-Button3 +click on a tag label adds/removes that tag to/from the focused window. +.SS Keyboard commands +.TP +.B Mod1\-Shift\-Return +Start +.BR st(1). +.TP +.B Mod1\-p +Spawn +.BR dmenu(1) +for launching other programs. +.TP +.B Mod1\-, +Focus previous screen, if any. +.TP +.B Mod1\-. +Focus next screen, if any. +.TP +.B Mod1\-Shift\-, +Send focused window to previous screen, if any. +.TP +.B Mod1\-Shift\-. +Send focused window to next screen, if any. +.TP +.B Mod1\-b +Toggles bar on and off. +.TP +.B Mod1\-t +Sets tiled layout. +.TP +.B Mod1\-f +Sets floating layout. +.TP +.B Mod1\-m +Sets monocle layout. +.TP +.B Mod1\-space +Toggles between current and previous layout. +.TP +.B Mod1\-j +Focus next window. +.TP +.B Mod1\-k +Focus previous window. +.TP +.B Mod1\-i +Increase number of windows in master area. +.TP +.B Mod1\-d +Decrease number of windows in master area. +.TP +.B Mod1\-l +Increase master area size. +.TP +.B Mod1\-h +Decrease master area size. +.TP +.B Mod1\-Return +Zooms/cycles focused window to/from master area (tiled layouts only). +.TP +.B Mod1\-Shift\-c +Close focused window. +.TP +.B Mod1\-Shift\-f +Toggle fullscreen for focused window. +.TP +.B Mod1\-Shift\-space +Toggle focused window between tiled and floating state. +.TP +.B Mod1\-Tab +Toggles to the previously selected tags. +.TP +.B Mod1\-Shift\-[1..n] +Apply nth tag to focused window. +.TP +.B Mod1\-Shift\-0 +Apply all tags to focused window. +.TP +.B Mod1\-Control\-Shift\-[1..n] +Add/remove nth tag to/from focused window. +.TP +.B Mod1\-[1..n] +View all windows with nth tag. +.TP +.B Mod1\-0 +View all windows with any tag. +.TP +.B Mod1\-Control\-[1..n] +Add/remove all windows with nth tag to/from the view. +.TP +.B Mod1\-Shift\-q +Quit dwm. +.SS Mouse commands +.TP +.B Mod1\-Button1 +Move focused window while dragging. Tiled windows will be toggled to the floating state. +.TP +.B Mod1\-Button2 +Toggles focused window between floating and tiled state. +.TP +.B Mod1\-Button3 +Resize focused window while dragging. Tiled windows will be toggled to the floating state. +.SH CUSTOMIZATION +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 st (1) +.SH ISSUES +Java applications which use the XToolkit/XAWT backend may draw grey windows +only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early +JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds +are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the +environment variable +.BR AWT_TOOLKIT=MToolkit +(to use the older Motif backend instead) or running +.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D +or +.B wmname LG3D +(to pretend that a non-reparenting window manager is running that the +XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable +.BR _JAVA_AWT_WM_NONREPARENTING=1 . +.SH BUGS +Send all bug reports with a patch to hackers@suckless.org. diff --git a/dwm.c b/dwm.c new file mode 100644 index 0000000..58b6771 --- /dev/null +++ b/dwm.c @@ -0,0 +1,3363 @@ +/* See LICENSE file for copyright and license details. + * + * dynamic window manager is designed like any other X client as well. It is + * driven through handling X events. In contrast to other X clients, a window + * manager selects for SubstructureRedirectMask on the root window, to receive + * events about window (dis-)appearance. Only one X connection at a time is + * allowed to select for this event mask. + * + * The event handlers of dwm are organized in an array which is accessed + * whenever a new event has been fetched. This allows event dispatching + * in O(1) time. + * + * Each child of the root window is called a client, except windows which have + * set the override_redirect flag. Clients are organized in a linked client + * list on each monitor, the focus history is remembered through a stack list + * on each monitor. Each client contains a bit array to indicate the tags of a + * client. + * + * Keys and tagging rules are organized as arrays and defined in config.h. + * + * To understand everything else, start reading main(). + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef XINERAMA +#include +#endif /* XINERAMA */ +#include +#include +#include +#ifdef __OpenBSD__ +#include +#include +#endif /* __OpenBSD */ + +#include "drw.h" +#include "util.h" + +/* macros */ +#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) +#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) +#define GETINC(X) ((X) - 2000) +#define INC(X) ((X) + 2000) +#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->mx+(m)->mw) - MAX((x),(m)->mx)) \ + * MAX(0, MIN((y)+(h),(m)->my+(m)->mh) - MAX((y),(m)->my))) +#define ISINC(X) ((X) > 1000 && (X) < 3000) +#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) +#define PREVSEL 3000 +#define LENGTH(X) (sizeof X / sizeof X[0]) +#define MOD(N,M) ((N)%(M) < 0 ? (N)%(M) + (M) : (N)%(M)) +#define MOUSEMASK (BUTTONMASK|PointerMotionMask) +#define WIDTH(X) ((X)->w + 2 * (X)->bw) +#define HEIGHT(X) ((X)->h + 2 * (X)->bw) +#define TAGMASK ((1 << LENGTH(tags)) - 1) +#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) +#define TRUNC(X,A,B) (MAX((A), MIN((X), (B)))) + +#define SYSTEM_TRAY_REQUEST_DOCK 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 }; /* color schemes */ +enum { NetSupported, NetWMName, NetWMState, NetWMCheck, + NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz, + 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 */ + +typedef struct TagState TagState; +struct TagState { + int selected; + int occupied; + int urgent; +}; + +typedef struct ClientState ClientState; +struct ClientState { + int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; +}; + +typedef union { + long i; + unsigned long ui; + float f; + const void *v; +} Arg; + +typedef struct { + unsigned int click; + unsigned int mask; + unsigned int button; + void (*func)(const Arg *arg); + const Arg arg; +} Button; + +typedef struct Monitor Monitor; +typedef struct Client Client; +struct Client { + char name[256]; + float mina, maxa; + float cfact; + int x, y, w, h; + int oldx, oldy, oldw, oldh; + int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; + int bw, oldbw; + unsigned int tags; + int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; + pid_t pid; + Client *next; + Client *snext; + Client *swallowing; + Monitor *mon; + Window win; + ClientState prevstate; +}; + +typedef struct { + unsigned int mod; + KeySym keysym; + void (*func)(const Arg *); + const Arg arg; +} Key; + +typedef struct { + const char *symbol; + void (*arrange)(Monitor *); +} Layout; + + +typedef struct Pertag Pertag; +struct Monitor { + char ltsymbol[16]; + char lastltsymbol[16]; + float mfact; + int nmaster; + int num; + int by, bh; /* bar geometry */ + int tx, tw; /* bar tray geometry */ + int mx, my, mw, mh; /* screen size */ + int wx, wy, ww, wh; /* window area */ + int gappih; /* horizontal gap between windows */ + int gappiv; /* vertical gap between windows */ + int gappoh; /* horizontal outer gaps */ + int gappov; /* vertical outer gaps */ + unsigned int seltags; + unsigned int sellt; + unsigned int tagset[2]; + TagState tagstate; + int showbar; + int topbar; + Client *clients; + Client *sel; + Client *lastsel; + Client *stack; + Monitor *next; + Window barwin; + Window traywin; + Pertag *pertag; + const Layout *lt[2]; + const Layout *lastlt; +}; + +typedef struct { + const char *class; + const char *instance; + const char *title; + unsigned int tags; + int isfloating; + int isterminal; + int noswallow; + int monitor; +} Rule; + +typedef struct Systray Systray; +struct Systray { + Window win; + Client *icons; +}; + +/* Xresources preferences */ +enum resource_type { + STRING = 0, + INTEGER = 1, + FLOAT = 2 +}; + +typedef struct { + char *name; + enum resource_type type; + void *dst; +} ResourcePref; + +/* function declarations */ +static void applyrules(Client *c); +static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact); +static void arrange(Monitor *m); +static void arrangemon(Monitor *m); +static void attach(Client *c); +static void attachBelow(Client *c); +static void attachstack(Client *c); +static void buttonpress(XEvent *e); +static void checkotherwm(void); +static void cleanup(void); +static void cleanupmon(Monitor *mon); +static void clientmessage(XEvent *e); +static void configure(Client *c); +static void configurenotify(XEvent *e); +static void configurerequest(XEvent *e); +static Monitor *createmon(void); +static void destroynotify(XEvent *e); +static void detach(Client *c); +static void detachstack(Client *c); +static Monitor *dirtomon(int dir); +static void drawbar(Monitor *m); +static void drawbars(void); +static void enternotify(XEvent *e); +static void expose(XEvent *e); +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); +static int handlexevent(struct epoll_event *ev); +static void incnmaster(const Arg *arg); +static void keypress(XEvent *e); +static void killclient(const Arg *arg); +static void manage(Window w, XWindowAttributes *wa); +static void managealtbar(Window win, XWindowAttributes *wa); +static void managetray(Window win, XWindowAttributes *wa); +static void mappingnotify(XEvent *e); +static void maprequest(XEvent *e); +static void monocle(Monitor *m); +static void motionnotify(XEvent *e); +static void movemouse(const Arg *arg); +static Client *nexttiled(Client *c); +static void pop(Client *c); +static void propertynotify(XEvent *e); +static void pushstack(const Arg *arg); +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 void scantray(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 setfocus(Client *c); +static void setfullscreen(Client *c, int fullscreen); +static void setlayout(const Arg *arg); +static void setlayoutsafe(const Arg *arg); +static void setcfact(const Arg *arg); +static void setmfact(const Arg *arg); +static void setup(void); +static void setupepoll(void); +static void seturgent(Client *c, int urg); +static void showhide(Client *c); +static void sigchld(int unused); +static int solitary(Client *c); +static void sighup(int unused); +static void sigterm(int unused); +static void spawn(const Arg *arg); +static int stackpos(const Arg *arg); +static void spawnbar(); +static Monitor *systraytomon(Monitor *m); +static void tag(const Arg *arg); +static void tagmon(const Arg *arg); +static void togglebar(const Arg *arg); +static void togglefloating(const Arg *arg); +static void togglefullscr(const Arg *arg); +static void toggletag(const Arg *arg); +static void toggleview(const Arg *arg); +static void unfocus(Client *c, int setfocus); +static void unmanage(Client *c, int destroyed); +static void unmanagealtbar(Window w); +static void unmanagetray(Window w); +static void unmapnotify(XEvent *e); +static void updatebarpos(Monitor *m); +static void updatebars(void); +static void updateclientlist(void); +static int updategeom(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 updatetitle(Client *c); +static void updatewindowtype(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 wmclasscontains(Window win, const char *class, const char *name); +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); +static void load_xresources(void); +static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst); + +static pid_t getparentprocess(pid_t p); +static int isdescprocess(pid_t p, pid_t c); +static Client *swallowingclient(Window w); +static Client *termforwin(const Client *c); +static pid_t winpid(Window w); + +/* variables */ +static Systray *systray = NULL; +static const char broken[] = "broken"; +static char stext[256]; +static int screen; +static int sw, sh; /* X display screen geometry width, height */ +static int bh; /* bar height */ +static int lrpad; /* sum of left and right padding for text */ +static int (*xerrorxlib)(Display *, XErrorEvent *); +static unsigned int numlockmask = 0; +static void (*handler[LASTEvent]) (XEvent *) = { + [ButtonPress] = buttonpress, + [ClientMessage] = clientmessage, + [ConfigureRequest] = configurerequest, + [ConfigureNotify] = configurenotify, + [DestroyNotify] = destroynotify, + [EnterNotify] = enternotify, + [Expose] = expose, + [FocusIn] = focusin, + [KeyPress] = keypress, + [MappingNotify] = mappingnotify, + [MapRequest] = maprequest, + [MotionNotify] = motionnotify, + [PropertyNotify] = propertynotify, + [ResizeRequest] = resizerequest, + [UnmapNotify] = unmapnotify +}; +static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast]; +static int epoll_fd; +static int dpy_fd; +static int restart = 0; +static int running = 1; +static Cur *cursor[CurLast]; +static Clr **scheme; +static Display *dpy; +static Drw *drw; +static Monitor *mons, *selmon, *lastselmon; +static Window root, wmcheckwin; + +#include "ipc.h" + +static xcb_connection_t *xcon; + +/* configuration, allows nested code to access above variables */ +#include "config.h" + +#ifdef VERSION +#include "IPCClient.c" +#include "yajl_dumps.c" +#include "ipc.c" +#endif + +struct Pertag { + unsigned int curtag, prevtag; /* current and previous tag */ + int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */ + float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */ + unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */ + const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */ + int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */ +}; + +/* compile-time check if all tags fit into an unsigned int bit array. */ +struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; + +/* function implementations */ +void +applyrules(Client *c) +{ + const char *class, *instance; + unsigned int i; + const Rule *r; + Monitor *m; + XClassHint ch = { NULL, NULL }; + + /* rule matching */ + c->isfloating = 0; + c->tags = 0; + XGetClassHint(dpy, c->win, &ch); + class = ch.res_class ? ch.res_class : broken; + instance = ch.res_name ? ch.res_name : broken; + + for (i = 0; i < LENGTH(rules); i++) { + r = &rules[i]; + if ((!r->title || strstr(c->name, r->title)) + && (!r->class || strstr(class, r->class)) + && (!r->instance || strstr(instance, r->instance))) + { + c->isterminal = r->isterminal; + c->noswallow = r->noswallow; + c->isfloating = r->isfloating; + c->tags |= r->tags; + for (m = mons; m && m->num != r->monitor; m = m->next); + if (m) + c->mon = m; + } + } + if (ch.res_class) + XFree(ch.res_class); + if (ch.res_name) + XFree(ch.res_name); + c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags]; +} + +int +applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact) +{ + int baseismin; + Monitor *m = c->mon; + + /* set minimum possible */ + *w = MAX(1, *w); + *h = MAX(1, *h); + if (interact) { + if (*x > sw) + *x = sw - WIDTH(c); + if (*y > sh) + *y = sh - HEIGHT(c); + if (*x + *w + 2 * c->bw < 0) + *x = 0; + if (*y + *h + 2 * c->bw < 0) + *y = 0; + } else { + if (*x >= m->wx + m->ww) + *x = m->wx + m->ww - WIDTH(c); + if (*y >= m->wy + m->wh) + *y = m->wy + m->wh - HEIGHT(c); + if (*x + *w + 2 * c->bw <= m->wx) + *x = m->wx; + if (*y + *h + 2 * c->bw <= m->wy) + *y = m->wy; + } + if (*h < bh) + *h = bh; + if (*w < bh) + *w = bh; + if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) { + if (!c->hintsvalid) + updatesizehints(c); + /* see last two sentences in ICCCM 4.1.2.3 */ + baseismin = c->basew == c->minw && c->baseh == c->minh; + if (!baseismin) { /* temporarily remove base dimensions */ + *w -= c->basew; + *h -= c->baseh; + } + /* adjust for aspect limits */ + if (c->mina > 0 && c->maxa > 0) { + if (c->maxa < (float)*w / *h) + *w = *h * c->maxa + 0.5; + else if (c->mina < (float)*h / *w) + *h = *w * c->mina + 0.5; + } + if (baseismin) { /* increment calculation requires this */ + *w -= c->basew; + *h -= c->baseh; + } + /* adjust for increment value */ + if (c->incw) + *w -= *w % c->incw; + if (c->inch) + *h -= *h % c->inch; + /* restore base dimensions */ + *w = MAX(*w + c->basew, c->minw); + *h = MAX(*h + c->baseh, c->minh); + if (c->maxw) + *w = MIN(*w, c->maxw); + if (c->maxh) + *h = MIN(*h, c->maxh); + } + return *x != c->x || *y != c->y || *w != c->w || *h != c->h; +} + +void +arrange(Monitor *m) +{ + if (m) + showhide(m->stack); + else for (m = mons; m; m = m->next) + showhide(m->stack); + if (m) { + arrangemon(m); + restack(m); + } else for (m = mons; m; m = m->next) + arrangemon(m); +} + +void +arrangemon(Monitor *m) +{ + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); + if (m->lt[m->sellt]->arrange) + m->lt[m->sellt]->arrange(m); +} + +void +attach(Client *c) +{ + c->next = c->mon->clients; + c->mon->clients = c; +} +void +attachBelow(Client *c) +{ + //If there is nothing on the monitor or the selected client is floating, attach as normal + if(c->mon->sel == NULL || c->mon->sel == c || c->mon->sel->isfloating) { + attach(c); + return; + } + + //Set the new client's next property to the same as the currently selected clients next + c->next = c->mon->sel->next; + //Set the currently selected clients next property to the new client + c->mon->sel->next = c; + +} + +void +attachstack(Client *c) +{ + c->snext = c->mon->stack; + c->mon->stack = c; +} + +void +swallow(Client *p, Client *c) +{ + + if (c->noswallow || c->isterminal) + return; + if (c->noswallow && !swallowfloating && c->isfloating) + return; + + detach(c); + detachstack(c); + + setclientstate(c, WithdrawnState); + XUnmapWindow(dpy, p->win); + + p->swallowing = c; + c->mon = p->mon; + + Window w = p->win; + p->win = c->win; + c->win = w; + updatetitle(p); + XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h); + arrange(p->mon); + configure(p); + updateclientlist(); +} + +void +unswallow(Client *c) +{ + c->win = c->swallowing->win; + + free(c->swallowing); + c->swallowing = NULL; + + /* unfullscreen the client */ + setfullscreen(c, 0); + updatetitle(c); + arrange(c->mon); + XMapWindow(dpy, c->win); + XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); + setclientstate(c, NormalState); + focus(NULL); + arrange(c->mon); +} + +void +buttonpress(XEvent *e) +{ + unsigned int i, x, click; + Arg arg = {0}; + Client *c; + Monitor *m; + XButtonPressedEvent *ev = &e->xbutton; + + click = ClkRootWin; + /* focus monitor if necessary */ + if ((m = wintomon(ev->window)) && m != selmon) { + unfocus(selmon->sel, 1); + selmon = m; + focus(NULL); + } + if (ev->window == selmon->barwin) { + i = x = 0; + unsigned int occ = 0; + for(c = m->clients; c; c=c->next) + occ |= c->tags; + do { + /* Do not reserve space for vacant tags */ + if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) + continue; + x += TEXTW(tags[i]); + } while (ev->x >= x && ++i < LENGTH(tags)); + if (i < LENGTH(tags)) { + click = ClkTagBar; + arg.ui = 1 << i; + } else if (ev->x < x + TEXTW(selmon->ltsymbol)) + click = ClkLtSymbol; + else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth()) + click = ClkStatusText; + else + click = ClkWinTitle; + } else if ((c = wintoclient(ev->window))) { + focus(c); + restack(selmon); + XAllowEvents(dpy, ReplayPointer, CurrentTime); + click = ClkClientWin; + } + for (i = 0; i < LENGTH(buttons); i++) + if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button + && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) + buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); +} + +void +checkotherwm(void) +{ + xerrorxlib = XSetErrorHandler(xerrorstart); + /* this causes an error if some other window manager is running */ + XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); + XSync(dpy, False); + XSetErrorHandler(xerror); + XSync(dpy, False); +} + +void +cleanup(void) +{ + Arg a = {.ui = ~0}; + Layout foo = { "", NULL }; + Monitor *m; + size_t i; + + view(&a); + selmon->lt[selmon->sellt] = &foo; + for (m = mons; m; m = m->next) + while (m->stack) + unmanage(m->stack, 0); + 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 < LENGTH(colors); i++) + free(scheme[i]); + free(scheme); + XDestroyWindow(dpy, wmcheckwin); + drw_free(drw); + XSync(dpy, False); + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); + XDeleteProperty(dpy, root, netatom[NetActiveWindow]); + + ipc_cleanup(); + + if (close(epoll_fd) < 0) { + fprintf(stderr, "Failed to close epoll file descriptor\n"); + } +} + +void +cleanupmon(Monitor *mon) +{ + Monitor *m; + + if (mon == mons) + mons = mons->next; + else { + for (m = mons; m && m->next != mon; m = m->next); + m->next = mon->next; + } + if (!usealtbar) { + XUnmapWindow(dpy, mon->barwin); + XDestroyWindow(dpy, mon->barwin); + } + free(mon); +} + +void +clientmessage(XEvent *e) +{ + XWindowAttributes wa; + XSetWindowAttributes swa; + XClientMessageEvent *cme = &e->xclient; + Client *c = wintoclient(cme->window); + unsigned int i; + + 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)); + if (!(c->win = cme->data.l[2])) { + free(c); + return; + } + c->mon = selmon; + c->next = systray->icons; + systray->icons = c; + if (!XGetWindowAttributes(dpy, c->win, &wa)) { + /* use sane defaults */ + wa.width = bh; + wa.height = bh; + wa.border_width = 0; + } + 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][ColBg].pixel; + 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]) { + if (cme->data.l[1] == netatom[NetWMFullscreen] + || cme->data.l[2] == netatom[NetWMFullscreen]) + setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ + || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); + } else if (cme->message_type == netatom[NetActiveWindow]) { + for (i = 0; i < LENGTH(tags) && !((1 << i) & c->tags); i++); + if (i < LENGTH(tags)) { + const Arg a = {.ui = 1 << i}; + view(&a); + focus(c); + restack(selmon); + } + } +} + +void +configure(Client *c) +{ + XConfigureEvent ce; + + ce.type = ConfigureNotify; + ce.display = dpy; + ce.event = c->win; + ce.window = c->win; + ce.x = c->x; + ce.y = c->y; + ce.width = c->w; + ce.height = c->h; + ce.border_width = c->bw; + ce.above = None; + ce.override_redirect = False; + XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce); +} + +void +configurenotify(XEvent *e) +{ + Monitor *m; + Client *c; + XConfigureEvent *ev = &e->xconfigure; + int dirty; + + /* TODO: updategeom handling sucks, needs to be simplified */ + if (ev->window == root) { + dirty = (sw != ev->width || sh != ev->height); + sw = ev->width; + sh = ev->height; + if (updategeom() || dirty) { + drw_resize(drw, sw, bh); + updatebars(); + for (m = mons; m; m = m->next) { + for (c = m->clients; c; c = c->next) + if (c->isfullscreen) + resizeclient(c, m->mx, m->my, m->mw, m->mh); + resizebarwin(m); + } + focus(NULL); + arrange(NULL); + } + } +} + +void +configurerequest(XEvent *e) +{ + Client *c; + Monitor *m; + XConfigureRequestEvent *ev = &e->xconfigurerequest; + XWindowChanges wc; + + if ((c = wintoclient(ev->window))) { + if (ev->value_mask & CWBorderWidth) + c->bw = ev->border_width; + else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) { + m = c->mon; + if (ev->value_mask & CWX) { + c->oldx = c->x; + c->x = m->mx + ev->x; + } + if (ev->value_mask & CWY) { + c->oldy = c->y; + c->y = m->my + ev->y; + } + if (ev->value_mask & CWWidth) { + c->oldw = c->w; + c->w = ev->width; + } + if (ev->value_mask & CWHeight) { + c->oldh = c->h; + c->h = ev->height; + } + if ((c->x + c->w) > m->mx + m->mw && c->isfloating) + c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */ + if ((c->y + c->h) > m->my + m->mh && c->isfloating) + c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */ + if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))) + configure(c); + if (ISVISIBLE(c)) + XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); + } else + configure(c); + } else { + wc.x = ev->x; + wc.y = ev->y; + wc.width = ev->width; + wc.height = ev->height; + wc.border_width = ev->border_width; + wc.sibling = ev->above; + wc.stack_mode = ev->detail; + XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); + } + XSync(dpy, False); +} + +Monitor * +createmon(void) +{ + Monitor *m; + unsigned int i; + + m = ecalloc(1, sizeof(Monitor)); + m->tagset[0] = m->tagset[1] = 1; + m->mfact = mfact; + m->nmaster = nmaster; + m->showbar = showbar; + m->topbar = topbar; + m->gappih = gappih; + m->gappiv = gappiv; + m->gappoh = gappoh; + m->gappov = gappov; + m->bh = bh; + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; + strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); + m->pertag = ecalloc(1, sizeof(Pertag)); + m->pertag->curtag = m->pertag->prevtag = 1; + + for (i = 0; i <= LENGTH(tags); i++) { + m->pertag->nmasters[i] = m->nmaster; + m->pertag->mfacts[i] = m->mfact; + + m->pertag->ltidxs[i][0] = m->lt[0]; + m->pertag->ltidxs[i][1] = m->lt[1]; + m->pertag->sellts[i] = m->sellt; + + m->pertag->showbars[i] = m->showbar; + } + + return m; +} + +void +destroynotify(XEvent *e) +{ + Client *c; + Monitor *m; + XDestroyWindowEvent *ev = &e->xdestroywindow; + + if ((c = wintoclient(ev->window))) + unmanage(c, 1); + else if ((c = swallowingclient(ev->window))) + unmanage(c->swallowing, 1); + else if ((c = wintosystrayicon(ev->window))) { + removesystrayicon(c); + resizebarwin(selmon); + updatesystray(); + } + else if ((m = wintomon(ev->window)) && m->barwin == ev->window) + unmanagealtbar(ev->window); + else if (m->traywin == ev->window) + unmanagetray(ev->window); +} + +void +detach(Client *c) +{ + Client **tc; + + for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next); + *tc = c->next; +} + +void +detachstack(Client *c) +{ + Client **tc, *t; + + for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext); + *tc = c->snext; + + if (c == c->mon->sel) { + for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext); + c->mon->sel = t; + } +} + +Monitor * +dirtomon(int dir) +{ + Monitor *m = NULL; + + if (dir > 0) { + if (!(m = selmon->next)) + m = mons; + } else if (selmon == mons) + for (m = mons; m->next; m = m->next); + else + for (m = mons; m->next != selmon; m = m->next); + return m; +} + +void +drawbar(Monitor *m) +{ + if (usealtbar) + return; + + int x, w, tw = 0, stw = 0; + int boxs = drw->fonts->h / 9; + int boxw = drw->fonts->h / 6 + 2; + unsigned int i, occ = 0, urg = 0; + Client *c; + + if (!m->showbar) + return; + + if(showsystray && m == systraytomon(m) && !systrayonleft) + stw = getsystraywidth(); + + /* draw status first so it can be overdrawn by tags later */ + if (m == selmon) { /* status is only drawn on selected monitor */ + drw_setscheme(drw, scheme[SchemeNorm]); + tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */ + drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0); + } + + resizebarwin(m); + for (c = m->clients; c; c = c->next) { + occ |= c->tags; + if (c->isurgent) + urg |= c->tags; + } + x = 0; + for (i = 0; i < LENGTH(tags); i++) { + /* Do not draw vacant tags */ + if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) + continue; + w = TEXTW(tags[i]); + drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); + x += w; + } + w = TEXTW(m->ltsymbol); + drw_setscheme(drw, scheme[SchemeNorm]); + x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); + + if ((w = m->ww - tw - stw - x) > bh) { + if (m->sel) { + drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); + if (m->sel->isfloating) + drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); + } else { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x, 0, w, bh, 1, 1); + } + } + drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh); +} + +void +drawbars(void) +{ + Monitor *m; + + for (m = mons; m; m = m->next) + drawbar(m); +} + +void +enternotify(XEvent *e) +{ + Client *c; + Monitor *m; + XCrossingEvent *ev = &e->xcrossing; + + if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) + return; + c = wintoclient(ev->window); + m = c ? c->mon : wintomon(ev->window); + if (m != selmon) { + unfocus(selmon->sel, 1); + selmon = m; + } else if (!c || c == selmon->sel) + return; + focus(c); +} + +void +expose(XEvent *e) +{ + Monitor *m; + XExposeEvent *ev = &e->xexpose; + + if (ev->count == 0 && (m = wintomon(ev->window))) { + drawbar(m); + if (m == selmon) + updatesystray(); + } +} + +void +focus(Client *c) +{ + if (!c || !ISVISIBLE(c)) + for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext); + if (selmon->sel && selmon->sel != c) + unfocus(selmon->sel, 0); + if (c) { + if (c->mon != selmon) + selmon = c->mon; + if (c->isurgent) + seturgent(c, 0); + detachstack(c); + attachstack(c); + grabbuttons(c, 1); + /* Avoid flickering when another client appears and the border + * is restored */ + if (!solitary(c)) { + XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); + } + setfocus(c); + } else { + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + XDeleteProperty(dpy, root, netatom[NetActiveWindow]); + } + selmon->sel = c; + drawbars(); +} + +/* there are some broken focus acquiring clients needing extra handling */ +void +focusin(XEvent *e) +{ + XFocusChangeEvent *ev = &e->xfocus; + + if (selmon->sel && ev->window != selmon->sel->win) + setfocus(selmon->sel); +} + +void +focusmon(const Arg *arg) +{ + Monitor *m; + + if (!mons->next) + return; + if ((m = dirtomon(arg->i)) == selmon) + return; + unfocus(selmon->sel, 0); + selmon = m; + focus(NULL); +} + +void +focusstack(const Arg *arg) +{ + int i = stackpos(arg); + Client *c, *p; + + if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen)) + return; + if(i < 0) + return; + + for(p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c)); + i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next); + focus(c ? c : p); + restack(selmon); +} + +Atom +getatomprop(Client *c, Atom prop) +{ + int di; + 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, 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; +} + +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 +getrootptr(int *x, int *y) +{ + int di; + unsigned int dui; + Window dummy; + + return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui); +} + +long +getstate(Window w) +{ + int format; + long result = -1; + unsigned char *p = NULL; + unsigned long n, extra; + Atom real; + + if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], + &real, &format, &n, &extra, (unsigned char **)&p) != Success) + return -1; + if (n != 0) + result = *p; + XFree(p); + return result; +} + +int +gettextprop(Window w, Atom atom, char *text, unsigned int size) +{ + char **list = NULL; + int n; + XTextProperty name; + + if (!text || size == 0) + return 0; + text[0] = '\0'; + if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems) + return 0; + if (name.encoding == XA_STRING) { + strncpy(text, (char *)name.value, size - 1); + } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) { + strncpy(text, *list, size - 1); + XFreeStringList(list); + } + text[size - 1] = '\0'; + XFree(name.value); + return 1; +} + +void +grabbuttons(Client *c, int focused) +{ + updatenumlockmask(); + { + unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + if (!focused) + XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, + BUTTONMASK, GrabModeSync, GrabModeSync, None, None); + for (i = 0; i < LENGTH(buttons); i++) + if (buttons[i].click == ClkClientWin) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabButton(dpy, buttons[i].button, + buttons[i].mask | modifiers[j], + c->win, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, None); + } +} + +void +grabkeys(void) +{ + updatenumlockmask(); + { + unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + KeyCode code; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < LENGTH(keys); i++) + if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, + True, GrabModeAsync, GrabModeAsync); + } +} + +int +handlexevent(struct epoll_event *ev) +{ + if (ev->events & EPOLLIN) { + XEvent ev; + while (running && XPending(dpy)) { + XNextEvent(dpy, &ev); + if (handler[ev.type]) { + handler[ev.type](&ev); /* call handler */ + ipc_send_events(mons, &lastselmon, selmon); + } + } + } else if (ev-> events & EPOLLHUP) { + return -1; + } + + return 0; +} + +void +incnmaster(const Arg *arg) +{ + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0); + arrange(selmon); +} + +#ifdef XINERAMA +static int +isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) +{ + while (n--) + if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org + && unique[n].width == info->width && unique[n].height == info->height) + return 0; + return 1; +} +#endif /* XINERAMA */ + +void +keypress(XEvent *e) +{ + unsigned int i; + KeySym keysym; + XKeyEvent *ev; + + ev = &e->xkey; + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + for (i = 0; i < LENGTH(keys); i++) + if (keysym == keys[i].keysym + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) + keys[i].func(&(keys[i].arg)); +} + +void +killclient(const Arg *arg) +{ + if (!selmon->sel) + return; + + if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) { + XGrabServer(dpy); + XSetErrorHandler(xerrordummy); + XSetCloseDownMode(dpy, DestroyAll); + XKillClient(dpy, selmon->sel->win); + XSync(dpy, False); + XSetErrorHandler(xerror); + XUngrabServer(dpy); + } +} + +void +manage(Window w, XWindowAttributes *wa) +{ + Client *c, *t = NULL, *term = NULL; + Window trans = None; + XWindowChanges wc; + + c = ecalloc(1, sizeof(Client)); + c->win = w; + c->pid = winpid(w); + /* geometry */ + c->x = c->oldx = wa->x; + c->y = c->oldy = wa->y; + c->w = c->oldw = wa->width; + c->h = c->oldh = wa->height; + c->oldbw = wa->border_width; + c->cfact = 1.0; + + updatetitle(c); + if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { + c->mon = t->mon; + c->tags = t->tags; + } else { + c->mon = selmon; + applyrules(c); + term = termforwin(c); + } + + if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww) + c->x = c->mon->wx + c->mon->ww - WIDTH(c); + if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh) + c->y = c->mon->wy + c->mon->wh - HEIGHT(c); + c->x = MAX(c->x, c->mon->wx); + c->y = MAX(c->y, c->mon->wy); + c->bw = borderpx; + + wc.border_width = c->bw; + XConfigureWindow(dpy, w, CWBorderWidth, &wc); + XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); + configure(c); /* propagates border_width, if size doesn't change */ + updatewindowtype(c); + updatesizehints(c); + updatewmhints(c); + XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); + grabbuttons(c, 0); + if (!c->isfloating) + c->isfloating = c->oldstate = trans != None || c->isfixed; + if (c->isfloating) + XRaiseWindow(dpy, c->win); + if( attachbelow ) + attachBelow(c); + else + attach(c); + attachstack(c); + XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, + (unsigned char *) &(c->win), 1); + XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */ + setclientstate(c, NormalState); + if (c->mon == selmon) + unfocus(selmon->sel, 0); + c->mon->sel = c; + arrange(c->mon); + XMapWindow(dpy, c->win); + if (term) + swallow(term, c); + focus(NULL); +} + +void +managealtbar(Window win, XWindowAttributes *wa) +{ + Monitor *m; + if (!(m = recttomon(wa->x, wa->y, wa->width, wa->height))) + return; + + m->barwin = win; + m->by = wa->y; + bh = m->bh = wa->height; + updatebarpos(m); + arrange(m); + XSelectInput(dpy, win, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); + XMoveResizeWindow(dpy, win, wa->x, wa->y, wa->width, wa->height); + XMapWindow(dpy, win); + XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, + (unsigned char *) &win, 1); +} + +void +managetray(Window win, XWindowAttributes *wa) +{ + Monitor *m; + if (!(m = recttomon(wa->x, wa->y, wa->width, wa->height))) + return; + + m->traywin = win; + m->tx = wa->x; + m->tw = wa->width; + updatebarpos(m); + arrange(m); + XSelectInput(dpy, win, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); + XMoveResizeWindow(dpy, win, wa->x, wa->y, wa->width, wa->height); + XMapWindow(dpy, win); + XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, + (unsigned char *) &win, 1); +} + + +void +mappingnotify(XEvent *e) +{ + XMappingEvent *ev = &e->xmapping; + + XRefreshKeyboardMapping(ev); + if (ev->request == MappingKeyboard) + grabkeys(); +} + +void +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) || wa.override_redirect) + return; + if (wmclasscontains(ev->window, altbarclass, "")) + managealtbar(ev->window, &wa); + else if (!wintoclient(ev->window)) + manage(ev->window, &wa); +} + +void +monocle(Monitor *m) +{ + unsigned int n = 0; + Client *c; + + for (c = m->clients; c; c = c->next) + if (ISVISIBLE(c)) + n++; + if (n > 0) /* override layout symbol */ + snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n); + for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) + resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); +} + +void +motionnotify(XEvent *e) +{ + static Monitor *mon = NULL; + Monitor *m; + XMotionEvent *ev = &e->xmotion; + + if (ev->window != root) + return; + if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) { + unfocus(selmon->sel, 1); + selmon = m; + focus(NULL); + } + mon = m; +} + +void +movemouse(const Arg *arg) +{ + int x, y, ocx, ocy, nx, ny; + Client *c; + Monitor *m; + XEvent ev; + Time lasttime = 0; + + if (!(c = selmon->sel)) + return; + if (c->isfullscreen) /* no support moving fullscreen windows by mouse */ + return; + restack(selmon); + ocx = c->x; + ocy = c->y; + if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, + None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) + return; + if (!getrootptr(&x, &y)) + return; + do { + XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); + switch(ev.type) { + case ConfigureRequest: + case Expose: + case MapRequest: + handler[ev.type](&ev); + break; + case MotionNotify: + if ((ev.xmotion.time - lasttime) <= (1000 / 60)) + continue; + lasttime = ev.xmotion.time; + + nx = ocx + (ev.xmotion.x - x); + ny = ocy + (ev.xmotion.y - y); + if (abs(selmon->wx - nx) < snap) + nx = selmon->wx; + else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap) + nx = selmon->wx + selmon->ww - WIDTH(c); + if (abs(selmon->wy - ny) < snap) + ny = selmon->wy; + else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap) + ny = selmon->wy + selmon->wh - HEIGHT(c); + if (!c->isfloating && selmon->lt[selmon->sellt]->arrange + && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) + togglefloating(NULL); + if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) + resize(c, nx, ny, c->w, c->h, 1); + break; + } + } while (ev.type != ButtonRelease); + XUngrabPointer(dpy, CurrentTime); + if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) { + sendmon(c, m); + selmon = m; + focus(NULL); + } +} + +Client * +nexttiled(Client *c) +{ + for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next); + return c; +} + +void +pop(Client *c) +{ + detach(c); + attach(c); + focus(c); + arrange(c->mon); +} + +void +propertynotify(XEvent *e) +{ + Client *c; + 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) + return; /* ignore */ + else if ((c = wintoclient(ev->window))) { + switch(ev->atom) { + default: break; + case XA_WM_TRANSIENT_FOR: + if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) && + (c->isfloating = (wintoclient(trans)) != NULL)) + arrange(c->mon); + break; + case XA_WM_NORMAL_HINTS: + c->hintsvalid = 0; + break; + case XA_WM_HINTS: + updatewmhints(c); + drawbars(); + break; + } + if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { + updatetitle(c); + if (c == c->mon->sel) + drawbar(c->mon); + } + if (ev->atom == netatom[NetWMWindowType]) + updatewindowtype(c); + } +} + +void +saveSession(void) +{ + FILE *fw = fopen(SESSION_FILE, "w"); + for (Client *c = selmon->clients; c != NULL; c = c->next) { // get all the clients with their tags and write them to the file + fprintf(fw, "%lu %u\n", c->win, c->tags); + } + fclose(fw); +} + +void +restoreSession(void) +{ + // restore session + FILE *fr = fopen(SESSION_FILE, "r"); + if (!fr) + return; + + char *str = malloc(23 * sizeof(char)); // allocate enough space for excepted input from text file + while (fscanf(fr, "%[^\n] ", str) != EOF) { // read file till the end + long unsigned int winId; + unsigned int tagsForWin; + int check = sscanf(str, "%lu %u", &winId, &tagsForWin); // get data + if (check != 2) // break loop if data wasn't read correctly + break; + + for (Client *c = selmon->clients; c ; c = c->next) { // add tags to every window by winId + if (c->win == winId) { + c->tags = tagsForWin; + break; + } + } + } + + for (Client *c = selmon->clients; c ; c = c->next) { // refocus on windows + focus(c); + restack(c->mon); + } + + for (Monitor *m = selmon; m; m = m->next) // rearrange all monitors + arrange(m); + + free(str); + fclose(fr); + + // delete a file + remove(SESSION_FILE); +} + +void +pushstack(const Arg *arg) { + int i = stackpos(arg); + Client *sel = selmon->sel, *c, *p; + + if(i < 0) + return; + else if(i == 0) { + detach(sel); + attach(sel); + } + else { + for(p = NULL, c = selmon->clients; c; p = c, c = c->next) + if(!(i -= (ISVISIBLE(c) && c != sel))) + break; + c = c ? c : p; + detach(sel); + sel->next = c->next; + c->next = sel; + } + arrange(selmon); +} + +void +quit(const Arg *arg) +{ + if(arg->i) restart = 1; + running = 0; + + if (restart == 1) + saveSession(); +} + +Monitor * +recttomon(int x, int y, int w, int h) +{ + Monitor *m, *r = selmon; + int a, area = 0; + + for (m = mons; m; m = m->next) + if ((a = INTERSECT(x, y, w, h, m)) > area) { + area = a; + r = m; + } + return r; +} + +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)) + resizeclient(c, x, y, w, h); +} + +void +resizebarwin(Monitor *m) { + unsigned int w = m->ww; + if (showsystray && m == systraytomon(m) && !systrayonleft) + 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; + + c->oldx = c->x; c->x = wc.x = x; + c->oldy = c->y; c->y = wc.y = y; + c->oldw = c->w; c->w = wc.width = w; + c->oldh = c->h; c->h = wc.height = h; + wc.border_width = c->bw; + if (solitary(c)) { + c->w = wc.width += c->bw * 2; + c->h = wc.height += c->bw * 2; + wc.border_width = 0; + } + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); +} + +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 +resizemouse(const Arg *arg) +{ + int ocx, ocy, nw, nh; + Client *c; + Monitor *m; + XEvent ev; + Time lasttime = 0; + + if (!(c = selmon->sel)) + return; + if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */ + return; + restack(selmon); + ocx = c->x; + ocy = c->y; + if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, + None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess) + return; + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); + do { + XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); + switch(ev.type) { + case ConfigureRequest: + case Expose: + case MapRequest: + handler[ev.type](&ev); + break; + case MotionNotify: + if ((ev.xmotion.time - lasttime) <= (1000 / 60)) + continue; + lasttime = ev.xmotion.time; + + nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); + nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); + if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww + && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh) + { + if (!c->isfloating && selmon->lt[selmon->sellt]->arrange + && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) + togglefloating(NULL); + } + if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) + resize(c, c->x, c->y, nw, nh, 1); + break; + } + } while (ev.type != ButtonRelease); + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); + XUngrabPointer(dpy, CurrentTime); + while (XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) { + sendmon(c, m); + selmon = m; + focus(NULL); + } +} + +void +restack(Monitor *m) +{ + Client *c; + XEvent ev; + XWindowChanges wc; + + drawbar(m); + if (!m->sel) + return; + if (m->sel->isfloating || !m->lt[m->sellt]->arrange) + XRaiseWindow(dpy, m->sel->win); + if (m->lt[m->sellt]->arrange) { + wc.stack_mode = Below; + wc.sibling = m->barwin; + for (c = m->stack; c; c = c->snext) + if (!c->isfloating && ISVISIBLE(c)) { + XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); + wc.sibling = c->win; + } + } + XSync(dpy, False); + while (XCheckMaskEvent(dpy, EnterWindowMask, &ev)); +} + +void +run(void) +{ + int event_count = 0; + const int MAX_EVENTS = 10; + struct epoll_event events[MAX_EVENTS]; + + XSync(dpy, False); + + /* main event loop */ + while (running) { + event_count = epoll_wait(epoll_fd, events, MAX_EVENTS, -1); + + for (int i = 0; i < event_count; i++) { + int event_fd = events[i].data.fd; + DEBUG("Got event from fd %d\n", event_fd); + + if (event_fd == dpy_fd) { + // -1 means EPOLLHUP + if (handlexevent(events + i) == -1) + return; + } else if (event_fd == ipc_get_sock_fd()) { + ipc_handle_socket_epoll_event(events + i); + } else if (ipc_is_client_registered(event_fd)){ + if (ipc_handle_client_epoll_event(events + i, mons, &lastselmon, selmon, + tags, LENGTH(tags), layouts, LENGTH(layouts)) < 0) { + fprintf(stderr, "Error handling IPC event on fd %d\n", event_fd); + } + } else { + fprintf(stderr, "Got event from unknown fd %d, ptr %p, u32 %d, u64 %lu", + event_fd, events[i].data.ptr, events[i].data.u32, + events[i].data.u64); + fprintf(stderr, " with events %d\n", events[i].events); + return; + } + } + } +} + +void +scan(void) +{ + unsigned int i, num; + Window d1, d2, *wins = NULL; + XWindowAttributes wa; + + if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { + for (i = 0; i < num; i++) { + if (!XGetWindowAttributes(dpy, wins[i], &wa) + || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) + continue; + if (wmclasscontains(wins[i], altbarclass, "")) + managealtbar(wins[i], &wa); + else if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState) + manage(wins[i], &wa); + } + for (i = 0; i < num; i++) { /* now the transients */ + if (!XGetWindowAttributes(dpy, wins[i], &wa)) + continue; + if (XGetTransientForHint(dpy, wins[i], &d1) + && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)) + manage(wins[i], &wa); + } + if (wins) + XFree(wins); + } +} + +void +scantray(void) +{ + unsigned int num; + Window d1, d2, *wins = NULL; + XWindowAttributes wa; + + if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { + for (unsigned int i = 0; i < num; i++) { + if (wmclasscontains(wins[i], altbarclass, alttrayname)) { + if (!XGetWindowAttributes(dpy, wins[i], &wa)) + break; + managetray(wins[i], &wa); + } + } + } + + if (wins) + XFree(wins); +} + + + +void +sendmon(Client *c, Monitor *m) +{ + if (c->mon == m) + return; + unfocus(c, 1); + detach(c); + detachstack(c); + c->mon = m; + c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ + if( attachbelow ) + attachBelow(c); + else + attach(c); + attachstack(c); + focus(NULL); + arrange(NULL); + spawnbar(); +} + +void +setclientstate(Client *c, long state) +{ + long data[] = { state, None }; + + XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, + PropModeReplace, (unsigned char *)data, 2); +} + +int +sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) +{ + int n; + Atom *protocols, mt; + int exists = 0; + XEvent ev; + + 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 = w; + ev.xclient.message_type = mt; + ev.xclient.format = 32; + 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; +} + +void +setfocus(Client *c) +{ + if (!c->neverfocus) { + XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + XChangeProperty(dpy, root, netatom[NetActiveWindow], + XA_WINDOW, 32, PropModeReplace, + (unsigned char *) &(c->win), 1); + } + sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0); +} + +void +setfullscreen(Client *c, int fullscreen) +{ + if (fullscreen && !c->isfullscreen) { + XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, + PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1); + c->isfullscreen = 1; + c->oldstate = c->isfloating; + c->oldbw = c->bw; + c->bw = 0; + c->isfloating = 1; + resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh); + XRaiseWindow(dpy, c->win); + } else if (!fullscreen && c->isfullscreen){ + XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, + PropModeReplace, (unsigned char*)0, 0); + c->isfullscreen = 0; + c->isfloating = c->oldstate; + c->bw = c->oldbw; + c->x = c->oldx; + c->y = c->oldy; + c->w = c->oldw; + c->h = c->oldh; + resizeclient(c, c->x, c->y, c->w, c->h); + arrange(c->mon); + } +} + +void +setlayout(const Arg *arg) +{ + if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1; + if (arg && arg->v) + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v; + strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol); + if (selmon->sel) + arrange(selmon); + else + drawbar(selmon); +} + +void +setlayoutsafe(const Arg *arg) +{ + const Layout *ltptr = (Layout *)arg->v; + if (ltptr == 0) + setlayout(arg); + for (int i = 0; i < LENGTH(layouts); i++) { + if (ltptr == &layouts[i]) + setlayout(arg); + } +} + +void +setcfact(const Arg *arg) { + float f; + Client *c; + + c = selmon->sel; + + if(!arg || !c || !selmon->lt[selmon->sellt]->arrange) + return; + f = arg->f + c->cfact; + if(arg->f == 0.0) + f = 1.0; + else if(f < 0.25 || f > 4.0) + return; + c->cfact = f; + arrange(selmon); +} + +/* arg > 1.0 will set mfact absolutely */ +void +setmfact(const Arg *arg) +{ + float f; + + if (!arg || !selmon->lt[selmon->sellt]->arrange) + return; + f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; + if (f < 0.05 || f > 0.95) + return; + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f; + arrange(selmon); +} + +void +setup(void) +{ + int i; + XSetWindowAttributes wa; + Atom utf8string; + + /* clean up any zombies immediately */ + sigchld(0); + + signal(SIGHUP, sighup); + signal(SIGTERM, sigterm); + + /* init screen */ + screen = DefaultScreen(dpy); + sw = DisplayWidth(dpy, screen); + sh = DisplayHeight(dpy, screen); + root = RootWindow(dpy, screen); + drw = drw_create(dpy, screen, root, sw, sh); + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; + bh = usealtbar ? 0 : drw->fonts->h + 2; + updategeom(); + /* init atoms */ + utf8string = XInternAtom(dpy, "UTF8_STRING", False); + wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); + wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); + 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[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False); + netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); + netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False); + netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", 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); + cursor[CurMove] = drw_cur_create(drw, XC_fleur); + /* init appearance */ + scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); + for (i = 0; i < LENGTH(colors); i++) + scheme[i] = drw_scm_create(drw, colors[i], 3); + /* init system tray */ + updatesystray(); + /* init bars */ + updatebars(); + updatestatus(); + /* supporting window for NetWMCheck */ + wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0); + XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, + PropModeReplace, (unsigned char *) &wmcheckwin, 1); + XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, + PropModeReplace, (unsigned char *) "dwm", 3); + XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, + PropModeReplace, (unsigned char *) &wmcheckwin, 1); + /* EWMH support per view */ + XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, + PropModeReplace, (unsigned char *) netatom, NetLast); + XDeleteProperty(dpy, root, netatom[NetClientList]); + /* select events */ + wa.cursor = cursor[CurNormal]->cursor; + wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask + |ButtonPressMask|PointerMotionMask|EnterWindowMask + |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; + XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); + XSelectInput(dpy, root, wa.event_mask); + grabkeys(); + focus(NULL); + setupepoll(); +} + +void +setupepoll(void) +{ + epoll_fd = epoll_create1(0); + dpy_fd = ConnectionNumber(dpy); + struct epoll_event dpy_event; + + // Initialize struct to 0 + memset(&dpy_event, 0, sizeof(dpy_event)); + + DEBUG("Display socket is fd %d\n", dpy_fd); + + if (epoll_fd == -1) { + fputs("Failed to create epoll file descriptor", stderr); + } + + dpy_event.events = EPOLLIN; + dpy_event.data.fd = dpy_fd; + if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, dpy_fd, &dpy_event)) { + fputs("Failed to add display file descriptor to epoll", stderr); + close(epoll_fd); + exit(1); + } + + if (ipc_init(ipcsockpath, epoll_fd, ipccommands, LENGTH(ipccommands)) < 0) { + fputs("Failed to initialize IPC\n", stderr); + } +} + +void +seturgent(Client *c, int urg) +{ + XWMHints *wmh; + + c->isurgent = urg; + if (!(wmh = XGetWMHints(dpy, c->win))) + return; + wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint); + XSetWMHints(dpy, c->win, wmh); + XFree(wmh); +} + +void +showhide(Client *c) +{ + if (!c) + return; + if (ISVISIBLE(c)) { + /* show clients top down */ + XMoveWindow(dpy, c->win, c->x, c->y); + if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen) + resize(c, c->x, c->y, c->w, c->h, 0); + showhide(c->snext); + } else { + /* hide clients bottom up */ + showhide(c->snext); + XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y); + } +} + +void +sigchld(int unused) +{ + if (signal(SIGCHLD, sigchld) == SIG_ERR) + die("can't install SIGCHLD handler:"); + while (0 < waitpid(-1, NULL, WNOHANG)); +} + +void +sighup(int unused) +{ + Arg a = {.i = 1}; + quit(&a); +} + +void +sigterm(int unused) +{ + Arg a = {.i = 0}; + quit(&a); +} + +int +solitary(Client *c) +{ + return ((nexttiled(c->mon->clients) == c && !nexttiled(c->next)) + || &monocle == c->mon->lt[c->mon->sellt]->arrange) + && !c->isfullscreen && !c->isfloating + && NULL != c->mon->lt[c->mon->sellt]->arrange; +} + +void +spawn(const Arg *arg) +{ + if (fork() == 0) { + if (dpy) + close(ConnectionNumber(dpy)); + setsid(); + execvp(((char **)arg->v)[0], (char **)arg->v); + die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]); + } +} + +void +spawnbar() +{ + if (*altbarcmd) + system(altbarcmd); +} + +int +stackpos(const Arg *arg) { + int n, i; + Client *c, *l; + + if(!selmon->clients) + return -1; + + if(arg->i == PREVSEL) { + for(l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext); + if(!l) + return -1; + for(i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + return i; + } + else if(ISINC(arg->i)) { + if(!selmon->sel) + return -1; + for(i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + for(n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next); + return MOD(i + GETINC(arg->i), n); + } + else if(arg->i < 0) { + for(i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next); + return MAX(i + arg->i, 0); + } + else + return arg->i; +} + +void +tag(const Arg *arg) +{ + if (selmon->sel && arg->ui & TAGMASK) { + selmon->sel->tags = arg->ui & TAGMASK; + focus(NULL); + arrange(selmon); + } +} + +void +tagmon(const Arg *arg) +{ + if (!selmon->sel || !mons->next) + return; + sendmon(selmon->sel, dirtomon(arg->i)); +} + +void +togglebar(const Arg *arg) +{ + /** + * Polybar tray does not raise maprequest event. It must be manually scanned + * for. Scanning it too early while the tray is being populated would give + * wrong dimensions. + */ + if (!selmon->traywin) + scantray(); + + selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar; + updatebarpos(selmon); + 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); + } + XMoveResizeWindow(dpy, selmon->traywin, selmon->tx, selmon->by, selmon->tw, selmon->bh); + arrange(selmon); +} + +void +togglefloating(const Arg *arg) +{ + if (!selmon->sel) + return; + if (selmon->sel->isfullscreen) /* no support for fullscreen windows */ + return; + selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; + if (selmon->sel->isfloating) + resize(selmon->sel, selmon->sel->x, selmon->sel->y, + selmon->sel->w, selmon->sel->h, 0); + arrange(selmon); +} + +void +togglefullscr(const Arg *arg) +{ + if(selmon->sel) + setfullscreen(selmon->sel, !selmon->sel->isfullscreen); +} + +void +toggletag(const Arg *arg) +{ + unsigned int newtags; + + if (!selmon->sel) + return; + newtags = selmon->sel->tags ^ (arg->ui & TAGMASK); + if (newtags) { + selmon->sel->tags = newtags; + focus(NULL); + arrange(selmon); + } +} + +void +toggleview(const Arg *arg) +{ + unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); + int i; + + if (newtagset) { + selmon->tagset[selmon->seltags] = newtagset; + + if (newtagset == ~0) { + selmon->pertag->prevtag = selmon->pertag->curtag; + selmon->pertag->curtag = 0; + } + + /* test if the user did not select the same tag */ + if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) { + selmon->pertag->prevtag = selmon->pertag->curtag; + for (i = 0; !(newtagset & 1 << i); i++) ; + selmon->pertag->curtag = i + 1; + } + + /* apply settings for this view */ + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; + selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; + + if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) + togglebar(NULL); + + focus(NULL); + arrange(selmon); + } +} + +void +unfocus(Client *c, int setfocus) +{ + if (!c) + return; + grabbuttons(c, 0); + XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); + if (setfocus) { + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + XDeleteProperty(dpy, root, netatom[NetActiveWindow]); + } +} + +void +unmanage(Client *c, int destroyed) +{ + Monitor *m = c->mon; + XWindowChanges wc; + + if (c->swallowing) { + unswallow(c); + return; + } + + Client *s = swallowingclient(c->win); + if (s) { + free(s->swallowing); + s->swallowing = NULL; + arrange(m); + focus(NULL); + return; + } + + detach(c); + detachstack(c); + if (!destroyed) { + wc.border_width = c->oldbw; + XGrabServer(dpy); /* avoid race conditions */ + XSetErrorHandler(xerrordummy); + XSelectInput(dpy, c->win, NoEventMask); + XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + setclientstate(c, WithdrawnState); + XSync(dpy, False); + XSetErrorHandler(xerror); + XUngrabServer(dpy); + } + free(c); + + if (!s) { + arrange(m); + focus(NULL); + updateclientlist(); + } +} + +void +unmanagealtbar(Window w) +{ + Monitor *m = wintomon(w); + + if (!m) + return; + + m->barwin = 0; + m->by = 0; + m->bh = 0; + updatebarpos(m); + arrange(m); +} + +void +unmanagetray(Window w) +{ + Monitor *m = wintomon(w); + + if (!m) + return; + + m->traywin = 0; + m->tx = 0; + m->tw = 0; + updatebarpos(m); + arrange(m); +} + +void +unmapnotify(XEvent *e) +{ + Client *c; + Monitor *m; + XUnmapEvent *ev = &e->xunmap; + + if ((c = wintoclient(ev->window))) { + if (ev->send_event) + setclientstate(c, WithdrawnState); + else + unmanage(c, 0); + } else if ((m = wintomon(ev->window)) && m->barwin == ev->window) + unmanagealtbar(ev->window); + else if (m->traywin == ev->window) + unmanagetray(ev->window); + else if ((c = wintosystrayicon(ev->window))) { + /* KLUDGE! sometimes icons occasionally unmap their windows, but do + * _not_ destroy them. We map those windows back */ + XMapRaised(dpy, c->win); + updatesystray(); + } +} + +void +updatebars(void) +{ + if (usealtbar) + return; + + unsigned int w; + Monitor *m; + XSetWindowAttributes wa = { + .override_redirect = True, + .background_pixmap = ParentRelative, + .event_mask = ButtonPressMask|ExposureMask + }; + XClassHint ch = {"dwm", "dwm"}; + for (m = mons; m; m = m->next) { + if (m->barwin) + continue; + 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); + XSetClassHint(dpy, m->barwin, &ch); + } +} + +void +updatebarpos(Monitor *m) +{ + m->wy = m->my; + m->wh = m->mh; + if (m->showbar) { + m->wh -= m->bh; + m->by = m->topbar ? m->wy : m->wy + m->wh; + m->wy = m->topbar ? m->wy + m->bh : m->wy; + } else + m->by = -m->bh; +} + +void +updateclientlist() +{ + Client *c; + Monitor *m; + + XDeleteProperty(dpy, root, netatom[NetClientList]); + for (m = mons; m; m = m->next) + for (c = m->clients; c; c = c->next) + XChangeProperty(dpy, root, netatom[NetClientList], + XA_WINDOW, 32, PropModeAppend, + (unsigned char *) &(c->win), 1); +} + +int +updategeom(void) +{ + int dirty = 0; + +#ifdef XINERAMA + if (XineramaIsActive(dpy)) { + int i, j, n, nn; + Client *c; + Monitor *m; + XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn); + XineramaScreenInfo *unique = NULL; + + for (n = 0, m = mons; m; m = m->next, n++); + /* only consider unique geometries as separate screens */ + unique = ecalloc(nn, sizeof(XineramaScreenInfo)); + for (i = 0, j = 0; i < nn; i++) + if (isuniquegeom(unique, j, &info[i])) + memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo)); + XFree(info); + nn = j; + + /* new monitors if nn > n */ + for (i = n; i < nn; i++) { + for (m = mons; m && m->next; m = m->next); + if (m) + m->next = createmon(); + else + mons = createmon(); + } + for (i = 0, m = mons; i < nn && m; m = m->next, i++) + if (i >= n + || unique[i].x_org != m->mx || unique[i].y_org != m->my + || unique[i].width != m->mw || unique[i].height != m->mh) + { + dirty = 1; + m->num = i; + m->mx = m->wx = unique[i].x_org; + m->my = m->wy = unique[i].y_org; + m->mw = m->ww = unique[i].width; + m->mh = m->wh = unique[i].height; + updatebarpos(m); + } + /* removed monitors if n > nn */ + for (i = nn; i < n; i++) { + for (m = mons; m && m->next; m = m->next); + while ((c = m->clients)) { + dirty = 1; + m->clients = c->next; + detachstack(c); + c->mon = mons; + if( attachbelow ) + attachBelow(c); + else + attach(c); + attachstack(c); + } + if (m == selmon) + selmon = mons; + cleanupmon(m); + } + free(unique); + } else +#endif /* XINERAMA */ + { /* default monitor setup */ + if (!mons) + mons = createmon(); + if (mons->mw != sw || mons->mh != sh) { + dirty = 1; + mons->mw = mons->ww = sw; + mons->mh = mons->wh = sh; + updatebarpos(mons); + } + } + if (dirty) { + selmon = mons; + selmon = wintomon(root); + } + return dirty; +} + +void +updatenumlockmask(void) +{ + unsigned int i, j; + XModifierKeymap *modmap; + + numlockmask = 0; + modmap = XGetModifierMapping(dpy); + for (i = 0; i < 8; i++) + for (j = 0; j < modmap->max_keypermod; j++) + if (modmap->modifiermap[i * modmap->max_keypermod + j] + == XKeysymToKeycode(dpy, XK_Num_Lock)) + numlockmask = (1 << i); + XFreeModifiermap(modmap); +} + +void +updatesizehints(Client *c) +{ + long msize; + XSizeHints size; + + if (!XGetWMNormalHints(dpy, c->win, &size, &msize)) + /* size is uninitialized, ensure that size.flags aren't used */ + size.flags = PSize; + if (size.flags & PBaseSize) { + c->basew = size.base_width; + c->baseh = size.base_height; + } else if (size.flags & PMinSize) { + c->basew = size.min_width; + c->baseh = size.min_height; + } else + c->basew = c->baseh = 0; + if (size.flags & PResizeInc) { + c->incw = size.width_inc; + c->inch = size.height_inc; + } else + c->incw = c->inch = 0; + if (size.flags & PMaxSize) { + c->maxw = size.max_width; + c->maxh = size.max_height; + } else + c->maxw = c->maxh = 0; + if (size.flags & PMinSize) { + c->minw = size.min_width; + c->minh = size.min_height; + } else if (size.flags & PBaseSize) { + c->minw = size.base_width; + c->minh = size.base_height; + } else + c->minw = c->minh = 0; + if (size.flags & PAspect) { + c->mina = (float)size.min_aspect.y / size.min_aspect.x; + c->maxa = (float)size.max_aspect.x / size.max_aspect.y; + } else + c->maxa = c->mina = 0.0; + c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh); + c->hintsvalid = 1; +} + +void +updatestatus(void) +{ + if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) + strcpy(stext, "dwm-"VERSION); + drawbar(selmon); + updatesystray(); +} + + +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 dimensions 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 sw = TEXTW(stext) - lrpad + systrayspacing; + unsigned int w = 1; + + if (!showsystray) + return; + if (systrayonleft) + x -= sw + lrpad / 2; + 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][ColBg].pixel); + wa.event_mask = ButtonPressMask | ExposureMask; + wa.override_redirect = True; + wa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + XSelectInput(dpy, systray->win, SubstructureNotifyMask); + XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 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][ColBg].pixel; + 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][ColBg].pixel); + XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh); + XSync(dpy, False); +} + +void +updatetitle(Client *c) +{ + char oldname[sizeof(c->name)]; + strcpy(oldname, c->name); + + if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name)) + gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name); + if (c->name[0] == '\0') /* hack to mark broken clients */ + strcpy(c->name, broken); + + for (Monitor *m = mons; m; m = m->next) { + if (m->sel == c && strcmp(oldname, c->name) != 0) + ipc_focused_title_change_event(m->num, c->win, oldname, c->name); + } +} + +void +updatewindowtype(Client *c) +{ + Atom state = getatomprop(c, netatom[NetWMState]); + Atom wtype = getatomprop(c, netatom[NetWMWindowType]); + + if (state == netatom[NetWMFullscreen]) + setfullscreen(c, 1); + if (wtype == netatom[NetWMWindowTypeDialog]) + c->isfloating = 1; +} + +void +updatewmhints(Client *c) +{ + XWMHints *wmh; + + if ((wmh = XGetWMHints(dpy, c->win))) { + if (c == selmon->sel && wmh->flags & XUrgencyHint) { + wmh->flags &= ~XUrgencyHint; + XSetWMHints(dpy, c->win, wmh); + } else + c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0; + if (wmh->flags & InputHint) + c->neverfocus = !wmh->input; + else + c->neverfocus = 0; + XFree(wmh); + } +} + +void +view(const Arg *arg) +{ + int i; + unsigned int tmptag; + + if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) + return; + selmon->seltags ^= 1; /* toggle sel tagset */ + if (arg->ui & TAGMASK) { + selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; + selmon->pertag->prevtag = selmon->pertag->curtag; + + if (arg->ui == ~0) + selmon->pertag->curtag = 0; + else { + for (i = 0; !(arg->ui & 1 << i); i++) ; + selmon->pertag->curtag = i + 1; + } + } else { + tmptag = selmon->pertag->prevtag; + selmon->pertag->prevtag = selmon->pertag->curtag; + selmon->pertag->curtag = tmptag; + } + + selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; + selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; + selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; + selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; + selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; + + if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) + togglebar(NULL); + + focus(NULL); + arrange(selmon); +} + +pid_t +winpid(Window w) +{ + + pid_t result = 0; + +#ifdef __linux__ + xcb_res_client_id_spec_t spec = {0}; + spec.client = w; + spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID; + + xcb_generic_error_t *e = NULL; + xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec); + xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e); + + if (!r) + return (pid_t)0; + + xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r); + for (; i.rem; xcb_res_client_id_value_next(&i)) { + spec = i.data->spec; + if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) { + uint32_t *t = xcb_res_client_id_value_value(i.data); + result = *t; + break; + } + } + + free(r); + + if (result == (pid_t)-1) + result = 0; + +#endif /* __linux__ */ + +#ifdef __OpenBSD__ + Atom type; + int format; + unsigned long len, bytes; + unsigned char *prop; + pid_t ret; + + if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop) + return 0; + + ret = *(pid_t*)prop; + XFree(prop); + result = ret; + +#endif /* __OpenBSD__ */ + return result; +} + +pid_t +getparentprocess(pid_t p) +{ + unsigned int v = 0; + +#ifdef __linux__ + FILE *f; + char buf[256]; + snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p); + + if (!(f = fopen(buf, "r"))) + return 0; + + fscanf(f, "%*u %*s %*c %u", &v); + fclose(f); +#endif /* __linux__*/ + +#ifdef __OpenBSD__ + int n; + kvm_t *kd; + struct kinfo_proc *kp; + + kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL); + if (!kd) + return 0; + + kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n); + v = kp->p_ppid; +#endif /* __OpenBSD__ */ + + return (pid_t)v; +} + +int +isdescprocess(pid_t p, pid_t c) +{ + while (p != c && c != 0) + c = getparentprocess(c); + + return (int)c; +} + +Client * +termforwin(const Client *w) +{ + Client *c; + Monitor *m; + + if (!w->pid || w->isterminal) + return NULL; + + for (m = mons; m; m = m->next) { + for (c = m->clients; c; c = c->next) { + if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid)) + return c; + } + } + + return NULL; +} + +Client * +swallowingclient(Window w) +{ + Client *c; + Monitor *m; + + for (m = mons; m; m = m->next) { + for (c = m->clients; c; c = c->next) { + if (c->swallowing && c->swallowing->win == w) + return c; + } + } + + return NULL; +} + +Client * +wintoclient(Window w) +{ + Client *c; + Monitor *m; + + for (m = mons; m; m = m->next) + for (c = m->clients; c; c = c->next) + if (c->win == w) + return c; + return NULL; +} + +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; +} + +Monitor * +wintomon(Window w) +{ + int x, y; + Client *c; + Monitor *m; + + if (w == root && getrootptr(&x, &y)) + return recttomon(x, y, 1, 1); + for (m = mons; m; m = m->next) + if (w == m->barwin || w == m->traywin) + return m; + if ((c = wintoclient(w))) + return c->mon; + return selmon; +} + +int +wmclasscontains(Window win, const char *class, const char *name) +{ + XClassHint ch = { NULL, NULL }; + int res = 1; + + if (XGetClassHint(dpy, win, &ch)) { + if (ch.res_name && strstr(ch.res_name, name) == NULL) + res = 0; + if (ch.res_class && strstr(ch.res_class, class) == NULL) + res = 0; + } else + res = 0; + + if (ch.res_class) + XFree(ch.res_class); + if (ch.res_name) + XFree(ch.res_name); + + return res; +} + +/* 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. */ +int +xerror(Display *dpy, XErrorEvent *ee) +{ + if (ee->error_code == BadWindow + || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) + || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) + || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) + || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) + || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) + || (ee->request_code == X_GrabButton && ee->error_code == BadAccess) + || (ee->request_code == X_GrabKey && ee->error_code == BadAccess) + || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) + return 0; + fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", + ee->request_code, ee->error_code); + return xerrorxlib(dpy, ee); /* may call exit */ +} + +int +xerrordummy(Display *dpy, XErrorEvent *ee) +{ + return 0; +} + +/* Startup Error handler to check if another window manager + * is already running. */ +int +xerrorstart(Display *dpy, XErrorEvent *ee) +{ + die("dwm: another window manager is already running"); + return -1; +} + +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 +zoom(const Arg *arg) +{ + Client *c = selmon->sel; + + if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating) + return; + if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next))) + return; + pop(c); +} + +void +resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst) +{ + char *sdst = NULL; + int *idst = NULL; + float *fdst = NULL; + + sdst = dst; + idst = dst; + fdst = dst; + + char fullname[256]; + char *type; + XrmValue ret; + + snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name); + fullname[sizeof(fullname) - 1] = '\0'; + + XrmGetResource(db, fullname, "*", &type, &ret); + if (!(ret.addr == NULL || strncmp("String", type, 64))) + { + switch (rtype) { + case STRING: + strcpy(sdst, ret.addr); + break; + case INTEGER: + *idst = strtoul(ret.addr, NULL, 10); + break; + case FLOAT: + *fdst = strtof(ret.addr, NULL); + break; + } + } +} + +void +load_xresources(void) +{ + Display *display; + char *resm; + XrmDatabase db; + ResourcePref *p; + + display = XOpenDisplay(NULL); + resm = XResourceManagerString(display); + if (!resm) + return; + + db = XrmGetStringDatabase(resm); + for (p = resources; p < resources + LENGTH(resources); p++) + resource_load(db, p->name, p->type, p->dst); + XCloseDisplay(display); +} + +int +main(int argc, char *argv[]) +{ + if (argc == 2 && !strcmp("-v", argv[1])) + die("dwm-"VERSION); + else if (argc != 1) + die("usage: dwm [-v]"); + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("dwm: cannot open display"); + if (!(xcon = XGetXCBConnection(dpy))) + die("dwm: cannot get xcb connection\n"); + checkotherwm(); + XrmInitialize(); + load_xresources(); + setup(); +#ifdef __OpenBSD__ + if (pledge("stdio rpath proc exec ps", NULL) == -1) + die("pledge"); +#endif /* __OpenBSD__ */ + scan(); + restoreSession(); + run(); + if(restart) execvp(argv[0], argv); + cleanup(); + XCloseDisplay(dpy); + return EXIT_SUCCESS; +} diff --git a/dwm.png b/dwm.png new file mode 100644 index 0000000000000000000000000000000000000000..b1f9ba7e5f4cc7350ee2392ebcea5fcbe00fb49b GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^2Y@($g9*gC@m3f}u_bxCyDx`7I;J! zGca%iWx0hJ8D`Cq01C2~c>21sUt<^MF=V?Ztt9{yk}YwKC~?lu%}vcKVQ?-=O)N=G zQ7F$W$xsN%NL6t6^bL5QqM8R(c+=CxF{I+w+q;fj4F)_6j>`Z3pZ>_($QEQ&92OXP z%lpEKGwG8$G-U1H{@Y%;mx-mNK|p|siBVAj$Z~Mt-~h6K0!}~{PyozQ07(f5fTdVi zm=-zT`NweeJ#%S&{fequZGmkDDC*%x$$Sa*fAP=$`nJkhx1Y~k<8b2;Hq)FOdV=P$ q&oWzoxz_&nv&n0)xBzV8k*jsxheTIy&cCY600f?{elF{r5}E*x)opSB literal 0 HcmV?d00001 diff --git a/ipc.c b/ipc.c new file mode 100644 index 0000000..c404791 --- /dev/null +++ b/ipc.c @@ -0,0 +1,1202 @@ +#include "ipc.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "util.h" +#include "yajl_dumps.h" + +static struct sockaddr_un sockaddr; +static struct epoll_event sock_epoll_event; +static IPCClientList ipc_clients = NULL; +static int epoll_fd = -1; +static int sock_fd = -1; +static IPCCommand *ipc_commands; +static unsigned int ipc_commands_len; +// Max size is 1 MB +static const uint32_t MAX_MESSAGE_SIZE = 1000000; +static const int IPC_SOCKET_BACKLOG = 5; + +/** + * Create IPC socket at specified path and return file descriptor to socket. + * This initializes the static variable sockaddr. + */ +static int +ipc_create_socket(const char *filename) +{ + char *normal_filename; + char *parent; + const size_t addr_size = sizeof(struct sockaddr_un); + const int sock_type = SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC; + + normalizepath(filename, &normal_filename); + + // In case socket file exists + unlink(normal_filename); + + // For portability clear the addr structure, since some implementations have + // nonstandard fields in the structure + memset(&sockaddr, 0, addr_size); + + parentdir(normal_filename, &parent); + // Create parent directories + mkdirp(parent); + free(parent); + + sockaddr.sun_family = AF_LOCAL; + strcpy(sockaddr.sun_path, normal_filename); + free(normal_filename); + + sock_fd = socket(AF_LOCAL, sock_type, 0); + if (sock_fd == -1) { + fputs("Failed to create socket\n", stderr); + return -1; + } + + DEBUG("Created socket at %s\n", sockaddr.sun_path); + + if (bind(sock_fd, (const struct sockaddr *)&sockaddr, addr_size) == -1) { + fputs("Failed to bind socket\n", stderr); + return -1; + } + + DEBUG("Socket binded\n"); + + if (listen(sock_fd, IPC_SOCKET_BACKLOG) < 0) { + fputs("Failed to listen for connections on socket\n", stderr); + return -1; + } + + DEBUG("Now listening for connections on socket\n"); + + return sock_fd; +} + +/** + * Internal function used to receive IPC messages from a given file descriptor. + * + * Returns -1 on error reading (could be EAGAIN or EINTR) + * Returns -2 if EOF before header could be read + * Returns -3 if invalid IPC header + * Returns -4 if message length exceeds MAX_MESSAGE_SIZE + */ +static int +ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size, + uint8_t **reply) +{ + uint32_t read_bytes = 0; + const int32_t to_read = sizeof(dwm_ipc_header_t); + char header[to_read]; + char *walk = header; + + // Try to read header + while (read_bytes < to_read) { + const ssize_t n = read(fd, header + read_bytes, to_read - read_bytes); + + if (n == 0) { + if (read_bytes == 0) { + fprintf(stderr, "Unexpectedly reached EOF while reading header."); + fprintf(stderr, + "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", + read_bytes, to_read); + return -2; + } else { + fprintf(stderr, "Unexpectedly reached EOF while reading header."); + fprintf(stderr, + "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", + read_bytes, to_read); + return -3; + } + } else if (n == -1) { + // errno will still be set + return -1; + } + + read_bytes += n; + } + + // Check if magic string in header matches + if (memcmp(walk, IPC_MAGIC, IPC_MAGIC_LEN) != 0) { + fprintf(stderr, "Invalid magic string. Got '%.*s', expected '%s'\n", + IPC_MAGIC_LEN, walk, IPC_MAGIC); + return -3; + } + + walk += IPC_MAGIC_LEN; + + // Extract reply size + memcpy(reply_size, walk, sizeof(uint32_t)); + walk += sizeof(uint32_t); + + if (*reply_size > MAX_MESSAGE_SIZE) { + fprintf(stderr, "Message too long: %" PRIu32 " bytes. ", *reply_size); + fprintf(stderr, "Maximum message size is: %d\n", MAX_MESSAGE_SIZE); + return -4; + } + + // Extract message type + memcpy(msg_type, walk, sizeof(uint8_t)); + walk += sizeof(uint8_t); + + if (*reply_size > 0) + (*reply) = malloc(*reply_size); + else + return 0; + + read_bytes = 0; + while (read_bytes < *reply_size) { + const ssize_t n = read(fd, *reply + read_bytes, *reply_size - read_bytes); + + if (n == 0) { + fprintf(stderr, "Unexpectedly reached EOF while reading payload."); + fprintf(stderr, "Read %" PRIu32 " bytes, expected %" PRIu32 " bytes.\n", + read_bytes, *reply_size); + free(*reply); + return -2; + } else if (n == -1) { + // TODO: Should we return and wait for another epoll event? + // This would require saving the partial read in some way. + if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) continue; + + free(*reply); + return -1; + } + + read_bytes += n; + } + + return 0; +} + +/** + * Internal function used to write a buffer to a file descriptor + * + * Returns number of bytes written if successful write + * Returns 0 if no bytes were written due to EAGAIN or EWOULDBLOCK + * Returns -1 on unknown error trying to write, errno will carry over from + * write() call + */ +static ssize_t +ipc_write_message(int fd, const void *buf, size_t count) +{ + size_t written = 0; + + while (written < count) { + const ssize_t n = write(fd, (uint8_t *)buf + written, count - written); + + if (n == -1) { + if (errno == EAGAIN || errno == EWOULDBLOCK) + return written; + else if (errno == EINTR) + continue; + else + return n; + } + + written += n; + DEBUG("Wrote %zu/%zu to client at fd %d\n", written, count, fd); + } + + return written; +} + +/** + * Initialization for generic event message. This is used to allocate the yajl + * handle, set yajl options, and in the future any other initialization that + * should occur for event messages. + */ +static void +ipc_event_init_message(yajl_gen *gen) +{ + *gen = yajl_gen_alloc(NULL); + yajl_gen_config(*gen, yajl_gen_beautify, 1); +} + +/** + * Prepares buffers of IPC subscribers of specified event using buffer from yajl + * handle. + */ +static void +ipc_event_prepare_send_message(yajl_gen gen, IPCEvent event) +{ + const unsigned char *buffer; + size_t len = 0; + + yajl_gen_get_buf(gen, &buffer, &len); + len++; // For null char + + for (IPCClient *c = ipc_clients; c; c = c->next) { + if (c->subscriptions & event) { + DEBUG("Sending selected client change event to fd %d\n", c->fd); + ipc_prepare_send_message(c, IPC_TYPE_EVENT, len, (char *)buffer); + } + } + + // Not documented, but this frees temp_buffer + yajl_gen_free(gen); +} + +/** + * Initialization for generic reply message. This is used to allocate the yajl + * handle, set yajl options, and in the future any other initialization that + * should occur for reply messages. + */ +static void +ipc_reply_init_message(yajl_gen *gen) +{ + *gen = yajl_gen_alloc(NULL); + yajl_gen_config(*gen, yajl_gen_beautify, 1); +} + +/** + * Prepares the IPC client's buffer with a message using the buffer of the yajl + * handle. + */ +static void +ipc_reply_prepare_send_message(yajl_gen gen, IPCClient *c, + IPCMessageType msg_type) +{ + const unsigned char *buffer; + size_t len = 0; + + yajl_gen_get_buf(gen, &buffer, &len); + len++; // For null char + + ipc_prepare_send_message(c, msg_type, len, (const char *)buffer); + + // Not documented, but this frees temp_buffer + yajl_gen_free(gen); +} + +/** + * Find the IPCCommand with the specified name + * + * Returns 0 if a command with the specified name was found + * Returns -1 if a command with the specified name could not be found + */ +static int +ipc_get_ipc_command(const char *name, IPCCommand *ipc_command) +{ + for (int i = 0; i < ipc_commands_len; i++) { + if (strcmp(ipc_commands[i].name, name) == 0) { + *ipc_command = ipc_commands[i]; + return 0; + } + } + + return -1; +} + +/** + * Parse a IPC_TYPE_RUN_COMMAND message from a client. This function extracts + * the arguments, argument count, argument types, and command name and returns + * the parsed information as an IPCParsedCommand. If this function returns + * successfully, the parsed_command must be freed using + * ipc_free_parsed_command_members. + * + * Returns 0 if the message was successfully parsed + * Returns -1 otherwise + */ +static int +ipc_parse_run_command(char *msg, IPCParsedCommand *parsed_command) +{ + char error_buffer[1000]; + yajl_val parent = yajl_tree_parse(msg, error_buffer, 1000); + + if (parent == NULL) { + fputs("Failed to parse command from client\n", stderr); + fprintf(stderr, "%s\n", error_buffer); + fprintf(stderr, "Tried to parse: %s\n", msg); + return -1; + } + + // Format: + // { + // "command": "" + // "args": [ "arg1", "arg2", ... ] + // } + const char *command_path[] = {"command", 0}; + yajl_val command_val = yajl_tree_get(parent, command_path, yajl_t_string); + + if (command_val == NULL) { + fputs("No command key found in client message\n", stderr); + yajl_tree_free(parent); + return -1; + } + + const char *command_name = YAJL_GET_STRING(command_val); + size_t command_name_len = strlen(command_name); + parsed_command->name = (char *)malloc((command_name_len + 1) * sizeof(char)); + strcpy(parsed_command->name, command_name); + + DEBUG("Received command: %s\n", parsed_command->name); + + const char *args_path[] = {"args", 0}; + yajl_val args_val = yajl_tree_get(parent, args_path, yajl_t_array); + + if (args_val == NULL) { + fputs("No args key found in client message\n", stderr); + yajl_tree_free(parent); + return -1; + } + + unsigned int *argc = &parsed_command->argc; + Arg **args = &parsed_command->args; + ArgType **arg_types = &parsed_command->arg_types; + + *argc = args_val->u.array.len; + + // If no arguments are specified, make a dummy argument to pass to the + // function. This is just the way dwm's void(Arg*) functions are setup. + if (*argc == 0) { + *args = (Arg *)malloc(sizeof(Arg)); + *arg_types = (ArgType *)malloc(sizeof(ArgType)); + (*arg_types)[0] = ARG_TYPE_NONE; + (*args)[0].i = 0; + (*argc)++; + } else if (*argc > 0) { + *args = (Arg *)calloc(*argc, sizeof(Arg)); + *arg_types = (ArgType *)malloc(*argc * sizeof(ArgType)); + + for (int i = 0; i < *argc; i++) { + yajl_val arg_val = args_val->u.array.values[i]; + + if (YAJL_IS_NUMBER(arg_val)) { + if (YAJL_IS_INTEGER(arg_val)) { + // Any values below 0 must be a signed int + if (YAJL_GET_INTEGER(arg_val) < 0) { + (*args)[i].i = YAJL_GET_INTEGER(arg_val); + (*arg_types)[i] = ARG_TYPE_SINT; + DEBUG("i=%ld\n", (*args)[i].i); + // Any values above 0 should be an unsigned int + } else if (YAJL_GET_INTEGER(arg_val) >= 0) { + (*args)[i].ui = YAJL_GET_INTEGER(arg_val); + (*arg_types)[i] = ARG_TYPE_UINT; + DEBUG("ui=%ld\n", (*args)[i].i); + } + // If the number is not an integer, it must be a float + } else { + (*args)[i].f = (float)YAJL_GET_DOUBLE(arg_val); + (*arg_types)[i] = ARG_TYPE_FLOAT; + DEBUG("f=%f\n", (*args)[i].f); + // If argument is not a number, it must be a string + } + } else if (YAJL_IS_STRING(arg_val)) { + char *arg_s = YAJL_GET_STRING(arg_val); + size_t arg_s_size = (strlen(arg_s) + 1) * sizeof(char); + (*args)[i].v = (char *)malloc(arg_s_size); + (*arg_types)[i] = ARG_TYPE_STR; + strcpy((char *)(*args)[i].v, arg_s); + } + } + } + + yajl_tree_free(parent); + + return 0; +} + +/** + * Free the members of a IPCParsedCommand struct + */ +static void +ipc_free_parsed_command_members(IPCParsedCommand *command) +{ + for (int i = 0; i < command->argc; i++) { + if (command->arg_types[i] == ARG_TYPE_STR) free((void *)command->args[i].v); + } + free(command->args); + free(command->arg_types); + free(command->name); +} + +/** + * Check if the given arguments are the correct length and type. Also do any + * casting to correct the types. + * + * Returns 0 if the arguments were the correct length and types + * Returns -1 if the argument count doesn't match + * Returns -2 if the argument types don't match + */ +static int +ipc_validate_run_command(IPCParsedCommand *parsed, const IPCCommand actual) +{ + if (actual.argc != parsed->argc) return -1; + + for (int i = 0; i < parsed->argc; i++) { + ArgType ptype = parsed->arg_types[i]; + ArgType atype = actual.arg_types[i]; + + if (ptype != atype) { + if (ptype == ARG_TYPE_UINT && atype == ARG_TYPE_PTR) + // If this argument is supposed to be a void pointer, cast it + parsed->args[i].v = (void *)parsed->args[i].ui; + else if (ptype == ARG_TYPE_UINT && atype == ARG_TYPE_SINT) + // If this argument is supposed to be a signed int, cast it + parsed->args[i].i = parsed->args[i].ui; + else + return -2; + } + } + + return 0; +} + +/** + * Convert event name to their IPCEvent equivalent enum value + * + * Returns 0 if a valid event name was given + * Returns -1 otherwise + */ +static int +ipc_event_stoi(const char *subscription, IPCEvent *event) +{ + if (strcmp(subscription, "tag_change_event") == 0) + *event = IPC_EVENT_TAG_CHANGE; + else if (strcmp(subscription, "client_focus_change_event") == 0) + *event = IPC_EVENT_CLIENT_FOCUS_CHANGE; + else if (strcmp(subscription, "layout_change_event") == 0) + *event = IPC_EVENT_LAYOUT_CHANGE; + else if (strcmp(subscription, "monitor_focus_change_event") == 0) + *event = IPC_EVENT_MONITOR_FOCUS_CHANGE; + else if (strcmp(subscription, "focused_title_change_event") == 0) + *event = IPC_EVENT_FOCUSED_TITLE_CHANGE; + else if (strcmp(subscription, "focused_state_change_event") == 0) + *event = IPC_EVENT_FOCUSED_STATE_CHANGE; + else + return -1; + return 0; +} + +/** + * Parse a IPC_TYPE_SUBSCRIBE message from a client. This function extracts the + * event name and the subscription action from the message. + * + * Returns 0 if message was successfully parsed + * Returns -1 otherwise + */ +static int +ipc_parse_subscribe(const char *msg, IPCSubscriptionAction *subscribe, + IPCEvent *event) +{ + char error_buffer[100]; + yajl_val parent = yajl_tree_parse((char *)msg, error_buffer, 100); + + if (parent == NULL) { + fputs("Failed to parse command from client\n", stderr); + fprintf(stderr, "%s\n", error_buffer); + return -1; + } + + // Format: + // { + // "event": "" + // "action": "" + // } + const char *event_path[] = {"event", 0}; + yajl_val event_val = yajl_tree_get(parent, event_path, yajl_t_string); + + if (event_val == NULL) { + fputs("No 'event' key found in client message\n", stderr); + return -1; + } + + const char *event_str = YAJL_GET_STRING(event_val); + DEBUG("Received event: %s\n", event_str); + + if (ipc_event_stoi(event_str, event) < 0) return -1; + + const char *action_path[] = {"action", 0}; + yajl_val action_val = yajl_tree_get(parent, action_path, yajl_t_string); + + if (action_val == NULL) { + fputs("No 'action' key found in client message\n", stderr); + return -1; + } + + const char *action = YAJL_GET_STRING(action_val); + + if (strcmp(action, "subscribe") == 0) + *subscribe = IPC_ACTION_SUBSCRIBE; + else if (strcmp(action, "unsubscribe") == 0) + *subscribe = IPC_ACTION_UNSUBSCRIBE; + else { + fputs("Invalid action specified for subscription\n", stderr); + return -1; + } + + yajl_tree_free(parent); + + return 0; +} + +/** + * Parse an IPC_TYPE_GET_DWM_CLIENT message from a client. This function + * extracts the window id from the message. + * + * Returns 0 if message was successfully parsed + * Returns -1 otherwise + */ +static int +ipc_parse_get_dwm_client(const char *msg, Window *win) +{ + char error_buffer[100]; + + yajl_val parent = yajl_tree_parse(msg, error_buffer, 100); + + if (parent == NULL) { + fputs("Failed to parse message from client\n", stderr); + fprintf(stderr, "%s\n", error_buffer); + return -1; + } + + // Format: + // { + // "client_window_id": + // } + const char *win_path[] = {"client_window_id", 0}; + yajl_val win_val = yajl_tree_get(parent, win_path, yajl_t_number); + + if (win_val == NULL) { + fputs("No client window id found in client message\n", stderr); + return -1; + } + + *win = YAJL_GET_INTEGER(win_val); + + yajl_tree_free(parent); + + return 0; +} + +/** + * Called when an IPC_TYPE_RUN_COMMAND message is received from a client. This + * function parses, executes the given command, and prepares a reply message to + * the client indicating success/failure. + * + * NOTE: There is currently no check for argument validity beyond the number of + * arguments given and types of arguments. There is also no way to check if the + * function succeeded based on dwm's void(const Arg*) function types. Pointer + * arguments can cause crashes if they are not validated in the function itself. + * + * Returns 0 if message was successfully parsed + * Returns -1 on failure parsing message + */ +static int +ipc_run_command(IPCClient *ipc_client, char *msg) +{ + IPCParsedCommand parsed_command; + IPCCommand ipc_command; + + // Initialize struct + memset(&parsed_command, 0, sizeof(IPCParsedCommand)); + + if (ipc_parse_run_command(msg, &parsed_command) < 0) { + ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, + "Failed to parse run command"); + return -1; + } + + if (ipc_get_ipc_command(parsed_command.name, &ipc_command) < 0) { + ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, + "Command %s not found", parsed_command.name); + ipc_free_parsed_command_members(&parsed_command); + return -1; + } + + int res = ipc_validate_run_command(&parsed_command, ipc_command); + if (res < 0) { + if (res == -1) + ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, + "%u arguments provided, %u expected", + parsed_command.argc, ipc_command.argc); + else if (res == -2) + ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, + "Type mismatch"); + ipc_free_parsed_command_members(&parsed_command); + return -1; + } + + if (parsed_command.argc == 1) + ipc_command.func.single_param(parsed_command.args); + else if (parsed_command.argc > 1) + ipc_command.func.array_param(parsed_command.args, parsed_command.argc); + + DEBUG("Called function for command %s\n", parsed_command.name); + + ipc_free_parsed_command_members(&parsed_command); + + ipc_prepare_reply_success(ipc_client, IPC_TYPE_RUN_COMMAND); + return 0; +} + +/** + * Called when an IPC_TYPE_GET_MONITORS message is received from a client. It + * prepares a reply with the properties of all of the monitors in JSON. + */ +static void +ipc_get_monitors(IPCClient *c, Monitor *mons, Monitor *selmon) +{ + yajl_gen gen; + ipc_reply_init_message(&gen); + dump_monitors(gen, mons, selmon); + + ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_MONITORS); +} + +/** + * Called when an IPC_TYPE_GET_TAGS message is received from a client. It + * prepares a reply with info about all the tags in JSON. + */ +static void +ipc_get_tags(IPCClient *c, const char *tags[], const int tags_len) +{ + yajl_gen gen; + ipc_reply_init_message(&gen); + + dump_tags(gen, tags, tags_len); + + ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_TAGS); +} + +/** + * Called when an IPC_TYPE_GET_LAYOUTS message is received from a client. It + * prepares a reply with a JSON array of available layouts + */ +static void +ipc_get_layouts(IPCClient *c, const Layout layouts[], const int layouts_len) +{ + yajl_gen gen; + ipc_reply_init_message(&gen); + + dump_layouts(gen, layouts, layouts_len); + + ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_LAYOUTS); +} + +/** + * Called when an IPC_TYPE_GET_DWM_CLIENT message is received from a client. It + * prepares a JSON reply with the properties of the client with the specified + * window XID. + * + * Returns 0 if the message was successfully parsed and if the client with the + * specified window XID was found + * Returns -1 if the message could not be parsed + */ +static int +ipc_get_dwm_client(IPCClient *ipc_client, const char *msg, const Monitor *mons) +{ + Window win; + + if (ipc_parse_get_dwm_client(msg, &win) < 0) return -1; + + // Find client with specified window XID + for (const Monitor *m = mons; m; m = m->next) + for (Client *c = m->clients; c; c = c->next) + if (c->win == win) { + yajl_gen gen; + ipc_reply_init_message(&gen); + + dump_client(gen, c); + + ipc_reply_prepare_send_message(gen, ipc_client, + IPC_TYPE_GET_DWM_CLIENT); + + return 0; + } + + ipc_prepare_reply_failure(ipc_client, IPC_TYPE_GET_DWM_CLIENT, + "Client with window id %d not found", win); + return -1; +} + +/** + * Called when an IPC_TYPE_SUBSCRIBE message is received from a client. It + * subscribes/unsubscribes the client from the specified event and replies with + * the result. + * + * Returns 0 if the message was successfully parsed. + * Returns -1 if the message could not be parsed + */ +static int +ipc_subscribe(IPCClient *c, const char *msg) +{ + IPCSubscriptionAction action = IPC_ACTION_SUBSCRIBE; + IPCEvent event = 0; + + if (ipc_parse_subscribe(msg, &action, &event)) { + ipc_prepare_reply_failure(c, IPC_TYPE_SUBSCRIBE, "Event does not exist"); + return -1; + } + + if (action == IPC_ACTION_SUBSCRIBE) { + DEBUG("Subscribing client on fd %d to %d\n", c->fd, event); + c->subscriptions |= event; + } else if (action == IPC_ACTION_UNSUBSCRIBE) { + DEBUG("Unsubscribing client on fd %d to %d\n", c->fd, event); + c->subscriptions ^= event; + } else { + ipc_prepare_reply_failure(c, IPC_TYPE_SUBSCRIBE, + "Invalid subscription action"); + return -1; + } + + ipc_prepare_reply_success(c, IPC_TYPE_SUBSCRIBE); + return 0; +} + +int +ipc_init(const char *socket_path, const int p_epoll_fd, IPCCommand commands[], + const int commands_len) +{ + // Initialize struct to 0 + memset(&sock_epoll_event, 0, sizeof(sock_epoll_event)); + + int socket_fd = ipc_create_socket(socket_path); + if (socket_fd < 0) return -1; + + ipc_commands = commands; + ipc_commands_len = commands_len; + + epoll_fd = p_epoll_fd; + + // Wake up to incoming connection requests + sock_epoll_event.data.fd = socket_fd; + sock_epoll_event.events = EPOLLIN; + if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, socket_fd, &sock_epoll_event)) { + fputs("Failed to add sock file descriptor to epoll", stderr); + return -1; + } + + return socket_fd; +} + +void +ipc_cleanup() +{ + IPCClient *c = ipc_clients; + // Free clients and their buffers + while (c) { + ipc_drop_client(c); + c = ipc_clients; + } + + // Stop waking up for socket events + epoll_ctl(epoll_fd, EPOLL_CTL_DEL, sock_fd, &sock_epoll_event); + + // Uninitialize all static variables + epoll_fd = -1; + sock_fd = -1; + ipc_commands = NULL; + ipc_commands_len = 0; + memset(&sock_epoll_event, 0, sizeof(struct epoll_event)); + memset(&sockaddr, 0, sizeof(struct sockaddr_un)); + + // Delete socket + unlink(sockaddr.sun_path); + + shutdown(sock_fd, SHUT_RDWR); + close(sock_fd); +} + +int +ipc_get_sock_fd() +{ + return sock_fd; +} + +IPCClient * +ipc_get_client(int fd) +{ + return ipc_list_get_client(ipc_clients, fd); +} + +int +ipc_is_client_registered(int fd) +{ + return (ipc_get_client(fd) != NULL); +} + +int +ipc_accept_client() +{ + int fd = -1; + + struct sockaddr_un client_addr; + socklen_t len = 0; + + // For portability clear the addr structure, since some implementations + // have nonstandard fields in the structure + memset(&client_addr, 0, sizeof(struct sockaddr_un)); + + fd = accept(sock_fd, (struct sockaddr *)&client_addr, &len); + if (fd < 0 && errno != EINTR) { + fputs("Failed to accept IPC connection from client", stderr); + return -1; + } + + if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { + shutdown(fd, SHUT_RDWR); + close(fd); + fputs("Failed to set flags on new client fd", stderr); + } + + IPCClient *nc = ipc_client_new(fd); + if (nc == NULL) return -1; + + // Wake up to messages from this client + nc->event.data.fd = fd; + nc->event.events = EPOLLIN | EPOLLHUP; + epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &nc->event); + + ipc_list_add_client(&ipc_clients, nc); + + DEBUG("%s%d\n", "New client at fd: ", fd); + + return fd; +} + +int +ipc_drop_client(IPCClient *c) +{ + int fd = c->fd; + shutdown(fd, SHUT_RDWR); + int res = close(fd); + + if (res == 0) { + struct epoll_event ev; + + // Stop waking up to messages from this client + epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, &ev); + ipc_list_remove_client(&ipc_clients, c); + + free(c->buffer); + free(c); + + DEBUG("Successfully removed client on fd %d\n", fd); + } else if (res < 0 && res != EINTR) { + fprintf(stderr, "Failed to close fd %d\n", fd); + } + + return res; +} + +int +ipc_read_client(IPCClient *c, IPCMessageType *msg_type, uint32_t *msg_size, + char **msg) +{ + int fd = c->fd; + int ret = + ipc_recv_message(fd, (uint8_t *)msg_type, msg_size, (uint8_t **)msg); + + if (ret < 0) { + // This will happen if these errors occur while reading header + if (ret == -1 && + (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) + return -2; + + fprintf(stderr, "Error reading message: dropping client at fd %d\n", fd); + ipc_drop_client(c); + + return -1; + } + + // Make sure receive message is null terminated to avoid parsing issues + if (*msg_size > 0) { + size_t len = *msg_size; + nullterminate(msg, &len); + *msg_size = len; + } + + DEBUG("[fd %d] ", fd); + if (*msg_size > 0) + DEBUG("Received message: '%.*s' ", *msg_size, *msg); + else + DEBUG("Received empty message "); + DEBUG("Message type: %" PRIu8 " ", (uint8_t)*msg_type); + DEBUG("Message size: %" PRIu32 "\n", *msg_size); + + return 0; +} + +ssize_t +ipc_write_client(IPCClient *c) +{ + const ssize_t n = ipc_write_message(c->fd, c->buffer, c->buffer_size); + + if (n < 0) return n; + + // TODO: Deal with client timeouts + + if (n == c->buffer_size) { + c->buffer_size = 0; + free(c->buffer); + // No dangling pointers! + c->buffer = NULL; + // Stop waking up when client is ready to receive messages + if (c->event.events & EPOLLOUT) { + c->event.events -= EPOLLOUT; + epoll_ctl(epoll_fd, EPOLL_CTL_MOD, c->fd, &c->event); + } + return n; + } + + // Shift unwritten buffer to beginning of buffer and reallocate + c->buffer_size -= n; + memmove(c->buffer, c->buffer + n, c->buffer_size); + c->buffer = (char *)realloc(c->buffer, c->buffer_size); + + return n; +} + +void +ipc_prepare_send_message(IPCClient *c, const IPCMessageType msg_type, + const uint32_t msg_size, const char *msg) +{ + dwm_ipc_header_t header = { + .magic = IPC_MAGIC_ARR, .type = msg_type, .size = msg_size}; + + uint32_t header_size = sizeof(dwm_ipc_header_t); + uint32_t packet_size = header_size + msg_size; + + if (c->buffer == NULL) + c->buffer = (char *)malloc(c->buffer_size + packet_size); + else + c->buffer = (char *)realloc(c->buffer, c->buffer_size + packet_size); + + // Copy header to end of client buffer + memcpy(c->buffer + c->buffer_size, &header, header_size); + c->buffer_size += header_size; + + // Copy message to end of client buffer + memcpy(c->buffer + c->buffer_size, msg, msg_size); + c->buffer_size += msg_size; + + // Wake up when client is ready to receive messages + c->event.events |= EPOLLOUT; + epoll_ctl(epoll_fd, EPOLL_CTL_MOD, c->fd, &c->event); +} + +void +ipc_prepare_reply_failure(IPCClient *c, IPCMessageType msg_type, + const char *format, ...) +{ + yajl_gen gen; + va_list args; + + // Get output size + va_start(args, format); + size_t len = vsnprintf(NULL, 0, format, args); + va_end(args); + char *buffer = (char *)malloc((len + 1) * sizeof(char)); + + ipc_reply_init_message(&gen); + + va_start(args, format); + vsnprintf(buffer, len + 1, format, args); + va_end(args); + dump_error_message(gen, buffer); + + ipc_reply_prepare_send_message(gen, c, msg_type); + fprintf(stderr, "[fd %d] Error: %s\n", c->fd, buffer); + + free(buffer); +} + +void +ipc_prepare_reply_success(IPCClient *c, IPCMessageType msg_type) +{ + const char *success_msg = "{\"result\":\"success\"}"; + const size_t msg_len = strlen(success_msg) + 1; // +1 for null char + + ipc_prepare_send_message(c, msg_type, msg_len, success_msg); +} + +void +ipc_tag_change_event(int mon_num, TagState old_state, TagState new_state) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_tag_event(gen, mon_num, old_state, new_state); + ipc_event_prepare_send_message(gen, IPC_EVENT_TAG_CHANGE); +} + +void +ipc_client_focus_change_event(int mon_num, Client *old_client, + Client *new_client) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_client_focus_change_event(gen, old_client, new_client, mon_num); + ipc_event_prepare_send_message(gen, IPC_EVENT_CLIENT_FOCUS_CHANGE); +} + +void +ipc_layout_change_event(const int mon_num, const char *old_symbol, + const Layout *old_layout, const char *new_symbol, + const Layout *new_layout) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_layout_change_event(gen, mon_num, old_symbol, old_layout, new_symbol, + new_layout); + ipc_event_prepare_send_message(gen, IPC_EVENT_LAYOUT_CHANGE); +} + +void +ipc_monitor_focus_change_event(const int last_mon_num, const int new_mon_num) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_monitor_focus_change_event(gen, last_mon_num, new_mon_num); + ipc_event_prepare_send_message(gen, IPC_EVENT_MONITOR_FOCUS_CHANGE); +} + +void +ipc_focused_title_change_event(const int mon_num, const Window client_id, + const char *old_name, const char *new_name) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_focused_title_change_event(gen, mon_num, client_id, old_name, new_name); + ipc_event_prepare_send_message(gen, IPC_EVENT_FOCUSED_TITLE_CHANGE); +} + +void +ipc_focused_state_change_event(const int mon_num, const Window client_id, + const ClientState *old_state, + const ClientState *new_state) +{ + yajl_gen gen; + ipc_event_init_message(&gen); + dump_focused_state_change_event(gen, mon_num, client_id, old_state, + new_state); + ipc_event_prepare_send_message(gen, IPC_EVENT_FOCUSED_STATE_CHANGE); +} + +void +ipc_send_events(Monitor *mons, Monitor **lastselmon, Monitor *selmon) +{ + for (Monitor *m = mons; m; m = m->next) { + unsigned int urg = 0, occ = 0, tagset = 0; + + for (Client *c = m->clients; c; c = c->next) { + occ |= c->tags; + + if (c->isurgent) urg |= c->tags; + } + tagset = m->tagset[m->seltags]; + + TagState new_state = {.selected = tagset, .occupied = occ, .urgent = urg}; + + if (memcmp(&m->tagstate, &new_state, sizeof(TagState)) != 0) { + ipc_tag_change_event(m->num, m->tagstate, new_state); + m->tagstate = new_state; + } + + if (m->lastsel != m->sel) { + ipc_client_focus_change_event(m->num, m->lastsel, m->sel); + m->lastsel = m->sel; + } + + if (strcmp(m->ltsymbol, m->lastltsymbol) != 0 || + m->lastlt != m->lt[m->sellt]) { + ipc_layout_change_event(m->num, m->lastltsymbol, m->lastlt, m->ltsymbol, + m->lt[m->sellt]); + strcpy(m->lastltsymbol, m->ltsymbol); + m->lastlt = m->lt[m->sellt]; + } + + if (*lastselmon != selmon) { + if (*lastselmon != NULL) + ipc_monitor_focus_change_event((*lastselmon)->num, selmon->num); + *lastselmon = selmon; + } + + Client *sel = m->sel; + if (!sel) continue; + ClientState *o = &m->sel->prevstate; + ClientState n = {.oldstate = sel->oldstate, + .isfixed = sel->isfixed, + .isfloating = sel->isfloating, + .isfullscreen = sel->isfullscreen, + .isurgent = sel->isurgent, + .neverfocus = sel->neverfocus}; + if (memcmp(o, &n, sizeof(ClientState)) != 0) { + ipc_focused_state_change_event(m->num, m->sel->win, o, &n); + *o = n; + } + } +} + +int +ipc_handle_client_epoll_event(struct epoll_event *ev, Monitor *mons, + Monitor **lastselmon, Monitor *selmon, + const char *tags[], const int tags_len, + const Layout *layouts, const int layouts_len) +{ + int fd = ev->data.fd; + IPCClient *c = ipc_get_client(fd); + + if (ev->events & EPOLLHUP) { + DEBUG("EPOLLHUP received from client at fd %d\n", fd); + ipc_drop_client(c); + } else if (ev->events & EPOLLOUT) { + DEBUG("Sending message to client at fd %d...\n", fd); + if (c->buffer_size) ipc_write_client(c); + } else if (ev->events & EPOLLIN) { + IPCMessageType msg_type = 0; + uint32_t msg_size = 0; + char *msg = NULL; + + DEBUG("Received message from fd %d\n", fd); + if (ipc_read_client(c, &msg_type, &msg_size, &msg) < 0) return -1; + + if (msg_type == IPC_TYPE_GET_MONITORS) + ipc_get_monitors(c, mons, selmon); + else if (msg_type == IPC_TYPE_GET_TAGS) + ipc_get_tags(c, tags, tags_len); + else if (msg_type == IPC_TYPE_GET_LAYOUTS) + ipc_get_layouts(c, layouts, layouts_len); + else if (msg_type == IPC_TYPE_RUN_COMMAND) { + if (ipc_run_command(c, msg) < 0) return -1; + ipc_send_events(mons, lastselmon, selmon); + } else if (msg_type == IPC_TYPE_GET_DWM_CLIENT) { + if (ipc_get_dwm_client(c, msg, mons) < 0) return -1; + } else if (msg_type == IPC_TYPE_SUBSCRIBE) { + if (ipc_subscribe(c, msg) < 0) return -1; + } else { + fprintf(stderr, "Invalid message type received from fd %d", fd); + ipc_prepare_reply_failure(c, msg_type, "Invalid message type: %d", + msg_type); + } + free(msg); + } else { + fprintf(stderr, "Epoll event returned %d from fd %d\n", ev->events, fd); + return -1; + } + + return 0; +} + +int +ipc_handle_socket_epoll_event(struct epoll_event *ev) +{ + if (!(ev->events & EPOLLIN)) return -1; + + // EPOLLIN means incoming client connection request + fputs("Received EPOLLIN event on socket\n", stderr); + int new_fd = ipc_accept_client(); + + return new_fd; +} diff --git a/ipc.h b/ipc.h new file mode 100644 index 0000000..e3b5bba --- /dev/null +++ b/ipc.h @@ -0,0 +1,320 @@ +#ifndef IPC_H_ +#define IPC_H_ + +#include +#include +#include + +#include "IPCClient.h" + +// clang-format off +#define IPC_MAGIC "DWM-IPC" +#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C'} +#define IPC_MAGIC_LEN 7 // Not including null char + +#define IPCCOMMAND(FUNC, ARGC, TYPES) \ + { #FUNC, {FUNC }, ARGC, (ArgType[ARGC])TYPES } +// clang-format on + +typedef enum IPCMessageType { + IPC_TYPE_RUN_COMMAND = 0, + IPC_TYPE_GET_MONITORS = 1, + IPC_TYPE_GET_TAGS = 2, + IPC_TYPE_GET_LAYOUTS = 3, + IPC_TYPE_GET_DWM_CLIENT = 4, + IPC_TYPE_SUBSCRIBE = 5, + IPC_TYPE_EVENT = 6 +} IPCMessageType; + +typedef enum IPCEvent { + IPC_EVENT_TAG_CHANGE = 1 << 0, + IPC_EVENT_CLIENT_FOCUS_CHANGE = 1 << 1, + IPC_EVENT_LAYOUT_CHANGE = 1 << 2, + IPC_EVENT_MONITOR_FOCUS_CHANGE = 1 << 3, + IPC_EVENT_FOCUSED_TITLE_CHANGE = 1 << 4, + IPC_EVENT_FOCUSED_STATE_CHANGE = 1 << 5 +} IPCEvent; + +typedef enum IPCSubscriptionAction { + IPC_ACTION_UNSUBSCRIBE = 0, + IPC_ACTION_SUBSCRIBE = 1 +} IPCSubscriptionAction; + +/** + * Every IPC packet starts with this structure + */ +typedef struct dwm_ipc_header { + uint8_t magic[IPC_MAGIC_LEN]; + uint32_t size; + uint8_t type; +} __attribute((packed)) dwm_ipc_header_t; + +typedef enum ArgType { + ARG_TYPE_NONE = 0, + ARG_TYPE_UINT = 1, + ARG_TYPE_SINT = 2, + ARG_TYPE_FLOAT = 3, + ARG_TYPE_PTR = 4, + ARG_TYPE_STR = 5 +} ArgType; + +/** + * An IPCCommand function can have either of these function signatures + */ +typedef union ArgFunction { + void (*single_param)(const Arg *); + void (*array_param)(const Arg *, int); +} ArgFunction; + +typedef struct IPCCommand { + char *name; + ArgFunction func; + unsigned int argc; + ArgType *arg_types; +} IPCCommand; + +typedef struct IPCParsedCommand { + char *name; + Arg *args; + ArgType *arg_types; + unsigned int argc; +} IPCParsedCommand; + +/** + * Initialize the IPC socket and the IPC module + * + * @param socket_path Path to create the socket at + * @param epoll_fd File descriptor for epoll + * @param commands Address of IPCCommands array defined in config.h + * @param commands_len Length of commands[] array + * + * @return int The file descriptor of the socket if it was successfully created, + * -1 otherwise + */ +int ipc_init(const char *socket_path, const int p_epoll_fd, + IPCCommand commands[], const int commands_len); + +/** + * Uninitialize the socket and module. Free allocated memory and restore static + * variables to their state before ipc_init + */ +void ipc_cleanup(); + +/** + * Get the file descriptor of the IPC socket + * + * @return int File descriptor of IPC socket, -1 if socket not created. + */ +int ipc_get_sock_fd(); + +/** + * Get address to IPCClient with specified file descriptor + * + * @param fd File descriptor of IPC Client + * + * @return Address to IPCClient with specified file descriptor, -1 otherwise + */ +IPCClient *ipc_get_client(int fd); + +/** + * Check if an IPC client exists with the specified file descriptor + * + * @param fd File descriptor + * + * @return int 1 if client exists, 0 otherwise + */ +int ipc_is_client_registered(int fd); + +/** + * Disconnect an IPCClient from the socket and remove the client from the list + * of known connected clients + * + * @param c Address of IPCClient + * + * @return 0 if the client's file descriptor was closed successfully, the + * result of executing close() on the file descriptor otherwise. + */ +int ipc_drop_client(IPCClient *c); + +/** + * Accept an IPC Client requesting to connect to the socket and add it to the + * list of clients + * + * @return File descriptor of new client, -1 on error + */ +int ipc_accept_client(); + +/** + * Read an incoming message from an accepted IPC client + * + * @param c Address of IPCClient + * @param msg_type Address to IPCMessageType variable which will be assigned + * the message type of the received message + * @param msg_size Address to uint32_t variable which will be assigned the size + * of the received message + * @param msg Address to char* variable which will be assigned the address of + * the received message. This must be freed using free(). + * + * @return 0 on success, -1 on error reading message, -2 if reading the message + * resulted in EAGAIN, EINTR, or EWOULDBLOCK. + */ +int ipc_read_client(IPCClient *c, IPCMessageType *msg_type, uint32_t *msg_size, + char **msg); + +/** + * Write any pending buffer of the client to the client's socket + * + * @param c Client whose buffer to write + * + * @return Number of bytes written >= 0, -1 otherwise. errno will still be set + * from the write operation. + */ +ssize_t ipc_write_client(IPCClient *c); + +/** + * Prepare a message in the specified client's buffer. + * + * @param c Client to prepare message for + * @param msg_type Type of message to prepare + * @param msg_size Size of the message in bytes. Should not exceed + * MAX_MESSAGE_SIZE + * @param msg Message to prepare (not including header). This pointer can be + * freed after the function invocation. + */ +void ipc_prepare_send_message(IPCClient *c, const IPCMessageType msg_type, + const uint32_t msg_size, const char *msg); + +/** + * Prepare an error message in the specified client's buffer + * + * @param c Client to prepare message for + * @param msg_type Type of message + * @param format Format string following vsprintf + * @param ... Arguments for format string + */ +void ipc_prepare_reply_failure(IPCClient *c, IPCMessageType msg_type, + const char *format, ...); + +/** + * Prepare a success message in the specified client's buffer + * + * @param c Client to prepare message for + * @param msg_type Type of message + */ +void ipc_prepare_reply_success(IPCClient *c, IPCMessageType msg_type); + +/** + * Send a tag_change_event to all subscribers. Should be called only when there + * has been a tag state change. + * + * @param mon_num The index of the monitor (Monitor.num property) + * @param old_state The old tag state + * @param new_state The new (now current) tag state + */ +void ipc_tag_change_event(const int mon_num, TagState old_state, + TagState new_state); + +/** + * Send a client_focus_change_event to all subscribers. Should be called only + * when the client focus changes. + * + * @param mon_num The index of the monitor (Monitor.num property) + * @param old_client The old DWM client selection (Monitor.oldsel) + * @param new_client The new (now current) DWM client selection + */ +void ipc_client_focus_change_event(const int mon_num, Client *old_client, + Client *new_client); + +/** + * Send a layout_change_event to all subscribers. Should be called only + * when there has been a layout change. + * + * @param mon_num The index of the monitor (Monitor.num property) + * @param old_symbol The old layout symbol + * @param old_layout Address to the old Layout + * @param new_symbol The new (now current) layout symbol + * @param new_layout Address to the new Layout + */ +void ipc_layout_change_event(const int mon_num, const char *old_symbol, + const Layout *old_layout, const char *new_symbol, + const Layout *new_layout); + +/** + * Send a monitor_focus_change_event to all subscribers. Should be called only + * when the monitor focus changes. + * + * @param last_mon_num The index of the previously selected monitor + * @param new_mon_num The index of the newly selected monitor + */ +void ipc_monitor_focus_change_event(const int last_mon_num, + const int new_mon_num); + +/** + * Send a focused_title_change_event to all subscribers. Should only be called + * if a selected client has a title change. + * + * @param mon_num Index of the client's monitor + * @param client_id Window XID of client + * @param old_name Old name of the client window + * @param new_name New name of the client window + */ +void ipc_focused_title_change_event(const int mon_num, const Window client_id, + const char *old_name, const char *new_name); + +/** + * Send a focused_state_change_event to all subscribers. Should only be called + * if a selected client has a state change. + * + * @param mon_num Index of the client's monitor + * @param client_id Window XID of client + * @param old_state Old state of the client + * @param new_state New state of the client + */ +void ipc_focused_state_change_event(const int mon_num, const Window client_id, + const ClientState *old_state, + const ClientState *new_state); +/** + * Check to see if an event has occured and call the *_change_event functions + * accordingly + * + * @param mons Address of Monitor pointing to start of linked list + * @param lastselmon Address of pointer to previously selected monitor + * @param selmon Address of selected Monitor + */ +void ipc_send_events(Monitor *mons, Monitor **lastselmon, Monitor *selmon); + +/** + * Handle an epoll event caused by a registered IPC client. Read, process, and + * handle any received messages from clients. Write pending buffer to client if + * the client is ready to receive messages. Drop clients that have sent an + * EPOLLHUP. + * + * @param ev Associated epoll event returned by epoll_wait + * @param mons Address of Monitor pointing to start of linked list + * @param selmon Address of selected Monitor + * @param lastselmon Address of pointer to previously selected monitor + * @param tags Array of tag names + * @param tags_len Length of tags array + * @param layouts Array of available layouts + * @param layouts_len Length of layouts array + * + * @return 0 if event was successfully handled, -1 on any error receiving + * or handling incoming messages or unhandled epoll event. + */ +int ipc_handle_client_epoll_event(struct epoll_event *ev, Monitor *mons, + Monitor **lastselmon, Monitor *selmon, + const char *tags[], const int tags_len, + const Layout *layouts, const int layouts_len); + +/** + * Handle an epoll event caused by the IPC socket. This function only handles an + * EPOLLIN event indicating a new client requesting to connect to the socket. + * + * @param ev Associated epoll event returned by epoll_wait + * + * @return 0, if the event was successfully handled, -1 if not an EPOLLIN event + * or if a new IPC client connection request could not be accepted. + */ +int ipc_handle_socket_epoll_event(struct epoll_event *ev); + +#endif /* IPC_H_ */ diff --git a/patches/dwm-actualfullscreen-20211013-cb3f58a.diff b/patches/dwm-actualfullscreen-20211013-cb3f58a.diff new file mode 100644 index 0000000..d3be230 --- /dev/null +++ b/patches/dwm-actualfullscreen-20211013-cb3f58a.diff @@ -0,0 +1,68 @@ +From eea13010ffc3983392857ee1e3804e3aa1064d7a Mon Sep 17 00:00:00 2001 +From: Soenke Lambert +Date: Wed, 13 Oct 2021 18:21:09 +0200 +Subject: [PATCH] Fullscreen current window with [Alt]+[Shift]+[f] + +This actually fullscreens a window, instead of just hiding the statusbar +and applying the monocle layout. +--- + config.def.h | 1 + + dwm.1 | 3 +++ + dwm.c | 8 ++++++++ + 3 files changed, 12 insertions(+) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..8cd3204 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -78,6 +78,7 @@ static Key keys[] = { + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, ++ { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, +diff --git a/dwm.1 b/dwm.1 +index 13b3729..a368d05 100644 +--- a/dwm.1 ++++ b/dwm.1 +@@ -116,6 +116,9 @@ Zooms/cycles focused window to/from master area (tiled layouts only). + .B Mod1\-Shift\-c + Close focused window. + .TP ++.B Mod1\-Shift\-f ++Toggle fullscreen for focused window. ++.TP + .B Mod1\-Shift\-space + Toggle focused window between tiled and floating state. + .TP +diff --git a/dwm.c b/dwm.c +index 4465af1..c1b899a 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -211,6 +211,7 @@ static void tagmon(const Arg *arg); + static void tile(Monitor *); + static void togglebar(const Arg *arg); + static void togglefloating(const Arg *arg); ++static void togglefullscr(const Arg *arg); + static void toggletag(const Arg *arg); + static void toggleview(const Arg *arg); + static void unfocus(Client *c, int setfocus); +@@ -1719,6 +1720,13 @@ togglefloating(const Arg *arg) + arrange(selmon); + } + ++void ++togglefullscr(const Arg *arg) ++{ ++ if(selmon->sel) ++ setfullscreen(selmon->sel, !selmon->sel->isfullscreen); ++} ++ + void + toggletag(const Arg *arg) + { +-- +2.30.2 + diff --git a/patches/dwm-anybar-polybar-tray-fix-20200810-bb2e722.diff b/patches/dwm-anybar-polybar-tray-fix-20200810-bb2e722.diff new file mode 100644 index 0000000..693bb7b --- /dev/null +++ b/patches/dwm-anybar-polybar-tray-fix-20200810-bb2e722.diff @@ -0,0 +1,445 @@ +From 9b5719969ce85c3ecc0238d49c0255c5c2cc79f0 Mon Sep 17 00:00:00 2001 +From: mihirlad55 +Date: Mon, 10 Aug 2020 01:39:28 +0000 +Subject: [PATCH] Add support for managing external status bars + +This patch allows dwm to manage other status bars such as +polybar/lemonbar without them needing to set override-redirect. For +all intents and purposes, DWM treats this bar as if it were its own +and as a result helps the status bar and DWM live in harmony. + +This has a few advantages +* The bar does not block fullscreen windows +* DWM makes room for the status bar, so windows do not overlap the bar +* The bar can be hidden/killed and DWM will not keep an unsightly gap + where the bar was +* DWM receives EnterNotify events when your cursor enters the bar + +To use another status bar, set usealtbar to 1 in your config.h and set +altbarclass to the class name (can be found using xprop) to the class +name of your status bar. Also make sure that if your status bar will +be displayed on top, topbar is set to 1 in your config, and if it will +be displayed on bottom, topbar is set to 0. This patch does not +support bars that are not docked at the top or at the bottom of your +monitor. + +This verison of the patch fixes handling of polybar's tray. + +The patch is developed at https://github.com/mihirlad55/dwm-anybar +--- + config.def.h | 4 ++ + dwm.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 181 insertions(+), 15 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..f45211b 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -5,6 +5,10 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ + static const unsigned int snap = 32; /* snap pixel */ + static const int showbar = 1; /* 0 means no bar */ + static const int topbar = 1; /* 0 means bottom bar */ ++static const int usealtbar = 1; /* 1 means use non-dwm status bar */ ++static const char *altbarclass = "Polybar"; /* Alternate bar class name */ ++static const char *alttrayname = "tray"; /* Polybar tray instance name */ ++static const char *altbarcmd = "$HOME/bar.sh"; /* Alternate bar launch command */ + static const char *fonts[] = { "monospace:size=10" }; + static const char dmenufont[] = "monospace:size=10"; + static const char col_gray1[] = "#222222"; +diff --git a/dwm.c b/dwm.c +index 9fd0286..c1d8ce0 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -47,8 +47,8 @@ + /* macros */ + #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) + #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) +-#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ +- * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy))) ++#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->mx+(m)->mw) - MAX((x),(m)->mx)) \ ++ * MAX(0, MIN((y)+(h),(m)->my+(m)->mh) - MAX((y),(m)->my))) + #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) + #define LENGTH(X) (sizeof X / sizeof X[0]) + #define MOUSEMASK (BUTTONMASK|PointerMotionMask) +@@ -116,7 +116,8 @@ struct Monitor { + float mfact; + int nmaster; + int num; +- int by; /* bar geometry */ ++ int by, bh; /* bar geometry */ ++ int tx, tw; /* bar tray geometry */ + int mx, my, mw, mh; /* screen size */ + int wx, wy, ww, wh; /* window area */ + unsigned int seltags; +@@ -129,6 +130,7 @@ struct Monitor { + Client *stack; + Monitor *next; + Window barwin; ++ Window traywin; + const Layout *lt[2]; + }; + +@@ -179,6 +181,8 @@ static void incnmaster(const Arg *arg); + static void keypress(XEvent *e); + static void killclient(const Arg *arg); + static void manage(Window w, XWindowAttributes *wa); ++static void managealtbar(Window win, XWindowAttributes *wa); ++static void managetray(Window win, XWindowAttributes *wa); + static void mappingnotify(XEvent *e); + static void maprequest(XEvent *e); + static void monocle(Monitor *m); +@@ -195,6 +199,7 @@ static void resizemouse(const Arg *arg); + static void restack(Monitor *m); + static void run(void); + static void scan(void); ++static void scantray(void); + static int sendevent(Client *c, Atom proto); + static void sendmon(Client *c, Monitor *m); + static void setclientstate(Client *c, long state); +@@ -207,6 +212,7 @@ static void seturgent(Client *c, int urg); + static void showhide(Client *c); + static void sigchld(int unused); + static void spawn(const Arg *arg); ++static void spawnbar(); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); + static void tile(Monitor *); +@@ -216,6 +222,8 @@ static void toggletag(const Arg *arg); + static void toggleview(const Arg *arg); + static void unfocus(Client *c, int setfocus); + static void unmanage(Client *c, int destroyed); ++static void unmanagealtbar(Window w); ++static void unmanagetray(Window w); + static void unmapnotify(XEvent *e); + static void updatebarpos(Monitor *m); + static void updatebars(void); +@@ -230,6 +238,7 @@ static void updatewmhints(Client *c); + static void view(const Arg *arg); + static Client *wintoclient(Window w); + static Monitor *wintomon(Window w); ++static int wmclasscontains(Window win, const char *class, const char *name); + static int xerror(Display *dpy, XErrorEvent *ee); + static int xerrordummy(Display *dpy, XErrorEvent *ee); + static int xerrorstart(Display *dpy, XErrorEvent *ee); +@@ -505,8 +514,10 @@ cleanupmon(Monitor *mon) + for (m = mons; m && m->next != mon; m = m->next); + m->next = mon->next; + } +- XUnmapWindow(dpy, mon->barwin); +- XDestroyWindow(dpy, mon->barwin); ++ if (!usealtbar) { ++ XUnmapWindow(dpy, mon->barwin); ++ XDestroyWindow(dpy, mon->barwin); ++ } + free(mon); + } + +@@ -568,7 +579,7 @@ configurenotify(XEvent *e) + for (c = m->clients; c; c = c->next) + if (c->isfullscreen) + resizeclient(c, m->mx, m->my, m->mw, m->mh); +- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); ++ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, m->bh); + } + focus(NULL); + arrange(NULL); +@@ -639,6 +650,7 @@ createmon(void) + m->nmaster = nmaster; + m->showbar = showbar; + m->topbar = topbar; ++ m->bh = bh; + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; + strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); +@@ -649,10 +661,15 @@ void + destroynotify(XEvent *e) + { + Client *c; ++ Monitor *m; + XDestroyWindowEvent *ev = &e->xdestroywindow; + + if ((c = wintoclient(ev->window))) + unmanage(c, 1); ++ else if ((m = wintomon(ev->window)) && m->barwin == ev->window) ++ unmanagealtbar(ev->window); ++ else if (m->traywin == ev->window) ++ unmanagetray(ev->window); + } + + void +@@ -696,6 +713,9 @@ dirtomon(int dir) + void + drawbar(Monitor *m) + { ++ if (usealtbar) ++ return; ++ + int x, w, tw = 0; + int boxs = drw->fonts->h / 9; + int boxw = drw->fonts->h / 6 + 2; +@@ -1077,6 +1097,45 @@ manage(Window w, XWindowAttributes *wa) + focus(NULL); + } + ++void ++managealtbar(Window win, XWindowAttributes *wa) ++{ ++ Monitor *m; ++ if (!(m = recttomon(wa->x, wa->y, wa->width, wa->height))) ++ return; ++ ++ m->barwin = win; ++ m->by = wa->y; ++ bh = m->bh = wa->height; ++ updatebarpos(m); ++ arrange(m); ++ XSelectInput(dpy, win, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); ++ XMoveResizeWindow(dpy, win, wa->x, wa->y, wa->width, wa->height); ++ XMapWindow(dpy, win); ++ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, ++ (unsigned char *) &win, 1); ++} ++ ++void ++managetray(Window win, XWindowAttributes *wa) ++{ ++ Monitor *m; ++ if (!(m = recttomon(wa->x, wa->y, wa->width, wa->height))) ++ return; ++ ++ m->traywin = win; ++ m->tx = wa->x; ++ m->tw = wa->width; ++ updatebarpos(m); ++ arrange(m); ++ XSelectInput(dpy, win, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); ++ XMoveResizeWindow(dpy, win, wa->x, wa->y, wa->width, wa->height); ++ XMapWindow(dpy, win); ++ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, ++ (unsigned char *) &win, 1); ++} ++ ++ + void + mappingnotify(XEvent *e) + { +@@ -1097,7 +1156,9 @@ maprequest(XEvent *e) + return; + if (wa.override_redirect) + return; +- if (!wintoclient(ev->window)) ++ if (wmclasscontains(ev->window, altbarclass, "")) ++ managealtbar(ev->window, &wa); ++ else if (!wintoclient(ev->window)) + manage(ev->window, &wa); + } + +@@ -1393,7 +1454,9 @@ scan(void) + if (!XGetWindowAttributes(dpy, wins[i], &wa) + || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) + continue; +- if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState) ++ if (wmclasscontains(wins[i], altbarclass, "")) ++ managealtbar(wins[i], &wa); ++ else if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState) + manage(wins[i], &wa); + } + for (i = 0; i < num; i++) { /* now the transients */ +@@ -1408,6 +1471,29 @@ scan(void) + } + } + ++void ++scantray(void) ++{ ++ unsigned int num; ++ Window d1, d2, *wins = NULL; ++ XWindowAttributes wa; ++ ++ if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { ++ for (unsigned int i = 0; i < num; i++) { ++ if (wmclasscontains(wins[i], altbarclass, alttrayname)) { ++ if (!XGetWindowAttributes(dpy, wins[i], &wa)) ++ break; ++ managetray(wins[i], &wa); ++ } ++ } ++ } ++ ++ if (wins) ++ XFree(wins); ++} ++ ++ ++ + void + sendmon(Client *c, Monitor *m) + { +@@ -1546,7 +1632,7 @@ setup(void) + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; +- bh = drw->fonts->h + 2; ++ bh = usealtbar ? 0 : drw->fonts->h + 2; + updategeom(); + /* init atoms */ + utf8string = XInternAtom(dpy, "UTF8_STRING", False); +@@ -1595,6 +1681,7 @@ setup(void) + XSelectInput(dpy, root, wa.event_mask); + grabkeys(); + focus(NULL); ++ spawnbar(); + } + + +@@ -1653,6 +1740,13 @@ spawn(const Arg *arg) + } + } + ++void ++spawnbar() ++{ ++ if (*altbarcmd) ++ system(altbarcmd); ++} ++ + void + tag(const Arg *arg) + { +@@ -1702,9 +1796,18 @@ tile(Monitor *m) + void + togglebar(const Arg *arg) + { ++ /** ++ * Polybar tray does not raise maprequest event. It must be manually scanned ++ * for. Scanning it too early while the tray is being populated would give ++ * wrong dimensions. ++ */ ++ if (!selmon->traywin) ++ scantray(); ++ + selmon->showbar = !selmon->showbar; + updatebarpos(selmon); +- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); ++ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, selmon->bh); ++ XMoveResizeWindow(dpy, selmon->traywin, selmon->tx, selmon->by, selmon->tw, selmon->bh); + arrange(selmon); + } + +@@ -1787,10 +1890,41 @@ unmanage(Client *c, int destroyed) + arrange(m); + } + ++void ++unmanagealtbar(Window w) ++{ ++ Monitor *m = wintomon(w); ++ ++ if (!m) ++ return; ++ ++ m->barwin = 0; ++ m->by = 0; ++ m->bh = 0; ++ updatebarpos(m); ++ arrange(m); ++} ++ ++void ++unmanagetray(Window w) ++{ ++ Monitor *m = wintomon(w); ++ ++ if (!m) ++ return; ++ ++ m->traywin = 0; ++ m->tx = 0; ++ m->tw = 0; ++ updatebarpos(m); ++ arrange(m); ++} ++ + void + unmapnotify(XEvent *e) + { + Client *c; ++ Monitor *m; + XUnmapEvent *ev = &e->xunmap; + + if ((c = wintoclient(ev->window))) { +@@ -1798,12 +1932,18 @@ unmapnotify(XEvent *e) + setclientstate(c, WithdrawnState); + else + unmanage(c, 0); +- } ++ } else if ((m = wintomon(ev->window)) && m->barwin == ev->window) ++ unmanagealtbar(ev->window); ++ else if (m->traywin == ev->window) ++ unmanagetray(ev->window); + } + + void + updatebars(void) + { ++ if (usealtbar) ++ return; ++ + Monitor *m; + XSetWindowAttributes wa = { + .override_redirect = True, +@@ -1829,11 +1969,11 @@ updatebarpos(Monitor *m) + m->wy = m->my; + m->wh = m->mh; + if (m->showbar) { +- m->wh -= bh; ++ m->wh -= m->bh; + m->by = m->topbar ? m->wy : m->wy + m->wh; +- m->wy = m->topbar ? m->wy + bh : m->wy; ++ m->wy = m->topbar ? m->wy + m->bh : m->wy; + } else +- m->by = -bh; ++ m->by = -m->bh; + } + + void +@@ -2070,13 +2210,35 @@ wintomon(Window w) + if (w == root && getrootptr(&x, &y)) + return recttomon(x, y, 1, 1); + for (m = mons; m; m = m->next) +- if (w == m->barwin) ++ if (w == m->barwin || w == m->traywin) + return m; + if ((c = wintoclient(w))) + return c->mon; + return selmon; + } + ++int ++wmclasscontains(Window win, const char *class, const char *name) ++{ ++ XClassHint ch = { NULL, NULL }; ++ int res = 1; ++ ++ if (XGetClassHint(dpy, win, &ch)) { ++ if (ch.res_name && strstr(ch.res_name, name) == NULL) ++ res = 0; ++ if (ch.res_class && strstr(ch.res_class, class) == NULL) ++ res = 0; ++ } else ++ res = 0; ++ ++ if (ch.res_class) ++ XFree(ch.res_class); ++ if (ch.res_name) ++ XFree(ch.res_name); ++ ++ return res; ++} ++ + /* 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. */ +-- +2.28.0 + diff --git a/patches/dwm-attachbelow-6.2.diff b/patches/dwm-attachbelow-6.2.diff new file mode 100644 index 0000000..1562b38 --- /dev/null +++ b/patches/dwm-attachbelow-6.2.diff @@ -0,0 +1,96 @@ +diff --git a/config.def.h b/config.def.h +index 1c0b587..cb8053a 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -35,6 +35,7 @@ static const Rule rules[] = { + static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ + static const int nmaster = 1; /* number of clients in master area */ + static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ ++static const int attachbelow = 1; /* 1 means attach after the currently active window */ + + static const Layout layouts[] = { + /* symbol arrange function */ +diff --git a/dwm.1 b/dwm.1 +index 13b3729..fb6e76c 100644 +--- a/dwm.1 ++++ b/dwm.1 +@@ -29,6 +29,9 @@ color. The tags of the focused window are indicated with a filled square in the + top left corner. The tags which are applied to one or more windows are + indicated with an empty square in the top left corner. + .P ++The attach below patch makes newly spawned windows attach after the currently ++selected window ++.P + dwm draws a small border around windows to indicate the focus state. + .SH OPTIONS + .TP +diff --git a/dwm.c b/dwm.c +index 4465af1..bd715a2 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -147,6 +147,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac + static void arrange(Monitor *m); + static void arrangemon(Monitor *m); + static void attach(Client *c); ++static void attachBelow(Client *c); + static void attachstack(Client *c); + static void buttonpress(XEvent *e); + static void checkotherwm(void); +@@ -405,6 +406,21 @@ attach(Client *c) + c->next = c->mon->clients; + c->mon->clients = c; + } ++void ++attachBelow(Client *c) ++{ ++ //If there is nothing on the monitor or the selected client is floating, attach as normal ++ if(c->mon->sel == NULL || c->mon->sel == c || c->mon->sel->isfloating) { ++ attach(c); ++ return; ++ } ++ ++ //Set the new client's next property to the same as the currently selected clients next ++ c->next = c->mon->sel->next; ++ //Set the currently selected clients next property to the new client ++ c->mon->sel->next = c; ++ ++} + + void + attachstack(Client *c) +@@ -1062,7 +1078,10 @@ manage(Window w, XWindowAttributes *wa) + c->isfloating = c->oldstate = trans != None || c->isfixed; + if (c->isfloating) + XRaiseWindow(dpy, c->win); +- attach(c); ++ if( attachbelow ) ++ attachBelow(c); ++ else ++ attach(c); + attachstack(c); + XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, + (unsigned char *) &(c->win), 1); +@@ -1417,7 +1436,10 @@ sendmon(Client *c, Monitor *m) + detachstack(c); + c->mon = m; + c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ +- attach(c); ++ if( attachbelow ) ++ attachBelow(c); ++ else ++ attach(c); + attachstack(c); + focus(NULL); + arrange(NULL); +@@ -1897,7 +1919,10 @@ updategeom(void) + m->clients = c->next; + detachstack(c); + c->mon = mons; +- attach(c); ++ if( attachbelow ) ++ attachBelow(c); ++ else ++ attach(c); + attachstack(c); + } + if (m == selmon) diff --git a/patches/dwm-cfacts-20200913-61bb8b2.diff b/patches/dwm-cfacts-20200913-61bb8b2.diff new file mode 100644 index 0000000..bb70e13 --- /dev/null +++ b/patches/dwm-cfacts-20200913-61bb8b2.diff @@ -0,0 +1,117 @@ +From c32a879432573d71dec7fcb4bf68927d2f4cdf10 Mon Sep 17 00:00:00 2001 +From: iofq +Date: Sat, 12 Sep 2020 22:28:09 -0500 +Subject: [PATCH] Fixed 'cfacts' patch failure due to upstream commit + 'f09418bbb...' + +--- + config.def.h | 3 +++ + dwm.c | 34 +++++++++++++++++++++++++++++++--- + 2 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..83910c1 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -70,6 +70,9 @@ static Key keys[] = { + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, ++ { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, ++ { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, ++ { MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} }, + { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, +diff --git a/dwm.c b/dwm.c +index 664c527..5233229 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -87,6 +87,7 @@ typedef struct Client Client; + struct Client { + char name[256]; + float mina, maxa; ++ float cfact; + int x, y, w, h; + int oldx, oldy, oldw, oldh; + int basew, baseh, incw, inch, maxw, maxh, minw, minh; +@@ -201,6 +202,7 @@ static void setclientstate(Client *c, long state); + static void setfocus(Client *c); + static void setfullscreen(Client *c, int fullscreen); + static void setlayout(const Arg *arg); ++static void setcfact(const Arg *arg); + static void setmfact(const Arg *arg); + static void setup(void); + static void seturgent(Client *c, int urg); +@@ -1030,6 +1032,7 @@ manage(Window w, XWindowAttributes *wa) + c->w = c->oldw = wa->width; + c->h = c->oldh = wa->height; + c->oldbw = wa->border_width; ++ c->cfact = 1.0; + + updatetitle(c); + if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { +@@ -1512,6 +1515,23 @@ setlayout(const Arg *arg) + drawbar(selmon); + } + ++void setcfact(const Arg *arg) { ++ float f; ++ Client *c; ++ ++ c = selmon->sel; ++ ++ if(!arg || !c || !selmon->lt[selmon->sellt]->arrange) ++ return; ++ f = arg->f + c->cfact; ++ if(arg->f == 0.0) ++ f = 1.0; ++ else if(f < 0.25 || f > 4.0) ++ return; ++ c->cfact = f; ++ arrange(selmon); ++} ++ + /* arg > 1.0 will set mfact absolutely */ + void + setmfact(const Arg *arg) +@@ -1675,9 +1695,15 @@ void + tile(Monitor *m) + { + unsigned int i, n, h, mw, my, ty; ++ float mfacts = 0, sfacts = 0; + Client *c; + +- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) { ++ if (n < m->nmaster) ++ mfacts += c->cfact; ++ else ++ sfacts += c->cfact; ++ } + if (n == 0) + return; + +@@ -1687,15 +1713,17 @@ tile(Monitor *m) + mw = m->ww; + for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { +- h = (m->wh - my) / (MIN(n, m->nmaster) - i); ++ h = (m->wh - my) * (c->cfact / mfacts); + resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); + if (my + HEIGHT(c) < m->wh) + my += HEIGHT(c); ++ mfacts -= c->cfact; + } else { +- h = (m->wh - ty) / (n - i); ++ h = (m->wh - ty) * (c->cfact / sfacts); + resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); + if (ty + HEIGHT(c) < m->wh) + ty += HEIGHT(c); ++ sfacts -= c->cfact; + } + } + +-- +2.28.0 + diff --git a/patches/dwm-cfacts-vanitygaps-6.4_combo.diff b/patches/dwm-cfacts-vanitygaps-6.4_combo.diff new file mode 100644 index 0000000..db2cc14 --- /dev/null +++ b/patches/dwm-cfacts-vanitygaps-6.4_combo.diff @@ -0,0 +1,1018 @@ +diff --git a/config.def.h b/config.def.h +index 9efa774..357dc6f 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -3,6 +3,11 @@ + /* appearance */ + static const unsigned int borderpx = 1; /* border pixel of windows */ + static const unsigned int snap = 32; /* snap pixel */ ++static const unsigned int gappih = 20; /* horiz inner gap between windows */ ++static const unsigned int gappiv = 10; /* vert inner gap between windows */ ++static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ ++static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */ ++static int smartgaps = 0; /* 1 means no outer gap when there is only one window */ + 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" }; +@@ -37,11 +42,26 @@ static const int nmaster = 1; /* number of clients in master area */ + static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ + static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ + ++#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ ++#include "vanitygaps.c" ++ + static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ +- { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, ++ { "[@]", spiral }, ++ { "[\\]", dwindle }, ++ { "H[]", deck }, ++ { "TTT", bstack }, ++ { "===", bstackhoriz }, ++ { "HHH", grid }, ++ { "###", nrowgrid }, ++ { "---", horizgrid }, ++ { ":::", gaplessgrid }, ++ { "|M|", centeredmaster }, ++ { ">M>", centeredfloatingmaster }, ++ { "><>", NULL }, /* no layout function means floating behavior */ ++ { NULL, NULL }, + }; + + /* key definitions */ +@@ -71,7 +91,26 @@ static const Key keys[] = { + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, ++ { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, ++ { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, ++ { MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} }, + { MODKEY, XK_Return, zoom, {0} }, ++ { MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_o, incrogaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_6, incrihgaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_7, incrivgaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_8, incrohgaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_9, incrovgaps, {.i = +1 } }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } }, ++ { MODKEY|Mod4Mask, XK_0, togglegaps, {0} }, ++ { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, +diff --git a/dwm.c b/dwm.c +index f1d86b2..5bbd733 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -87,6 +87,7 @@ typedef struct Client Client; + struct Client { + char name[256]; + float mina, maxa; ++ float cfact; + int x, y, w, h; + int oldx, oldy, oldw, oldh; + int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; +@@ -119,6 +120,10 @@ struct Monitor { + int by; /* bar geometry */ + int mx, my, mw, mh; /* screen size */ + int wx, wy, ww, wh; /* window area */ ++ int gappih; /* horizontal gap between windows */ ++ int gappiv; /* vertical gap between windows */ ++ int gappoh; /* horizontal outer gaps */ ++ int gappov; /* vertical outer gaps */ + unsigned int seltags; + unsigned int sellt; + unsigned int tagset[2]; +@@ -201,6 +206,7 @@ static void setclientstate(Client *c, long state); + static void setfocus(Client *c); + static void setfullscreen(Client *c, int fullscreen); + static void setlayout(const Arg *arg); ++static void setcfact(const Arg *arg); + static void setmfact(const Arg *arg); + static void setup(void); + static void seturgent(Client *c, int urg); +@@ -208,7 +214,6 @@ static void showhide(Client *c); + static void spawn(const Arg *arg); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); +-static void tile(Monitor *m); + static void togglebar(const Arg *arg); + static void togglefloating(const Arg *arg); + static void toggletag(const Arg *arg); +@@ -641,6 +646,10 @@ createmon(void) + m->nmaster = nmaster; + m->showbar = showbar; + m->topbar = topbar; ++ m->gappih = gappih; ++ m->gappiv = gappiv; ++ m->gappoh = gappoh; ++ m->gappov = gappov; + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; + strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); +@@ -1043,6 +1052,7 @@ manage(Window w, XWindowAttributes *wa) + c->w = c->oldw = wa->width; + c->h = c->oldh = wa->height; + c->oldbw = wa->border_width; ++ c->cfact = 1.0; + + updatetitle(c); + if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { +@@ -1521,6 +1531,24 @@ setlayout(const Arg *arg) + drawbar(selmon); + } + ++void ++setcfact(const Arg *arg) { ++ float f; ++ Client *c; ++ ++ c = selmon->sel; ++ ++ if(!arg || !c || !selmon->lt[selmon->sellt]->arrange) ++ return; ++ f = arg->f + c->cfact; ++ if(arg->f == 0.0) ++ f = 1.0; ++ else if(f < 0.25 || f > 4.0) ++ return; ++ c->cfact = f; ++ arrange(selmon); ++} ++ + /* arg > 1.0 will set mfact absolutely */ + void + setmfact(const Arg *arg) +@@ -1684,34 +1712,6 @@ tagmon(const Arg *arg) + sendmon(selmon->sel, dirtomon(arg->i)); + } + +-void +-tile(Monitor *m) +-{ +- unsigned int i, n, h, mw, my, ty; +- Client *c; +- +- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); +- if (n == 0) +- return; +- +- if (n > m->nmaster) +- mw = m->nmaster ? m->ww * m->mfact : 0; +- else +- mw = m->ww; +- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) +- if (i < m->nmaster) { +- h = (m->wh - my) / (MIN(n, m->nmaster) - i); +- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); +- if (my + HEIGHT(c) < m->wh) +- my += HEIGHT(c); +- } else { +- h = (m->wh - ty) / (n - i); +- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); +- if (ty + HEIGHT(c) < m->wh) +- ty += HEIGHT(c); +- } +-} +- + void + togglebar(const Arg *arg) + { +diff --git a/vanitygaps.c b/vanitygaps.c +new file mode 100644 +index 0000000..1a816b6 +--- /dev/null ++++ b/vanitygaps.c +@@ -0,0 +1,822 @@ ++/* Key binding functions */ ++static void defaultgaps(const Arg *arg); ++static void incrgaps(const Arg *arg); ++static void incrigaps(const Arg *arg); ++static void incrogaps(const Arg *arg); ++static void incrohgaps(const Arg *arg); ++static void incrovgaps(const Arg *arg); ++static void incrihgaps(const Arg *arg); ++static void incrivgaps(const Arg *arg); ++static void togglegaps(const Arg *arg); ++/* Layouts (delete the ones you do not need) */ ++static void bstack(Monitor *m); ++static void bstackhoriz(Monitor *m); ++static void centeredmaster(Monitor *m); ++static void centeredfloatingmaster(Monitor *m); ++static void deck(Monitor *m); ++static void dwindle(Monitor *m); ++static void fibonacci(Monitor *m, int s); ++static void grid(Monitor *m); ++static void nrowgrid(Monitor *m); ++static void spiral(Monitor *m); ++static void tile(Monitor *m); ++/* Internals */ ++static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc); ++static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr); ++static void setgaps(int oh, int ov, int ih, int iv); ++ ++/* Settings */ ++#if !PERTAG_PATCH ++static int enablegaps = 1; ++#endif // PERTAG_PATCH ++ ++void ++setgaps(int oh, int ov, int ih, int iv) ++{ ++ if (oh < 0) oh = 0; ++ if (ov < 0) ov = 0; ++ if (ih < 0) ih = 0; ++ if (iv < 0) iv = 0; ++ ++ selmon->gappoh = oh; ++ selmon->gappov = ov; ++ selmon->gappih = ih; ++ selmon->gappiv = iv; ++ arrange(selmon); ++} ++ ++void ++togglegaps(const Arg *arg) ++{ ++ #if PERTAG_PATCH ++ selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag]; ++ #else ++ enablegaps = !enablegaps; ++ #endif // PERTAG_PATCH ++ arrange(NULL); ++} ++ ++void ++defaultgaps(const Arg *arg) ++{ ++ setgaps(gappoh, gappov, gappih, gappiv); ++} ++ ++void ++incrgaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh + arg->i, ++ selmon->gappov + arg->i, ++ selmon->gappih + arg->i, ++ selmon->gappiv + arg->i ++ ); ++} ++ ++void ++incrigaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh, ++ selmon->gappov, ++ selmon->gappih + arg->i, ++ selmon->gappiv + arg->i ++ ); ++} ++ ++void ++incrogaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh + arg->i, ++ selmon->gappov + arg->i, ++ selmon->gappih, ++ selmon->gappiv ++ ); ++} ++ ++void ++incrohgaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh + arg->i, ++ selmon->gappov, ++ selmon->gappih, ++ selmon->gappiv ++ ); ++} ++ ++void ++incrovgaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh, ++ selmon->gappov + arg->i, ++ selmon->gappih, ++ selmon->gappiv ++ ); ++} ++ ++void ++incrihgaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh, ++ selmon->gappov, ++ selmon->gappih + arg->i, ++ selmon->gappiv ++ ); ++} ++ ++void ++incrivgaps(const Arg *arg) ++{ ++ setgaps( ++ selmon->gappoh, ++ selmon->gappov, ++ selmon->gappih, ++ selmon->gappiv + arg->i ++ ); ++} ++ ++void ++getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) ++{ ++ unsigned int n, oe, ie; ++ #if PERTAG_PATCH ++ oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag]; ++ #else ++ oe = ie = enablegaps; ++ #endif // PERTAG_PATCH ++ Client *c; ++ ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); ++ if (smartgaps && n == 1) { ++ oe = 0; // outer gaps disabled when only one client ++ } ++ ++ *oh = m->gappoh*oe; // outer horizontal gap ++ *ov = m->gappov*oe; // outer vertical gap ++ *ih = m->gappih*ie; // inner horizontal gap ++ *iv = m->gappiv*ie; // inner vertical gap ++ *nc = n; // number of clients ++} ++ ++void ++getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr) ++{ ++ unsigned int n; ++ float mfacts = 0, sfacts = 0; ++ int mtotal = 0, stotal = 0; ++ Client *c; ++ ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ++ if (n < m->nmaster) ++ mfacts += c->cfact; ++ else ++ sfacts += c->cfact; ++ ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ++ if (n < m->nmaster) ++ mtotal += msize * (c->cfact / mfacts); ++ else ++ stotal += ssize * (c->cfact / sfacts); ++ ++ *mf = mfacts; // total factor of master area ++ *sf = sfacts; // total factor of stack area ++ *mr = msize - mtotal; // the remainder (rest) of pixels after a cfacts master split ++ *sr = ssize - stotal; // the remainder (rest) of pixels after a cfacts stack split ++} ++ ++/*** ++ * Layouts ++ */ ++ ++/* ++ * Bottomstack layout + gaps ++ * https://dwm.suckless.org/patches/bottomstack/ ++ */ ++static void ++bstack(Monitor *m) ++{ ++ unsigned int i, n; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ float mfacts, sfacts; ++ int mrest, srest; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ sh = mh = m->wh - 2*oh; ++ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); ++ sw = m->ww - 2*ov - iv * (n - m->nmaster - 1); ++ ++ if (m->nmaster && n > m->nmaster) { ++ sh = (mh - ih) * (1 - m->mfact); ++ mh = mh - ih - sh; ++ sx = mx; ++ sy = my + mh + ih; ++ } ++ ++ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { ++ if (i < m->nmaster) { ++ resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); ++ mx += WIDTH(c) + iv; ++ } else { ++ resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); ++ sx += WIDTH(c) + iv; ++ } ++ } ++} ++ ++static void ++bstackhoriz(Monitor *m) ++{ ++ unsigned int i, n; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ float mfacts, sfacts; ++ int mrest, srest; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ mh = m->wh - 2*oh; ++ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); ++ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); ++ sw = m->ww - 2*ov; ++ ++ if (m->nmaster && n > m->nmaster) { ++ sh = (mh - ih) * (1 - m->mfact); ++ mh = mh - ih - sh; ++ sy = my + mh + ih; ++ sh = m->wh - mh - 2*oh - ih * (n - m->nmaster); ++ } ++ ++ getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest); ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { ++ if (i < m->nmaster) { ++ resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); ++ mx += WIDTH(c) + iv; ++ } else { ++ resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); ++ sy += HEIGHT(c) + ih; ++ } ++ } ++} ++ ++/* ++ * Centred master layout + gaps ++ * https://dwm.suckless.org/patches/centeredmaster/ ++ */ ++void ++centeredmaster(Monitor *m) ++{ ++ unsigned int i, n; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int lx = 0, ly = 0, lw = 0, lh = 0; ++ int rx = 0, ry = 0, rw = 0, rh = 0; ++ float mfacts = 0, lfacts = 0, rfacts = 0; ++ int mtotal = 0, ltotal = 0, rtotal = 0; ++ int mrest = 0, lrest = 0, rrest = 0; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ /* initialize areas */ ++ mx = m->wx + ov; ++ my = m->wy + oh; ++ mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1); ++ mw = m->ww - 2*ov; ++ lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1); ++ rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1)); ++ ++ if (m->nmaster && n > m->nmaster) { ++ /* go mfact box in the center if more than nmaster clients */ ++ if (n - m->nmaster > 1) { ++ /* ||<-S->|<---M--->|<-S->|| */ ++ mw = (m->ww - 2*ov - 2*iv) * m->mfact; ++ lw = (m->ww - mw - 2*ov - 2*iv) / 2; ++ rw = (m->ww - mw - 2*ov - 2*iv) - lw; ++ mx += lw + iv; ++ } else { ++ /* ||<---M--->|<-S->|| */ ++ mw = (mw - iv) * m->mfact; ++ lw = 0; ++ rw = m->ww - mw - iv - 2*ov; ++ } ++ lx = m->wx + ov; ++ ly = m->wy + oh; ++ rx = mx + mw + iv; ++ ry = m->wy + oh; ++ } ++ ++ /* calculate facts */ ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) { ++ if (!m->nmaster || n < m->nmaster) ++ mfacts += c->cfact; ++ else if ((n - m->nmaster) % 2) ++ lfacts += c->cfact; // total factor of left hand stack area ++ else ++ rfacts += c->cfact; // total factor of right hand stack area ++ } ++ ++ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ++ if (!m->nmaster || n < m->nmaster) ++ mtotal += mh * (c->cfact / mfacts); ++ else if ((n - m->nmaster) % 2) ++ ltotal += lh * (c->cfact / lfacts); ++ else ++ rtotal += rh * (c->cfact / rfacts); ++ ++ mrest = mh - mtotal; ++ lrest = lh - ltotal; ++ rrest = rh - rtotal; ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { ++ if (!m->nmaster || i < m->nmaster) { ++ /* nmaster clients are stacked vertically, in the center of the screen */ ++ resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); ++ my += HEIGHT(c) + ih; ++ } else { ++ /* stack clients are stacked vertically */ ++ if ((i - m->nmaster) % 2 ) { ++ resize(c, lx, ly, lw - (2*c->bw), lh * (c->cfact / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0); ++ ly += HEIGHT(c) + ih; ++ } else { ++ resize(c, rx, ry, rw - (2*c->bw), rh * (c->cfact / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0); ++ ry += HEIGHT(c) + ih; ++ } ++ } ++ } ++} ++ ++void ++centeredfloatingmaster(Monitor *m) ++{ ++ unsigned int i, n; ++ float mfacts, sfacts; ++ float mivf = 1.0; // master inner vertical gap factor ++ int oh, ov, ih, iv, mrest, srest; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ sh = mh = m->wh - 2*oh; ++ mw = m->ww - 2*ov - iv*(n - 1); ++ sw = m->ww - 2*ov - iv*(n - m->nmaster - 1); ++ ++ if (m->nmaster && n > m->nmaster) { ++ mivf = 0.8; ++ /* go mfact box in the center if more than nmaster clients */ ++ if (m->ww > m->wh) { ++ mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1); ++ mh = m->wh * 0.9; ++ } else { ++ mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1); ++ mh = m->wh * m->mfact; ++ } ++ mx = m->wx + (m->ww - mw) / 2; ++ my = m->wy + (m->wh - mh - 2*oh) / 2; ++ ++ sx = m->wx + ov; ++ sy = m->wy + oh; ++ sh = m->wh - 2*oh; ++ } ++ ++ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < m->nmaster) { ++ /* nmaster clients are stacked horizontally, in the center of the screen */ ++ resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); ++ mx += WIDTH(c) + iv*mivf; ++ } else { ++ /* stack clients are stacked horizontally */ ++ resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); ++ sx += WIDTH(c) + iv; ++ } ++} ++ ++/* ++ * Deck layout + gaps ++ * https://dwm.suckless.org/patches/deck/ ++ */ ++void ++deck(Monitor *m) ++{ ++ unsigned int i, n; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ float mfacts, sfacts; ++ int mrest, srest; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); ++ sw = mw = m->ww - 2*ov; ++ ++ if (m->nmaster && n > m->nmaster) { ++ sw = (mw - iv) * (1 - m->mfact); ++ mw = mw - iv - sw; ++ sx = mx + mw + iv; ++ sh = m->wh - 2*oh; ++ } ++ ++ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); ++ ++ if (n - m->nmaster > 0) /* override layout symbol */ ++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster); ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < m->nmaster) { ++ resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); ++ my += HEIGHT(c) + ih; ++ } else { ++ resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0); ++ } ++} ++ ++/* ++ * Fibonacci layout + gaps ++ * https://dwm.suckless.org/patches/fibonacci/ ++ */ ++void ++fibonacci(Monitor *m, int s) ++{ ++ unsigned int i, n; ++ int nx, ny, nw, nh; ++ int oh, ov, ih, iv; ++ int nv, hrest = 0, wrest = 0, r = 1; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ nx = m->wx + ov; ++ ny = m->wy + oh; ++ nw = m->ww - 2*ov; ++ nh = m->wh - 2*oh; ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { ++ if (r) { ++ if ((i % 2 && (nh - ih) / 2 <= (bh + 2*c->bw)) ++ || (!(i % 2) && (nw - iv) / 2 <= (bh + 2*c->bw))) { ++ r = 0; ++ } ++ if (r && i < n - 1) { ++ if (i % 2) { ++ nv = (nh - ih) / 2; ++ hrest = nh - 2*nv - ih; ++ nh = nv; ++ } else { ++ nv = (nw - iv) / 2; ++ wrest = nw - 2*nv - iv; ++ nw = nv; ++ } ++ ++ if ((i % 4) == 2 && !s) ++ nx += nw + iv; ++ else if ((i % 4) == 3 && !s) ++ ny += nh + ih; ++ } ++ ++ if ((i % 4) == 0) { ++ if (s) { ++ ny += nh + ih; ++ nh += hrest; ++ } ++ else { ++ nh -= hrest; ++ ny -= nh + ih; ++ } ++ } ++ else if ((i % 4) == 1) { ++ nx += nw + iv; ++ nw += wrest; ++ } ++ else if ((i % 4) == 2) { ++ ny += nh + ih; ++ nh += hrest; ++ if (i < n - 1) ++ nw += wrest; ++ } ++ else if ((i % 4) == 3) { ++ if (s) { ++ nx += nw + iv; ++ nw -= wrest; ++ } else { ++ nw -= wrest; ++ nx -= nw + iv; ++ nh += hrest; ++ } ++ } ++ if (i == 0) { ++ if (n != 1) { ++ nw = (m->ww - iv - 2*ov) - (m->ww - iv - 2*ov) * (1 - m->mfact); ++ wrest = 0; ++ } ++ ny = m->wy + oh; ++ } ++ else if (i == 1) ++ nw = m->ww - nw - iv - 2*ov; ++ i++; ++ } ++ ++ resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False); ++ } ++} ++ ++void ++dwindle(Monitor *m) ++{ ++ fibonacci(m, 1); ++} ++ ++void ++spiral(Monitor *m) ++{ ++ fibonacci(m, 0); ++} ++ ++/* ++ * Gappless grid layout + gaps (ironically) ++ * https://dwm.suckless.org/patches/gaplessgrid/ ++ */ ++void ++gaplessgrid(Monitor *m) ++{ ++ unsigned int i, n; ++ int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters ++ int oh, ov, ih, iv; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ /* grid dimensions */ ++ for (cols = 0; cols <= n/2; cols++) ++ if (cols*cols >= n) ++ break; ++ if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */ ++ cols = 2; ++ rows = n/cols; ++ cn = rn = 0; // reset column no, row no, client count ++ ++ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; ++ cw = (m->ww - 2*ov - iv * (cols - 1)) / cols; ++ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; ++ crest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; ++ x = m->wx + ov; ++ y = m->wy + oh; ++ ++ for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) { ++ if (i/rows + 1 > cols - n%cols) { ++ rows = n/cols + 1; ++ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; ++ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; ++ } ++ resize(c, ++ x, ++ y + rn*(ch + ih) + MIN(rn, rrest), ++ cw + (cn < crest ? 1 : 0) - 2*c->bw, ++ ch + (rn < rrest ? 1 : 0) - 2*c->bw, ++ 0); ++ rn++; ++ if (rn >= rows) { ++ rn = 0; ++ x += cw + ih + (cn < crest ? 1 : 0); ++ cn++; ++ } ++ } ++} ++ ++/* ++ * Gridmode layout + gaps ++ * https://dwm.suckless.org/patches/gridmode/ ++ */ ++void ++grid(Monitor *m) ++{ ++ unsigned int i, n; ++ int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows; ++ int oh, ov, ih, iv; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ ++ /* grid dimensions */ ++ for (rows = 0; rows <= n/2; rows++) ++ if (rows*rows >= n) ++ break; ++ cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; ++ ++ /* window geoms (cell height/width) */ ++ ch = (m->wh - 2*oh - ih * (rows - 1)) / (rows ? rows : 1); ++ cw = (m->ww - 2*ov - iv * (cols - 1)) / (cols ? cols : 1); ++ chrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; ++ cwrest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { ++ cc = i / rows; ++ cr = i % rows; ++ cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest); ++ cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest); ++ resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2*c->bw, ch + (cr < chrest ? 1 : 0) - 2*c->bw, False); ++ } ++} ++ ++/* ++ * Horizontal grid layout + gaps ++ * https://dwm.suckless.org/patches/horizgrid/ ++ */ ++void ++horizgrid(Monitor *m) { ++ Client *c; ++ unsigned int n, i; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ int ntop, nbottom = 1; ++ float mfacts = 0, sfacts = 0; ++ int mrest, srest, mtotal = 0, stotal = 0; ++ ++ /* Count windows */ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ if (n <= 2) ++ ntop = n; ++ else { ++ ntop = n / 2; ++ nbottom = n - ntop; ++ } ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ sh = mh = m->wh - 2*oh; ++ sw = mw = m->ww - 2*ov; ++ ++ if (n > ntop) { ++ sh = (mh - ih) / 2; ++ mh = mh - ih - sh; ++ sy = my + mh + ih; ++ mw = m->ww - 2*ov - iv * (ntop - 1); ++ sw = m->ww - 2*ov - iv * (nbottom - 1); ++ } ++ ++ /* calculate facts */ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < ntop) ++ mfacts += c->cfact; ++ else ++ sfacts += c->cfact; ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < ntop) ++ mtotal += mh * (c->cfact / mfacts); ++ else ++ stotal += sw * (c->cfact / sfacts); ++ ++ mrest = mh - mtotal; ++ srest = sw - stotal; ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < ntop) { ++ resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); ++ mx += WIDTH(c) + iv; ++ } else { ++ resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - ntop) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); ++ sx += WIDTH(c) + iv; ++ } ++} ++ ++/* ++ * nrowgrid layout + gaps ++ * https://dwm.suckless.org/patches/nrowgrid/ ++ */ ++void ++nrowgrid(Monitor *m) ++{ ++ unsigned int n; ++ int ri = 0, ci = 0; /* counters */ ++ int oh, ov, ih, iv; /* vanitygap settings */ ++ unsigned int cx, cy, cw, ch; /* client geometry */ ++ unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */ ++ unsigned int cols, rows = m->nmaster + 1; ++ Client *c; ++ ++ /* count clients */ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ ++ /* nothing to do here */ ++ if (n == 0) ++ return; ++ ++ /* force 2 clients to always split vertically */ ++ if (FORCE_VSPLIT && n == 2) ++ rows = 1; ++ ++ /* never allow empty rows */ ++ if (n < rows) ++ rows = n; ++ ++ /* define first row */ ++ cols = n / rows; ++ uc = cols; ++ cy = m->wy + oh; ++ ch = (m->wh - 2*oh - ih*(rows - 1)) / rows; ++ uh = ch; ++ ++ for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) { ++ if (ci == cols) { ++ uw = 0; ++ ci = 0; ++ ri++; ++ ++ /* next row */ ++ cols = (n - uc) / (rows - ri); ++ uc += cols; ++ cy = m->wy + oh + uh + ih; ++ uh += ch + ih; ++ } ++ ++ cx = m->wx + ov + uw; ++ cw = (m->ww - 2*ov - uw) / (cols - ci); ++ uw += cw + iv; ++ ++ resize(c, cx, cy, cw - (2*c->bw), ch - (2*c->bw), 0); ++ } ++} ++ ++/* ++ * Default tile layout + gaps ++ */ ++static void ++tile(Monitor *m) ++{ ++ unsigned int i, n; ++ int oh, ov, ih, iv; ++ int mx = 0, my = 0, mh = 0, mw = 0; ++ int sx = 0, sy = 0, sh = 0, sw = 0; ++ float mfacts, sfacts; ++ int mrest, srest; ++ Client *c; ++ ++ getgaps(m, &oh, &ov, &ih, &iv, &n); ++ if (n == 0) ++ return; ++ ++ sx = mx = m->wx + ov; ++ sy = my = m->wy + oh; ++ mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); ++ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); ++ sw = mw = m->ww - 2*ov; ++ ++ if (m->nmaster && n > m->nmaster) { ++ sw = (mw - iv) * (1 - m->mfact); ++ mw = mw - iv - sw; ++ sx = mx + mw + iv; ++ } ++ ++ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); ++ ++ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < m->nmaster) { ++ resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); ++ my += HEIGHT(c) + ih; ++ } else { ++ resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); ++ sy += HEIGHT(c) + ih; ++ } ++} +\ No newline at end of file diff --git a/patches/dwm-deck-6.2.diff b/patches/dwm-deck-6.2.diff new file mode 100644 index 0000000..b5afed7 --- /dev/null +++ b/patches/dwm-deck-6.2.diff @@ -0,0 +1,77 @@ +From a071b060a1b9b94bcb167b988cf7774ceb870aad Mon Sep 17 00:00:00 2001 +From: Jack Bird +Date: Mon, 2 Aug 2021 18:44:05 +0100 +Subject: [PATCH] deck patch works with 6.2 + +--- + config.def.h | 2 ++ + dwm.c | 26 ++++++++++++++++++++++++++ + 2 files changed, 28 insertions(+) + +diff --git a/config.def.h b/config.def.h +index a2ac963..d865e18 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -42,6 +42,7 @@ static const Layout layouts[] = { + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, ++ { "[D]", deck }, + }; + + /* key definitions */ +@@ -77,6 +78,7 @@ static Key keys[] = { + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, ++ { MODKEY, XK_r, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, +diff --git a/dwm.c b/dwm.c +index 5e4d494..c67ff91 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -157,6 +157,7 @@ static void configure(Client *c); + static void configurenotify(XEvent *e); + static void configurerequest(XEvent *e); + static Monitor *createmon(void); ++static void deck(Monitor *m); + static void destroynotify(XEvent *e); + static void detach(Client *c); + static void detachstack(Client *c); +@@ -655,6 +656,31 @@ destroynotify(XEvent *e) + unmanage(c, 1); + } + ++void ++deck(Monitor *m) { ++ unsigned int i, n, h, mw, my; ++ Client *c; ++ ++ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); ++ if(n == 0) ++ return; ++ ++ if(n > m->nmaster) { ++ mw = m->nmaster ? m->ww * m->mfact : 0; ++ snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n - m->nmaster); ++ } ++ else ++ mw = m->ww; ++ for(i = my = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if(i < m->nmaster) { ++ h = (m->wh - my) / (MIN(n, m->nmaster) - i); ++ resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False); ++ my += HEIGHT(c); ++ } ++ else ++ resize(c, m->wx + mw, m->wy, m->ww - mw - (2*c->bw), m->wh - (2*c->bw), False); ++} ++ + void + detach(Client *c) + { +-- +2.32.0 + diff --git a/patches/dwm-focusonnetactive-2017-12-24-3756f7f.diff b/patches/dwm-focusonnetactive-2017-12-24-3756f7f.diff new file mode 100644 index 0000000..f88d424 --- /dev/null +++ b/patches/dwm-focusonnetactive-2017-12-24-3756f7f.diff @@ -0,0 +1,55 @@ +From cda7fd4e732c6db03180301e45b48b961fda5eba Mon Sep 17 00:00:00 2001 +From: Danny O'Brien +Date: Sat, 23 Dec 2017 16:45:29 -0800 +Subject: [PATCH] Activate a window in response to _NET_ACTIVE_WINDOW + +By default, dwm response to client requests to _NET_ACTIVE_WINDOW client +messages by setting the urgency bit on the named window. + +This patch activates the window instead. + +Both behaviours are legitimate according to +https://specifications.freedesktop.org/wm-spec/wm-spec-latest.html#idm140200472702304 + +One should decide which of these one should perform based on the message +senders' untestable claims that it represents the end-user. Setting the +urgency bit is the conservative decision. This patch implements the more +trusting alternative. + +It also allows dwm to work with `wmctrl -a` and other external window +management utilities. +--- + dwm.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/dwm.c b/dwm.c +index ff893df..b278182 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -515,6 +515,7 @@ clientmessage(XEvent *e) + { + XClientMessageEvent *cme = &e->xclient; + Client *c = wintoclient(cme->window); ++ unsigned int i; + + if (!c) + return; +@@ -524,8 +525,13 @@ clientmessage(XEvent *e) + setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ + || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); + } else if (cme->message_type == netatom[NetActiveWindow]) { +- if (c != selmon->sel && !c->isurgent) +- seturgent(c, 1); ++ for (i = 0; i < LENGTH(tags) && !((1 << i) & c->tags); i++); ++ if (i < LENGTH(tags)) { ++ const Arg a = {.ui = 1 << i}; ++ view(&a); ++ focus(c); ++ restack(selmon); ++ } + } + } + +-- +2.15.1 + diff --git a/patches/dwm-hide_vacant_tags-6.3.diff b/patches/dwm-hide_vacant_tags-6.3.diff new file mode 100644 index 0000000..0ccc7fc --- /dev/null +++ b/patches/dwm-hide_vacant_tags-6.3.diff @@ -0,0 +1,39 @@ +diff --git a/dwm.c b/dwm.c +index a96f33c..f2da729 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -432,9 +432,15 @@ buttonpress(XEvent *e) + } + if (ev->window == selmon->barwin) { + i = x = 0; +- do ++ unsigned int occ = 0; ++ for(c = m->clients; c; c=c->next) ++ occ |= c->tags; ++ do { ++ /* Do not reserve space for vacant tags */ ++ if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) ++ continue; + x += TEXTW(tags[i]); +- while (ev->x >= x && ++i < LENGTH(tags)); ++ } while (ev->x >= x && ++i < LENGTH(tags)); + if (i < LENGTH(tags)) { + click = ClkTagBar; + arg.ui = 1 << i; +@@ -719,13 +725,12 @@ drawbar(Monitor *m) + } + x = 0; + for (i = 0; i < LENGTH(tags); i++) { ++ /* Do not draw vacant tags */ ++ if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) ++ continue; + w = TEXTW(tags[i]); + drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); +- if (occ & 1 << i) +- drw_rect(drw, x + boxs, boxs, boxw, boxw, +- m == selmon && selmon->sel && selmon->sel->tags & 1 << i, +- urg & 1 << i); + x += w; + } + w = blw = TEXTW(m->ltsymbol); diff --git a/patches/dwm-ipc-20201106-f04cac6.diff b/patches/dwm-ipc-20201106-f04cac6.diff new file mode 100644 index 0000000..5d947f6 --- /dev/null +++ b/patches/dwm-ipc-20201106-f04cac6.diff @@ -0,0 +1,3246 @@ +From 9c4c16485ac374583a1055ff7c26cba53ac92c05 Mon Sep 17 00:00:00 2001 +From: mihirlad55 +Date: Fri, 6 Nov 2020 17:13:42 +0000 +Subject: [PATCH] Add IPC support through a unix socket + +This patch currently supports the following requests: +* Run custom commands with arguments (similar to key bind functions) +* Get monitor properties +* Get all available layouts +* Get available tags +* Get client properties +* Subscribe to tag change, client focus change, and layout change, + monitor focus change, focused title change, and client state change + events + +This patch includes a dwm-msg cli program that supports all of the +above requests for easy integration into shell scripts. + +The messages are sent in a JSON format to promote integration to +increase scriptability in languages like Python/JavaScript. + +The patch requires YAJL for JSON parsing and a system with epoll +support. Portability is planned to be increased in the future. + +This patch is best applied after all other patches to avoid merge +conflicts. + +For more info on the IPC implementation and how to send/receive +messages, documentation can be found at +https://github.com/mihirlad55/dwm-ipc +--- + IPCClient.c | 66 +++ + IPCClient.h | 61 +++ + Makefile | 10 +- + config.def.h | 18 + + config.mk | 8 +- + dwm-msg.c | 548 +++++++++++++++++++++++ + dwm.c | 150 ++++++- + ipc.c | 1202 ++++++++++++++++++++++++++++++++++++++++++++++++++ + ipc.h | 320 ++++++++++++++ + util.c | 135 ++++++ + util.h | 10 + + yajl_dumps.c | 351 +++++++++++++++ + yajl_dumps.h | 65 +++ + 13 files changed, 2931 insertions(+), 13 deletions(-) + create mode 100644 IPCClient.c + create mode 100644 IPCClient.h + create mode 100644 dwm-msg.c + create mode 100644 ipc.c + create mode 100644 ipc.h + create mode 100644 yajl_dumps.c + create mode 100644 yajl_dumps.h + +diff --git a/IPCClient.c b/IPCClient.c +new file mode 100644 +index 0000000..0d3eefb +--- /dev/null ++++ b/IPCClient.c +@@ -0,0 +1,66 @@ ++#include "IPCClient.h" ++ ++#include ++#include ++ ++#include "util.h" ++ ++IPCClient * ++ipc_client_new(int fd) ++{ ++ IPCClient *c = (IPCClient *)malloc(sizeof(IPCClient)); ++ ++ if (c == NULL) return NULL; ++ ++ // Initialize struct ++ memset(&c->event, 0, sizeof(struct epoll_event)); ++ ++ c->buffer_size = 0; ++ c->buffer = NULL; ++ c->fd = fd; ++ c->event.data.fd = fd; ++ c->next = NULL; ++ c->prev = NULL; ++ c->subscriptions = 0; ++ ++ return c; ++} ++ ++void ++ipc_list_add_client(IPCClientList *list, IPCClient *nc) ++{ ++ DEBUG("Adding client with fd %d to list\n", nc->fd); ++ ++ if (*list == NULL) { ++ // List is empty, point list at first client ++ *list = nc; ++ } else { ++ IPCClient *c; ++ // Go to last client in list ++ for (c = *list; c && c->next; c = c->next) ++ ; ++ c->next = nc; ++ nc->prev = c; ++ } ++} ++ ++void ++ipc_list_remove_client(IPCClientList *list, IPCClient *c) ++{ ++ IPCClient *cprev = c->prev; ++ IPCClient *cnext = c->next; ++ ++ if (cprev != NULL) cprev->next = c->next; ++ if (cnext != NULL) cnext->prev = c->prev; ++ if (c == *list) *list = c->next; ++} ++ ++IPCClient * ++ipc_list_get_client(IPCClientList list, int fd) ++{ ++ for (IPCClient *c = list; c; c = c->next) { ++ if (c->fd == fd) return c; ++ } ++ ++ return NULL; ++} +diff --git a/IPCClient.h b/IPCClient.h +new file mode 100644 +index 0000000..307dfba +--- /dev/null ++++ b/IPCClient.h +@@ -0,0 +1,61 @@ ++#ifndef IPC_CLIENT_H_ ++#define IPC_CLIENT_H_ ++ ++#include ++#include ++#include ++ ++typedef struct IPCClient IPCClient; ++/** ++ * This structure contains the details of an IPC Client and pointers for a ++ * linked list ++ */ ++struct IPCClient { ++ int fd; ++ int subscriptions; ++ ++ char *buffer; ++ uint32_t buffer_size; ++ ++ struct epoll_event event; ++ IPCClient *next; ++ IPCClient *prev; ++}; ++ ++typedef IPCClient *IPCClientList; ++ ++/** ++ * Allocate memory for new IPCClient with the specified file descriptor and ++ * initialize struct. ++ * ++ * @param fd File descriptor of IPC client ++ * ++ * @return Address to allocated IPCClient struct ++ */ ++IPCClient *ipc_client_new(int fd); ++ ++/** ++ * Add an IPC Client to the specified list ++ * ++ * @param list Address of the list to add the client to ++ * @param nc Address of the IPCClient ++ */ ++void ipc_list_add_client(IPCClientList *list, IPCClient *nc); ++ ++/** ++ * Remove an IPCClient from the specified list ++ * ++ * @param list Address of the list to remove the client from ++ * @param c Address of the IPCClient ++ */ ++void ipc_list_remove_client(IPCClientList *list, IPCClient *c); ++ ++/** ++ * Get an IPCClient from the specified IPCClient list ++ * ++ * @param list List to remove the client from ++ * @param fd File descriptor of the IPCClient ++ */ ++IPCClient *ipc_list_get_client(IPCClientList list, int fd); ++ ++#endif // IPC_CLIENT_H_ +diff --git a/Makefile b/Makefile +index 77bcbc0..0456754 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ include config.mk + SRC = drw.c dwm.c util.c + OBJ = ${SRC:.c=.o} + +-all: options dwm ++all: options dwm dwm-msg + + options: + @echo dwm build options: +@@ -25,8 +25,11 @@ config.h: + dwm: ${OBJ} + ${CC} -o $@ ${OBJ} ${LDFLAGS} + ++dwm-msg: dwm-msg.o ++ ${CC} -o $@ $< ${LDFLAGS} ++ + clean: +- rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz ++ rm -f dwm dwm-msg ${OBJ} dwm-${VERSION}.tar.gz + + dist: clean + mkdir -p dwm-${VERSION} +@@ -38,8 +41,9 @@ dist: clean + + install: all + mkdir -p ${DESTDIR}${PREFIX}/bin +- cp -f dwm ${DESTDIR}${PREFIX}/bin ++ cp -f dwm dwm-msg ${DESTDIR}${PREFIX}/bin + chmod 755 ${DESTDIR}${PREFIX}/bin/dwm ++ chmod 755 ${DESTDIR}${PREFIX}/bin/dwm-msg + mkdir -p ${DESTDIR}${MANPREFIX}/man1 + sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 + chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 +diff --git a/config.def.h b/config.def.h +index 1c0b587..059a831 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -113,3 +113,21 @@ static Button buttons[] = { + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + }; + ++static const char *ipcsockpath = "/tmp/dwm.sock"; ++static IPCCommand ipccommands[] = { ++ IPCCOMMAND( view, 1, {ARG_TYPE_UINT} ), ++ IPCCOMMAND( toggleview, 1, {ARG_TYPE_UINT} ), ++ IPCCOMMAND( tag, 1, {ARG_TYPE_UINT} ), ++ IPCCOMMAND( toggletag, 1, {ARG_TYPE_UINT} ), ++ IPCCOMMAND( tagmon, 1, {ARG_TYPE_UINT} ), ++ IPCCOMMAND( focusmon, 1, {ARG_TYPE_SINT} ), ++ IPCCOMMAND( focusstack, 1, {ARG_TYPE_SINT} ), ++ IPCCOMMAND( zoom, 1, {ARG_TYPE_NONE} ), ++ IPCCOMMAND( incnmaster, 1, {ARG_TYPE_SINT} ), ++ IPCCOMMAND( killclient, 1, {ARG_TYPE_SINT} ), ++ IPCCOMMAND( togglefloating, 1, {ARG_TYPE_NONE} ), ++ IPCCOMMAND( setmfact, 1, {ARG_TYPE_FLOAT} ), ++ IPCCOMMAND( setlayoutsafe, 1, {ARG_TYPE_PTR} ), ++ IPCCOMMAND( quit, 1, {ARG_TYPE_NONE} ) ++}; ++ +diff --git a/config.mk b/config.mk +index 7084c33..8570938 100644 +--- a/config.mk ++++ b/config.mk +@@ -20,9 +20,13 @@ FREETYPEINC = /usr/include/freetype2 + # OpenBSD (uncomment) + #FREETYPEINC = ${X11INC}/freetype2 + ++# yajl ++YAJLLIBS = -lyajl ++YAJLINC = /usr/include/yajl ++ + # includes and libs +-INCS = -I${X11INC} -I${FREETYPEINC} +-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ++INCS = -I${X11INC} -I${FREETYPEINC} -I${YAJLINC} ++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${YAJLLIBS} + + # flags + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +diff --git a/dwm-msg.c b/dwm-msg.c +new file mode 100644 +index 0000000..1971d32 +--- /dev/null ++++ b/dwm-msg.c +@@ -0,0 +1,548 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define IPC_MAGIC "DWM-IPC" ++// clang-format off ++#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C' } ++// clang-format on ++#define IPC_MAGIC_LEN 7 // Not including null char ++ ++#define IPC_EVENT_TAG_CHANGE "tag_change_event" ++#define IPC_EVENT_CLIENT_FOCUS_CHANGE "client_focus_change_event" ++#define IPC_EVENT_LAYOUT_CHANGE "layout_change_event" ++#define IPC_EVENT_MONITOR_FOCUS_CHANGE "monitor_focus_change_event" ++#define IPC_EVENT_FOCUSED_TITLE_CHANGE "focused_title_change_event" ++#define IPC_EVENT_FOCUSED_STATE_CHANGE "focused_state_change_event" ++ ++#define YSTR(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str)) ++#define YINT(num) yajl_gen_integer(gen, num) ++#define YDOUBLE(num) yajl_gen_double(gen, num) ++#define YBOOL(v) yajl_gen_bool(gen, v) ++#define YNULL() yajl_gen_null(gen) ++#define YARR(body) \ ++ { \ ++ yajl_gen_array_open(gen); \ ++ body; \ ++ yajl_gen_array_close(gen); \ ++ } ++#define YMAP(body) \ ++ { \ ++ yajl_gen_map_open(gen); \ ++ body; \ ++ yajl_gen_map_close(gen); \ ++ } ++ ++typedef unsigned long Window; ++ ++const char *DEFAULT_SOCKET_PATH = "/tmp/dwm.sock"; ++static int sock_fd = -1; ++static unsigned int ignore_reply = 0; ++ ++typedef enum IPCMessageType { ++ IPC_TYPE_RUN_COMMAND = 0, ++ IPC_TYPE_GET_MONITORS = 1, ++ IPC_TYPE_GET_TAGS = 2, ++ IPC_TYPE_GET_LAYOUTS = 3, ++ IPC_TYPE_GET_DWM_CLIENT = 4, ++ IPC_TYPE_SUBSCRIBE = 5, ++ IPC_TYPE_EVENT = 6 ++} IPCMessageType; ++ ++// Every IPC message must begin with this ++typedef struct dwm_ipc_header { ++ uint8_t magic[IPC_MAGIC_LEN]; ++ uint32_t size; ++ uint8_t type; ++} __attribute((packed)) dwm_ipc_header_t; ++ ++static int ++recv_message(uint8_t *msg_type, uint32_t *reply_size, uint8_t **reply) ++{ ++ uint32_t read_bytes = 0; ++ const int32_t to_read = sizeof(dwm_ipc_header_t); ++ char header[to_read]; ++ char *walk = header; ++ ++ // Try to read header ++ while (read_bytes < to_read) { ++ ssize_t n = read(sock_fd, header + read_bytes, to_read - read_bytes); ++ ++ if (n == 0) { ++ if (read_bytes == 0) { ++ fprintf(stderr, "Unexpectedly reached EOF while reading header."); ++ fprintf(stderr, ++ "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", ++ read_bytes, to_read); ++ return -2; ++ } else { ++ fprintf(stderr, "Unexpectedly reached EOF while reading header."); ++ fprintf(stderr, ++ "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", ++ read_bytes, to_read); ++ return -3; ++ } ++ } else if (n == -1) { ++ return -1; ++ } ++ ++ read_bytes += n; ++ } ++ ++ // Check if magic string in header matches ++ if (memcmp(walk, IPC_MAGIC, IPC_MAGIC_LEN) != 0) { ++ fprintf(stderr, "Invalid magic string. Got '%.*s', expected '%s'\n", ++ IPC_MAGIC_LEN, walk, IPC_MAGIC); ++ return -3; ++ } ++ ++ walk += IPC_MAGIC_LEN; ++ ++ // Extract reply size ++ memcpy(reply_size, walk, sizeof(uint32_t)); ++ walk += sizeof(uint32_t); ++ ++ // Extract message type ++ memcpy(msg_type, walk, sizeof(uint8_t)); ++ walk += sizeof(uint8_t); ++ ++ (*reply) = malloc(*reply_size); ++ ++ // Extract payload ++ read_bytes = 0; ++ while (read_bytes < *reply_size) { ++ ssize_t n = read(sock_fd, *reply + read_bytes, *reply_size - read_bytes); ++ ++ if (n == 0) { ++ fprintf(stderr, "Unexpectedly reached EOF while reading payload."); ++ fprintf(stderr, "Read %" PRIu32 " bytes, expected %" PRIu32 " bytes.\n", ++ read_bytes, *reply_size); ++ free(*reply); ++ return -2; ++ } else if (n == -1) { ++ if (errno == EINTR || errno == EAGAIN) continue; ++ free(*reply); ++ return -1; ++ } ++ ++ read_bytes += n; ++ } ++ ++ return 0; ++} ++ ++static int ++read_socket(IPCMessageType *msg_type, uint32_t *msg_size, char **msg) ++{ ++ int ret = -1; ++ ++ while (ret != 0) { ++ ret = recv_message((uint8_t *)msg_type, msg_size, (uint8_t **)msg); ++ ++ if (ret < 0) { ++ // Try again (non-fatal error) ++ if (ret == -1 && (errno == EINTR || errno == EAGAIN)) continue; ++ ++ fprintf(stderr, "Error receiving response from socket. "); ++ fprintf(stderr, "The connection might have been lost.\n"); ++ exit(2); ++ } ++ } ++ ++ return 0; ++} ++ ++static ssize_t ++write_socket(const void *buf, size_t count) ++{ ++ size_t written = 0; ++ ++ while (written < count) { ++ const ssize_t n = ++ write(sock_fd, ((uint8_t *)buf) + written, count - written); ++ ++ if (n == -1) { ++ if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) ++ continue; ++ else ++ return n; ++ } ++ written += n; ++ } ++ return written; ++} ++ ++static void ++connect_to_socket() ++{ ++ struct sockaddr_un addr; ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Initialize struct to 0 ++ memset(&addr, 0, sizeof(struct sockaddr_un)); ++ ++ addr.sun_family = AF_UNIX; ++ strcpy(addr.sun_path, DEFAULT_SOCKET_PATH); ++ ++ connect(sock, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)); ++ ++ sock_fd = sock; ++} ++ ++static int ++send_message(IPCMessageType msg_type, uint32_t msg_size, uint8_t *msg) ++{ ++ dwm_ipc_header_t header = { ++ .magic = IPC_MAGIC_ARR, .size = msg_size, .type = msg_type}; ++ ++ size_t header_size = sizeof(dwm_ipc_header_t); ++ size_t total_size = header_size + msg_size; ++ ++ uint8_t buffer[total_size]; ++ ++ // Copy header to buffer ++ memcpy(buffer, &header, header_size); ++ // Copy message to buffer ++ memcpy(buffer + header_size, msg, header.size); ++ ++ write_socket(buffer, total_size); ++ ++ return 0; ++} ++ ++static int ++is_float(const char *s) ++{ ++ size_t len = strlen(s); ++ int is_dot_used = 0; ++ int is_minus_used = 0; ++ ++ // Floats can only have one decimal point in between or digits ++ // Optionally, floats can also be below zero (negative) ++ for (int i = 0; i < len; i++) { ++ if (isdigit(s[i])) ++ continue; ++ else if (!is_dot_used && s[i] == '.' && i != 0 && i != len - 1) { ++ is_dot_used = 1; ++ continue; ++ } else if (!is_minus_used && s[i] == '-' && i == 0) { ++ is_minus_used = 1; ++ continue; ++ } else ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static int ++is_unsigned_int(const char *s) ++{ ++ size_t len = strlen(s); ++ ++ // Unsigned int can only have digits ++ for (int i = 0; i < len; i++) { ++ if (isdigit(s[i])) ++ continue; ++ else ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static int ++is_signed_int(const char *s) ++{ ++ size_t len = strlen(s); ++ ++ // Signed int can only have digits and a negative sign at the start ++ for (int i = 0; i < len; i++) { ++ if (isdigit(s[i])) ++ continue; ++ else if (i == 0 && s[i] == '-') { ++ continue; ++ } else ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static void ++flush_socket_reply() ++{ ++ IPCMessageType reply_type; ++ uint32_t reply_size; ++ char *reply; ++ ++ read_socket(&reply_type, &reply_size, &reply); ++ ++ free(reply); ++} ++ ++static void ++print_socket_reply() ++{ ++ IPCMessageType reply_type; ++ uint32_t reply_size; ++ char *reply; ++ ++ read_socket(&reply_type, &reply_size, &reply); ++ ++ printf("%.*s\n", reply_size, reply); ++ fflush(stdout); ++ free(reply); ++} ++ ++static int ++run_command(const char *name, char *args[], int argc) ++{ ++ const unsigned char *msg; ++ size_t msg_size; ++ ++ yajl_gen gen = yajl_gen_alloc(NULL); ++ ++ // Message format: ++ // { ++ // "command": "", ++ // "args": [ ... ] ++ // } ++ // clang-format off ++ YMAP( ++ YSTR("command"); YSTR(name); ++ YSTR("args"); YARR( ++ for (int i = 0; i < argc; i++) { ++ if (is_signed_int(args[i])) { ++ long long num = atoll(args[i]); ++ YINT(num); ++ } else if (is_float(args[i])) { ++ float num = atof(args[i]); ++ YDOUBLE(num); ++ } else { ++ YSTR(args[i]); ++ } ++ } ++ ) ++ ) ++ // clang-format on ++ ++ yajl_gen_get_buf(gen, &msg, &msg_size); ++ ++ send_message(IPC_TYPE_RUN_COMMAND, msg_size, (uint8_t *)msg); ++ ++ if (!ignore_reply) ++ print_socket_reply(); ++ else ++ flush_socket_reply(); ++ ++ yajl_gen_free(gen); ++ ++ return 0; ++} ++ ++static int ++get_monitors() ++{ ++ send_message(IPC_TYPE_GET_MONITORS, 1, (uint8_t *)""); ++ print_socket_reply(); ++ return 0; ++} ++ ++static int ++get_tags() ++{ ++ send_message(IPC_TYPE_GET_TAGS, 1, (uint8_t *)""); ++ print_socket_reply(); ++ ++ return 0; ++} ++ ++static int ++get_layouts() ++{ ++ send_message(IPC_TYPE_GET_LAYOUTS, 1, (uint8_t *)""); ++ print_socket_reply(); ++ ++ return 0; ++} ++ ++static int ++get_dwm_client(Window win) ++{ ++ const unsigned char *msg; ++ size_t msg_size; ++ ++ yajl_gen gen = yajl_gen_alloc(NULL); ++ ++ // Message format: ++ // { ++ // "client_window_id": "" ++ // } ++ // clang-format off ++ YMAP( ++ YSTR("client_window_id"); YINT(win); ++ ) ++ // clang-format on ++ ++ yajl_gen_get_buf(gen, &msg, &msg_size); ++ ++ send_message(IPC_TYPE_GET_DWM_CLIENT, msg_size, (uint8_t *)msg); ++ ++ print_socket_reply(); ++ ++ yajl_gen_free(gen); ++ ++ return 0; ++} ++ ++static int ++subscribe(const char *event) ++{ ++ const unsigned char *msg; ++ size_t msg_size; ++ ++ yajl_gen gen = yajl_gen_alloc(NULL); ++ ++ // Message format: ++ // { ++ // "event": "", ++ // "action": "subscribe" ++ // } ++ // clang-format off ++ YMAP( ++ YSTR("event"); YSTR(event); ++ YSTR("action"); YSTR("subscribe"); ++ ) ++ // clang-format on ++ ++ yajl_gen_get_buf(gen, &msg, &msg_size); ++ ++ send_message(IPC_TYPE_SUBSCRIBE, msg_size, (uint8_t *)msg); ++ ++ if (!ignore_reply) ++ print_socket_reply(); ++ else ++ flush_socket_reply(); ++ ++ yajl_gen_free(gen); ++ ++ return 0; ++} ++ ++static void ++usage_error(const char *prog_name, const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ ++ fprintf(stderr, "Error: "); ++ vfprintf(stderr, format, args); ++ fprintf(stderr, "\nusage: %s [...]\n", prog_name); ++ fprintf(stderr, "Try '%s help'\n", prog_name); ++ ++ va_end(args); ++ exit(1); ++} ++ ++static void ++print_usage(const char *name) ++{ ++ printf("usage: %s [options] [...]\n", name); ++ puts(""); ++ puts("Commands:"); ++ puts(" run_command [args...] Run an IPC command"); ++ puts(""); ++ puts(" get_monitors Get monitor properties"); ++ puts(""); ++ puts(" get_tags Get list of tags"); ++ puts(""); ++ puts(" get_layouts Get list of layouts"); ++ puts(""); ++ puts(" get_dwm_client Get dwm client proprties"); ++ puts(""); ++ puts(" subscribe [events...] Subscribe to specified events"); ++ puts(" Options: " IPC_EVENT_TAG_CHANGE ","); ++ puts(" " IPC_EVENT_LAYOUT_CHANGE ","); ++ puts(" " IPC_EVENT_CLIENT_FOCUS_CHANGE ","); ++ puts(" " IPC_EVENT_MONITOR_FOCUS_CHANGE ","); ++ puts(" " IPC_EVENT_FOCUSED_TITLE_CHANGE ","); ++ puts(" " IPC_EVENT_FOCUSED_STATE_CHANGE); ++ puts(""); ++ puts(" help Display this message"); ++ puts(""); ++ puts("Options:"); ++ puts(" --ignore-reply Don't print reply messages from"); ++ puts(" run_command and subscribe."); ++ puts(""); ++} ++ ++int ++main(int argc, char *argv[]) ++{ ++ const char *prog_name = argv[0]; ++ ++ connect_to_socket(); ++ if (sock_fd == -1) { ++ fprintf(stderr, "Failed to connect to socket\n"); ++ return 1; ++ } ++ ++ int i = 1; ++ if (i < argc && strcmp(argv[i], "--ignore-reply") == 0) { ++ ignore_reply = 1; ++ i++; ++ } ++ ++ if (i >= argc) usage_error(prog_name, "Expected an argument, got none"); ++ ++ if (strcmp(argv[i], "help") == 0) ++ print_usage(prog_name); ++ else if (strcmp(argv[i], "run_command") == 0) { ++ if (++i >= argc) usage_error(prog_name, "No command specified"); ++ // Command name ++ char *command = argv[i]; ++ // Command arguments are everything after command name ++ char **command_args = argv + ++i; ++ // Number of command arguments ++ int command_argc = argc - i; ++ run_command(command, command_args, command_argc); ++ } else if (strcmp(argv[i], "get_monitors") == 0) { ++ get_monitors(); ++ } else if (strcmp(argv[i], "get_tags") == 0) { ++ get_tags(); ++ } else if (strcmp(argv[i], "get_layouts") == 0) { ++ get_layouts(); ++ } else if (strcmp(argv[i], "get_dwm_client") == 0) { ++ if (++i < argc) { ++ if (is_unsigned_int(argv[i])) { ++ Window win = atol(argv[i]); ++ get_dwm_client(win); ++ } else ++ usage_error(prog_name, "Expected unsigned integer argument"); ++ } else ++ usage_error(prog_name, "Expected the window id"); ++ } else if (strcmp(argv[i], "subscribe") == 0) { ++ if (++i < argc) { ++ for (int j = i; j < argc; j++) subscribe(argv[j]); ++ } else ++ usage_error(prog_name, "Expected event name"); ++ // Keep listening for events forever ++ while (1) { ++ print_socket_reply(); ++ } ++ } else ++ usage_error(prog_name, "Invalid argument '%s'", argv[i]); ++ ++ return 0; ++} +diff --git a/dwm.c b/dwm.c +index 9fd0286..c90c61a 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -67,9 +68,21 @@ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms * + enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, + ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ + ++typedef struct TagState TagState; ++struct TagState { ++ int selected; ++ int occupied; ++ int urgent; ++}; ++ ++typedef struct ClientState ClientState; ++struct ClientState { ++ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; ++}; ++ + typedef union { +- int i; +- unsigned int ui; ++ long i; ++ unsigned long ui; + float f; + const void *v; + } Arg; +@@ -97,6 +110,7 @@ struct Client { + Client *snext; + Monitor *mon; + Window win; ++ ClientState prevstate; + }; + + typedef struct { +@@ -111,8 +125,10 @@ typedef struct { + void (*arrange)(Monitor *); + } Layout; + ++ + struct Monitor { + char ltsymbol[16]; ++ char lastltsymbol[16]; + float mfact; + int nmaster; + int num; +@@ -122,14 +138,17 @@ struct Monitor { + unsigned int seltags; + unsigned int sellt; + unsigned int tagset[2]; ++ TagState tagstate; + int showbar; + int topbar; + Client *clients; + Client *sel; ++ Client *lastsel; + Client *stack; + Monitor *next; + Window barwin; + const Layout *lt[2]; ++ const Layout *lastlt; + }; + + typedef struct { +@@ -175,6 +194,7 @@ static long getstate(Window w); + static int gettextprop(Window w, Atom atom, char *text, unsigned int size); + static void grabbuttons(Client *c, int focused); + static void grabkeys(void); ++static int handlexevent(struct epoll_event *ev); + static void incnmaster(const Arg *arg); + static void keypress(XEvent *e); + static void killclient(const Arg *arg); +@@ -201,8 +221,10 @@ static void setclientstate(Client *c, long state); + static void setfocus(Client *c); + static void setfullscreen(Client *c, int fullscreen); + static void setlayout(const Arg *arg); ++static void setlayoutsafe(const Arg *arg); + static void setmfact(const Arg *arg); + static void setup(void); ++static void setupepoll(void); + static void seturgent(Client *c, int urg); + static void showhide(Client *c); + static void sigchld(int unused); +@@ -261,17 +283,27 @@ static void (*handler[LASTEvent]) (XEvent *) = { + [UnmapNotify] = unmapnotify + }; + static Atom wmatom[WMLast], netatom[NetLast]; ++static int epoll_fd; ++static int dpy_fd; + static int running = 1; + static Cur *cursor[CurLast]; + static Clr **scheme; + static Display *dpy; + static Drw *drw; +-static Monitor *mons, *selmon; ++static Monitor *mons, *selmon, *lastselmon; + static Window root, wmcheckwin; + ++#include "ipc.h" ++ + /* configuration, allows nested code to access above variables */ + #include "config.h" + ++#ifdef VERSION ++#include "IPCClient.c" ++#include "yajl_dumps.c" ++#include "ipc.c" ++#endif ++ + /* compile-time check if all tags fit into an unsigned int bit array. */ + struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; + +@@ -492,6 +524,12 @@ cleanup(void) + XSync(dpy, False); + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); + XDeleteProperty(dpy, root, netatom[NetActiveWindow]); ++ ++ ipc_cleanup(); ++ ++ if (close(epoll_fd) < 0) { ++ fprintf(stderr, "Failed to close epoll file descriptor\n"); ++ } + } + + void +@@ -964,6 +1002,25 @@ grabkeys(void) + } + } + ++int ++handlexevent(struct epoll_event *ev) ++{ ++ if (ev->events & EPOLLIN) { ++ XEvent ev; ++ while (running && XPending(dpy)) { ++ XNextEvent(dpy, &ev); ++ if (handler[ev.type]) { ++ handler[ev.type](&ev); /* call handler */ ++ ipc_send_events(mons, &lastselmon, selmon); ++ } ++ } ++ } else if (ev-> events & EPOLLHUP) { ++ return -1; ++ } ++ ++ return 0; ++} ++ + void + incnmaster(const Arg *arg) + { +@@ -1373,12 +1430,40 @@ restack(Monitor *m) + void + run(void) + { +- XEvent ev; +- /* main event loop */ ++ int event_count = 0; ++ const int MAX_EVENTS = 10; ++ struct epoll_event events[MAX_EVENTS]; ++ + XSync(dpy, False); +- while (running && !XNextEvent(dpy, &ev)) +- if (handler[ev.type]) +- handler[ev.type](&ev); /* call handler */ ++ ++ /* main event loop */ ++ while (running) { ++ event_count = epoll_wait(epoll_fd, events, MAX_EVENTS, -1); ++ ++ for (int i = 0; i < event_count; i++) { ++ int event_fd = events[i].data.fd; ++ DEBUG("Got event from fd %d\n", event_fd); ++ ++ if (event_fd == dpy_fd) { ++ // -1 means EPOLLHUP ++ if (handlexevent(events + i) == -1) ++ return; ++ } else if (event_fd == ipc_get_sock_fd()) { ++ ipc_handle_socket_epoll_event(events + i); ++ } else if (ipc_is_client_registered(event_fd)){ ++ if (ipc_handle_client_epoll_event(events + i, mons, &lastselmon, selmon, ++ tags, LENGTH(tags), layouts, LENGTH(layouts)) < 0) { ++ fprintf(stderr, "Error handling IPC event on fd %d\n", event_fd); ++ } ++ } else { ++ fprintf(stderr, "Got event from unknown fd %d, ptr %p, u32 %d, u64 %lu", ++ event_fd, events[i].data.ptr, events[i].data.u32, ++ events[i].data.u64); ++ fprintf(stderr, " with events %d\n", events[i].events); ++ return; ++ } ++ } ++ } + } + + void +@@ -1512,6 +1597,18 @@ setlayout(const Arg *arg) + drawbar(selmon); + } + ++void ++setlayoutsafe(const Arg *arg) ++{ ++ const Layout *ltptr = (Layout *)arg->v; ++ if (ltptr == 0) ++ setlayout(arg); ++ for (int i = 0; i < LENGTH(layouts); i++) { ++ if (ltptr == &layouts[i]) ++ setlayout(arg); ++ } ++} ++ + /* arg > 1.0 will set mfact absolutely */ + void + setmfact(const Arg *arg) +@@ -1595,8 +1692,37 @@ setup(void) + XSelectInput(dpy, root, wa.event_mask); + grabkeys(); + focus(NULL); ++ setupepoll(); + } + ++void ++setupepoll(void) ++{ ++ epoll_fd = epoll_create1(0); ++ dpy_fd = ConnectionNumber(dpy); ++ struct epoll_event dpy_event; ++ ++ // Initialize struct to 0 ++ memset(&dpy_event, 0, sizeof(dpy_event)); ++ ++ DEBUG("Display socket is fd %d\n", dpy_fd); ++ ++ if (epoll_fd == -1) { ++ fputs("Failed to create epoll file descriptor", stderr); ++ } ++ ++ dpy_event.events = EPOLLIN; ++ dpy_event.data.fd = dpy_fd; ++ if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, dpy_fd, &dpy_event)) { ++ fputs("Failed to add display file descriptor to epoll", stderr); ++ close(epoll_fd); ++ exit(1); ++ } ++ ++ if (ipc_init(ipcsockpath, epoll_fd, ipccommands, LENGTH(ipccommands)) < 0) { ++ fputs("Failed to initialize IPC\n", stderr); ++ } ++} + + void + seturgent(Client *c, int urg) +@@ -1998,10 +2124,18 @@ updatestatus(void) + void + updatetitle(Client *c) + { ++ char oldname[sizeof(c->name)]; ++ strcpy(oldname, c->name); ++ + if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name)) + gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name); + if (c->name[0] == '\0') /* hack to mark broken clients */ + strcpy(c->name, broken); ++ ++ for (Monitor *m = mons; m; m = m->next) { ++ if (m->sel == c && strcmp(oldname, c->name) != 0) ++ ipc_focused_title_change_event(m->num, c->win, oldname, c->name); ++ } + } + + void +diff --git a/ipc.c b/ipc.c +new file mode 100644 +index 0000000..c404791 +--- /dev/null ++++ b/ipc.c +@@ -0,0 +1,1202 @@ ++#include "ipc.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "util.h" ++#include "yajl_dumps.h" ++ ++static struct sockaddr_un sockaddr; ++static struct epoll_event sock_epoll_event; ++static IPCClientList ipc_clients = NULL; ++static int epoll_fd = -1; ++static int sock_fd = -1; ++static IPCCommand *ipc_commands; ++static unsigned int ipc_commands_len; ++// Max size is 1 MB ++static const uint32_t MAX_MESSAGE_SIZE = 1000000; ++static const int IPC_SOCKET_BACKLOG = 5; ++ ++/** ++ * Create IPC socket at specified path and return file descriptor to socket. ++ * This initializes the static variable sockaddr. ++ */ ++static int ++ipc_create_socket(const char *filename) ++{ ++ char *normal_filename; ++ char *parent; ++ const size_t addr_size = sizeof(struct sockaddr_un); ++ const int sock_type = SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC; ++ ++ normalizepath(filename, &normal_filename); ++ ++ // In case socket file exists ++ unlink(normal_filename); ++ ++ // For portability clear the addr structure, since some implementations have ++ // nonstandard fields in the structure ++ memset(&sockaddr, 0, addr_size); ++ ++ parentdir(normal_filename, &parent); ++ // Create parent directories ++ mkdirp(parent); ++ free(parent); ++ ++ sockaddr.sun_family = AF_LOCAL; ++ strcpy(sockaddr.sun_path, normal_filename); ++ free(normal_filename); ++ ++ sock_fd = socket(AF_LOCAL, sock_type, 0); ++ if (sock_fd == -1) { ++ fputs("Failed to create socket\n", stderr); ++ return -1; ++ } ++ ++ DEBUG("Created socket at %s\n", sockaddr.sun_path); ++ ++ if (bind(sock_fd, (const struct sockaddr *)&sockaddr, addr_size) == -1) { ++ fputs("Failed to bind socket\n", stderr); ++ return -1; ++ } ++ ++ DEBUG("Socket binded\n"); ++ ++ if (listen(sock_fd, IPC_SOCKET_BACKLOG) < 0) { ++ fputs("Failed to listen for connections on socket\n", stderr); ++ return -1; ++ } ++ ++ DEBUG("Now listening for connections on socket\n"); ++ ++ return sock_fd; ++} ++ ++/** ++ * Internal function used to receive IPC messages from a given file descriptor. ++ * ++ * Returns -1 on error reading (could be EAGAIN or EINTR) ++ * Returns -2 if EOF before header could be read ++ * Returns -3 if invalid IPC header ++ * Returns -4 if message length exceeds MAX_MESSAGE_SIZE ++ */ ++static int ++ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size, ++ uint8_t **reply) ++{ ++ uint32_t read_bytes = 0; ++ const int32_t to_read = sizeof(dwm_ipc_header_t); ++ char header[to_read]; ++ char *walk = header; ++ ++ // Try to read header ++ while (read_bytes < to_read) { ++ const ssize_t n = read(fd, header + read_bytes, to_read - read_bytes); ++ ++ if (n == 0) { ++ if (read_bytes == 0) { ++ fprintf(stderr, "Unexpectedly reached EOF while reading header."); ++ fprintf(stderr, ++ "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", ++ read_bytes, to_read); ++ return -2; ++ } else { ++ fprintf(stderr, "Unexpectedly reached EOF while reading header."); ++ fprintf(stderr, ++ "Read %" PRIu32 " bytes, expected %" PRIu32 " total bytes.\n", ++ read_bytes, to_read); ++ return -3; ++ } ++ } else if (n == -1) { ++ // errno will still be set ++ return -1; ++ } ++ ++ read_bytes += n; ++ } ++ ++ // Check if magic string in header matches ++ if (memcmp(walk, IPC_MAGIC, IPC_MAGIC_LEN) != 0) { ++ fprintf(stderr, "Invalid magic string. Got '%.*s', expected '%s'\n", ++ IPC_MAGIC_LEN, walk, IPC_MAGIC); ++ return -3; ++ } ++ ++ walk += IPC_MAGIC_LEN; ++ ++ // Extract reply size ++ memcpy(reply_size, walk, sizeof(uint32_t)); ++ walk += sizeof(uint32_t); ++ ++ if (*reply_size > MAX_MESSAGE_SIZE) { ++ fprintf(stderr, "Message too long: %" PRIu32 " bytes. ", *reply_size); ++ fprintf(stderr, "Maximum message size is: %d\n", MAX_MESSAGE_SIZE); ++ return -4; ++ } ++ ++ // Extract message type ++ memcpy(msg_type, walk, sizeof(uint8_t)); ++ walk += sizeof(uint8_t); ++ ++ if (*reply_size > 0) ++ (*reply) = malloc(*reply_size); ++ else ++ return 0; ++ ++ read_bytes = 0; ++ while (read_bytes < *reply_size) { ++ const ssize_t n = read(fd, *reply + read_bytes, *reply_size - read_bytes); ++ ++ if (n == 0) { ++ fprintf(stderr, "Unexpectedly reached EOF while reading payload."); ++ fprintf(stderr, "Read %" PRIu32 " bytes, expected %" PRIu32 " bytes.\n", ++ read_bytes, *reply_size); ++ free(*reply); ++ return -2; ++ } else if (n == -1) { ++ // TODO: Should we return and wait for another epoll event? ++ // This would require saving the partial read in some way. ++ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) continue; ++ ++ free(*reply); ++ return -1; ++ } ++ ++ read_bytes += n; ++ } ++ ++ return 0; ++} ++ ++/** ++ * Internal function used to write a buffer to a file descriptor ++ * ++ * Returns number of bytes written if successful write ++ * Returns 0 if no bytes were written due to EAGAIN or EWOULDBLOCK ++ * Returns -1 on unknown error trying to write, errno will carry over from ++ * write() call ++ */ ++static ssize_t ++ipc_write_message(int fd, const void *buf, size_t count) ++{ ++ size_t written = 0; ++ ++ while (written < count) { ++ const ssize_t n = write(fd, (uint8_t *)buf + written, count - written); ++ ++ if (n == -1) { ++ if (errno == EAGAIN || errno == EWOULDBLOCK) ++ return written; ++ else if (errno == EINTR) ++ continue; ++ else ++ return n; ++ } ++ ++ written += n; ++ DEBUG("Wrote %zu/%zu to client at fd %d\n", written, count, fd); ++ } ++ ++ return written; ++} ++ ++/** ++ * Initialization for generic event message. This is used to allocate the yajl ++ * handle, set yajl options, and in the future any other initialization that ++ * should occur for event messages. ++ */ ++static void ++ipc_event_init_message(yajl_gen *gen) ++{ ++ *gen = yajl_gen_alloc(NULL); ++ yajl_gen_config(*gen, yajl_gen_beautify, 1); ++} ++ ++/** ++ * Prepares buffers of IPC subscribers of specified event using buffer from yajl ++ * handle. ++ */ ++static void ++ipc_event_prepare_send_message(yajl_gen gen, IPCEvent event) ++{ ++ const unsigned char *buffer; ++ size_t len = 0; ++ ++ yajl_gen_get_buf(gen, &buffer, &len); ++ len++; // For null char ++ ++ for (IPCClient *c = ipc_clients; c; c = c->next) { ++ if (c->subscriptions & event) { ++ DEBUG("Sending selected client change event to fd %d\n", c->fd); ++ ipc_prepare_send_message(c, IPC_TYPE_EVENT, len, (char *)buffer); ++ } ++ } ++ ++ // Not documented, but this frees temp_buffer ++ yajl_gen_free(gen); ++} ++ ++/** ++ * Initialization for generic reply message. This is used to allocate the yajl ++ * handle, set yajl options, and in the future any other initialization that ++ * should occur for reply messages. ++ */ ++static void ++ipc_reply_init_message(yajl_gen *gen) ++{ ++ *gen = yajl_gen_alloc(NULL); ++ yajl_gen_config(*gen, yajl_gen_beautify, 1); ++} ++ ++/** ++ * Prepares the IPC client's buffer with a message using the buffer of the yajl ++ * handle. ++ */ ++static void ++ipc_reply_prepare_send_message(yajl_gen gen, IPCClient *c, ++ IPCMessageType msg_type) ++{ ++ const unsigned char *buffer; ++ size_t len = 0; ++ ++ yajl_gen_get_buf(gen, &buffer, &len); ++ len++; // For null char ++ ++ ipc_prepare_send_message(c, msg_type, len, (const char *)buffer); ++ ++ // Not documented, but this frees temp_buffer ++ yajl_gen_free(gen); ++} ++ ++/** ++ * Find the IPCCommand with the specified name ++ * ++ * Returns 0 if a command with the specified name was found ++ * Returns -1 if a command with the specified name could not be found ++ */ ++static int ++ipc_get_ipc_command(const char *name, IPCCommand *ipc_command) ++{ ++ for (int i = 0; i < ipc_commands_len; i++) { ++ if (strcmp(ipc_commands[i].name, name) == 0) { ++ *ipc_command = ipc_commands[i]; ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++/** ++ * Parse a IPC_TYPE_RUN_COMMAND message from a client. This function extracts ++ * the arguments, argument count, argument types, and command name and returns ++ * the parsed information as an IPCParsedCommand. If this function returns ++ * successfully, the parsed_command must be freed using ++ * ipc_free_parsed_command_members. ++ * ++ * Returns 0 if the message was successfully parsed ++ * Returns -1 otherwise ++ */ ++static int ++ipc_parse_run_command(char *msg, IPCParsedCommand *parsed_command) ++{ ++ char error_buffer[1000]; ++ yajl_val parent = yajl_tree_parse(msg, error_buffer, 1000); ++ ++ if (parent == NULL) { ++ fputs("Failed to parse command from client\n", stderr); ++ fprintf(stderr, "%s\n", error_buffer); ++ fprintf(stderr, "Tried to parse: %s\n", msg); ++ return -1; ++ } ++ ++ // Format: ++ // { ++ // "command": "" ++ // "args": [ "arg1", "arg2", ... ] ++ // } ++ const char *command_path[] = {"command", 0}; ++ yajl_val command_val = yajl_tree_get(parent, command_path, yajl_t_string); ++ ++ if (command_val == NULL) { ++ fputs("No command key found in client message\n", stderr); ++ yajl_tree_free(parent); ++ return -1; ++ } ++ ++ const char *command_name = YAJL_GET_STRING(command_val); ++ size_t command_name_len = strlen(command_name); ++ parsed_command->name = (char *)malloc((command_name_len + 1) * sizeof(char)); ++ strcpy(parsed_command->name, command_name); ++ ++ DEBUG("Received command: %s\n", parsed_command->name); ++ ++ const char *args_path[] = {"args", 0}; ++ yajl_val args_val = yajl_tree_get(parent, args_path, yajl_t_array); ++ ++ if (args_val == NULL) { ++ fputs("No args key found in client message\n", stderr); ++ yajl_tree_free(parent); ++ return -1; ++ } ++ ++ unsigned int *argc = &parsed_command->argc; ++ Arg **args = &parsed_command->args; ++ ArgType **arg_types = &parsed_command->arg_types; ++ ++ *argc = args_val->u.array.len; ++ ++ // If no arguments are specified, make a dummy argument to pass to the ++ // function. This is just the way dwm's void(Arg*) functions are setup. ++ if (*argc == 0) { ++ *args = (Arg *)malloc(sizeof(Arg)); ++ *arg_types = (ArgType *)malloc(sizeof(ArgType)); ++ (*arg_types)[0] = ARG_TYPE_NONE; ++ (*args)[0].i = 0; ++ (*argc)++; ++ } else if (*argc > 0) { ++ *args = (Arg *)calloc(*argc, sizeof(Arg)); ++ *arg_types = (ArgType *)malloc(*argc * sizeof(ArgType)); ++ ++ for (int i = 0; i < *argc; i++) { ++ yajl_val arg_val = args_val->u.array.values[i]; ++ ++ if (YAJL_IS_NUMBER(arg_val)) { ++ if (YAJL_IS_INTEGER(arg_val)) { ++ // Any values below 0 must be a signed int ++ if (YAJL_GET_INTEGER(arg_val) < 0) { ++ (*args)[i].i = YAJL_GET_INTEGER(arg_val); ++ (*arg_types)[i] = ARG_TYPE_SINT; ++ DEBUG("i=%ld\n", (*args)[i].i); ++ // Any values above 0 should be an unsigned int ++ } else if (YAJL_GET_INTEGER(arg_val) >= 0) { ++ (*args)[i].ui = YAJL_GET_INTEGER(arg_val); ++ (*arg_types)[i] = ARG_TYPE_UINT; ++ DEBUG("ui=%ld\n", (*args)[i].i); ++ } ++ // If the number is not an integer, it must be a float ++ } else { ++ (*args)[i].f = (float)YAJL_GET_DOUBLE(arg_val); ++ (*arg_types)[i] = ARG_TYPE_FLOAT; ++ DEBUG("f=%f\n", (*args)[i].f); ++ // If argument is not a number, it must be a string ++ } ++ } else if (YAJL_IS_STRING(arg_val)) { ++ char *arg_s = YAJL_GET_STRING(arg_val); ++ size_t arg_s_size = (strlen(arg_s) + 1) * sizeof(char); ++ (*args)[i].v = (char *)malloc(arg_s_size); ++ (*arg_types)[i] = ARG_TYPE_STR; ++ strcpy((char *)(*args)[i].v, arg_s); ++ } ++ } ++ } ++ ++ yajl_tree_free(parent); ++ ++ return 0; ++} ++ ++/** ++ * Free the members of a IPCParsedCommand struct ++ */ ++static void ++ipc_free_parsed_command_members(IPCParsedCommand *command) ++{ ++ for (int i = 0; i < command->argc; i++) { ++ if (command->arg_types[i] == ARG_TYPE_STR) free((void *)command->args[i].v); ++ } ++ free(command->args); ++ free(command->arg_types); ++ free(command->name); ++} ++ ++/** ++ * Check if the given arguments are the correct length and type. Also do any ++ * casting to correct the types. ++ * ++ * Returns 0 if the arguments were the correct length and types ++ * Returns -1 if the argument count doesn't match ++ * Returns -2 if the argument types don't match ++ */ ++static int ++ipc_validate_run_command(IPCParsedCommand *parsed, const IPCCommand actual) ++{ ++ if (actual.argc != parsed->argc) return -1; ++ ++ for (int i = 0; i < parsed->argc; i++) { ++ ArgType ptype = parsed->arg_types[i]; ++ ArgType atype = actual.arg_types[i]; ++ ++ if (ptype != atype) { ++ if (ptype == ARG_TYPE_UINT && atype == ARG_TYPE_PTR) ++ // If this argument is supposed to be a void pointer, cast it ++ parsed->args[i].v = (void *)parsed->args[i].ui; ++ else if (ptype == ARG_TYPE_UINT && atype == ARG_TYPE_SINT) ++ // If this argument is supposed to be a signed int, cast it ++ parsed->args[i].i = parsed->args[i].ui; ++ else ++ return -2; ++ } ++ } ++ ++ return 0; ++} ++ ++/** ++ * Convert event name to their IPCEvent equivalent enum value ++ * ++ * Returns 0 if a valid event name was given ++ * Returns -1 otherwise ++ */ ++static int ++ipc_event_stoi(const char *subscription, IPCEvent *event) ++{ ++ if (strcmp(subscription, "tag_change_event") == 0) ++ *event = IPC_EVENT_TAG_CHANGE; ++ else if (strcmp(subscription, "client_focus_change_event") == 0) ++ *event = IPC_EVENT_CLIENT_FOCUS_CHANGE; ++ else if (strcmp(subscription, "layout_change_event") == 0) ++ *event = IPC_EVENT_LAYOUT_CHANGE; ++ else if (strcmp(subscription, "monitor_focus_change_event") == 0) ++ *event = IPC_EVENT_MONITOR_FOCUS_CHANGE; ++ else if (strcmp(subscription, "focused_title_change_event") == 0) ++ *event = IPC_EVENT_FOCUSED_TITLE_CHANGE; ++ else if (strcmp(subscription, "focused_state_change_event") == 0) ++ *event = IPC_EVENT_FOCUSED_STATE_CHANGE; ++ else ++ return -1; ++ return 0; ++} ++ ++/** ++ * Parse a IPC_TYPE_SUBSCRIBE message from a client. This function extracts the ++ * event name and the subscription action from the message. ++ * ++ * Returns 0 if message was successfully parsed ++ * Returns -1 otherwise ++ */ ++static int ++ipc_parse_subscribe(const char *msg, IPCSubscriptionAction *subscribe, ++ IPCEvent *event) ++{ ++ char error_buffer[100]; ++ yajl_val parent = yajl_tree_parse((char *)msg, error_buffer, 100); ++ ++ if (parent == NULL) { ++ fputs("Failed to parse command from client\n", stderr); ++ fprintf(stderr, "%s\n", error_buffer); ++ return -1; ++ } ++ ++ // Format: ++ // { ++ // "event": "" ++ // "action": "" ++ // } ++ const char *event_path[] = {"event", 0}; ++ yajl_val event_val = yajl_tree_get(parent, event_path, yajl_t_string); ++ ++ if (event_val == NULL) { ++ fputs("No 'event' key found in client message\n", stderr); ++ return -1; ++ } ++ ++ const char *event_str = YAJL_GET_STRING(event_val); ++ DEBUG("Received event: %s\n", event_str); ++ ++ if (ipc_event_stoi(event_str, event) < 0) return -1; ++ ++ const char *action_path[] = {"action", 0}; ++ yajl_val action_val = yajl_tree_get(parent, action_path, yajl_t_string); ++ ++ if (action_val == NULL) { ++ fputs("No 'action' key found in client message\n", stderr); ++ return -1; ++ } ++ ++ const char *action = YAJL_GET_STRING(action_val); ++ ++ if (strcmp(action, "subscribe") == 0) ++ *subscribe = IPC_ACTION_SUBSCRIBE; ++ else if (strcmp(action, "unsubscribe") == 0) ++ *subscribe = IPC_ACTION_UNSUBSCRIBE; ++ else { ++ fputs("Invalid action specified for subscription\n", stderr); ++ return -1; ++ } ++ ++ yajl_tree_free(parent); ++ ++ return 0; ++} ++ ++/** ++ * Parse an IPC_TYPE_GET_DWM_CLIENT message from a client. This function ++ * extracts the window id from the message. ++ * ++ * Returns 0 if message was successfully parsed ++ * Returns -1 otherwise ++ */ ++static int ++ipc_parse_get_dwm_client(const char *msg, Window *win) ++{ ++ char error_buffer[100]; ++ ++ yajl_val parent = yajl_tree_parse(msg, error_buffer, 100); ++ ++ if (parent == NULL) { ++ fputs("Failed to parse message from client\n", stderr); ++ fprintf(stderr, "%s\n", error_buffer); ++ return -1; ++ } ++ ++ // Format: ++ // { ++ // "client_window_id": ++ // } ++ const char *win_path[] = {"client_window_id", 0}; ++ yajl_val win_val = yajl_tree_get(parent, win_path, yajl_t_number); ++ ++ if (win_val == NULL) { ++ fputs("No client window id found in client message\n", stderr); ++ return -1; ++ } ++ ++ *win = YAJL_GET_INTEGER(win_val); ++ ++ yajl_tree_free(parent); ++ ++ return 0; ++} ++ ++/** ++ * Called when an IPC_TYPE_RUN_COMMAND message is received from a client. This ++ * function parses, executes the given command, and prepares a reply message to ++ * the client indicating success/failure. ++ * ++ * NOTE: There is currently no check for argument validity beyond the number of ++ * arguments given and types of arguments. There is also no way to check if the ++ * function succeeded based on dwm's void(const Arg*) function types. Pointer ++ * arguments can cause crashes if they are not validated in the function itself. ++ * ++ * Returns 0 if message was successfully parsed ++ * Returns -1 on failure parsing message ++ */ ++static int ++ipc_run_command(IPCClient *ipc_client, char *msg) ++{ ++ IPCParsedCommand parsed_command; ++ IPCCommand ipc_command; ++ ++ // Initialize struct ++ memset(&parsed_command, 0, sizeof(IPCParsedCommand)); ++ ++ if (ipc_parse_run_command(msg, &parsed_command) < 0) { ++ ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, ++ "Failed to parse run command"); ++ return -1; ++ } ++ ++ if (ipc_get_ipc_command(parsed_command.name, &ipc_command) < 0) { ++ ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, ++ "Command %s not found", parsed_command.name); ++ ipc_free_parsed_command_members(&parsed_command); ++ return -1; ++ } ++ ++ int res = ipc_validate_run_command(&parsed_command, ipc_command); ++ if (res < 0) { ++ if (res == -1) ++ ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, ++ "%u arguments provided, %u expected", ++ parsed_command.argc, ipc_command.argc); ++ else if (res == -2) ++ ipc_prepare_reply_failure(ipc_client, IPC_TYPE_RUN_COMMAND, ++ "Type mismatch"); ++ ipc_free_parsed_command_members(&parsed_command); ++ return -1; ++ } ++ ++ if (parsed_command.argc == 1) ++ ipc_command.func.single_param(parsed_command.args); ++ else if (parsed_command.argc > 1) ++ ipc_command.func.array_param(parsed_command.args, parsed_command.argc); ++ ++ DEBUG("Called function for command %s\n", parsed_command.name); ++ ++ ipc_free_parsed_command_members(&parsed_command); ++ ++ ipc_prepare_reply_success(ipc_client, IPC_TYPE_RUN_COMMAND); ++ return 0; ++} ++ ++/** ++ * Called when an IPC_TYPE_GET_MONITORS message is received from a client. It ++ * prepares a reply with the properties of all of the monitors in JSON. ++ */ ++static void ++ipc_get_monitors(IPCClient *c, Monitor *mons, Monitor *selmon) ++{ ++ yajl_gen gen; ++ ipc_reply_init_message(&gen); ++ dump_monitors(gen, mons, selmon); ++ ++ ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_MONITORS); ++} ++ ++/** ++ * Called when an IPC_TYPE_GET_TAGS message is received from a client. It ++ * prepares a reply with info about all the tags in JSON. ++ */ ++static void ++ipc_get_tags(IPCClient *c, const char *tags[], const int tags_len) ++{ ++ yajl_gen gen; ++ ipc_reply_init_message(&gen); ++ ++ dump_tags(gen, tags, tags_len); ++ ++ ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_TAGS); ++} ++ ++/** ++ * Called when an IPC_TYPE_GET_LAYOUTS message is received from a client. It ++ * prepares a reply with a JSON array of available layouts ++ */ ++static void ++ipc_get_layouts(IPCClient *c, const Layout layouts[], const int layouts_len) ++{ ++ yajl_gen gen; ++ ipc_reply_init_message(&gen); ++ ++ dump_layouts(gen, layouts, layouts_len); ++ ++ ipc_reply_prepare_send_message(gen, c, IPC_TYPE_GET_LAYOUTS); ++} ++ ++/** ++ * Called when an IPC_TYPE_GET_DWM_CLIENT message is received from a client. It ++ * prepares a JSON reply with the properties of the client with the specified ++ * window XID. ++ * ++ * Returns 0 if the message was successfully parsed and if the client with the ++ * specified window XID was found ++ * Returns -1 if the message could not be parsed ++ */ ++static int ++ipc_get_dwm_client(IPCClient *ipc_client, const char *msg, const Monitor *mons) ++{ ++ Window win; ++ ++ if (ipc_parse_get_dwm_client(msg, &win) < 0) return -1; ++ ++ // Find client with specified window XID ++ for (const Monitor *m = mons; m; m = m->next) ++ for (Client *c = m->clients; c; c = c->next) ++ if (c->win == win) { ++ yajl_gen gen; ++ ipc_reply_init_message(&gen); ++ ++ dump_client(gen, c); ++ ++ ipc_reply_prepare_send_message(gen, ipc_client, ++ IPC_TYPE_GET_DWM_CLIENT); ++ ++ return 0; ++ } ++ ++ ipc_prepare_reply_failure(ipc_client, IPC_TYPE_GET_DWM_CLIENT, ++ "Client with window id %d not found", win); ++ return -1; ++} ++ ++/** ++ * Called when an IPC_TYPE_SUBSCRIBE message is received from a client. It ++ * subscribes/unsubscribes the client from the specified event and replies with ++ * the result. ++ * ++ * Returns 0 if the message was successfully parsed. ++ * Returns -1 if the message could not be parsed ++ */ ++static int ++ipc_subscribe(IPCClient *c, const char *msg) ++{ ++ IPCSubscriptionAction action = IPC_ACTION_SUBSCRIBE; ++ IPCEvent event = 0; ++ ++ if (ipc_parse_subscribe(msg, &action, &event)) { ++ ipc_prepare_reply_failure(c, IPC_TYPE_SUBSCRIBE, "Event does not exist"); ++ return -1; ++ } ++ ++ if (action == IPC_ACTION_SUBSCRIBE) { ++ DEBUG("Subscribing client on fd %d to %d\n", c->fd, event); ++ c->subscriptions |= event; ++ } else if (action == IPC_ACTION_UNSUBSCRIBE) { ++ DEBUG("Unsubscribing client on fd %d to %d\n", c->fd, event); ++ c->subscriptions ^= event; ++ } else { ++ ipc_prepare_reply_failure(c, IPC_TYPE_SUBSCRIBE, ++ "Invalid subscription action"); ++ return -1; ++ } ++ ++ ipc_prepare_reply_success(c, IPC_TYPE_SUBSCRIBE); ++ return 0; ++} ++ ++int ++ipc_init(const char *socket_path, const int p_epoll_fd, IPCCommand commands[], ++ const int commands_len) ++{ ++ // Initialize struct to 0 ++ memset(&sock_epoll_event, 0, sizeof(sock_epoll_event)); ++ ++ int socket_fd = ipc_create_socket(socket_path); ++ if (socket_fd < 0) return -1; ++ ++ ipc_commands = commands; ++ ipc_commands_len = commands_len; ++ ++ epoll_fd = p_epoll_fd; ++ ++ // Wake up to incoming connection requests ++ sock_epoll_event.data.fd = socket_fd; ++ sock_epoll_event.events = EPOLLIN; ++ if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, socket_fd, &sock_epoll_event)) { ++ fputs("Failed to add sock file descriptor to epoll", stderr); ++ return -1; ++ } ++ ++ return socket_fd; ++} ++ ++void ++ipc_cleanup() ++{ ++ IPCClient *c = ipc_clients; ++ // Free clients and their buffers ++ while (c) { ++ ipc_drop_client(c); ++ c = ipc_clients; ++ } ++ ++ // Stop waking up for socket events ++ epoll_ctl(epoll_fd, EPOLL_CTL_DEL, sock_fd, &sock_epoll_event); ++ ++ // Uninitialize all static variables ++ epoll_fd = -1; ++ sock_fd = -1; ++ ipc_commands = NULL; ++ ipc_commands_len = 0; ++ memset(&sock_epoll_event, 0, sizeof(struct epoll_event)); ++ memset(&sockaddr, 0, sizeof(struct sockaddr_un)); ++ ++ // Delete socket ++ unlink(sockaddr.sun_path); ++ ++ shutdown(sock_fd, SHUT_RDWR); ++ close(sock_fd); ++} ++ ++int ++ipc_get_sock_fd() ++{ ++ return sock_fd; ++} ++ ++IPCClient * ++ipc_get_client(int fd) ++{ ++ return ipc_list_get_client(ipc_clients, fd); ++} ++ ++int ++ipc_is_client_registered(int fd) ++{ ++ return (ipc_get_client(fd) != NULL); ++} ++ ++int ++ipc_accept_client() ++{ ++ int fd = -1; ++ ++ struct sockaddr_un client_addr; ++ socklen_t len = 0; ++ ++ // For portability clear the addr structure, since some implementations ++ // have nonstandard fields in the structure ++ memset(&client_addr, 0, sizeof(struct sockaddr_un)); ++ ++ fd = accept(sock_fd, (struct sockaddr *)&client_addr, &len); ++ if (fd < 0 && errno != EINTR) { ++ fputs("Failed to accept IPC connection from client", stderr); ++ return -1; ++ } ++ ++ if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { ++ shutdown(fd, SHUT_RDWR); ++ close(fd); ++ fputs("Failed to set flags on new client fd", stderr); ++ } ++ ++ IPCClient *nc = ipc_client_new(fd); ++ if (nc == NULL) return -1; ++ ++ // Wake up to messages from this client ++ nc->event.data.fd = fd; ++ nc->event.events = EPOLLIN | EPOLLHUP; ++ epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &nc->event); ++ ++ ipc_list_add_client(&ipc_clients, nc); ++ ++ DEBUG("%s%d\n", "New client at fd: ", fd); ++ ++ return fd; ++} ++ ++int ++ipc_drop_client(IPCClient *c) ++{ ++ int fd = c->fd; ++ shutdown(fd, SHUT_RDWR); ++ int res = close(fd); ++ ++ if (res == 0) { ++ struct epoll_event ev; ++ ++ // Stop waking up to messages from this client ++ epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, &ev); ++ ipc_list_remove_client(&ipc_clients, c); ++ ++ free(c->buffer); ++ free(c); ++ ++ DEBUG("Successfully removed client on fd %d\n", fd); ++ } else if (res < 0 && res != EINTR) { ++ fprintf(stderr, "Failed to close fd %d\n", fd); ++ } ++ ++ return res; ++} ++ ++int ++ipc_read_client(IPCClient *c, IPCMessageType *msg_type, uint32_t *msg_size, ++ char **msg) ++{ ++ int fd = c->fd; ++ int ret = ++ ipc_recv_message(fd, (uint8_t *)msg_type, msg_size, (uint8_t **)msg); ++ ++ if (ret < 0) { ++ // This will happen if these errors occur while reading header ++ if (ret == -1 && ++ (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) ++ return -2; ++ ++ fprintf(stderr, "Error reading message: dropping client at fd %d\n", fd); ++ ipc_drop_client(c); ++ ++ return -1; ++ } ++ ++ // Make sure receive message is null terminated to avoid parsing issues ++ if (*msg_size > 0) { ++ size_t len = *msg_size; ++ nullterminate(msg, &len); ++ *msg_size = len; ++ } ++ ++ DEBUG("[fd %d] ", fd); ++ if (*msg_size > 0) ++ DEBUG("Received message: '%.*s' ", *msg_size, *msg); ++ else ++ DEBUG("Received empty message "); ++ DEBUG("Message type: %" PRIu8 " ", (uint8_t)*msg_type); ++ DEBUG("Message size: %" PRIu32 "\n", *msg_size); ++ ++ return 0; ++} ++ ++ssize_t ++ipc_write_client(IPCClient *c) ++{ ++ const ssize_t n = ipc_write_message(c->fd, c->buffer, c->buffer_size); ++ ++ if (n < 0) return n; ++ ++ // TODO: Deal with client timeouts ++ ++ if (n == c->buffer_size) { ++ c->buffer_size = 0; ++ free(c->buffer); ++ // No dangling pointers! ++ c->buffer = NULL; ++ // Stop waking up when client is ready to receive messages ++ if (c->event.events & EPOLLOUT) { ++ c->event.events -= EPOLLOUT; ++ epoll_ctl(epoll_fd, EPOLL_CTL_MOD, c->fd, &c->event); ++ } ++ return n; ++ } ++ ++ // Shift unwritten buffer to beginning of buffer and reallocate ++ c->buffer_size -= n; ++ memmove(c->buffer, c->buffer + n, c->buffer_size); ++ c->buffer = (char *)realloc(c->buffer, c->buffer_size); ++ ++ return n; ++} ++ ++void ++ipc_prepare_send_message(IPCClient *c, const IPCMessageType msg_type, ++ const uint32_t msg_size, const char *msg) ++{ ++ dwm_ipc_header_t header = { ++ .magic = IPC_MAGIC_ARR, .type = msg_type, .size = msg_size}; ++ ++ uint32_t header_size = sizeof(dwm_ipc_header_t); ++ uint32_t packet_size = header_size + msg_size; ++ ++ if (c->buffer == NULL) ++ c->buffer = (char *)malloc(c->buffer_size + packet_size); ++ else ++ c->buffer = (char *)realloc(c->buffer, c->buffer_size + packet_size); ++ ++ // Copy header to end of client buffer ++ memcpy(c->buffer + c->buffer_size, &header, header_size); ++ c->buffer_size += header_size; ++ ++ // Copy message to end of client buffer ++ memcpy(c->buffer + c->buffer_size, msg, msg_size); ++ c->buffer_size += msg_size; ++ ++ // Wake up when client is ready to receive messages ++ c->event.events |= EPOLLOUT; ++ epoll_ctl(epoll_fd, EPOLL_CTL_MOD, c->fd, &c->event); ++} ++ ++void ++ipc_prepare_reply_failure(IPCClient *c, IPCMessageType msg_type, ++ const char *format, ...) ++{ ++ yajl_gen gen; ++ va_list args; ++ ++ // Get output size ++ va_start(args, format); ++ size_t len = vsnprintf(NULL, 0, format, args); ++ va_end(args); ++ char *buffer = (char *)malloc((len + 1) * sizeof(char)); ++ ++ ipc_reply_init_message(&gen); ++ ++ va_start(args, format); ++ vsnprintf(buffer, len + 1, format, args); ++ va_end(args); ++ dump_error_message(gen, buffer); ++ ++ ipc_reply_prepare_send_message(gen, c, msg_type); ++ fprintf(stderr, "[fd %d] Error: %s\n", c->fd, buffer); ++ ++ free(buffer); ++} ++ ++void ++ipc_prepare_reply_success(IPCClient *c, IPCMessageType msg_type) ++{ ++ const char *success_msg = "{\"result\":\"success\"}"; ++ const size_t msg_len = strlen(success_msg) + 1; // +1 for null char ++ ++ ipc_prepare_send_message(c, msg_type, msg_len, success_msg); ++} ++ ++void ++ipc_tag_change_event(int mon_num, TagState old_state, TagState new_state) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_tag_event(gen, mon_num, old_state, new_state); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_TAG_CHANGE); ++} ++ ++void ++ipc_client_focus_change_event(int mon_num, Client *old_client, ++ Client *new_client) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_client_focus_change_event(gen, old_client, new_client, mon_num); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_CLIENT_FOCUS_CHANGE); ++} ++ ++void ++ipc_layout_change_event(const int mon_num, const char *old_symbol, ++ const Layout *old_layout, const char *new_symbol, ++ const Layout *new_layout) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_layout_change_event(gen, mon_num, old_symbol, old_layout, new_symbol, ++ new_layout); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_LAYOUT_CHANGE); ++} ++ ++void ++ipc_monitor_focus_change_event(const int last_mon_num, const int new_mon_num) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_monitor_focus_change_event(gen, last_mon_num, new_mon_num); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_MONITOR_FOCUS_CHANGE); ++} ++ ++void ++ipc_focused_title_change_event(const int mon_num, const Window client_id, ++ const char *old_name, const char *new_name) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_focused_title_change_event(gen, mon_num, client_id, old_name, new_name); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_FOCUSED_TITLE_CHANGE); ++} ++ ++void ++ipc_focused_state_change_event(const int mon_num, const Window client_id, ++ const ClientState *old_state, ++ const ClientState *new_state) ++{ ++ yajl_gen gen; ++ ipc_event_init_message(&gen); ++ dump_focused_state_change_event(gen, mon_num, client_id, old_state, ++ new_state); ++ ipc_event_prepare_send_message(gen, IPC_EVENT_FOCUSED_STATE_CHANGE); ++} ++ ++void ++ipc_send_events(Monitor *mons, Monitor **lastselmon, Monitor *selmon) ++{ ++ for (Monitor *m = mons; m; m = m->next) { ++ unsigned int urg = 0, occ = 0, tagset = 0; ++ ++ for (Client *c = m->clients; c; c = c->next) { ++ occ |= c->tags; ++ ++ if (c->isurgent) urg |= c->tags; ++ } ++ tagset = m->tagset[m->seltags]; ++ ++ TagState new_state = {.selected = tagset, .occupied = occ, .urgent = urg}; ++ ++ if (memcmp(&m->tagstate, &new_state, sizeof(TagState)) != 0) { ++ ipc_tag_change_event(m->num, m->tagstate, new_state); ++ m->tagstate = new_state; ++ } ++ ++ if (m->lastsel != m->sel) { ++ ipc_client_focus_change_event(m->num, m->lastsel, m->sel); ++ m->lastsel = m->sel; ++ } ++ ++ if (strcmp(m->ltsymbol, m->lastltsymbol) != 0 || ++ m->lastlt != m->lt[m->sellt]) { ++ ipc_layout_change_event(m->num, m->lastltsymbol, m->lastlt, m->ltsymbol, ++ m->lt[m->sellt]); ++ strcpy(m->lastltsymbol, m->ltsymbol); ++ m->lastlt = m->lt[m->sellt]; ++ } ++ ++ if (*lastselmon != selmon) { ++ if (*lastselmon != NULL) ++ ipc_monitor_focus_change_event((*lastselmon)->num, selmon->num); ++ *lastselmon = selmon; ++ } ++ ++ Client *sel = m->sel; ++ if (!sel) continue; ++ ClientState *o = &m->sel->prevstate; ++ ClientState n = {.oldstate = sel->oldstate, ++ .isfixed = sel->isfixed, ++ .isfloating = sel->isfloating, ++ .isfullscreen = sel->isfullscreen, ++ .isurgent = sel->isurgent, ++ .neverfocus = sel->neverfocus}; ++ if (memcmp(o, &n, sizeof(ClientState)) != 0) { ++ ipc_focused_state_change_event(m->num, m->sel->win, o, &n); ++ *o = n; ++ } ++ } ++} ++ ++int ++ipc_handle_client_epoll_event(struct epoll_event *ev, Monitor *mons, ++ Monitor **lastselmon, Monitor *selmon, ++ const char *tags[], const int tags_len, ++ const Layout *layouts, const int layouts_len) ++{ ++ int fd = ev->data.fd; ++ IPCClient *c = ipc_get_client(fd); ++ ++ if (ev->events & EPOLLHUP) { ++ DEBUG("EPOLLHUP received from client at fd %d\n", fd); ++ ipc_drop_client(c); ++ } else if (ev->events & EPOLLOUT) { ++ DEBUG("Sending message to client at fd %d...\n", fd); ++ if (c->buffer_size) ipc_write_client(c); ++ } else if (ev->events & EPOLLIN) { ++ IPCMessageType msg_type = 0; ++ uint32_t msg_size = 0; ++ char *msg = NULL; ++ ++ DEBUG("Received message from fd %d\n", fd); ++ if (ipc_read_client(c, &msg_type, &msg_size, &msg) < 0) return -1; ++ ++ if (msg_type == IPC_TYPE_GET_MONITORS) ++ ipc_get_monitors(c, mons, selmon); ++ else if (msg_type == IPC_TYPE_GET_TAGS) ++ ipc_get_tags(c, tags, tags_len); ++ else if (msg_type == IPC_TYPE_GET_LAYOUTS) ++ ipc_get_layouts(c, layouts, layouts_len); ++ else if (msg_type == IPC_TYPE_RUN_COMMAND) { ++ if (ipc_run_command(c, msg) < 0) return -1; ++ ipc_send_events(mons, lastselmon, selmon); ++ } else if (msg_type == IPC_TYPE_GET_DWM_CLIENT) { ++ if (ipc_get_dwm_client(c, msg, mons) < 0) return -1; ++ } else if (msg_type == IPC_TYPE_SUBSCRIBE) { ++ if (ipc_subscribe(c, msg) < 0) return -1; ++ } else { ++ fprintf(stderr, "Invalid message type received from fd %d", fd); ++ ipc_prepare_reply_failure(c, msg_type, "Invalid message type: %d", ++ msg_type); ++ } ++ free(msg); ++ } else { ++ fprintf(stderr, "Epoll event returned %d from fd %d\n", ev->events, fd); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++int ++ipc_handle_socket_epoll_event(struct epoll_event *ev) ++{ ++ if (!(ev->events & EPOLLIN)) return -1; ++ ++ // EPOLLIN means incoming client connection request ++ fputs("Received EPOLLIN event on socket\n", stderr); ++ int new_fd = ipc_accept_client(); ++ ++ return new_fd; ++} +diff --git a/ipc.h b/ipc.h +new file mode 100644 +index 0000000..e3b5bba +--- /dev/null ++++ b/ipc.h +@@ -0,0 +1,320 @@ ++#ifndef IPC_H_ ++#define IPC_H_ ++ ++#include ++#include ++#include ++ ++#include "IPCClient.h" ++ ++// clang-format off ++#define IPC_MAGIC "DWM-IPC" ++#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C'} ++#define IPC_MAGIC_LEN 7 // Not including null char ++ ++#define IPCCOMMAND(FUNC, ARGC, TYPES) \ ++ { #FUNC, {FUNC }, ARGC, (ArgType[ARGC])TYPES } ++// clang-format on ++ ++typedef enum IPCMessageType { ++ IPC_TYPE_RUN_COMMAND = 0, ++ IPC_TYPE_GET_MONITORS = 1, ++ IPC_TYPE_GET_TAGS = 2, ++ IPC_TYPE_GET_LAYOUTS = 3, ++ IPC_TYPE_GET_DWM_CLIENT = 4, ++ IPC_TYPE_SUBSCRIBE = 5, ++ IPC_TYPE_EVENT = 6 ++} IPCMessageType; ++ ++typedef enum IPCEvent { ++ IPC_EVENT_TAG_CHANGE = 1 << 0, ++ IPC_EVENT_CLIENT_FOCUS_CHANGE = 1 << 1, ++ IPC_EVENT_LAYOUT_CHANGE = 1 << 2, ++ IPC_EVENT_MONITOR_FOCUS_CHANGE = 1 << 3, ++ IPC_EVENT_FOCUSED_TITLE_CHANGE = 1 << 4, ++ IPC_EVENT_FOCUSED_STATE_CHANGE = 1 << 5 ++} IPCEvent; ++ ++typedef enum IPCSubscriptionAction { ++ IPC_ACTION_UNSUBSCRIBE = 0, ++ IPC_ACTION_SUBSCRIBE = 1 ++} IPCSubscriptionAction; ++ ++/** ++ * Every IPC packet starts with this structure ++ */ ++typedef struct dwm_ipc_header { ++ uint8_t magic[IPC_MAGIC_LEN]; ++ uint32_t size; ++ uint8_t type; ++} __attribute((packed)) dwm_ipc_header_t; ++ ++typedef enum ArgType { ++ ARG_TYPE_NONE = 0, ++ ARG_TYPE_UINT = 1, ++ ARG_TYPE_SINT = 2, ++ ARG_TYPE_FLOAT = 3, ++ ARG_TYPE_PTR = 4, ++ ARG_TYPE_STR = 5 ++} ArgType; ++ ++/** ++ * An IPCCommand function can have either of these function signatures ++ */ ++typedef union ArgFunction { ++ void (*single_param)(const Arg *); ++ void (*array_param)(const Arg *, int); ++} ArgFunction; ++ ++typedef struct IPCCommand { ++ char *name; ++ ArgFunction func; ++ unsigned int argc; ++ ArgType *arg_types; ++} IPCCommand; ++ ++typedef struct IPCParsedCommand { ++ char *name; ++ Arg *args; ++ ArgType *arg_types; ++ unsigned int argc; ++} IPCParsedCommand; ++ ++/** ++ * Initialize the IPC socket and the IPC module ++ * ++ * @param socket_path Path to create the socket at ++ * @param epoll_fd File descriptor for epoll ++ * @param commands Address of IPCCommands array defined in config.h ++ * @param commands_len Length of commands[] array ++ * ++ * @return int The file descriptor of the socket if it was successfully created, ++ * -1 otherwise ++ */ ++int ipc_init(const char *socket_path, const int p_epoll_fd, ++ IPCCommand commands[], const int commands_len); ++ ++/** ++ * Uninitialize the socket and module. Free allocated memory and restore static ++ * variables to their state before ipc_init ++ */ ++void ipc_cleanup(); ++ ++/** ++ * Get the file descriptor of the IPC socket ++ * ++ * @return int File descriptor of IPC socket, -1 if socket not created. ++ */ ++int ipc_get_sock_fd(); ++ ++/** ++ * Get address to IPCClient with specified file descriptor ++ * ++ * @param fd File descriptor of IPC Client ++ * ++ * @return Address to IPCClient with specified file descriptor, -1 otherwise ++ */ ++IPCClient *ipc_get_client(int fd); ++ ++/** ++ * Check if an IPC client exists with the specified file descriptor ++ * ++ * @param fd File descriptor ++ * ++ * @return int 1 if client exists, 0 otherwise ++ */ ++int ipc_is_client_registered(int fd); ++ ++/** ++ * Disconnect an IPCClient from the socket and remove the client from the list ++ * of known connected clients ++ * ++ * @param c Address of IPCClient ++ * ++ * @return 0 if the client's file descriptor was closed successfully, the ++ * result of executing close() on the file descriptor otherwise. ++ */ ++int ipc_drop_client(IPCClient *c); ++ ++/** ++ * Accept an IPC Client requesting to connect to the socket and add it to the ++ * list of clients ++ * ++ * @return File descriptor of new client, -1 on error ++ */ ++int ipc_accept_client(); ++ ++/** ++ * Read an incoming message from an accepted IPC client ++ * ++ * @param c Address of IPCClient ++ * @param msg_type Address to IPCMessageType variable which will be assigned ++ * the message type of the received message ++ * @param msg_size Address to uint32_t variable which will be assigned the size ++ * of the received message ++ * @param msg Address to char* variable which will be assigned the address of ++ * the received message. This must be freed using free(). ++ * ++ * @return 0 on success, -1 on error reading message, -2 if reading the message ++ * resulted in EAGAIN, EINTR, or EWOULDBLOCK. ++ */ ++int ipc_read_client(IPCClient *c, IPCMessageType *msg_type, uint32_t *msg_size, ++ char **msg); ++ ++/** ++ * Write any pending buffer of the client to the client's socket ++ * ++ * @param c Client whose buffer to write ++ * ++ * @return Number of bytes written >= 0, -1 otherwise. errno will still be set ++ * from the write operation. ++ */ ++ssize_t ipc_write_client(IPCClient *c); ++ ++/** ++ * Prepare a message in the specified client's buffer. ++ * ++ * @param c Client to prepare message for ++ * @param msg_type Type of message to prepare ++ * @param msg_size Size of the message in bytes. Should not exceed ++ * MAX_MESSAGE_SIZE ++ * @param msg Message to prepare (not including header). This pointer can be ++ * freed after the function invocation. ++ */ ++void ipc_prepare_send_message(IPCClient *c, const IPCMessageType msg_type, ++ const uint32_t msg_size, const char *msg); ++ ++/** ++ * Prepare an error message in the specified client's buffer ++ * ++ * @param c Client to prepare message for ++ * @param msg_type Type of message ++ * @param format Format string following vsprintf ++ * @param ... Arguments for format string ++ */ ++void ipc_prepare_reply_failure(IPCClient *c, IPCMessageType msg_type, ++ const char *format, ...); ++ ++/** ++ * Prepare a success message in the specified client's buffer ++ * ++ * @param c Client to prepare message for ++ * @param msg_type Type of message ++ */ ++void ipc_prepare_reply_success(IPCClient *c, IPCMessageType msg_type); ++ ++/** ++ * Send a tag_change_event to all subscribers. Should be called only when there ++ * has been a tag state change. ++ * ++ * @param mon_num The index of the monitor (Monitor.num property) ++ * @param old_state The old tag state ++ * @param new_state The new (now current) tag state ++ */ ++void ipc_tag_change_event(const int mon_num, TagState old_state, ++ TagState new_state); ++ ++/** ++ * Send a client_focus_change_event to all subscribers. Should be called only ++ * when the client focus changes. ++ * ++ * @param mon_num The index of the monitor (Monitor.num property) ++ * @param old_client The old DWM client selection (Monitor.oldsel) ++ * @param new_client The new (now current) DWM client selection ++ */ ++void ipc_client_focus_change_event(const int mon_num, Client *old_client, ++ Client *new_client); ++ ++/** ++ * Send a layout_change_event to all subscribers. Should be called only ++ * when there has been a layout change. ++ * ++ * @param mon_num The index of the monitor (Monitor.num property) ++ * @param old_symbol The old layout symbol ++ * @param old_layout Address to the old Layout ++ * @param new_symbol The new (now current) layout symbol ++ * @param new_layout Address to the new Layout ++ */ ++void ipc_layout_change_event(const int mon_num, const char *old_symbol, ++ const Layout *old_layout, const char *new_symbol, ++ const Layout *new_layout); ++ ++/** ++ * Send a monitor_focus_change_event to all subscribers. Should be called only ++ * when the monitor focus changes. ++ * ++ * @param last_mon_num The index of the previously selected monitor ++ * @param new_mon_num The index of the newly selected monitor ++ */ ++void ipc_monitor_focus_change_event(const int last_mon_num, ++ const int new_mon_num); ++ ++/** ++ * Send a focused_title_change_event to all subscribers. Should only be called ++ * if a selected client has a title change. ++ * ++ * @param mon_num Index of the client's monitor ++ * @param client_id Window XID of client ++ * @param old_name Old name of the client window ++ * @param new_name New name of the client window ++ */ ++void ipc_focused_title_change_event(const int mon_num, const Window client_id, ++ const char *old_name, const char *new_name); ++ ++/** ++ * Send a focused_state_change_event to all subscribers. Should only be called ++ * if a selected client has a state change. ++ * ++ * @param mon_num Index of the client's monitor ++ * @param client_id Window XID of client ++ * @param old_state Old state of the client ++ * @param new_state New state of the client ++ */ ++void ipc_focused_state_change_event(const int mon_num, const Window client_id, ++ const ClientState *old_state, ++ const ClientState *new_state); ++/** ++ * Check to see if an event has occured and call the *_change_event functions ++ * accordingly ++ * ++ * @param mons Address of Monitor pointing to start of linked list ++ * @param lastselmon Address of pointer to previously selected monitor ++ * @param selmon Address of selected Monitor ++ */ ++void ipc_send_events(Monitor *mons, Monitor **lastselmon, Monitor *selmon); ++ ++/** ++ * Handle an epoll event caused by a registered IPC client. Read, process, and ++ * handle any received messages from clients. Write pending buffer to client if ++ * the client is ready to receive messages. Drop clients that have sent an ++ * EPOLLHUP. ++ * ++ * @param ev Associated epoll event returned by epoll_wait ++ * @param mons Address of Monitor pointing to start of linked list ++ * @param selmon Address of selected Monitor ++ * @param lastselmon Address of pointer to previously selected monitor ++ * @param tags Array of tag names ++ * @param tags_len Length of tags array ++ * @param layouts Array of available layouts ++ * @param layouts_len Length of layouts array ++ * ++ * @return 0 if event was successfully handled, -1 on any error receiving ++ * or handling incoming messages or unhandled epoll event. ++ */ ++int ipc_handle_client_epoll_event(struct epoll_event *ev, Monitor *mons, ++ Monitor **lastselmon, Monitor *selmon, ++ const char *tags[], const int tags_len, ++ const Layout *layouts, const int layouts_len); ++ ++/** ++ * Handle an epoll event caused by the IPC socket. This function only handles an ++ * EPOLLIN event indicating a new client requesting to connect to the socket. ++ * ++ * @param ev Associated epoll event returned by epoll_wait ++ * ++ * @return 0, if the event was successfully handled, -1 if not an EPOLLIN event ++ * or if a new IPC client connection request could not be accepted. ++ */ ++int ipc_handle_socket_epoll_event(struct epoll_event *ev); ++ ++#endif /* IPC_H_ */ +diff --git a/util.c b/util.c +index fe044fc..dca4794 100644 +--- a/util.c ++++ b/util.c +@@ -3,6 +3,8 @@ + #include + #include + #include ++#include ++#include + + #include "util.h" + +@@ -33,3 +35,136 @@ die(const char *fmt, ...) { + + exit(1); + } ++ ++int ++normalizepath(const char *path, char **normal) ++{ ++ size_t len = strlen(path); ++ *normal = (char *)malloc((len + 1) * sizeof(char)); ++ const char *walk = path; ++ const char *match; ++ size_t newlen = 0; ++ ++ while ((match = strchr(walk, '/'))) { ++ // Copy everything between match and walk ++ strncpy(*normal + newlen, walk, match - walk); ++ newlen += match - walk; ++ walk += match - walk; ++ ++ // Skip all repeating slashes ++ while (*walk == '/') ++ walk++; ++ ++ // If not last character in path ++ if (walk != path + len) ++ (*normal)[newlen++] = '/'; ++ } ++ ++ (*normal)[newlen++] = '\0'; ++ ++ // Copy remaining path ++ strcat(*normal, walk); ++ newlen += strlen(walk); ++ ++ *normal = (char *)realloc(*normal, newlen * sizeof(char)); ++ ++ return 0; ++} ++ ++int ++parentdir(const char *path, char **parent) ++{ ++ char *normal; ++ char *walk; ++ ++ normalizepath(path, &normal); ++ ++ // Pointer to last '/' ++ if (!(walk = strrchr(normal, '/'))) { ++ free(normal); ++ return -1; ++ } ++ ++ // Get path up to last '/' ++ size_t len = walk - normal; ++ *parent = (char *)malloc((len + 1) * sizeof(char)); ++ ++ // Copy path up to last '/' ++ strncpy(*parent, normal, len); ++ // Add null char ++ (*parent)[len] = '\0'; ++ ++ free(normal); ++ ++ return 0; ++} ++ ++int ++mkdirp(const char *path) ++{ ++ char *normal; ++ char *walk; ++ size_t normallen; ++ ++ normalizepath(path, &normal); ++ normallen = strlen(normal); ++ walk = normal; ++ ++ while (walk < normal + normallen + 1) { ++ // Get length from walk to next / ++ size_t n = strcspn(walk, "/"); ++ ++ // Skip path / ++ if (n == 0) { ++ walk++; ++ continue; ++ } ++ ++ // Length of current path segment ++ size_t curpathlen = walk - normal + n; ++ char curpath[curpathlen + 1]; ++ struct stat s; ++ ++ // Copy path segment to stat ++ strncpy(curpath, normal, curpathlen); ++ strcpy(curpath + curpathlen, ""); ++ int res = stat(curpath, &s); ++ ++ if (res < 0) { ++ if (errno == ENOENT) { ++ DEBUG("Making directory %s\n", curpath); ++ if (mkdir(curpath, 0700) < 0) { ++ fprintf(stderr, "Failed to make directory %s\n", curpath); ++ perror(""); ++ free(normal); ++ return -1; ++ } ++ } else { ++ fprintf(stderr, "Error statting directory %s\n", curpath); ++ perror(""); ++ free(normal); ++ return -1; ++ } ++ } ++ ++ // Continue to next path segment ++ walk += n; ++ } ++ ++ free(normal); ++ ++ return 0; ++} ++ ++int ++nullterminate(char **str, size_t *len) ++{ ++ if ((*str)[*len - 1] == '\0') ++ return 0; ++ ++ (*len)++; ++ *str = (char*)realloc(*str, *len * sizeof(char)); ++ (*str)[*len - 1] = '\0'; ++ ++ return 0; ++} +diff --git a/util.h b/util.h +index f633b51..73a238e 100644 +--- a/util.h ++++ b/util.h +@@ -4,5 +4,15 @@ + #define MIN(A, B) ((A) < (B) ? (A) : (B)) + #define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) + ++#ifdef _DEBUG ++#define DEBUG(...) fprintf(stderr, __VA_ARGS__) ++#else ++#define DEBUG(...) ++#endif ++ + void die(const char *fmt, ...); + void *ecalloc(size_t nmemb, size_t size); ++int normalizepath(const char *path, char **normal); ++int mkdirp(const char *path); ++int parentdir(const char *path, char **parent); ++int nullterminate(char **str, size_t *len); +diff --git a/yajl_dumps.c b/yajl_dumps.c +new file mode 100644 +index 0000000..8bf9688 +--- /dev/null ++++ b/yajl_dumps.c +@@ -0,0 +1,351 @@ ++#include "yajl_dumps.h" ++ ++#include ++ ++int ++dump_tag(yajl_gen gen, const char *name, const int tag_mask) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("bit_mask"); YINT(tag_mask); ++ YSTR("name"); YSTR(name); ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_tags(yajl_gen gen, const char *tags[], int tags_len) ++{ ++ // clang-format off ++ YARR( ++ for (int i = 0; i < tags_len; i++) ++ dump_tag(gen, tags[i], 1 << i); ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_client(yajl_gen gen, Client *c) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("name"); YSTR(c->name); ++ YSTR("tags"); YINT(c->tags); ++ YSTR("window_id"); YINT(c->win); ++ YSTR("monitor_number"); YINT(c->mon->num); ++ ++ YSTR("geometry"); YMAP( ++ YSTR("current"); YMAP ( ++ YSTR("x"); YINT(c->x); ++ YSTR("y"); YINT(c->y); ++ YSTR("width"); YINT(c->w); ++ YSTR("height"); YINT(c->h); ++ ) ++ YSTR("old"); YMAP( ++ YSTR("x"); YINT(c->oldx); ++ YSTR("y"); YINT(c->oldy); ++ YSTR("width"); YINT(c->oldw); ++ YSTR("height"); YINT(c->oldh); ++ ) ++ ) ++ ++ YSTR("size_hints"); YMAP( ++ YSTR("base"); YMAP( ++ YSTR("width"); YINT(c->basew); ++ YSTR("height"); YINT(c->baseh); ++ ) ++ YSTR("step"); YMAP( ++ YSTR("width"); YINT(c->incw); ++ YSTR("height"); YINT(c->inch); ++ ) ++ YSTR("max"); YMAP( ++ YSTR("width"); YINT(c->maxw); ++ YSTR("height"); YINT(c->maxh); ++ ) ++ YSTR("min"); YMAP( ++ YSTR("width"); YINT(c->minw); ++ YSTR("height"); YINT(c->minh); ++ ) ++ YSTR("aspect_ratio"); YMAP( ++ YSTR("min"); YDOUBLE(c->mina); ++ YSTR("max"); YDOUBLE(c->maxa); ++ ) ++ ) ++ ++ YSTR("border_width"); YMAP( ++ YSTR("current"); YINT(c->bw); ++ YSTR("old"); YINT(c->oldbw); ++ ) ++ ++ YSTR("states"); YMAP( ++ YSTR("is_fixed"); YBOOL(c->isfixed); ++ YSTR("is_floating"); YBOOL(c->isfloating); ++ YSTR("is_urgent"); YBOOL(c->isurgent); ++ YSTR("never_focus"); YBOOL(c->neverfocus); ++ YSTR("old_state"); YBOOL(c->oldstate); ++ YSTR("is_fullscreen"); YBOOL(c->isfullscreen); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_monitor(yajl_gen gen, Monitor *mon, int is_selected) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("master_factor"); YDOUBLE(mon->mfact); ++ YSTR("num_master"); YINT(mon->nmaster); ++ YSTR("num"); YINT(mon->num); ++ YSTR("is_selected"); YBOOL(is_selected); ++ ++ YSTR("monitor_geometry"); YMAP( ++ YSTR("x"); YINT(mon->mx); ++ YSTR("y"); YINT(mon->my); ++ YSTR("width"); YINT(mon->mw); ++ YSTR("height"); YINT(mon->mh); ++ ) ++ ++ YSTR("window_geometry"); YMAP( ++ YSTR("x"); YINT(mon->wx); ++ YSTR("y"); YINT(mon->wy); ++ YSTR("width"); YINT(mon->ww); ++ YSTR("height"); YINT(mon->wh); ++ ) ++ ++ YSTR("tagset"); YMAP( ++ YSTR("current"); YINT(mon->tagset[mon->seltags]); ++ YSTR("old"); YINT(mon->tagset[mon->seltags ^ 1]); ++ ) ++ ++ YSTR("tag_state"); dump_tag_state(gen, mon->tagstate); ++ ++ YSTR("clients"); YMAP( ++ YSTR("selected"); YINT(mon->sel ? mon->sel->win : 0); ++ YSTR("stack"); YARR( ++ for (Client* c = mon->stack; c; c = c->snext) ++ YINT(c->win); ++ ) ++ YSTR("all"); YARR( ++ for (Client* c = mon->clients; c; c = c->next) ++ YINT(c->win); ++ ) ++ ) ++ ++ YSTR("layout"); YMAP( ++ YSTR("symbol"); YMAP( ++ YSTR("current"); YSTR(mon->ltsymbol); ++ YSTR("old"); YSTR(mon->lastltsymbol); ++ ) ++ YSTR("address"); YMAP( ++ YSTR("current"); YINT((uintptr_t)mon->lt[mon->sellt]); ++ YSTR("old"); YINT((uintptr_t)mon->lt[mon->sellt ^ 1]); ++ ) ++ ) ++ ++ YSTR("bar"); YMAP( ++ YSTR("y"); YINT(mon->by); ++ YSTR("is_shown"); YBOOL(mon->showbar); ++ YSTR("is_top"); YBOOL(mon->topbar); ++ YSTR("window_id"); YINT(mon->barwin); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_monitors(yajl_gen gen, Monitor *mons, Monitor *selmon) ++{ ++ // clang-format off ++ YARR( ++ for (Monitor *mon = mons; mon; mon = mon->next) { ++ if (mon == selmon) ++ dump_monitor(gen, mon, 1); ++ else ++ dump_monitor(gen, mon, 0); ++ } ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_layouts(yajl_gen gen, const Layout layouts[], const int layouts_len) ++{ ++ // clang-format off ++ YARR( ++ for (int i = 0; i < layouts_len; i++) { ++ YMAP( ++ // Check for a NULL pointer. The cycle layouts patch adds an entry at ++ // the end of the layouts array with a NULL pointer for the symbol ++ YSTR("symbol"); YSTR((layouts[i].symbol ? layouts[i].symbol : "")); ++ YSTR("address"); YINT((uintptr_t)(layouts + i)); ++ ) ++ } ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_tag_state(yajl_gen gen, TagState state) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("selected"); YINT(state.selected); ++ YSTR("occupied"); YINT(state.occupied); ++ YSTR("urgent"); YINT(state.urgent); ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_tag_event(yajl_gen gen, int mon_num, TagState old_state, ++ TagState new_state) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("tag_change_event"); YMAP( ++ YSTR("monitor_number"); YINT(mon_num); ++ YSTR("old_state"); dump_tag_state(gen, old_state); ++ YSTR("new_state"); dump_tag_state(gen, new_state); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_client_focus_change_event(yajl_gen gen, Client *old_client, ++ Client *new_client, int mon_num) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("client_focus_change_event"); YMAP( ++ YSTR("monitor_number"); YINT(mon_num); ++ YSTR("old_win_id"); old_client == NULL ? YNULL() : YINT(old_client->win); ++ YSTR("new_win_id"); new_client == NULL ? YNULL() : YINT(new_client->win); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_layout_change_event(yajl_gen gen, const int mon_num, ++ const char *old_symbol, const Layout *old_layout, ++ const char *new_symbol, const Layout *new_layout) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("layout_change_event"); YMAP( ++ YSTR("monitor_number"); YINT(mon_num); ++ YSTR("old_symbol"); YSTR(old_symbol); ++ YSTR("old_address"); YINT((uintptr_t)old_layout); ++ YSTR("new_symbol"); YSTR(new_symbol); ++ YSTR("new_address"); YINT((uintptr_t)new_layout); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_monitor_focus_change_event(yajl_gen gen, const int last_mon_num, ++ const int new_mon_num) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("monitor_focus_change_event"); YMAP( ++ YSTR("old_monitor_number"); YINT(last_mon_num); ++ YSTR("new_monitor_number"); YINT(new_mon_num); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_focused_title_change_event(yajl_gen gen, const int mon_num, ++ const Window client_id, const char *old_name, ++ const char *new_name) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("focused_title_change_event"); YMAP( ++ YSTR("monitor_number"); YINT(mon_num); ++ YSTR("client_window_id"); YINT(client_id); ++ YSTR("old_name"); YSTR(old_name); ++ YSTR("new_name"); YSTR(new_name); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_client_state(yajl_gen gen, const ClientState *state) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("old_state"); YBOOL(state->oldstate); ++ YSTR("is_fixed"); YBOOL(state->isfixed); ++ YSTR("is_floating"); YBOOL(state->isfloating); ++ YSTR("is_fullscreen"); YBOOL(state->isfullscreen); ++ YSTR("is_urgent"); YBOOL(state->isurgent); ++ YSTR("never_focus"); YBOOL(state->neverfocus); ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_focused_state_change_event(yajl_gen gen, const int mon_num, ++ const Window client_id, ++ const ClientState *old_state, ++ const ClientState *new_state) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("focused_state_change_event"); YMAP( ++ YSTR("monitor_number"); YINT(mon_num); ++ YSTR("client_window_id"); YINT(client_id); ++ YSTR("old_state"); dump_client_state(gen, old_state); ++ YSTR("new_state"); dump_client_state(gen, new_state); ++ ) ++ ) ++ // clang-format on ++ ++ return 0; ++} ++ ++int ++dump_error_message(yajl_gen gen, const char *reason) ++{ ++ // clang-format off ++ YMAP( ++ YSTR("result"); YSTR("error"); ++ YSTR("reason"); YSTR(reason); ++ ) ++ // clang-format on ++ ++ return 0; ++} +diff --git a/yajl_dumps.h b/yajl_dumps.h +new file mode 100644 +index 0000000..ee9948e +--- /dev/null ++++ b/yajl_dumps.h +@@ -0,0 +1,65 @@ ++#ifndef YAJL_DUMPS_H_ ++#define YAJL_DUMPS_H_ ++ ++#include ++#include ++ ++#define YSTR(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str)) ++#define YINT(num) yajl_gen_integer(gen, num) ++#define YDOUBLE(num) yajl_gen_double(gen, num) ++#define YBOOL(v) yajl_gen_bool(gen, v) ++#define YNULL() yajl_gen_null(gen) ++#define YARR(body) \ ++ { \ ++ yajl_gen_array_open(gen); \ ++ body; \ ++ yajl_gen_array_close(gen); \ ++ } ++#define YMAP(body) \ ++ { \ ++ yajl_gen_map_open(gen); \ ++ body; \ ++ yajl_gen_map_close(gen); \ ++ } ++ ++int dump_tag(yajl_gen gen, const char *name, const int tag_mask); ++ ++int dump_tags(yajl_gen gen, const char *tags[], int tags_len); ++ ++int dump_client(yajl_gen gen, Client *c); ++ ++int dump_monitor(yajl_gen gen, Monitor *mon, int is_selected); ++ ++int dump_monitors(yajl_gen gen, Monitor *mons, Monitor *selmon); ++ ++int dump_layouts(yajl_gen gen, const Layout layouts[], const int layouts_len); ++ ++int dump_tag_state(yajl_gen gen, TagState state); ++ ++int dump_tag_event(yajl_gen gen, int mon_num, TagState old_state, ++ TagState new_state); ++ ++int dump_client_focus_change_event(yajl_gen gen, Client *old_client, ++ Client *new_client, int mon_num); ++ ++int dump_layout_change_event(yajl_gen gen, const int mon_num, ++ const char *old_symbol, const Layout *old_layout, ++ const char *new_symbol, const Layout *new_layout); ++ ++int dump_monitor_focus_change_event(yajl_gen gen, const int last_mon_num, ++ const int new_mon_num); ++ ++int dump_focused_title_change_event(yajl_gen gen, const int mon_num, ++ const Window client_id, ++ const char *old_name, const char *new_name); ++ ++int dump_client_state(yajl_gen gen, const ClientState *state); ++ ++int dump_focused_state_change_event(yajl_gen gen, const int mon_num, ++ const Window client_id, ++ const ClientState *old_state, ++ const ClientState *new_state); ++ ++int dump_error_message(yajl_gen gen, const char *reason); ++ ++#endif // YAJL_DUMPS_H_ +-- +2.29.2 + diff --git a/patches/dwm-noborderselflickerfix-2022042627-d93ff48803f0.diff b/patches/dwm-noborderselflickerfix-2022042627-d93ff48803f0.diff new file mode 100644 index 0000000..5a82b33 --- /dev/null +++ b/patches/dwm-noborderselflickerfix-2022042627-d93ff48803f0.diff @@ -0,0 +1,53 @@ +diff --git dwm.c dwm.c +index 0fc328a..4a767bd 100644 +--- dwm.c ++++ dwm.c +@@ -206,6 +206,7 @@ static void setup(void); + static void seturgent(Client *c, int urg); + static void showhide(Client *c); + static void sigchld(int unused); ++static int solitary(Client *c); + static void spawn(const Arg *arg); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); +@@ -802,7 +803,11 @@ focus(Client *c) + detachstack(c); + attachstack(c); + grabbuttons(c, 1); +- XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); ++ /* Avoid flickering when another client appears and the border ++ * is restored */ ++ if (!solitary(c)) { ++ XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); ++ } + setfocus(c); + } else { + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); +@@ -1288,6 +1293,11 @@ resizeclient(Client *c, int x, int y, int w, int h) + c->oldw = c->w; c->w = wc.width = w; + c->oldh = c->h; c->h = wc.height = h; + wc.border_width = c->bw; ++ if (solitary(c)) { ++ c->w = wc.width += c->bw * 2; ++ c->h = wc.height += c->bw * 2; ++ wc.border_width = 0; ++ } + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); +@@ -1642,6 +1652,15 @@ sigchld(int unused) + while (0 < waitpid(-1, NULL, WNOHANG)); + } + ++int ++solitary(Client *c) ++{ ++ return ((nexttiled(c->mon->clients) == c && !nexttiled(c->next)) ++ || &monocle == c->mon->lt[c->mon->sellt]->arrange) ++ && !c->isfullscreen && !c->isfloating ++ && NULL != c->mon->lt[c->mon->sellt]->arrange; ++} ++ + void + spawn(const Arg *arg) + { diff --git a/patches/dwm-pertag-20200914-61bb8b2.diff b/patches/dwm-pertag-20200914-61bb8b2.diff new file mode 100644 index 0000000..c8d7fbc --- /dev/null +++ b/patches/dwm-pertag-20200914-61bb8b2.diff @@ -0,0 +1,177 @@ +diff --git a/dwm.c b/dwm.c +index 664c527..ac8e4ec 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -111,6 +111,7 @@ typedef struct { + void (*arrange)(Monitor *); + } Layout; + ++typedef struct Pertag Pertag; + struct Monitor { + char ltsymbol[16]; + float mfact; +@@ -130,6 +131,7 @@ struct Monitor { + Monitor *next; + Window barwin; + const Layout *lt[2]; ++ Pertag *pertag; + }; + + typedef struct { +@@ -272,6 +274,15 @@ static Window root, wmcheckwin; + /* configuration, allows nested code to access above variables */ + #include "config.h" + ++struct Pertag { ++ unsigned int curtag, prevtag; /* current and previous tag */ ++ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */ ++ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */ ++ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */ ++ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */ ++ int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */ ++}; ++ + /* compile-time check if all tags fit into an unsigned int bit array. */ + struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; }; + +@@ -632,6 +643,7 @@ Monitor * + createmon(void) + { + Monitor *m; ++ unsigned int i; + + m = ecalloc(1, sizeof(Monitor)); + m->tagset[0] = m->tagset[1] = 1; +@@ -642,6 +654,20 @@ createmon(void) + m->lt[0] = &layouts[0]; + m->lt[1] = &layouts[1 % LENGTH(layouts)]; + strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); ++ m->pertag = ecalloc(1, sizeof(Pertag)); ++ m->pertag->curtag = m->pertag->prevtag = 1; ++ ++ for (i = 0; i <= LENGTH(tags); i++) { ++ m->pertag->nmasters[i] = m->nmaster; ++ m->pertag->mfacts[i] = m->mfact; ++ ++ m->pertag->ltidxs[i][0] = m->lt[0]; ++ m->pertag->ltidxs[i][1] = m->lt[1]; ++ m->pertag->sellts[i] = m->sellt; ++ ++ m->pertag->showbars[i] = m->showbar; ++ } ++ + return m; + } + +@@ -967,7 +993,7 @@ grabkeys(void) + void + incnmaster(const Arg *arg) + { +- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0); ++ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0); + arrange(selmon); + } + +@@ -1502,9 +1528,9 @@ void + setlayout(const Arg *arg) + { + if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) +- selmon->sellt ^= 1; ++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1; + if (arg && arg->v) +- selmon->lt[selmon->sellt] = (Layout *)arg->v; ++ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v; + strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol); + if (selmon->sel) + arrange(selmon); +@@ -1523,7 +1549,7 @@ setmfact(const Arg *arg) + f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; + if (f < 0.05 || f > 0.95) + return; +- selmon->mfact = f; ++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f; + arrange(selmon); + } + +@@ -1702,7 +1728,7 @@ tile(Monitor *m) + void + togglebar(const Arg *arg) + { +- selmon->showbar = !selmon->showbar; ++ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar; + updatebarpos(selmon); + XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); + arrange(selmon); +@@ -1741,9 +1767,33 @@ void + toggleview(const Arg *arg) + { + unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); ++ int i; + + if (newtagset) { + selmon->tagset[selmon->seltags] = newtagset; ++ ++ if (newtagset == ~0) { ++ selmon->pertag->prevtag = selmon->pertag->curtag; ++ selmon->pertag->curtag = 0; ++ } ++ ++ /* test if the user did not select the same tag */ ++ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) { ++ selmon->pertag->prevtag = selmon->pertag->curtag; ++ for (i = 0; !(newtagset & 1 << i); i++) ; ++ selmon->pertag->curtag = i + 1; ++ } ++ ++ /* apply settings for this view */ ++ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; ++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; ++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; ++ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; ++ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; ++ ++ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) ++ togglebar(NULL); ++ + focus(NULL); + arrange(selmon); + } +@@ -2038,11 +2088,37 @@ updatewmhints(Client *c) + void + view(const Arg *arg) + { ++ int i; ++ unsigned int tmptag; ++ + if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) + return; + selmon->seltags ^= 1; /* toggle sel tagset */ +- if (arg->ui & TAGMASK) ++ if (arg->ui & TAGMASK) { + selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; ++ selmon->pertag->prevtag = selmon->pertag->curtag; ++ ++ if (arg->ui == ~0) ++ selmon->pertag->curtag = 0; ++ else { ++ for (i = 0; !(arg->ui & 1 << i); i++) ; ++ selmon->pertag->curtag = i + 1; ++ } ++ } else { ++ tmptag = selmon->pertag->prevtag; ++ selmon->pertag->prevtag = selmon->pertag->curtag; ++ selmon->pertag->curtag = tmptag; ++ } ++ ++ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag]; ++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag]; ++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; ++ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; ++ selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; ++ ++ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag]) ++ togglebar(NULL); ++ + focus(NULL); + arrange(selmon); + } diff --git a/patches/dwm-restartsig-20180523-6.2.diff b/patches/dwm-restartsig-20180523-6.2.diff new file mode 100644 index 0000000..f1f8680 --- /dev/null +++ b/patches/dwm-restartsig-20180523-6.2.diff @@ -0,0 +1,139 @@ +From 2991f37f0aaf44b9f9b11e7893ff0af8eb88f649 Mon Sep 17 00:00:00 2001 +From: Christopher Drelich +Date: Wed, 23 May 2018 22:50:38 -0400 +Subject: [PATCH] Modifies quit to handle restarts and adds SIGHUP and SIGTERM + handlers. + +Modified quit() to restart if it receives arg .i = 1 +MOD+CTRL+SHIFT+Q was added to confid.def.h to do just that. + +Signal handlers were handled for SIGHUP and SIGTERM. +If dwm receives these signals it calls quit() with +arg .i = to 1 or 0, respectively. + +To restart dwm: +MOD+CTRL+SHIFT+Q +or +kill -HUP dwmpid + +To quit dwm cleanly: +MOD+SHIFT+Q +or +kill -TERM dwmpid +--- + config.def.h | 1 + + dwm.1 | 10 ++++++++++ + dwm.c | 22 ++++++++++++++++++++++ + 3 files changed, 33 insertions(+) + +diff --git a/config.def.h b/config.def.h +index a9ac303..e559429 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -94,6 +94,7 @@ static Key keys[] = { + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, ++ { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} }, + }; + + /* button definitions */ +diff --git a/dwm.1 b/dwm.1 +index 13b3729..36a331c 100644 +--- a/dwm.1 ++++ b/dwm.1 +@@ -142,6 +142,9 @@ Add/remove all windows with nth tag to/from the view. + .TP + .B Mod1\-Shift\-q + Quit dwm. ++.TP ++.B Mod1\-Control\-Shift\-q ++Restart dwm. + .SS Mouse commands + .TP + .B Mod1\-Button1 +@@ -155,6 +158,13 @@ Resize focused window while dragging. Tiled windows will be toggled to the float + .SH CUSTOMIZATION + dwm is customized by creating a custom config.h and (re)compiling the source + code. This keeps it fast, secure and simple. ++.SH SIGNALS ++.TP ++.B SIGHUP - 1 ++Restart the dwm process. ++.TP ++.B SIGTERM - 15 ++Cleanly terminate the dwm process. + .SH SEE ALSO + .BR dmenu (1), + .BR st (1) +diff --git a/dwm.c b/dwm.c +index bb95e26..286eecd 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -205,6 +205,8 @@ static void setup(void); + static void seturgent(Client *c, int urg); + static void showhide(Client *c); + static void sigchld(int unused); ++static void sighup(int unused); ++static void sigterm(int unused); + static void spawn(const Arg *arg); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); +@@ -260,6 +262,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { + [UnmapNotify] = unmapnotify + }; + static Atom wmatom[WMLast], netatom[NetLast]; ++static int restart = 0; + static int running = 1; + static Cur *cursor[CurLast]; + static Clr **scheme; +@@ -1248,6 +1251,7 @@ propertynotify(XEvent *e) + void + quit(const Arg *arg) + { ++ if(arg->i) restart = 1; + running = 0; + } + +@@ -1536,6 +1540,9 @@ setup(void) + /* clean up any zombies immediately */ + sigchld(0); + ++ signal(SIGHUP, sighup); ++ signal(SIGTERM, sigterm); ++ + /* init screen */ + screen = DefaultScreen(dpy); + sw = DisplayWidth(dpy, screen); +@@ -1637,6 +1644,20 @@ sigchld(int unused) + } + + void ++sighup(int unused) ++{ ++ Arg a = {.i = 1}; ++ quit(&a); ++} ++ ++void ++sigterm(int unused) ++{ ++ Arg a = {.i = 0}; ++ quit(&a); ++} ++ ++void + spawn(const Arg *arg) + { + if (arg->v == dmenucmd) +@@ -2139,6 +2160,7 @@ main(int argc, char *argv[]) + setup(); + scan(); + run(); ++ if(restart) execvp(argv[0], argv); + cleanup(); + XCloseDisplay(dpy); + return EXIT_SUCCESS; +-- +2.7.4 + diff --git a/patches/dwm-restoreafterrestart-20220709-d3f93c7.diff b/patches/dwm-restoreafterrestart-20220709-d3f93c7.diff new file mode 100644 index 0000000..cfcb607 --- /dev/null +++ b/patches/dwm-restoreafterrestart-20220709-d3f93c7.diff @@ -0,0 +1,101 @@ +From 9fd4a02b57aa8a764d8105d5f2f854372f4ef559 Mon Sep 17 00:00:00 2001 +From: ViliamKovac1223 +Date: Sat, 9 Jul 2022 17:35:54 +0200 +Subject: [PATCH] add restore patch + +--- + config.def.h | 2 ++ + dwm.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+) + +diff --git a/config.def.h b/config.def.h +index 6ec4146..0b91976 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -1,5 +1,7 @@ + /* See LICENSE file for copyright and license details. */ + ++#define SESSION_FILE "/tmp/dwm-session" ++ + /* appearance */ + static const unsigned int borderpx = 1; /* border pixel of windows */ + static const unsigned int snap = 32; /* snap pixel */ +diff --git a/dwm.c b/dwm.c +index 74cec7e..76b40a2 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -1255,11 +1255,63 @@ propertynotify(XEvent *e) + } + } + ++void ++saveSession(void) ++{ ++ FILE *fw = fopen(SESSION_FILE, "w"); ++ for (Client *c = selmon->clients; c != NULL; c = c->next) { // get all the clients with their tags and write them to the file ++ fprintf(fw, "%lu %u\n", c->win, c->tags); ++ } ++ fclose(fw); ++} ++ ++void ++restoreSession(void) ++{ ++ // restore session ++ FILE *fr = fopen(SESSION_FILE, "r"); ++ if (!fr) ++ return; ++ ++ char *str = malloc(23 * sizeof(char)); // allocate enough space for excepted input from text file ++ while (fscanf(fr, "%[^\n] ", str) != EOF) { // read file till the end ++ long unsigned int winId; ++ unsigned int tagsForWin; ++ int check = sscanf(str, "%lu %u", &winId, &tagsForWin); // get data ++ if (check != 2) // break loop if data wasn't read correctly ++ break; ++ ++ for (Client *c = selmon->clients; c ; c = c->next) { // add tags to every window by winId ++ if (c->win == winId) { ++ c->tags = tagsForWin; ++ break; ++ } ++ } ++ } ++ ++ for (Client *c = selmon->clients; c ; c = c->next) { // refocus on windows ++ focus(c); ++ restack(c->mon); ++ } ++ ++ for (Monitor *m = selmon; m; m = m->next) // rearrange all monitors ++ arrange(m); ++ ++ free(str); ++ fclose(fr); ++ ++ // delete a file ++ remove(SESSION_FILE); ++} ++ + void + quit(const Arg *arg) + { + if(arg->i) restart = 1; + running = 0; ++ ++ if (restart == 1) ++ saveSession(); + } + + Monitor * +@@ -2173,6 +2225,7 @@ main(int argc, char *argv[]) + die("pledge"); + #endif /* __OpenBSD__ */ + scan(); ++ restoreSession(); + run(); + if(restart) execvp(argv[0], argv); + cleanup(); +-- +2.35.1 + diff --git a/patches/dwm-stacker-6.2.diff b/patches/dwm-stacker-6.2.diff new file mode 100644 index 0000000..8fe3b80 --- /dev/null +++ b/patches/dwm-stacker-6.2.diff @@ -0,0 +1,197 @@ +From d04f2d00688c8b0969d4f10f460c980dd91dac37 Mon Sep 17 00:00:00 2001 +From: MLquest8 +Date: Fri, 12 Jun 2020 16:04:18 +0400 +Subject: [PATCH] stacker updated for version 6.2 + +--- + config.def.h | 14 +++++++-- + dwm.c | 88 ++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 80 insertions(+), 22 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..d28f8fc 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -50,6 +50,14 @@ static const Layout layouts[] = { + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, ++#define STACKKEYS(MOD,ACTION) \ ++ { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ ++ { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ ++ { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ ++ { MOD, XK_q, ACTION##stack, {.i = 0 } }, \ ++ { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ ++ { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ ++ { MOD, XK_x, ACTION##stack, {.i = -1 } }, + + /* helper for spawning shell commands in the pre dwm-5.0 fashion */ + #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } +@@ -64,8 +72,8 @@ static Key keys[] = { + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, +- { MODKEY, XK_j, focusstack, {.i = +1 } }, +- { MODKEY, XK_k, focusstack, {.i = -1 } }, ++ STACKKEYS(MODKEY, focus) ++ STACKKEYS(MODKEY|ShiftMask, push) + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, +@@ -93,7 +101,7 @@ static Key keys[] = { + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) +- { MODKEY|ShiftMask, XK_q, quit, {0} }, ++ { MODKEY|ShiftMask, XK_BackSpace, quit, {0} }, + }; + + /* button definitions */ +diff --git a/dwm.c b/dwm.c +index 9fd0286..6c302c3 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -47,15 +47,21 @@ + /* macros */ + #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) + #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) ++#define GETINC(X) ((X) - 2000) ++#define INC(X) ((X) + 2000) + #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ + * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy))) ++#define ISINC(X) ((X) > 1000 && (X) < 3000) + #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) ++#define PREVSEL 3000 + #define LENGTH(X) (sizeof X / sizeof X[0]) ++#define MOD(N,M) ((N)%(M) < 0 ? (N)%(M) + (M) : (N)%(M)) + #define MOUSEMASK (BUTTONMASK|PointerMotionMask) + #define WIDTH(X) ((X)->w + 2 * (X)->bw) + #define HEIGHT(X) ((X)->h + 2 * (X)->bw) + #define TAGMASK ((1 << LENGTH(tags)) - 1) + #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) ++#define TRUNC(X,A,B) (MAX((A), MIN((X), (B)))) + + /* enums */ + enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ +@@ -187,6 +193,7 @@ static void movemouse(const Arg *arg); + static Client *nexttiled(Client *c); + static void pop(Client *); + static void propertynotify(XEvent *e); ++static void pushstack(const Arg *arg); + static void quit(const Arg *arg); + static Monitor *recttomon(int x, int y, int w, int h); + static void resize(Client *c, int x, int y, int w, int h, int interact); +@@ -207,6 +214,7 @@ static void seturgent(Client *c, int urg); + static void showhide(Client *c); + static void sigchld(int unused); + static void spawn(const Arg *arg); ++static int stackpos(const Arg *arg); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); + static void tile(Monitor *); +@@ -833,27 +841,16 @@ focusmon(const Arg *arg) + void + focusstack(const Arg *arg) + { +- Client *c = NULL, *i; ++ int i = stackpos(arg); ++ Client *c, *p; + +- if (!selmon->sel) ++ if(i < 0) + return; +- if (arg->i > 0) { +- for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next); +- if (!c) +- for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next); +- } else { +- for (i = selmon->clients; i != selmon->sel; i = i->next) +- if (ISVISIBLE(i)) +- c = i; +- if (!c) +- for (; i; i = i->next) +- if (ISVISIBLE(i)) +- c = i; +- } +- if (c) { +- focus(c); +- restack(selmon); +- } ++ ++ for(p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c)); ++ i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next); ++ focus(c ? c : p); ++ restack(selmon); + } + + Atom +@@ -1246,6 +1243,29 @@ propertynotify(XEvent *e) + } + } + ++void ++pushstack(const Arg *arg) { ++ int i = stackpos(arg); ++ Client *sel = selmon->sel, *c, *p; ++ ++ if(i < 0) ++ return; ++ else if(i == 0) { ++ detach(sel); ++ attach(sel); ++ } ++ else { ++ for(p = NULL, c = selmon->clients; c; p = c, c = c->next) ++ if(!(i -= (ISVISIBLE(c) && c != sel))) ++ break; ++ c = c ? c : p; ++ detach(sel); ++ sel->next = c->next; ++ c->next = sel; ++ } ++ arrange(selmon); ++} ++ + void + quit(const Arg *arg) + { +@@ -1653,6 +1673,36 @@ spawn(const Arg *arg) + } + } + ++int ++stackpos(const Arg *arg) { ++ int n, i; ++ Client *c, *l; ++ ++ if(!selmon->clients) ++ return -1; ++ ++ if(arg->i == PREVSEL) { ++ for(l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel); l = l->snext); ++ if(!l) ++ return -1; ++ for(i = 0, c = selmon->clients; c != l; i += ISVISIBLE(c) ? 1 : 0, c = c->next); ++ return i; ++ } ++ else if(ISINC(arg->i)) { ++ if(!selmon->sel) ++ return -1; ++ for(i = 0, c = selmon->clients; c != selmon->sel; i += ISVISIBLE(c) ? 1 : 0, c = c->next); ++ for(n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next); ++ return MOD(i + GETINC(arg->i), n); ++ } ++ else if(arg->i < 0) { ++ for(i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next); ++ return MAX(i + arg->i, 0); ++ } ++ else ++ return arg->i; ++} ++ + void + tag(const Arg *arg) + { +-- +2.26.2 + diff --git a/patches/dwm-swallow-6.3.diff b/patches/dwm-swallow-6.3.diff new file mode 100644 index 0000000..47586a0 --- /dev/null +++ b/patches/dwm-swallow-6.3.diff @@ -0,0 +1,412 @@ +From 0cf9a007511f7dfd7dd94171b172562ebac9b6d5 Mon Sep 17 00:00:00 2001 +From: Tom Schwindl +Date: Sat, 10 Sep 2022 12:51:09 +0200 +Subject: [PATCH] 6.3 swallow patch + +--- + config.def.h | 9 +- + config.mk | 3 +- + dwm.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 237 insertions(+), 10 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 061ad662f82a..0b2b8ffd30d5 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -3,6 +3,7 @@ + /* appearance */ + static const unsigned int borderpx = 1; /* border pixel of windows */ + static const unsigned int snap = 32; /* snap pixel */ ++static const int swallowfloating = 0; /* 1 means swallow floating windows by default */ + 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" }; +@@ -26,9 +27,11 @@ static const Rule rules[] = { + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ +- /* class instance title tags mask isfloating monitor */ +- { "Gimp", NULL, NULL, 0, 1, -1 }, +- { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, ++ /* class instance title tags mask isfloating isterminal noswallow monitor */ ++ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, ++ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, ++ { "St", NULL, NULL, 0, 0, 1, 0, -1 }, ++ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ + }; + + /* layout(s) */ +diff --git a/config.mk b/config.mk +index 81c493ef4aff..52d1ebf30bec 100644 +--- a/config.mk ++++ b/config.mk +@@ -20,10 +20,11 @@ FREETYPEINC = /usr/include/freetype2 + # OpenBSD (uncomment) + #FREETYPEINC = ${X11INC}/freetype2 + #MANPREFIX = ${PREFIX}/man ++#KVMLIB = -lkvm + + # includes and libs + INCS = -I${X11INC} -I${FREETYPEINC} +-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB} + + # flags + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +diff --git a/dwm.c b/dwm.c +index e5efb6a22806..e68294b6b679 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -40,6 +40,12 @@ + #include + #endif /* XINERAMA */ + #include ++#include ++#include ++#ifdef __OpenBSD__ ++#include ++#include ++#endif /* __OpenBSD */ + + #include "drw.h" + #include "util.h" +@@ -92,9 +98,11 @@ struct Client { + int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; + int bw, oldbw; + unsigned int tags; +- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; ++ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; ++ pid_t pid; + Client *next; + Client *snext; ++ Client *swallowing; + Monitor *mon; + Window win; + }; +@@ -138,6 +146,8 @@ typedef struct { + const char *title; + unsigned int tags; + int isfloating; ++ int isterminal; ++ int noswallow; + int monitor; + } Rule; + +@@ -235,6 +245,12 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); + static int xerrorstart(Display *dpy, XErrorEvent *ee); + static void zoom(const Arg *arg); + ++static pid_t getparentprocess(pid_t p); ++static int isdescprocess(pid_t p, pid_t c); ++static Client *swallowingclient(Window w); ++static Client *termforwin(const Client *c); ++static pid_t winpid(Window w); ++ + /* variables */ + static const char broken[] = "broken"; + static char stext[256]; +@@ -269,6 +285,8 @@ static Drw *drw; + static Monitor *mons, *selmon; + static Window root, wmcheckwin; + ++static xcb_connection_t *xcon; ++ + /* configuration, allows nested code to access above variables */ + #include "config.h" + +@@ -298,6 +316,8 @@ applyrules(Client *c) + && (!r->class || strstr(class, r->class)) + && (!r->instance || strstr(instance, r->instance))) + { ++ c->isterminal = r->isterminal; ++ c->noswallow = r->noswallow; + c->isfloating = r->isfloating; + c->tags |= r->tags; + for (m = mons; m && m->num != r->monitor; m = m->next); +@@ -416,6 +436,53 @@ attachstack(Client *c) + c->mon->stack = c; + } + ++void ++swallow(Client *p, Client *c) ++{ ++ ++ if (c->noswallow || c->isterminal) ++ return; ++ if (c->noswallow && !swallowfloating && c->isfloating) ++ return; ++ ++ detach(c); ++ detachstack(c); ++ ++ setclientstate(c, WithdrawnState); ++ XUnmapWindow(dpy, p->win); ++ ++ p->swallowing = c; ++ c->mon = p->mon; ++ ++ Window w = p->win; ++ p->win = c->win; ++ c->win = w; ++ updatetitle(p); ++ XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h); ++ arrange(p->mon); ++ configure(p); ++ updateclientlist(); ++} ++ ++void ++unswallow(Client *c) ++{ ++ c->win = c->swallowing->win; ++ ++ free(c->swallowing); ++ c->swallowing = NULL; ++ ++ /* unfullscreen the client */ ++ setfullscreen(c, 0); ++ updatetitle(c); ++ arrange(c->mon); ++ XMapWindow(dpy, c->win); ++ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); ++ setclientstate(c, NormalState); ++ focus(NULL); ++ arrange(c->mon); ++} ++ + void + buttonpress(XEvent *e) + { +@@ -656,6 +723,9 @@ destroynotify(XEvent *e) + + if ((c = wintoclient(ev->window))) + unmanage(c, 1); ++ ++ else if ((c = swallowingclient(ev->window))) ++ unmanage(c->swallowing, 1); + } + + void +@@ -1022,12 +1092,13 @@ killclient(const Arg *arg) + void + manage(Window w, XWindowAttributes *wa) + { +- Client *c, *t = NULL; ++ Client *c, *t = NULL, *term = NULL; + Window trans = None; + XWindowChanges wc; + + c = ecalloc(1, sizeof(Client)); + c->win = w; ++ c->pid = winpid(w); + /* geometry */ + c->x = c->oldx = wa->x; + c->y = c->oldy = wa->y; +@@ -1042,6 +1113,7 @@ manage(Window w, XWindowAttributes *wa) + } else { + c->mon = selmon; + applyrules(c); ++ term = termforwin(c); + } + + if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww) +@@ -1076,6 +1148,8 @@ manage(Window w, XWindowAttributes *wa) + c->mon->sel = c; + arrange(c->mon); + XMapWindow(dpy, c->win); ++ if (term) ++ swallow(term, c); + focus(NULL); + } + +@@ -1763,6 +1837,20 @@ unmanage(Client *c, int destroyed) + Monitor *m = c->mon; + XWindowChanges wc; + ++ if (c->swallowing) { ++ unswallow(c); ++ return; ++ } ++ ++ Client *s = swallowingclient(c->win); ++ if (s) { ++ free(s->swallowing); ++ s->swallowing = NULL; ++ arrange(m); ++ focus(NULL); ++ return; ++ } ++ + detach(c); + detachstack(c); + if (!destroyed) { +@@ -1778,9 +1866,12 @@ unmanage(Client *c, int destroyed) + XUngrabServer(dpy); + } + free(c); +- focus(NULL); +- updateclientlist(); +- arrange(m); ++ ++ if (!s) { ++ arrange(m); ++ focus(NULL); ++ updateclientlist(); ++ } + } + + void +@@ -2044,6 +2135,136 @@ view(const Arg *arg) + arrange(selmon); + } + ++pid_t ++winpid(Window w) ++{ ++ ++ pid_t result = 0; ++ ++#ifdef __linux__ ++ xcb_res_client_id_spec_t spec = {0}; ++ spec.client = w; ++ spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID; ++ ++ xcb_generic_error_t *e = NULL; ++ xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec); ++ xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e); ++ ++ if (!r) ++ return (pid_t)0; ++ ++ xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r); ++ for (; i.rem; xcb_res_client_id_value_next(&i)) { ++ spec = i.data->spec; ++ if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) { ++ uint32_t *t = xcb_res_client_id_value_value(i.data); ++ result = *t; ++ break; ++ } ++ } ++ ++ free(r); ++ ++ if (result == (pid_t)-1) ++ result = 0; ++ ++#endif /* __linux__ */ ++ ++#ifdef __OpenBSD__ ++ Atom type; ++ int format; ++ unsigned long len, bytes; ++ unsigned char *prop; ++ pid_t ret; ++ ++ if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop) ++ return 0; ++ ++ ret = *(pid_t*)prop; ++ XFree(prop); ++ result = ret; ++ ++#endif /* __OpenBSD__ */ ++ return result; ++} ++ ++pid_t ++getparentprocess(pid_t p) ++{ ++ unsigned int v = 0; ++ ++#ifdef __linux__ ++ FILE *f; ++ char buf[256]; ++ snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p); ++ ++ if (!(f = fopen(buf, "r"))) ++ return 0; ++ ++ fscanf(f, "%*u %*s %*c %u", &v); ++ fclose(f); ++#endif /* __linux__*/ ++ ++#ifdef __OpenBSD__ ++ int n; ++ kvm_t *kd; ++ struct kinfo_proc *kp; ++ ++ kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++ if (!kd) ++ return 0; ++ ++ kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n); ++ v = kp->p_ppid; ++#endif /* __OpenBSD__ */ ++ ++ return (pid_t)v; ++} ++ ++int ++isdescprocess(pid_t p, pid_t c) ++{ ++ while (p != c && c != 0) ++ c = getparentprocess(c); ++ ++ return (int)c; ++} ++ ++Client * ++termforwin(const Client *w) ++{ ++ Client *c; ++ Monitor *m; ++ ++ if (!w->pid || w->isterminal) ++ return NULL; ++ ++ for (m = mons; m; m = m->next) { ++ for (c = m->clients; c; c = c->next) { ++ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid)) ++ return c; ++ } ++ } ++ ++ return NULL; ++} ++ ++Client * ++swallowingclient(Window w) ++{ ++ Client *c; ++ Monitor *m; ++ ++ for (m = mons; m; m = m->next) { ++ for (c = m->clients; c; c = c->next) { ++ if (c->swallowing && c->swallowing->win == w) ++ return c; ++ } ++ } ++ ++ return NULL; ++} ++ + Client * + wintoclient(Window w) + { +@@ -2133,10 +2354,12 @@ main(int argc, char *argv[]) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("dwm: cannot open display"); ++ if (!(xcon = XGetXCBConnection(dpy))) ++ die("dwm: cannot get xcb connection\n"); + checkotherwm(); + setup(); + #ifdef __OpenBSD__ +- if (pledge("stdio rpath proc exec", NULL) == -1) ++ if (pledge("stdio rpath proc exec ps", NULL) == -1) + die("pledge"); + #endif /* __OpenBSD__ */ + scan(); +-- +2.37.2 + diff --git a/patches/dwm-systray-6.4.diff b/patches/dwm-systray-6.4.diff new file mode 100644 index 0000000..58e4a69 --- /dev/null +++ b/patches/dwm-systray-6.4.diff @@ -0,0 +1,746 @@ +diff --git a/config.def.h b/config.def.h +index 9efa774..750529d 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -3,6 +3,11 @@ + /* appearance */ + 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 systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ ++static const unsigned int systrayspacing = 2; /* systray spacing */ ++static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: 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 */ + static const char *fonts[] = { "monospace:size=10" }; +@@ -101,8 +106,8 @@ static const Key keys[] = { + /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ + static const Button buttons[] = { + /* click event mask button function argument */ +- { ClkLtSymbol, 0, Button1, setlayout, {0} }, +- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, ++ { ClkTagBar, MODKEY, Button1, tag, {0} }, ++ { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, +diff --git a/dwm.c b/dwm.c +index 03baf42..4611a03 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -57,12 +57,27 @@ + #define TAGMASK ((1 << LENGTH(tags)) - 1) + #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + ++#define SYSTEM_TRAY_REQUEST_DOCK 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 }; /* color schemes */ + enum { NetSupported, NetWMName, NetWMState, NetWMCheck, ++ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz, + 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 +156,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); +@@ -172,6 +193,7 @@ 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 +211,16 @@ static void pop(Client *c); + 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); +@@ -207,6 +232,7 @@ static void seturgent(Client *c, int urg); + 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 *m); +@@ -224,18 +250,23 @@ static int updategeom(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 updatetitle(Client *c); + static void updatewindowtype(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 const char broken[] = "broken"; + static char stext[256]; + static int screen; +@@ -258,9 +289,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 Clr **scheme; +@@ -442,7 +474,7 @@ buttonpress(XEvent *e) + arg.ui = 1 << i; + } else if (ev->x < x + TEXTW(selmon->ltsymbol)) + click = ClkLtSymbol; +- else if (ev->x > selmon->ww - (int)TEXTW(stext)) ++ else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth()) + click = ClkStatusText; + else + click = ClkWinTitle; +@@ -485,6 +517,13 @@ 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 < LENGTH(colors); i++) +@@ -516,9 +555,58 @@ cleanupmon(Monitor *mon) + 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)); ++ if (!(c->win = cme->data.l[2])) { ++ free(c); ++ return; ++ } ++ c->mon = selmon; ++ c->next = systray->icons; ++ systray->icons = c; ++ if (!XGetWindowAttributes(dpy, c->win, &wa)) { ++ /* use sane defaults */ ++ wa.width = bh; ++ wa.height = bh; ++ wa.border_width = 0; ++ } ++ 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][ColBg].pixel; ++ 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]) { +@@ -571,7 +659,7 @@ configurenotify(XEvent *e) + for (c = m->clients; c; c = c->next) + if (c->isfullscreen) + resizeclient(c, m->mx, m->my, m->mw, m->mh); +- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); ++ resizebarwin(m); + } + focus(NULL); + arrange(NULL); +@@ -656,6 +744,11 @@ destroynotify(XEvent *e) + + if ((c = wintoclient(ev->window))) + unmanage(c, 1); ++ else if ((c = wintosystrayicon(ev->window))) { ++ removesystrayicon(c); ++ resizebarwin(selmon); ++ updatesystray(); ++ } + } + + void +@@ -699,7 +792,7 @@ dirtomon(int dir) + void + drawbar(Monitor *m) + { +- int x, w, tw = 0; ++ int x, w, tw = 0, stw = 0; + int boxs = drw->fonts->h / 9; + int boxw = drw->fonts->h / 6 + 2; + unsigned int i, occ = 0, urg = 0; +@@ -708,13 +801,17 @@ drawbar(Monitor *m) + if (!m->showbar) + return; + ++ if(showsystray && m == systraytomon(m) && !systrayonleft) ++ stw = getsystraywidth(); ++ + /* draw status first so it can be overdrawn by tags later */ + if (m == selmon) { /* status is only drawn on selected monitor */ + drw_setscheme(drw, scheme[SchemeNorm]); +- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ +- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); ++ tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */ ++ drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0); + } + ++ resizebarwin(m); + for (c = m->clients; c; c = c->next) { + occ |= c->tags; + if (c->isurgent) +@@ -735,7 +832,7 @@ drawbar(Monitor *m) + drw_setscheme(drw, scheme[SchemeNorm]); + x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); + +- if ((w = m->ww - tw - x) > bh) { ++ if ((w = m->ww - tw - stw - x) > bh) { + if (m->sel) { + drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); +@@ -746,7 +843,7 @@ drawbar(Monitor *m) + drw_rect(drw, x, 0, w, bh, 1, 1); + } + } +- drw_map(drw, m->barwin, 0, 0, m->ww, bh); ++ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh); + } + + void +@@ -783,8 +880,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 +@@ -870,14 +970,32 @@ getatomprop(Client *c, Atom prop) + unsigned char *p = NULL; + Atom da, atom = None; + +- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, ++ /* 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, 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; + } + ++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 + getrootptr(int *x, int *y) + { +@@ -1018,7 +1136,8 @@ 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 +1224,13 @@ 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) || wa.override_redirect) + return; + if (!wintoclient(ev->window)) +@@ -1226,6 +1352,17 @@ 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) +@@ -1276,6 +1413,19 @@ recttomon(int x, int y, int w, int h) + return r; + } + ++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) + { +@@ -1283,6 +1433,14 @@ resize(Client *c, int x, int y, int w, int h, int interact) + resizeclient(c, x, y, w, h); + } + ++void ++resizebarwin(Monitor *m) { ++ unsigned int w = m->ww; ++ if (showsystray && m == systraytomon(m) && !systrayonleft) ++ w -= getsystraywidth(); ++ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh); ++} ++ + void + resizeclient(Client *c, int x, int y, int w, int h) + { +@@ -1298,6 +1456,19 @@ resizeclient(Client *c, int x, int y, int w, int h) + XSync(dpy, False); + } + ++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 + resizemouse(const Arg *arg) + { +@@ -1444,26 +1615,37 @@ 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; + } +@@ -1477,7 +1659,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 +@@ -1566,6 +1748,10 @@ 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[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False); + netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); + netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False); + netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False); +@@ -1573,6 +1759,9 @@ 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); ++ 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); +@@ -1581,6 +1770,8 @@ setup(void) + scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); + for (i = 0; i < LENGTH(colors); i++) + scheme[i] = drw_scm_create(drw, colors[i], 3); ++ /* init system tray */ ++ updatesystray(); + /* init bars */ + updatebars(); + updatestatus(); +@@ -1711,7 +1902,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); + } + +@@ -1807,11 +2009,18 @@ unmapnotify(XEvent *e) + else + unmanage(c, 0); + } ++ else if ((c = wintosystrayicon(ev->window))) { ++ /* KLUDGE! sometimes icons occasionally unmap their windows, but do ++ * _not_ destroy them. We map those windows back */ ++ XMapRaised(dpy, c->win); ++ updatesystray(); ++ } + } + + void + updatebars(void) + { ++ unsigned int w; + Monitor *m; + XSetWindowAttributes wa = { + .override_redirect = True, +@@ -1822,10 +2031,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); + XSetClassHint(dpy, m->barwin, &ch); + } +@@ -2002,6 +2216,125 @@ updatestatus(void) + if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) + strcpy(stext, "dwm-"VERSION); + drawbar(selmon); ++ updatesystray(); ++} ++ ++ ++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 dimensions 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 sw = TEXTW(stext) - lrpad + systrayspacing; ++ unsigned int w = 1; ++ ++ if (!showsystray) ++ return; ++ if (systrayonleft) ++ x -= sw + lrpad / 2; ++ 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][ColBg].pixel); ++ wa.event_mask = ButtonPressMask | ExposureMask; ++ wa.override_redirect = True; ++ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel; ++ XSelectInput(dpy, systray->win, SubstructureNotifyMask); ++ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32, ++ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 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][ColBg].pixel; ++ 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][ColBg].pixel); ++ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh); ++ XSync(dpy, False); + } + + void +@@ -2069,6 +2402,16 @@ wintoclient(Window w) + return NULL; + } + ++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; ++} ++ + Monitor * + wintomon(Window w) + { +@@ -2122,6 +2465,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee) + return -1; + } + ++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 + zoom(const Arg *arg) + { diff --git a/patches/dwm-xresources-20210827-138b405.diff b/patches/dwm-xresources-20210827-138b405.diff new file mode 100644 index 0000000..29852a9 --- /dev/null +++ b/patches/dwm-xresources-20210827-138b405.diff @@ -0,0 +1,240 @@ +From f30583c6e2ab5e7de6ef4ebf156076ac0f6e69fc Mon Sep 17 00:00:00 2001 +From: Jack Bird +Date: Fri, 27 Aug 2021 00:53:14 +0100 +Subject: [PATCH] xresources updated for 138b405 + +--- + config.def.h | 61 ++++++++++++++++++++++++++++++-------------- + drw.c | 2 +- + drw.h | 2 +- + dwm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 116 insertions(+), 21 deletions(-) + +diff --git a/config.def.h b/config.def.h +index a2ac963..87ac198 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -1,21 +1,23 @@ + /* See LICENSE file for copyright and license details. */ + + /* appearance */ +-static const unsigned int borderpx = 1; /* border pixel of windows */ +-static const unsigned int snap = 32; /* snap pixel */ +-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"; +-static const char col_gray4[] = "#eeeeee"; +-static const char col_cyan[] = "#005577"; +-static const char *colors[][3] = { +- /* fg bg border */ +- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, +- [SchemeSel] = { col_gray4, col_cyan, col_cyan }, ++static unsigned int borderpx = 1; /* border pixel of windows */ ++static unsigned int snap = 32; /* snap pixel */ ++static int showbar = 1; /* 0 means no bar */ ++static int topbar = 1; /* 0 means bottom bar */ ++static char font[] = "monospace:size=10"; ++static char dmenufont[] = "monospace:size=10"; ++static const char *fonts[] = { font }; ++static char normbgcolor[] = "#222222"; ++static char normbordercolor[] = "#444444"; ++static char normfgcolor[] = "#bbbbbb"; ++static char selfgcolor[] = "#eeeeee"; ++static char selbordercolor[] = "#005577"; ++static char selbgcolor[] = "#005577"; ++static char *colors[][3] = { ++ /* fg bg border */ ++ [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, ++ [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, + }; + + /* tagging */ +@@ -32,9 +34,9 @@ static const Rule rules[] = { + }; + + /* layout(s) */ +-static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +-static const int nmaster = 1; /* number of clients in master area */ +-static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ ++static float mfact = 0.55; /* factor of master area size [0.05..0.95] */ ++static int nmaster = 1; /* number of clients in master area */ ++static int resizehints = 1; /* 1 means respect size hints in tiled resizals */ + static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ + + static const Layout layouts[] = { +@@ -57,9 +59,30 @@ static const Layout layouts[] = { + + /* 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 *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; + static const char *termcmd[] = { "st", NULL }; + ++/* ++ * Xresources preferences to load at startup ++ */ ++ResourcePref resources[] = { ++ { "font", STRING, &font }, ++ { "dmenufont", STRING, &dmenufont }, ++ { "normbgcolor", STRING, &normbgcolor }, ++ { "normbordercolor", STRING, &normbordercolor }, ++ { "normfgcolor", STRING, &normfgcolor }, ++ { "selbgcolor", STRING, &selbgcolor }, ++ { "selbordercolor", STRING, &selbordercolor }, ++ { "selfgcolor", STRING, &selfgcolor }, ++ { "borderpx", INTEGER, &borderpx }, ++ { "snap", INTEGER, &snap }, ++ { "showbar", INTEGER, &showbar }, ++ { "topbar", INTEGER, &topbar }, ++ { "nmaster", INTEGER, &nmaster }, ++ { "resizehints", INTEGER, &resizehints }, ++ { "mfact", FLOAT, &mfact }, ++}; ++ + static Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +diff --git a/drw.c b/drw.c +index 4cdbcbe..8f1059e 100644 +--- a/drw.c ++++ b/drw.c +@@ -208,7 +208,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) + /* Wrapper to create color schemes. The caller has to call free(3) on the + * returned color scheme when done using it. */ + Clr * +-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) ++drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount) + { + size_t i; + Clr *ret; +diff --git a/drw.h b/drw.h +index 4bcd5ad..42b04ce 100644 +--- a/drw.h ++++ b/drw.h +@@ -39,7 +39,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in + + /* Colorscheme abstraction */ + void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); +-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); ++Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount); + + /* Cursor abstraction */ + Cur *drw_cur_create(Drw *drw, int shape); +diff --git a/dwm.c b/dwm.c +index 5e4d494..2214b19 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #ifdef XINERAMA + #include + #endif /* XINERAMA */ +@@ -141,6 +142,19 @@ typedef struct { + int monitor; + } Rule; + ++/* Xresources preferences */ ++enum resource_type { ++ STRING = 0, ++ INTEGER = 1, ++ FLOAT = 2 ++}; ++ ++typedef struct { ++ char *name; ++ enum resource_type type; ++ void *dst; ++} ResourcePref; ++ + /* function declarations */ + static void applyrules(Client *c); + static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact); +@@ -234,6 +248,8 @@ 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); ++static void load_xresources(void); ++static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst); + + /* variables */ + static const char broken[] = "broken"; +@@ -2127,6 +2143,60 @@ zoom(const Arg *arg) + pop(c); + } + ++void ++resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst) ++{ ++ char *sdst = NULL; ++ int *idst = NULL; ++ float *fdst = NULL; ++ ++ sdst = dst; ++ idst = dst; ++ fdst = dst; ++ ++ char fullname[256]; ++ char *type; ++ XrmValue ret; ++ ++ snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name); ++ fullname[sizeof(fullname) - 1] = '\0'; ++ ++ XrmGetResource(db, fullname, "*", &type, &ret); ++ if (!(ret.addr == NULL || strncmp("String", type, 64))) ++ { ++ switch (rtype) { ++ case STRING: ++ strcpy(sdst, ret.addr); ++ break; ++ case INTEGER: ++ *idst = strtoul(ret.addr, NULL, 10); ++ break; ++ case FLOAT: ++ *fdst = strtof(ret.addr, NULL); ++ break; ++ } ++ } ++} ++ ++void ++load_xresources(void) ++{ ++ Display *display; ++ char *resm; ++ XrmDatabase db; ++ ResourcePref *p; ++ ++ display = XOpenDisplay(NULL); ++ resm = XResourceManagerString(display); ++ if (!resm) ++ return; ++ ++ db = XrmGetStringDatabase(resm); ++ for (p = resources; p < resources + LENGTH(resources); p++) ++ resource_load(db, p->name, p->type, p->dst); ++ XCloseDisplay(display); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -2139,6 +2209,8 @@ main(int argc, char *argv[]) + if (!(dpy = XOpenDisplay(NULL))) + die("dwm: cannot open display"); + checkotherwm(); ++ XrmInitialize(); ++ load_xresources(); + setup(); + #ifdef __OpenBSD__ + if (pledge("stdio rpath proc exec", NULL) == -1) +-- +2.33.0 + diff --git a/transient.c b/transient.c new file mode 100644 index 0000000..040adb5 --- /dev/null +++ b/transient.c @@ -0,0 +1,42 @@ +/* cc transient.c -o transient -lX11 */ + +#include +#include +#include +#include + +int main(void) { + Display *d; + Window r, f, t = None; + XSizeHints h; + XEvent e; + + d = XOpenDisplay(NULL); + if (!d) + exit(1); + r = DefaultRootWindow(d); + + f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0); + h.min_width = h.max_width = h.min_height = h.max_height = 400; + h.flags = PMinSize | PMaxSize; + XSetWMNormalHints(d, f, &h); + XStoreName(d, f, "floating"); + XMapWindow(d, f); + + XSelectInput(d, f, ExposureMask); + while (1) { + XNextEvent(d, &e); + + if (t == None) { + sleep(5); + t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0); + XSetTransientForHint(d, t, f); + XStoreName(d, t, "transient"); + XMapWindow(d, t); + XSelectInput(d, t, ExposureMask); + } + } + + XCloseDisplay(d); + exit(0); +} diff --git a/util.c b/util.c new file mode 100644 index 0000000..648dee7 --- /dev/null +++ b/util.c @@ -0,0 +1,171 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include +#include + +#include "util.h" + +void +die(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + + if (fmt[0] && fmt[strlen(fmt)-1] == ':') { + fputc(' ', stderr); + perror(NULL); + } else { + fputc('\n', stderr); + } + + exit(1); +} + +void * +ecalloc(size_t nmemb, size_t size) +{ + void *p; + + if (!(p = calloc(nmemb, size))) + die("calloc:"); + return p; +} + +int +normalizepath(const char *path, char **normal) +{ + size_t len = strlen(path); + *normal = (char *)malloc((len + 1) * sizeof(char)); + const char *walk = path; + const char *match; + size_t newlen = 0; + + while ((match = strchr(walk, '/'))) { + // Copy everything between match and walk + strncpy(*normal + newlen, walk, match - walk); + newlen += match - walk; + walk += match - walk; + + // Skip all repeating slashes + while (*walk == '/') + walk++; + + // If not last character in path + if (walk != path + len) + (*normal)[newlen++] = '/'; + } + + (*normal)[newlen++] = '\0'; + + // Copy remaining path + strcat(*normal, walk); + newlen += strlen(walk); + + *normal = (char *)realloc(*normal, newlen * sizeof(char)); + + return 0; +} + +int +parentdir(const char *path, char **parent) +{ + char *normal; + char *walk; + + normalizepath(path, &normal); + + // Pointer to last '/' + if (!(walk = strrchr(normal, '/'))) { + free(normal); + return -1; + } + + // Get path up to last '/' + size_t len = walk - normal; + *parent = (char *)malloc((len + 1) * sizeof(char)); + + // Copy path up to last '/' + strncpy(*parent, normal, len); + // Add null char + (*parent)[len] = '\0'; + + free(normal); + + return 0; +} + +int +mkdirp(const char *path) +{ + char *normal; + char *walk; + size_t normallen; + + normalizepath(path, &normal); + normallen = strlen(normal); + walk = normal; + + while (walk < normal + normallen + 1) { + // Get length from walk to next / + size_t n = strcspn(walk, "/"); + + // Skip path / + if (n == 0) { + walk++; + continue; + } + + // Length of current path segment + size_t curpathlen = walk - normal + n; + char curpath[curpathlen + 1]; + struct stat s; + + // Copy path segment to stat + strncpy(curpath, normal, curpathlen); + strcpy(curpath + curpathlen, ""); + int res = stat(curpath, &s); + + if (res < 0) { + if (errno == ENOENT) { + DEBUG("Making directory %s\n", curpath); + if (mkdir(curpath, 0700) < 0) { + fprintf(stderr, "Failed to make directory %s\n", curpath); + perror(""); + free(normal); + return -1; + } + } else { + fprintf(stderr, "Error statting directory %s\n", curpath); + perror(""); + free(normal); + return -1; + } + } + + // Continue to next path segment + walk += n; + } + + free(normal); + + return 0; +} + +int +nullterminate(char **str, size_t *len) +{ + if ((*str)[*len - 1] == '\0') + return 0; + + (*len)++; + *str = (char*)realloc(*str, *len * sizeof(char)); + (*str)[*len - 1] = '\0'; + + return 0; +} diff --git a/util.h b/util.h new file mode 100644 index 0000000..73a238e --- /dev/null +++ b/util.h @@ -0,0 +1,18 @@ +/* See LICENSE file for copyright and license details. */ + +#define MAX(A, B) ((A) > (B) ? (A) : (B)) +#define MIN(A, B) ((A) < (B) ? (A) : (B)) +#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) + +#ifdef _DEBUG +#define DEBUG(...) fprintf(stderr, __VA_ARGS__) +#else +#define DEBUG(...) +#endif + +void die(const char *fmt, ...); +void *ecalloc(size_t nmemb, size_t size); +int normalizepath(const char *path, char **normal); +int mkdirp(const char *path); +int parentdir(const char *path, char **parent); +int nullterminate(char **str, size_t *len); diff --git a/vanitygaps.c b/vanitygaps.c new file mode 100644 index 0000000..1a816b6 --- /dev/null +++ b/vanitygaps.c @@ -0,0 +1,822 @@ +/* Key binding functions */ +static void defaultgaps(const Arg *arg); +static void incrgaps(const Arg *arg); +static void incrigaps(const Arg *arg); +static void incrogaps(const Arg *arg); +static void incrohgaps(const Arg *arg); +static void incrovgaps(const Arg *arg); +static void incrihgaps(const Arg *arg); +static void incrivgaps(const Arg *arg); +static void togglegaps(const Arg *arg); +/* Layouts (delete the ones you do not need) */ +static void bstack(Monitor *m); +static void bstackhoriz(Monitor *m); +static void centeredmaster(Monitor *m); +static void centeredfloatingmaster(Monitor *m); +static void deck(Monitor *m); +static void dwindle(Monitor *m); +static void fibonacci(Monitor *m, int s); +static void grid(Monitor *m); +static void nrowgrid(Monitor *m); +static void spiral(Monitor *m); +static void tile(Monitor *m); +/* Internals */ +static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc); +static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr); +static void setgaps(int oh, int ov, int ih, int iv); + +/* Settings */ +#if !PERTAG_PATCH +static int enablegaps = 1; +#endif // PERTAG_PATCH + +void +setgaps(int oh, int ov, int ih, int iv) +{ + if (oh < 0) oh = 0; + if (ov < 0) ov = 0; + if (ih < 0) ih = 0; + if (iv < 0) iv = 0; + + selmon->gappoh = oh; + selmon->gappov = ov; + selmon->gappih = ih; + selmon->gappiv = iv; + arrange(selmon); +} + +void +togglegaps(const Arg *arg) +{ + #if PERTAG_PATCH + selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag]; + #else + enablegaps = !enablegaps; + #endif // PERTAG_PATCH + arrange(NULL); +} + +void +defaultgaps(const Arg *arg) +{ + setgaps(gappoh, gappov, gappih, gappiv); +} + +void +incrgaps(const Arg *arg) +{ + setgaps( + selmon->gappoh + arg->i, + selmon->gappov + arg->i, + selmon->gappih + arg->i, + selmon->gappiv + arg->i + ); +} + +void +incrigaps(const Arg *arg) +{ + setgaps( + selmon->gappoh, + selmon->gappov, + selmon->gappih + arg->i, + selmon->gappiv + arg->i + ); +} + +void +incrogaps(const Arg *arg) +{ + setgaps( + selmon->gappoh + arg->i, + selmon->gappov + arg->i, + selmon->gappih, + selmon->gappiv + ); +} + +void +incrohgaps(const Arg *arg) +{ + setgaps( + selmon->gappoh + arg->i, + selmon->gappov, + selmon->gappih, + selmon->gappiv + ); +} + +void +incrovgaps(const Arg *arg) +{ + setgaps( + selmon->gappoh, + selmon->gappov + arg->i, + selmon->gappih, + selmon->gappiv + ); +} + +void +incrihgaps(const Arg *arg) +{ + setgaps( + selmon->gappoh, + selmon->gappov, + selmon->gappih + arg->i, + selmon->gappiv + ); +} + +void +incrivgaps(const Arg *arg) +{ + setgaps( + selmon->gappoh, + selmon->gappov, + selmon->gappih, + selmon->gappiv + arg->i + ); +} + +void +getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) +{ + unsigned int n, oe, ie; + #if PERTAG_PATCH + oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag]; + #else + oe = ie = enablegaps; + #endif // PERTAG_PATCH + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (smartgaps && n == 1) { + oe = 0; // outer gaps disabled when only one client + } + + *oh = m->gappoh*oe; // outer horizontal gap + *ov = m->gappov*oe; // outer vertical gap + *ih = m->gappih*ie; // inner horizontal gap + *iv = m->gappiv*ie; // inner vertical gap + *nc = n; // number of clients +} + +void +getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr) +{ + unsigned int n; + float mfacts = 0, sfacts = 0; + int mtotal = 0, stotal = 0; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) + if (n < m->nmaster) + mfacts += c->cfact; + else + sfacts += c->cfact; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) + if (n < m->nmaster) + mtotal += msize * (c->cfact / mfacts); + else + stotal += ssize * (c->cfact / sfacts); + + *mf = mfacts; // total factor of master area + *sf = sfacts; // total factor of stack area + *mr = msize - mtotal; // the remainder (rest) of pixels after a cfacts master split + *sr = ssize - stotal; // the remainder (rest) of pixels after a cfacts stack split +} + +/*** + * Layouts + */ + +/* + * Bottomstack layout + gaps + * https://dwm.suckless.org/patches/bottomstack/ + */ +static void +bstack(Monitor *m) +{ + unsigned int i, n; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + float mfacts, sfacts; + int mrest, srest; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh; + mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); + sw = m->ww - 2*ov - iv * (n - m->nmaster - 1); + + if (m->nmaster && n > m->nmaster) { + sh = (mh - ih) * (1 - m->mfact); + mh = mh - ih - sh; + sx = mx; + sy = my + mh + ih; + } + + getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (i < m->nmaster) { + resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv; + } else { + resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); + sx += WIDTH(c) + iv; + } + } +} + +static void +bstackhoriz(Monitor *m) +{ + unsigned int i, n; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + float mfacts, sfacts; + int mrest, srest; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + mh = m->wh - 2*oh; + sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); + mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1); + sw = m->ww - 2*ov; + + if (m->nmaster && n > m->nmaster) { + sh = (mh - ih) * (1 - m->mfact); + mh = mh - ih - sh; + sy = my + mh + ih; + sh = m->wh - mh - 2*oh - ih * (n - m->nmaster); + } + + getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest); + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (i < m->nmaster) { + resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv; + } else { + resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); + sy += HEIGHT(c) + ih; + } + } +} + +/* + * Centred master layout + gaps + * https://dwm.suckless.org/patches/centeredmaster/ + */ +void +centeredmaster(Monitor *m) +{ + unsigned int i, n; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int lx = 0, ly = 0, lw = 0, lh = 0; + int rx = 0, ry = 0, rw = 0, rh = 0; + float mfacts = 0, lfacts = 0, rfacts = 0; + int mtotal = 0, ltotal = 0, rtotal = 0; + int mrest = 0, lrest = 0, rrest = 0; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + /* initialize areas */ + mx = m->wx + ov; + my = m->wy + oh; + mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1); + mw = m->ww - 2*ov; + lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1); + rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1)); + + if (m->nmaster && n > m->nmaster) { + /* go mfact box in the center if more than nmaster clients */ + if (n - m->nmaster > 1) { + /* ||<-S->|<---M--->|<-S->|| */ + mw = (m->ww - 2*ov - 2*iv) * m->mfact; + lw = (m->ww - mw - 2*ov - 2*iv) / 2; + rw = (m->ww - mw - 2*ov - 2*iv) - lw; + mx += lw + iv; + } else { + /* ||<---M--->|<-S->|| */ + mw = (mw - iv) * m->mfact; + lw = 0; + rw = m->ww - mw - iv - 2*ov; + } + lx = m->wx + ov; + ly = m->wy + oh; + rx = mx + mw + iv; + ry = m->wy + oh; + } + + /* calculate facts */ + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) { + if (!m->nmaster || n < m->nmaster) + mfacts += c->cfact; + else if ((n - m->nmaster) % 2) + lfacts += c->cfact; // total factor of left hand stack area + else + rfacts += c->cfact; // total factor of right hand stack area + } + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) + if (!m->nmaster || n < m->nmaster) + mtotal += mh * (c->cfact / mfacts); + else if ((n - m->nmaster) % 2) + ltotal += lh * (c->cfact / lfacts); + else + rtotal += rh * (c->cfact / rfacts); + + mrest = mh - mtotal; + lrest = lh - ltotal; + rrest = rh - rtotal; + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (!m->nmaster || i < m->nmaster) { + /* nmaster clients are stacked vertically, in the center of the screen */ + resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); + my += HEIGHT(c) + ih; + } else { + /* stack clients are stacked vertically */ + if ((i - m->nmaster) % 2 ) { + resize(c, lx, ly, lw - (2*c->bw), lh * (c->cfact / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0); + ly += HEIGHT(c) + ih; + } else { + resize(c, rx, ry, rw - (2*c->bw), rh * (c->cfact / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0); + ry += HEIGHT(c) + ih; + } + } + } +} + +void +centeredfloatingmaster(Monitor *m) +{ + unsigned int i, n; + float mfacts, sfacts; + float mivf = 1.0; // master inner vertical gap factor + int oh, ov, ih, iv, mrest, srest; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh; + mw = m->ww - 2*ov - iv*(n - 1); + sw = m->ww - 2*ov - iv*(n - m->nmaster - 1); + + if (m->nmaster && n > m->nmaster) { + mivf = 0.8; + /* go mfact box in the center if more than nmaster clients */ + if (m->ww > m->wh) { + mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1); + mh = m->wh * 0.9; + } else { + mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1); + mh = m->wh * m->mfact; + } + mx = m->wx + (m->ww - mw) / 2; + my = m->wy + (m->wh - mh - 2*oh) / 2; + + sx = m->wx + ov; + sy = m->wy + oh; + sh = m->wh - 2*oh; + } + + getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + /* nmaster clients are stacked horizontally, in the center of the screen */ + resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv*mivf; + } else { + /* stack clients are stacked horizontally */ + resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); + sx += WIDTH(c) + iv; + } +} + +/* + * Deck layout + gaps + * https://dwm.suckless.org/patches/deck/ + */ +void +deck(Monitor *m) +{ + unsigned int i, n; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + float mfacts, sfacts; + int mrest, srest; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); + sw = mw = m->ww - 2*ov; + + if (m->nmaster && n > m->nmaster) { + sw = (mw - iv) * (1 - m->mfact); + mw = mw - iv - sw; + sx = mx + mw + iv; + sh = m->wh - 2*oh; + } + + getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); + + if (n - m->nmaster > 0) /* override layout symbol */ + snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster); + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); + my += HEIGHT(c) + ih; + } else { + resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0); + } +} + +/* + * Fibonacci layout + gaps + * https://dwm.suckless.org/patches/fibonacci/ + */ +void +fibonacci(Monitor *m, int s) +{ + unsigned int i, n; + int nx, ny, nw, nh; + int oh, ov, ih, iv; + int nv, hrest = 0, wrest = 0, r = 1; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + nx = m->wx + ov; + ny = m->wy + oh; + nw = m->ww - 2*ov; + nh = m->wh - 2*oh; + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { + if (r) { + if ((i % 2 && (nh - ih) / 2 <= (bh + 2*c->bw)) + || (!(i % 2) && (nw - iv) / 2 <= (bh + 2*c->bw))) { + r = 0; + } + if (r && i < n - 1) { + if (i % 2) { + nv = (nh - ih) / 2; + hrest = nh - 2*nv - ih; + nh = nv; + } else { + nv = (nw - iv) / 2; + wrest = nw - 2*nv - iv; + nw = nv; + } + + if ((i % 4) == 2 && !s) + nx += nw + iv; + else if ((i % 4) == 3 && !s) + ny += nh + ih; + } + + if ((i % 4) == 0) { + if (s) { + ny += nh + ih; + nh += hrest; + } + else { + nh -= hrest; + ny -= nh + ih; + } + } + else if ((i % 4) == 1) { + nx += nw + iv; + nw += wrest; + } + else if ((i % 4) == 2) { + ny += nh + ih; + nh += hrest; + if (i < n - 1) + nw += wrest; + } + else if ((i % 4) == 3) { + if (s) { + nx += nw + iv; + nw -= wrest; + } else { + nw -= wrest; + nx -= nw + iv; + nh += hrest; + } + } + if (i == 0) { + if (n != 1) { + nw = (m->ww - iv - 2*ov) - (m->ww - iv - 2*ov) * (1 - m->mfact); + wrest = 0; + } + ny = m->wy + oh; + } + else if (i == 1) + nw = m->ww - nw - iv - 2*ov; + i++; + } + + resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False); + } +} + +void +dwindle(Monitor *m) +{ + fibonacci(m, 1); +} + +void +spiral(Monitor *m) +{ + fibonacci(m, 0); +} + +/* + * Gappless grid layout + gaps (ironically) + * https://dwm.suckless.org/patches/gaplessgrid/ + */ +void +gaplessgrid(Monitor *m) +{ + unsigned int i, n; + int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters + int oh, ov, ih, iv; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + /* grid dimensions */ + for (cols = 0; cols <= n/2; cols++) + if (cols*cols >= n) + break; + if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */ + cols = 2; + rows = n/cols; + cn = rn = 0; // reset column no, row no, client count + + ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; + cw = (m->ww - 2*ov - iv * (cols - 1)) / cols; + rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; + crest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; + x = m->wx + ov; + y = m->wy + oh; + + for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) { + if (i/rows + 1 > cols - n%cols) { + rows = n/cols + 1; + ch = (m->wh - 2*oh - ih * (rows - 1)) / rows; + rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; + } + resize(c, + x, + y + rn*(ch + ih) + MIN(rn, rrest), + cw + (cn < crest ? 1 : 0) - 2*c->bw, + ch + (rn < rrest ? 1 : 0) - 2*c->bw, + 0); + rn++; + if (rn >= rows) { + rn = 0; + x += cw + ih + (cn < crest ? 1 : 0); + cn++; + } + } +} + +/* + * Gridmode layout + gaps + * https://dwm.suckless.org/patches/gridmode/ + */ +void +grid(Monitor *m) +{ + unsigned int i, n; + int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows; + int oh, ov, ih, iv; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + + /* grid dimensions */ + for (rows = 0; rows <= n/2; rows++) + if (rows*rows >= n) + break; + cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; + + /* window geoms (cell height/width) */ + ch = (m->wh - 2*oh - ih * (rows - 1)) / (rows ? rows : 1); + cw = (m->ww - 2*ov - iv * (cols - 1)) / (cols ? cols : 1); + chrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows; + cwrest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols; + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + cc = i / rows; + cr = i % rows; + cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest); + cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest); + resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2*c->bw, ch + (cr < chrest ? 1 : 0) - 2*c->bw, False); + } +} + +/* + * Horizontal grid layout + gaps + * https://dwm.suckless.org/patches/horizgrid/ + */ +void +horizgrid(Monitor *m) { + Client *c; + unsigned int n, i; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + int ntop, nbottom = 1; + float mfacts = 0, sfacts = 0; + int mrest, srest, mtotal = 0, stotal = 0; + + /* Count windows */ + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + if (n <= 2) + ntop = n; + else { + ntop = n / 2; + nbottom = n - ntop; + } + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh; + sw = mw = m->ww - 2*ov; + + if (n > ntop) { + sh = (mh - ih) / 2; + mh = mh - ih - sh; + sy = my + mh + ih; + mw = m->ww - 2*ov - iv * (ntop - 1); + sw = m->ww - 2*ov - iv * (nbottom - 1); + } + + /* calculate facts */ + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < ntop) + mfacts += c->cfact; + else + sfacts += c->cfact; + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < ntop) + mtotal += mh * (c->cfact / mfacts); + else + stotal += sw * (c->cfact / sfacts); + + mrest = mh - mtotal; + srest = sw - stotal; + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < ntop) { + resize(c, mx, my, mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv; + } else { + resize(c, sx, sy, sw * (c->cfact / sfacts) + ((i - ntop) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0); + sx += WIDTH(c) + iv; + } +} + +/* + * nrowgrid layout + gaps + * https://dwm.suckless.org/patches/nrowgrid/ + */ +void +nrowgrid(Monitor *m) +{ + unsigned int n; + int ri = 0, ci = 0; /* counters */ + int oh, ov, ih, iv; /* vanitygap settings */ + unsigned int cx, cy, cw, ch; /* client geometry */ + unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */ + unsigned int cols, rows = m->nmaster + 1; + Client *c; + + /* count clients */ + getgaps(m, &oh, &ov, &ih, &iv, &n); + + /* nothing to do here */ + if (n == 0) + return; + + /* force 2 clients to always split vertically */ + if (FORCE_VSPLIT && n == 2) + rows = 1; + + /* never allow empty rows */ + if (n < rows) + rows = n; + + /* define first row */ + cols = n / rows; + uc = cols; + cy = m->wy + oh; + ch = (m->wh - 2*oh - ih*(rows - 1)) / rows; + uh = ch; + + for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) { + if (ci == cols) { + uw = 0; + ci = 0; + ri++; + + /* next row */ + cols = (n - uc) / (rows - ri); + uc += cols; + cy = m->wy + oh + uh + ih; + uh += ch + ih; + } + + cx = m->wx + ov + uw; + cw = (m->ww - 2*ov - uw) / (cols - ci); + uw += cw + iv; + + resize(c, cx, cy, cw - (2*c->bw), ch - (2*c->bw), 0); + } +} + +/* + * Default tile layout + gaps + */ +static void +tile(Monitor *m) +{ + unsigned int i, n; + int oh, ov, ih, iv; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + float mfacts, sfacts; + int mrest, srest; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); + sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); + sw = mw = m->ww - 2*ov; + + if (m->nmaster && n > m->nmaster) { + sw = (mw - iv) * (1 - m->mfact); + mw = mw - iv - sw; + sx = mx + mw + iv; + } + + getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + resize(c, mx, my, mw - (2*c->bw), mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0); + my += HEIGHT(c) + ih; + } else { + resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); + sy += HEIGHT(c) + ih; + } +} \ No newline at end of file diff --git a/yajl_dumps.c b/yajl_dumps.c new file mode 100644 index 0000000..8bf9688 --- /dev/null +++ b/yajl_dumps.c @@ -0,0 +1,351 @@ +#include "yajl_dumps.h" + +#include + +int +dump_tag(yajl_gen gen, const char *name, const int tag_mask) +{ + // clang-format off + YMAP( + YSTR("bit_mask"); YINT(tag_mask); + YSTR("name"); YSTR(name); + ) + // clang-format on + + return 0; +} + +int +dump_tags(yajl_gen gen, const char *tags[], int tags_len) +{ + // clang-format off + YARR( + for (int i = 0; i < tags_len; i++) + dump_tag(gen, tags[i], 1 << i); + ) + // clang-format on + + return 0; +} + +int +dump_client(yajl_gen gen, Client *c) +{ + // clang-format off + YMAP( + YSTR("name"); YSTR(c->name); + YSTR("tags"); YINT(c->tags); + YSTR("window_id"); YINT(c->win); + YSTR("monitor_number"); YINT(c->mon->num); + + YSTR("geometry"); YMAP( + YSTR("current"); YMAP ( + YSTR("x"); YINT(c->x); + YSTR("y"); YINT(c->y); + YSTR("width"); YINT(c->w); + YSTR("height"); YINT(c->h); + ) + YSTR("old"); YMAP( + YSTR("x"); YINT(c->oldx); + YSTR("y"); YINT(c->oldy); + YSTR("width"); YINT(c->oldw); + YSTR("height"); YINT(c->oldh); + ) + ) + + YSTR("size_hints"); YMAP( + YSTR("base"); YMAP( + YSTR("width"); YINT(c->basew); + YSTR("height"); YINT(c->baseh); + ) + YSTR("step"); YMAP( + YSTR("width"); YINT(c->incw); + YSTR("height"); YINT(c->inch); + ) + YSTR("max"); YMAP( + YSTR("width"); YINT(c->maxw); + YSTR("height"); YINT(c->maxh); + ) + YSTR("min"); YMAP( + YSTR("width"); YINT(c->minw); + YSTR("height"); YINT(c->minh); + ) + YSTR("aspect_ratio"); YMAP( + YSTR("min"); YDOUBLE(c->mina); + YSTR("max"); YDOUBLE(c->maxa); + ) + ) + + YSTR("border_width"); YMAP( + YSTR("current"); YINT(c->bw); + YSTR("old"); YINT(c->oldbw); + ) + + YSTR("states"); YMAP( + YSTR("is_fixed"); YBOOL(c->isfixed); + YSTR("is_floating"); YBOOL(c->isfloating); + YSTR("is_urgent"); YBOOL(c->isurgent); + YSTR("never_focus"); YBOOL(c->neverfocus); + YSTR("old_state"); YBOOL(c->oldstate); + YSTR("is_fullscreen"); YBOOL(c->isfullscreen); + ) + ) + // clang-format on + + return 0; +} + +int +dump_monitor(yajl_gen gen, Monitor *mon, int is_selected) +{ + // clang-format off + YMAP( + YSTR("master_factor"); YDOUBLE(mon->mfact); + YSTR("num_master"); YINT(mon->nmaster); + YSTR("num"); YINT(mon->num); + YSTR("is_selected"); YBOOL(is_selected); + + YSTR("monitor_geometry"); YMAP( + YSTR("x"); YINT(mon->mx); + YSTR("y"); YINT(mon->my); + YSTR("width"); YINT(mon->mw); + YSTR("height"); YINT(mon->mh); + ) + + YSTR("window_geometry"); YMAP( + YSTR("x"); YINT(mon->wx); + YSTR("y"); YINT(mon->wy); + YSTR("width"); YINT(mon->ww); + YSTR("height"); YINT(mon->wh); + ) + + YSTR("tagset"); YMAP( + YSTR("current"); YINT(mon->tagset[mon->seltags]); + YSTR("old"); YINT(mon->tagset[mon->seltags ^ 1]); + ) + + YSTR("tag_state"); dump_tag_state(gen, mon->tagstate); + + YSTR("clients"); YMAP( + YSTR("selected"); YINT(mon->sel ? mon->sel->win : 0); + YSTR("stack"); YARR( + for (Client* c = mon->stack; c; c = c->snext) + YINT(c->win); + ) + YSTR("all"); YARR( + for (Client* c = mon->clients; c; c = c->next) + YINT(c->win); + ) + ) + + YSTR("layout"); YMAP( + YSTR("symbol"); YMAP( + YSTR("current"); YSTR(mon->ltsymbol); + YSTR("old"); YSTR(mon->lastltsymbol); + ) + YSTR("address"); YMAP( + YSTR("current"); YINT((uintptr_t)mon->lt[mon->sellt]); + YSTR("old"); YINT((uintptr_t)mon->lt[mon->sellt ^ 1]); + ) + ) + + YSTR("bar"); YMAP( + YSTR("y"); YINT(mon->by); + YSTR("is_shown"); YBOOL(mon->showbar); + YSTR("is_top"); YBOOL(mon->topbar); + YSTR("window_id"); YINT(mon->barwin); + ) + ) + // clang-format on + + return 0; +} + +int +dump_monitors(yajl_gen gen, Monitor *mons, Monitor *selmon) +{ + // clang-format off + YARR( + for (Monitor *mon = mons; mon; mon = mon->next) { + if (mon == selmon) + dump_monitor(gen, mon, 1); + else + dump_monitor(gen, mon, 0); + } + ) + // clang-format on + + return 0; +} + +int +dump_layouts(yajl_gen gen, const Layout layouts[], const int layouts_len) +{ + // clang-format off + YARR( + for (int i = 0; i < layouts_len; i++) { + YMAP( + // Check for a NULL pointer. The cycle layouts patch adds an entry at + // the end of the layouts array with a NULL pointer for the symbol + YSTR("symbol"); YSTR((layouts[i].symbol ? layouts[i].symbol : "")); + YSTR("address"); YINT((uintptr_t)(layouts + i)); + ) + } + ) + // clang-format on + + return 0; +} + +int +dump_tag_state(yajl_gen gen, TagState state) +{ + // clang-format off + YMAP( + YSTR("selected"); YINT(state.selected); + YSTR("occupied"); YINT(state.occupied); + YSTR("urgent"); YINT(state.urgent); + ) + // clang-format on + + return 0; +} + +int +dump_tag_event(yajl_gen gen, int mon_num, TagState old_state, + TagState new_state) +{ + // clang-format off + YMAP( + YSTR("tag_change_event"); YMAP( + YSTR("monitor_number"); YINT(mon_num); + YSTR("old_state"); dump_tag_state(gen, old_state); + YSTR("new_state"); dump_tag_state(gen, new_state); + ) + ) + // clang-format on + + return 0; +} + +int +dump_client_focus_change_event(yajl_gen gen, Client *old_client, + Client *new_client, int mon_num) +{ + // clang-format off + YMAP( + YSTR("client_focus_change_event"); YMAP( + YSTR("monitor_number"); YINT(mon_num); + YSTR("old_win_id"); old_client == NULL ? YNULL() : YINT(old_client->win); + YSTR("new_win_id"); new_client == NULL ? YNULL() : YINT(new_client->win); + ) + ) + // clang-format on + + return 0; +} + +int +dump_layout_change_event(yajl_gen gen, const int mon_num, + const char *old_symbol, const Layout *old_layout, + const char *new_symbol, const Layout *new_layout) +{ + // clang-format off + YMAP( + YSTR("layout_change_event"); YMAP( + YSTR("monitor_number"); YINT(mon_num); + YSTR("old_symbol"); YSTR(old_symbol); + YSTR("old_address"); YINT((uintptr_t)old_layout); + YSTR("new_symbol"); YSTR(new_symbol); + YSTR("new_address"); YINT((uintptr_t)new_layout); + ) + ) + // clang-format on + + return 0; +} + +int +dump_monitor_focus_change_event(yajl_gen gen, const int last_mon_num, + const int new_mon_num) +{ + // clang-format off + YMAP( + YSTR("monitor_focus_change_event"); YMAP( + YSTR("old_monitor_number"); YINT(last_mon_num); + YSTR("new_monitor_number"); YINT(new_mon_num); + ) + ) + // clang-format on + + return 0; +} + +int +dump_focused_title_change_event(yajl_gen gen, const int mon_num, + const Window client_id, const char *old_name, + const char *new_name) +{ + // clang-format off + YMAP( + YSTR("focused_title_change_event"); YMAP( + YSTR("monitor_number"); YINT(mon_num); + YSTR("client_window_id"); YINT(client_id); + YSTR("old_name"); YSTR(old_name); + YSTR("new_name"); YSTR(new_name); + ) + ) + // clang-format on + + return 0; +} + +int +dump_client_state(yajl_gen gen, const ClientState *state) +{ + // clang-format off + YMAP( + YSTR("old_state"); YBOOL(state->oldstate); + YSTR("is_fixed"); YBOOL(state->isfixed); + YSTR("is_floating"); YBOOL(state->isfloating); + YSTR("is_fullscreen"); YBOOL(state->isfullscreen); + YSTR("is_urgent"); YBOOL(state->isurgent); + YSTR("never_focus"); YBOOL(state->neverfocus); + ) + // clang-format on + + return 0; +} + +int +dump_focused_state_change_event(yajl_gen gen, const int mon_num, + const Window client_id, + const ClientState *old_state, + const ClientState *new_state) +{ + // clang-format off + YMAP( + YSTR("focused_state_change_event"); YMAP( + YSTR("monitor_number"); YINT(mon_num); + YSTR("client_window_id"); YINT(client_id); + YSTR("old_state"); dump_client_state(gen, old_state); + YSTR("new_state"); dump_client_state(gen, new_state); + ) + ) + // clang-format on + + return 0; +} + +int +dump_error_message(yajl_gen gen, const char *reason) +{ + // clang-format off + YMAP( + YSTR("result"); YSTR("error"); + YSTR("reason"); YSTR(reason); + ) + // clang-format on + + return 0; +} diff --git a/yajl_dumps.h b/yajl_dumps.h new file mode 100644 index 0000000..ee9948e --- /dev/null +++ b/yajl_dumps.h @@ -0,0 +1,65 @@ +#ifndef YAJL_DUMPS_H_ +#define YAJL_DUMPS_H_ + +#include +#include + +#define YSTR(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str)) +#define YINT(num) yajl_gen_integer(gen, num) +#define YDOUBLE(num) yajl_gen_double(gen, num) +#define YBOOL(v) yajl_gen_bool(gen, v) +#define YNULL() yajl_gen_null(gen) +#define YARR(body) \ + { \ + yajl_gen_array_open(gen); \ + body; \ + yajl_gen_array_close(gen); \ + } +#define YMAP(body) \ + { \ + yajl_gen_map_open(gen); \ + body; \ + yajl_gen_map_close(gen); \ + } + +int dump_tag(yajl_gen gen, const char *name, const int tag_mask); + +int dump_tags(yajl_gen gen, const char *tags[], int tags_len); + +int dump_client(yajl_gen gen, Client *c); + +int dump_monitor(yajl_gen gen, Monitor *mon, int is_selected); + +int dump_monitors(yajl_gen gen, Monitor *mons, Monitor *selmon); + +int dump_layouts(yajl_gen gen, const Layout layouts[], const int layouts_len); + +int dump_tag_state(yajl_gen gen, TagState state); + +int dump_tag_event(yajl_gen gen, int mon_num, TagState old_state, + TagState new_state); + +int dump_client_focus_change_event(yajl_gen gen, Client *old_client, + Client *new_client, int mon_num); + +int dump_layout_change_event(yajl_gen gen, const int mon_num, + const char *old_symbol, const Layout *old_layout, + const char *new_symbol, const Layout *new_layout); + +int dump_monitor_focus_change_event(yajl_gen gen, const int last_mon_num, + const int new_mon_num); + +int dump_focused_title_change_event(yajl_gen gen, const int mon_num, + const Window client_id, + const char *old_name, const char *new_name); + +int dump_client_state(yajl_gen gen, const ClientState *state); + +int dump_focused_state_change_event(yajl_gen gen, const int mon_num, + const Window client_id, + const ClientState *old_state, + const ClientState *new_state); + +int dump_error_message(yajl_gen gen, const char *reason); + +#endif // YAJL_DUMPS_H_