From 7d5b1b38a29f44deab9d0472eac276edd8478ee4 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Sun, 30 Aug 2020 13:51:19 -0400 Subject: [PATCH] cyclelayouts patch - Apply cyclelayouts patch - Add patch link to README - Add new layout cycling keybindings to man page --- README.md | 1 + config.h | 3 +++ dwm.1 | 6 ++++++ dwm.c | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/README.md b/README.md index d79ae81..1493b5d 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ and (re)compiling the source code. * [autostart](https://dwm.suckless.org/patches/autostart/) * [centeredmaster](https://dwm.suckless.org/patches/centeredmaster/) * [combo](https://dwm.suckless.org/patches/combo/) +* [cyclelayouts](https://dwm.suckless.org/patches/cyclelayouts/) * [gridmode](https://dwm.suckless.org/patches/gridmode/) * [movestack](https://dwm.suckless.org/patches/movestack/) * [ru_gaps](https://dwm.suckless.org/patches/ru_gaps/) diff --git a/config.h b/config.h index 9723c0a..219b907 100644 --- a/config.h +++ b/config.h @@ -53,6 +53,7 @@ static const Layout layouts[] = { { "|M|", centeredmaster }, { ">M>", centeredfloatingmaster }, { "HHH", grid }, + { NULL, NULL }, }; /* key definitions */ @@ -112,6 +113,8 @@ static Key keys[] = { { MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, { MODKEY, XK_g, setlayout, {.v = &layouts[5]} }, + { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } }, + { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0} }, diff --git a/dwm.1 b/dwm.1 index a6d4fbc..85302ee 100644 --- a/dwm.1 +++ b/dwm.1 @@ -137,6 +137,12 @@ Sets grid layout. .B Mod1\-space Toggles between current and previous layout. .TP +.B Mod1\-Control\-, +Cycles backwards in layout list. +.TP +.B Mod1\-Control\-. +Cycles forwards in layout list. +.TP .B Mod1\-j Focus next window. .TP diff --git a/dwm.c b/dwm.c index 664eb65..c9884bf 100644 --- a/dwm.c +++ b/dwm.c @@ -183,6 +183,7 @@ static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); static Monitor *createmon(void); +static void cyclelayout(const Arg *arg); static void destroynotify(XEvent *e); static void detach(Client *c); static void detachstack(Client *c); @@ -786,6 +787,23 @@ createmon(void) return m; } +void +cyclelayout(const Arg *arg) { + Layout *l; + for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++); + if(arg->i > 0) { + if(l->symbol && (l + 1)->symbol) + setlayout(&((Arg) { .v = (l + 1) })); + else + setlayout(&((Arg) { .v = layouts })); + } else { + if(l != layouts && (l - 1)->symbol) + setlayout(&((Arg) { .v = (l - 1) })); + else + setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] })); + } +} + void destroynotify(XEvent *e) {