mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-10-26 17:54:17 +00:00
update centeredmaster for HEAD
This commit is contained in:
parent
0f4e40fee4
commit
b104a580a8
@ -1,16 +1,16 @@
|
|||||||
From 9f8c11325b14939e325e48995fb5a62d51d66fa4 Mon Sep 17 00:00:00 2001
|
From a9d47325283a55fd299de5bbbab5ab195840c7ca Mon Sep 17 00:00:00 2001
|
||||||
From: wochap <gean.marroquin@gmail.com>
|
From: wochap <gean.marroquin@gmail.com>
|
||||||
Date: Tue, 5 Mar 2024 21:58:19 -0500
|
Date: Thu, 11 Apr 2024 16:42:25 -0500
|
||||||
Subject: [PATCH] apply nikita centeredmaster patch
|
Subject: [PATCH] implement centeredmaster layout
|
||||||
|
|
||||||
source: https://github.com/djpohly/dwl/wiki/centeredmaster
|
inspiration: https://github.com/djpohly/dwl/wiki/centeredmaster
|
||||||
---
|
---
|
||||||
config.def.h | 2 ++
|
config.def.h | 2 ++
|
||||||
dwl.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
dwl.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
2 files changed, 65 insertions(+)
|
2 files changed, 66 insertions(+)
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
diff --git a/config.def.h b/config.def.h
|
||||||
index db0babc..95611ef 100644
|
index 8847e58..cfc6e62 100644
|
||||||
--- a/config.def.h
|
--- a/config.def.h
|
||||||
+++ b/config.def.h
|
+++ b/config.def.h
|
||||||
@@ -33,6 +33,7 @@ static const Layout layouts[] = {
|
@@ -33,6 +33,7 @@ static const Layout layouts[] = {
|
||||||
@ -21,7 +21,7 @@ index db0babc..95611ef 100644
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* monitors */
|
/* monitors */
|
||||||
@@ -132,6 +133,7 @@ static const Key keys[] = {
|
@@ -134,6 +135,7 @@ static const Key keys[] = {
|
||||||
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||||
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
||||||
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
||||||
@ -30,10 +30,10 @@ index db0babc..95611ef 100644
|
|||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
||||||
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
||||||
diff --git a/dwl.c b/dwl.c
|
diff --git a/dwl.c b/dwl.c
|
||||||
index ef27a1d..0ab3789 100644
|
index bf763df..0e84ccf 100644
|
||||||
--- a/dwl.c
|
--- a/dwl.c
|
||||||
+++ b/dwl.c
|
+++ b/dwl.c
|
||||||
@@ -235,6 +235,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
@@ -248,6 +248,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||||
static void arrangelayers(Monitor *m);
|
static void arrangelayers(Monitor *m);
|
||||||
static void axisnotify(struct wl_listener *listener, void *data);
|
static void axisnotify(struct wl_listener *listener, void *data);
|
||||||
static void buttonpress(struct wl_listener *listener, void *data);
|
static void buttonpress(struct wl_listener *listener, void *data);
|
||||||
@ -41,14 +41,15 @@ index ef27a1d..0ab3789 100644
|
|||||||
static void chvt(const Arg *arg);
|
static void chvt(const Arg *arg);
|
||||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||||
static void cleanup(void);
|
static void cleanup(void);
|
||||||
@@ -597,6 +598,68 @@ buttonpress(struct wl_listener *listener, void *data)
|
@@ -628,6 +629,69 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||||
event->time_msec, event->button, event->state);
|
event->time_msec, event->button, event->state);
|
||||||
}
|
}
|
||||||
|
|
||||||
+void
|
+void
|
||||||
+centeredmaster(Monitor *m)
|
+centeredmaster(Monitor *m)
|
||||||
+{
|
+{
|
||||||
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
|
+ unsigned int h, mw, mx, my, oty, ety, tw;
|
||||||
|
+ int i, n;
|
||||||
+ Client *c;
|
+ Client *c;
|
||||||
+
|
+
|
||||||
+ n = 0;
|
+ n = 0;
|
||||||
@ -66,7 +67,7 @@ index ef27a1d..0ab3789 100644
|
|||||||
+
|
+
|
||||||
+ if (n > m->nmaster) {
|
+ if (n > m->nmaster) {
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
+ /* go mfact box in the center if more than nmaster clients */
|
||||||
+ mw = m->nmaster ? m->w.width * m->mfact : 0;
|
+ mw = ROUND(m->nmaster ? m->w.width * m->mfact : 0);
|
||||||
+ tw = m->w.width - mw;
|
+ tw = m->w.width - mw;
|
||||||
+
|
+
|
||||||
+ if (n - m->nmaster > 1) {
|
+ if (n - m->nmaster > 1) {
|
||||||
@ -111,4 +112,5 @@ index ef27a1d..0ab3789 100644
|
|||||||
chvt(const Arg *arg)
|
chvt(const Arg *arg)
|
||||||
{
|
{
|
||||||
--
|
--
|
||||||
2.42.0
|
2.43.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user