mirror of
https://github.com/tiyn/dwl.git
synced 2026-01-11 17:39:45 +01:00
Compare commits
2 Commits
bottomstac
...
hide-behin
| Author | SHA1 | Date | |
|---|---|---|---|
| 2084721901 | |||
| f2780a182b |
@@ -1,140 +0,0 @@
|
|||||||
From b352fb08f40b1ee2d8c4748be4922df711e3aaa9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: wochap <gean.marroquin@gmail.com>
|
|
||||||
Date: Fri, 5 Jul 2024 10:44:29 -0500
|
|
||||||
Subject: [PATCH] implement bottomstack
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 4 +++
|
|
||||||
dwl.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 88 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 22d2171..5aac3e9 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -34,6 +34,8 @@ static const Layout layouts[] = {
|
|
||||||
{ "[]=", tile },
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
+ { "TTT", bstack },
|
|
||||||
+ { "===", bstackhoriz },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* monitors */
|
|
||||||
@@ -139,6 +141,8 @@ static const Key keys[] = {
|
|
||||||
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
+ { MODKEY, XKB_KEY_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
+ { MODKEY, XKB_KEY_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
|
||||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
|
|
||||||
diff --git a/dwl.c b/dwl.c
|
|
||||||
index dc0437e..5648d5f 100644
|
|
||||||
--- a/dwl.c
|
|
||||||
+++ b/dwl.c
|
|
||||||
@@ -57,6 +57,7 @@
|
|
||||||
#include <wlr/types/wlr_xdg_decoration_v1.h>
|
|
||||||
#include <wlr/types/wlr_xdg_output_v1.h>
|
|
||||||
#include <wlr/types/wlr_xdg_shell.h>
|
|
||||||
+#include <wlr/util/box.h>
|
|
||||||
#include <wlr/util/log.h>
|
|
||||||
#include <wlr/util/region.h>
|
|
||||||
#include <xkbcommon/xkbcommon.h>
|
|
||||||
@@ -351,6 +352,8 @@ static Monitor *xytomon(double x, double y);
|
|
||||||
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
|
||||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
+static void bstack(Monitor *m);
|
|
||||||
+static void bstackhoriz(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
@@ -3160,3 +3163,84 @@ main(int argc, char *argv[])
|
|
||||||
usage:
|
|
||||||
die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+bstack(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ int w, h, mh, mx, tx, ty, tw;
|
|
||||||
+ int i, n = 0;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ wl_list_for_each(c, &clients, link)
|
|
||||||
+ if (VISIBLEON(c, m) && !c->isfloating)
|
|
||||||
+ n++;
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
|
|
||||||
+ tw = m->w.width / (n - m->nmaster);
|
|
||||||
+ ty = m->w.y + mh;
|
|
||||||
+ } else {
|
|
||||||
+ mh = m->w.height;
|
|
||||||
+ tw = m->w.width;
|
|
||||||
+ ty = m->w.y;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ i = mx = 0;
|
|
||||||
+ tx = m-> w.x;
|
|
||||||
+ wl_list_for_each(c, &clients, link) {
|
|
||||||
+ if (!VISIBLEON(c, m) || c->isfloating)
|
|
||||||
+ continue;
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
|
|
||||||
+ mx += c->geom.width;
|
|
||||||
+ } else {
|
|
||||||
+ h = m->w.height - mh;
|
|
||||||
+ resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = tw, .height = h }, 0);
|
|
||||||
+ if (tw != m->w.width)
|
|
||||||
+ tx += c->geom.width;
|
|
||||||
+ }
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+bstackhoriz(Monitor *m) {
|
|
||||||
+ int w, mh, mx, tx, ty, th;
|
|
||||||
+ int i, n = 0;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ wl_list_for_each(c, &clients, link)
|
|
||||||
+ if (VISIBLEON(c, m) && !c->isfloating)
|
|
||||||
+ n ++;
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
|
|
||||||
+ th = (m->w.height - mh) / (n - m->nmaster);
|
|
||||||
+ ty = m->w.y + mh;
|
|
||||||
+ } else {
|
|
||||||
+ th = mh = m->w.height;
|
|
||||||
+ ty = m->w.y;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ i = mx = 0;
|
|
||||||
+ tx = m-> w.x;
|
|
||||||
+ wl_list_for_each(c, &clients, link) {
|
|
||||||
+ if (!VISIBLEON(c,m) || c->isfloating)
|
|
||||||
+ continue;
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
|
|
||||||
+ mx += c->geom.width;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = m->w.width, .height = th }, 0);
|
|
||||||
+ if (th != m->w.height)
|
|
||||||
+ ty += c->geom.height;
|
|
||||||
+ }
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.45.1
|
|
||||||
@@ -12,7 +12,7 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
|||||||
static const float focuscolor[] = COLOR(0x005577ff);
|
static const float focuscolor[] = COLOR(0x005577ff);
|
||||||
static const float urgentcolor[] = COLOR(0xff0000ff);
|
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||||
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||||
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
|
||||||
|
|
||||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||||
#define TAGCOUNT (9)
|
#define TAGCOUNT (9)
|
||||||
@@ -34,8 +34,6 @@ static const Layout layouts[] = {
|
|||||||
{ "[]=", tile },
|
{ "[]=", tile },
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
{ "[M]", monocle },
|
{ "[M]", monocle },
|
||||||
{ "TTT", bstack },
|
|
||||||
{ "===", bstackhoriz },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* monitors */
|
/* monitors */
|
||||||
@@ -141,8 +139,6 @@ 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]} },
|
||||||
{ MODKEY, XKB_KEY_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
{ MODKEY, XKB_KEY_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
{ MODKEY, XKB_KEY_space, setlayout, {0} },
|
||||||
{ 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} },
|
||||||
|
|||||||
108
dwl.c
108
dwl.c
@@ -59,7 +59,6 @@
|
|||||||
#include <wlr/types/wlr_xdg_decoration_v1.h>
|
#include <wlr/types/wlr_xdg_decoration_v1.h>
|
||||||
#include <wlr/types/wlr_xdg_output_v1.h>
|
#include <wlr/types/wlr_xdg_output_v1.h>
|
||||||
#include <wlr/types/wlr_xdg_shell.h>
|
#include <wlr/types/wlr_xdg_shell.h>
|
||||||
#include <wlr/util/box.h>
|
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include <wlr/util/region.h>
|
#include <wlr/util/region.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
@@ -352,8 +351,6 @@ static Monitor *xytomon(double x, double y);
|
|||||||
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
static void xytonode(double x, double y, struct wlr_surface **psurface,
|
||||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
||||||
static void zoom(const Arg *arg);
|
static void zoom(const Arg *arg);
|
||||||
static void bstack(Monitor *m);
|
|
||||||
static void bstackhoriz(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
static pid_t child_pid = -1;
|
static pid_t child_pid = -1;
|
||||||
@@ -508,7 +505,9 @@ applyrules(Client *c)
|
|||||||
void
|
void
|
||||||
arrange(Monitor *m)
|
arrange(Monitor *m)
|
||||||
{
|
{
|
||||||
Client *c;
|
LayerSurface *l;
|
||||||
|
Client *c, *sel = focustop(m);
|
||||||
|
int i;
|
||||||
|
|
||||||
if (!m->wlr_output->enabled)
|
if (!m->wlr_output->enabled)
|
||||||
return;
|
return;
|
||||||
@@ -539,6 +538,26 @@ arrange(Monitor *m)
|
|||||||
: c->scene->node.parent);
|
: c->scene->node.parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
|
||||||
|
for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||||
|
wl_list_for_each(l, &sel->mon->layers[i], link)
|
||||||
|
wlr_scene_node_set_enabled(&l->scene->node, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
wl_list_for_each(c, &clients, link) {
|
||||||
|
if (c->mon != m)
|
||||||
|
continue;
|
||||||
|
wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
|
||||||
|
|| !sel->isfullscreen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
|
||||||
|
for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||||
|
wl_list_for_each(l, &m->layers[i], link)
|
||||||
|
wlr_scene_node_set_enabled(&l->scene->node, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (m->lt[m->sellt]->arrange)
|
if (m->lt[m->sellt]->arrange)
|
||||||
m->lt[m->sellt]->arrange(m);
|
m->lt[m->sellt]->arrange(m);
|
||||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||||
@@ -3211,84 +3230,3 @@ main(int argc, char *argv[])
|
|||||||
usage:
|
usage:
|
||||||
die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
|
die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
bstack(Monitor *m)
|
|
||||||
{
|
|
||||||
int w, h, mh, mx, tx, ty, tw;
|
|
||||||
int i, n = 0;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
wl_list_for_each(c, &clients, link)
|
|
||||||
if (VISIBLEON(c, m) && !c->isfloating)
|
|
||||||
n++;
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (n > m->nmaster) {
|
|
||||||
mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
|
|
||||||
tw = m->w.width / (n - m->nmaster);
|
|
||||||
ty = m->w.y + mh;
|
|
||||||
} else {
|
|
||||||
mh = m->w.height;
|
|
||||||
tw = m->w.width;
|
|
||||||
ty = m->w.y;
|
|
||||||
}
|
|
||||||
|
|
||||||
i = mx = 0;
|
|
||||||
tx = m-> w.x;
|
|
||||||
wl_list_for_each(c, &clients, link) {
|
|
||||||
if (!VISIBLEON(c, m) || c->isfloating)
|
|
||||||
continue;
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
|
|
||||||
mx += c->geom.width;
|
|
||||||
} else {
|
|
||||||
h = m->w.height - mh;
|
|
||||||
resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = tw, .height = h }, 0);
|
|
||||||
if (tw != m->w.width)
|
|
||||||
tx += c->geom.width;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
bstackhoriz(Monitor *m) {
|
|
||||||
int w, mh, mx, tx, ty, th;
|
|
||||||
int i, n = 0;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
wl_list_for_each(c, &clients, link)
|
|
||||||
if (VISIBLEON(c, m) && !c->isfloating)
|
|
||||||
n ++;
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (n > m->nmaster) {
|
|
||||||
mh = (int)round(m->nmaster ? m->mfact * m->w.height : 0);
|
|
||||||
th = (m->w.height - mh) / (n - m->nmaster);
|
|
||||||
ty = m->w.y + mh;
|
|
||||||
} else {
|
|
||||||
th = mh = m->w.height;
|
|
||||||
ty = m->w.y;
|
|
||||||
}
|
|
||||||
|
|
||||||
i = mx = 0;
|
|
||||||
tx = m-> w.x;
|
|
||||||
wl_list_for_each(c, &clients, link) {
|
|
||||||
if (!VISIBLEON(c,m) || c->isfloating)
|
|
||||||
continue;
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
w = (m->w.width - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
resize(c, (struct wlr_box) { .x = m->w.x + mx, .y = m->w.y, .width = w, .height = mh }, 0);
|
|
||||||
mx += c->geom.width;
|
|
||||||
} else {
|
|
||||||
resize(c, (struct wlr_box) { .x = tx, .y = ty, .width = m->w.width, .height = th }, 0);
|
|
||||||
if (th != m->w.height)
|
|
||||||
ty += c->geom.height;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
73
hide-behind-fullscreen.patch
Normal file
73
hide-behind-fullscreen.patch
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
From ac1537f068ea626f1984803ed8db08faf7943b18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
|
||||||
|
<leohdz172@proton.me>
|
||||||
|
Date: Sun, 10 Apr 2022 22:38:53 -0500
|
||||||
|
Subject: [PATCH] hide-behind-fullscreen
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
|
||||||
|
---
|
||||||
|
config.def.h | 2 +-
|
||||||
|
dwl.c | 24 +++++++++++++++++++++++-
|
||||||
|
2 files changed, 24 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 22d2171d..1d5a4c84 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -12,7 +12,7 @@ static const float bordercolor[] = COLOR(0x444444ff);
|
||||||
|
static const float focuscolor[] = COLOR(0x005577ff);
|
||||||
|
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||||
|
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||||
|
-static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
||||||
|
+static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
|
||||||
|
|
||||||
|
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||||
|
#define TAGCOUNT (9)
|
||||||
|
diff --git a/dwl.c b/dwl.c
|
||||||
|
index ad21e1ba..f5395fe6 100644
|
||||||
|
--- a/dwl.c
|
||||||
|
+++ b/dwl.c
|
||||||
|
@@ -505,7 +505,9 @@ applyrules(Client *c)
|
||||||
|
void
|
||||||
|
arrange(Monitor *m)
|
||||||
|
{
|
||||||
|
- Client *c;
|
||||||
|
+ LayerSurface *l;
|
||||||
|
+ Client *c, *sel = focustop(m);
|
||||||
|
+ int i;
|
||||||
|
|
||||||
|
if (!m->wlr_output->enabled)
|
||||||
|
return;
|
||||||
|
@@ -536,6 +538,26 @@ arrange(Monitor *m)
|
||||||
|
: c->scene->node.parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
|
||||||
|
+ for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||||
|
+ wl_list_for_each(l, &sel->mon->layers[i], link)
|
||||||
|
+ wlr_scene_node_set_enabled(&l->scene->node, 0);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ wl_list_for_each(c, &clients, link) {
|
||||||
|
+ if (c->mon != m)
|
||||||
|
+ continue;
|
||||||
|
+ wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
|
||||||
|
+ || !sel->isfullscreen);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
|
||||||
|
+ for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
|
||||||
|
+ wl_list_for_each(l, &m->layers[i], link)
|
||||||
|
+ wlr_scene_node_set_enabled(&l->scene->node, 1);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (m->lt[m->sellt]->arrange)
|
||||||
|
m->lt[m->sellt]->arrange(m);
|
||||||
|
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||||
|
--
|
||||||
|
2.48.0
|
||||||
|
|
||||||
Reference in New Issue
Block a user