Applay the fibonacci layouts and improve the code🥰

This commit is contained in:
Anas Elgarhy 2022-07-10 20:24:03 +02:00
parent f9882626e7
commit 793c1cc205
8 changed files with 204 additions and 2718 deletions

View file

@ -15,6 +15,7 @@
- [systray](https://dwm.suckless.org/patches/systray) - [systray](https://dwm.suckless.org/patches/systray)
- [sticky](https://dwm.suckless.org/patches/sticky) - [sticky](https://dwm.suckless.org/patches/sticky)
- [noborder](https://dwm.suckless.org/patches/noborder) - [noborder](https://dwm.suckless.org/patches/noborder)
- [fibonacci layouts](https://dwm.suckless.org/patches/fibonacci)
### Keys ### Keys
| Keys | Function | | Keys | Function |
@ -48,6 +49,8 @@
| modkey + s -> f | Use the float layout | | modkey + s -> f | Use the float layout |
| modkey + s -> m | Use the monocle layout | | modkey + s -> m | Use the monocle layout |
| modkey + s -> g | Use the grid layout | | modkey + s -> g | Use the grid layout |
| modkey + s -> r | Use the spial layout (part from fibonacci layouts) |
| modkey + s -> shift + r | Use the dwindle layout (part from fibonacci layouts) |
| modkey + s -> space | Toggle between current layout and tile layout | | modkey + s -> space | Toggle between current layout and tile layout |
| modkey + shift + s | Toggle sticky mode | | modkey + shift + s | Toggle sticky mode |
| modkey + alt + f | Toggle floating window | | modkey + alt + f | Toggle floating window |

View file

@ -141,6 +141,8 @@ static Keychord keychords[] = {
{1, {{MODKEY|ShiftMask, XK_j}}, movestack, {.i = +1 } }, {1, {{MODKEY|ShiftMask, XK_j}}, movestack, {.i = +1 } },
{1, {{MODKEY|ShiftMask, XK_k}}, movestack, {.i = -1 } }, {1, {{MODKEY|ShiftMask, XK_k}}, movestack, {.i = -1 } },
// Toogle styky mode
{1, {{MODKEY|ShiftMask, XK_s}}, togglesticky, {0} },
// Quit from the foucsed window (kill) // Quit from the foucsed window (kill)
{2, {{MODKEY, XK_q}, {0, XK_q}}, killclient, {0} }, {2, {{MODKEY, XK_q}, {0, XK_q}}, killclient, {0} },

View file

@ -60,13 +60,15 @@ 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 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 int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
#include "layouts.c" #include "layouts/layouts.h"
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */ { "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
{ "HHH", grid }, { "HHH", grid },
{ "[@]", spiral },
{ "[\\]", dwindle },
}; };
/* key definitions */ /* key definitions */
@ -155,6 +157,10 @@ static Keychord keychords[] = {
{2, {{MODKEY, XK_s}, {0, XK_m}}, setlayout, {.v = &layouts[2]} }, {2, {{MODKEY, XK_s}, {0, XK_m}}, setlayout, {.v = &layouts[2]} },
// Grid layout // Grid layout
{2, {{MODKEY, XK_s}, {0, XK_g}}, setlayout, {.v = &layouts[3]} }, {2, {{MODKEY, XK_s}, {0, XK_g}}, setlayout, {.v = &layouts[3]} },
// Spiral layout
{2, {{MODKEY, XK_s}, {0, XK_r}}, setlayout, {.v = &layouts[4]} },
// Dwindle layout
{2, {{MODKEY, XK_s}, {0, XK_r|ShiftMask}}, setlayout, {.v = &layouts[5]} },
// Toggle between current layout and tile layout // Toggle between current layout and tile layout
{2, {{MODKEY, XK_s}, {0, XK_space}}, setlayout, {0} }, {2, {{MODKEY, XK_s}, {0, XK_space}}, setlayout, {0} },

2712
dwm.c.orig

File diff suppressed because it is too large Load diff

66
layouts/fibonacci.c Normal file
View file

@ -0,0 +1,66 @@
void
fibonacci(Monitor *mon, int s) {
unsigned int i, n, nx, ny, nw, nh;
Client *c;
for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
nx = mon->wx;
ny = 0;
nw = mon->ww;
nh = mon->wh;
for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
if((i % 2 && nh / 2 > 2 * c->bw)
|| (!(i % 2) && nw / 2 > 2 * c->bw)) {
if(i < n - 1) {
if(i % 2)
nh /= 2;
else
nw /= 2;
if((i % 4) == 2 && !s)
nx += nw;
else if((i % 4) == 3 && !s)
ny += nh;
}
if((i % 4) == 0) {
if(s)
ny += nh;
else
ny -= nh;
}
else if((i % 4) == 1)
nx += nw;
else if((i % 4) == 2)
ny += nh;
else if((i % 4) == 3) {
if(s)
nx += nw;
else
nx -= nw;
}
if(i == 0)
{
if(n != 1)
nw = mon->ww * mon->mfact;
ny = mon->wy;
}
else if(i == 1)
nw = mon->ww - nw;
i++;
}
resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
}
}
void
dwindle(Monitor *mon) {
fibonacci(mon, 1);
}
void
spiral(Monitor *mon) {
fibonacci(mon, 0);
}

7
layouts/layouts.h Normal file
View file

@ -0,0 +1,7 @@
#ifndef layouts_H
#define layouts_H
#include "grid.c"
#include "fibonacci.c"
#endif // !layouts.h

View file

@ -0,0 +1,114 @@
From ec9f55b6005cfa3b025b3d700c61af3ce539d057 Mon Sep 17 00:00:00 2001
From: Niki Yoshiuchi <nyoshiuchi@gmail.com>
Date: Sat, 18 Apr 2020 09:55:26 -0700
Subject: [PATCH] Adding the fibonacci layout patch
---
config.def.h | 5 ++++
fibonacci.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 fibonacci.c
diff --git a/config.def.h b/config.def.h
index 1c0b587..5708487 100644
--- a/config.def.h
+++ b/config.def.h
@@ -36,11 +36,14 @@ 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 */
+#include "fibonacci.c"
static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
+ { "[@]", spiral },
+ { "[\\]", dwindle },
};
/* key definitions */
@@ -76,6 +79,8 @@ 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|ShiftMask, XK_r, setlayout, {.v = &layouts[4]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
diff --git a/fibonacci.c b/fibonacci.c
new file mode 100644
index 0000000..fce0a57
--- /dev/null
+++ b/fibonacci.c
@@ -0,0 +1,66 @@
+void
+fibonacci(Monitor *mon, int s) {
+ unsigned int i, n, nx, ny, nw, nh;
+ Client *c;
+
+ for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
+
+ nx = mon->wx;
+ ny = 0;
+ nw = mon->ww;
+ nh = mon->wh;
+
+ for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
+ if((i % 2 && nh / 2 > 2 * c->bw)
+ || (!(i % 2) && nw / 2 > 2 * c->bw)) {
+ if(i < n - 1) {
+ if(i % 2)
+ nh /= 2;
+ else
+ nw /= 2;
+ if((i % 4) == 2 && !s)
+ nx += nw;
+ else if((i % 4) == 3 && !s)
+ ny += nh;
+ }
+ if((i % 4) == 0) {
+ if(s)
+ ny += nh;
+ else
+ ny -= nh;
+ }
+ else if((i % 4) == 1)
+ nx += nw;
+ else if((i % 4) == 2)
+ ny += nh;
+ else if((i % 4) == 3) {
+ if(s)
+ nx += nw;
+ else
+ nx -= nw;
+ }
+ if(i == 0)
+ {
+ if(n != 1)
+ nw = mon->ww * mon->mfact;
+ ny = mon->wy;
+ }
+ else if(i == 1)
+ nw = mon->ww - nw;
+ i++;
+ }
+ resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
+ }
+}
+
+void
+dwindle(Monitor *mon) {
+ fibonacci(mon, 1);
+}
+
+void
+spiral(Monitor *mon) {
+ fibonacci(mon, 0);
+}
--
2.20.1