tiyn/dwl
1
0
Fork 0
mirror of https://github.com/tiyn/dwl.git synced 2026-01-11 09:29:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: tiyn:b5ac3f0ef61d6f3abbc3b50cbd1cc405f85a6032
Branches Tags
tiyn:master tiyn:config tiyn:foreign-toplevel-management tiyn:hide-behind-fullscreen tiyn:hide-behind-monocle tiyn:unclutter tiyn:xwayland-handle-minimize tiyn:swallow tiyn:togglekblayoutandoptions tiyn:en-keycodes tiyn:warpcursor tiyn:bottomstack tiyn:attachtop tiyn:fakefullscreenclient tiyn:inputdevicerules tiyn:ipc tiyn:pertag tiyn:smartborders tiyn:deck tiyn:base
..
compare: tiyn:deck
Branches Tags
tiyn:master tiyn:config tiyn:foreign-toplevel-management tiyn:hide-behind-fullscreen tiyn:hide-behind-monocle tiyn:unclutter tiyn:xwayland-handle-minimize tiyn:swallow tiyn:togglekblayoutandoptions tiyn:en-keycodes tiyn:warpcursor tiyn:bottomstack tiyn:attachtop tiyn:fakefullscreenclient tiyn:inputdevicerules tiyn:ipc tiyn:pertag tiyn:smartborders tiyn:deck tiyn:base

3 Commits
b5ac3f0ef6 ... deck

Author SHA1 Message Date
tiyn
f33af5fca8 add number to deck layout 2025-04-06 00:29:25 +02:00
tiyn
c1702d5d8b fixed bug 2025-04-06 00:17:53 +02:00
tiyn
4d56baeed1 added and patched deck branch 2025-04-06 00:09:26 +02:00
4 changed files with 181 additions and 126 deletions
Expand all files Collapse all files

161
config.def.h
View File

@@ -6,7 +6,6 @@
/* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const int smartborders = 1;
static const unsigned int borderpx = 1; /* border pixel of windows */
static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff);
@@ -14,53 +13,28 @@ 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 int enableautoswallow = 0; /* enables autoswallowing newly spawned clients */
static float swallowborder = 1.0f; /* add this multiplied by borderpx to border when a client is swallowed */
/* tagging - TAGCOUNT must be no greater than 31 */
#define TAGCOUNT (10)
#define TAGCOUNT (9)
/* logging */
static int log_level = WLR_ERROR;
/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
static const Rule rules[] = {
/* app_id title tags mask isfloating isterm noswallow monitor */
/* app_id title tags mask isfloating monitor */
/* examples: */
{ "firefox", NULL, 1 << 1, 0, 0, 0, -1 },
{ "zen", NULL, 1 << 1, 0, 0, 0, -1 },
{ "Lutris", NULL, 1 << 2, 0, 0, 0, 0 },
{ "zenity", NULL, 0, 1, 0, 0, -1 },
{ "steam", NULL, 1 << 2, 0, 0, 0, 0 },
{ "discord", NULL, 1 << 2, 0, 0, 0, 1 },
{ "TeamSpeak", NULL, 1 << 2, 0, 0, 0, 1 },
{ "Mattermost", NULL, 1 << 2, 0, 0, 0, 1 },
{ "Element", NULL, 1 << 2, 0, 0, 0, 1 },
{ "signal", NULL, 1 << 4, 0, 0, 0, 1 },
{ "telegram", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Threema", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Thunderbird", NULL, 1 << 4, 0, 0, 0, 1 },
{ "Sonixd", NULL, 1 << 8, 0, 0, 0, 1 },
{ "KeePassXC", "Unlock Database - KeePassXC", 1 << 1, 1, 0, 0, 0 },
{ "KeePassXC", NULL, 1 << 9, 0, 0, 0, 0 },
{ "com.obsproject.Studio",NULL, 1 << 7, 0, 0, 0, 1 },
{ "easyeffects", NULL, 1 << 9, 0, 0, 0, 1 },
{ "pavucontrol", NULL, 1 << 9, 0, 0, 0, 1 },
{ "nextcloud", NULL, 0, 1, 0, 0, -1 },
{ "st", NULL, 0, 0, 1, 0, -1 },
{ "vifm", NULL, 0, 0, 1, 0, -1 },
{ "vifmrun", NULL, 0, 0, 1, 0, -1 },
{ "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
{ "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
};
/* layout(s) */
static const Layout layouts[] = {
/* symbol arrange function */
{ "M", monocle },
{ "T", tile },
{ "D", deck },
{ "B", bstack },
{ "B", bstackhoriz },
{ "F", NULL }, /* no layout function means floating behavior */
{ "[]=", tile },
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
{ "[D]", deck },
};
/* monitors */
@@ -79,33 +53,12 @@ static const MonitorRule monrules[] = {
};
/* keyboard */
static const struct xkb_rule_names xkb_rules[] = {
{
.layout = "de",
static const struct xkb_rule_names xkb_rules = {
/* can specify fields: rules, model, layout, variant, options */
/* example:
.options = "ctrl:nocaps",
*/
.options = NULL,
},
{
.layout = "de",
.variant = "nodeadkeys",
.options = NULL,
},
{
.layout = "de",
.variant = "ru",
.options = NULL,
}
};
/* input devices */
static const InputRule inputrules[] = {
/* name kbcreate ptrcreate */
/* ignore bad device - like a touchpad ;) */
{ "BAD DEVICE", NULL, NULL },
/* ungroup ydotool device - fixes a bug */
{ "ydotoold virtual device", createungroupedkeyboard, createpointer },
/* put your touchpad name here to enable toggle touchpad */
{ "SYNA8020:00 06CB:CE5C Touchpad", createkeyboard, createtogglepointer },
{ NULL, createkeyboard, createpointer },
};
static const int repeat_rate = 25;
@@ -154,10 +107,8 @@ LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
*/
static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
static const int cursor_timeout = 5;
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
#define MODKEY WLR_MODIFIER_LOGO
#define MODKEY WLR_MODIFIER_ALT
#define TAGKEYS(KEY,SKEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
@@ -169,66 +120,46 @@ static const int cursor_timeout = 5;
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */
static const char *termcmd[] = { "st", NULL };
static const char *filecmd[] = { "st", "-e", "vifmrun", NULL };
static const char *menucmd[] = { "dmenu_run", "-F", "-i", "-c", "-l", "20", NULL };
static const char *termcmd[] = { "foot", NULL };
static const char *menucmd[] = { "wmenu-run", NULL };
static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Escape, quit, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D, togglefloating, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F, togglefullscreen, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_F, togglefakefullscreen, {0} },
{ MODKEY, XKB_KEY_h, focusstack, {.i = -1} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, zoom, {0} },
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, incnmaster, {.i = +1} },
{ MODKEY, XKB_KEY_l, focusstack, {.i = +1} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M, setlayout, {.v = &layouts[0]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_U, setmfact, {.f = -0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I, setmfact, {.f = -0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, setmfact, {.f = +0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P, setmfact, {.f = +0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, killclient, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T, setlayout, {.v = &layouts[1]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, setlayout, {.v = &layouts[2]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_V, setlayout, {.v = &layouts[3]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S, setlayout, {.v = &layouts[4]} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, setmfact, {.f = -0.05f} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, incxkbrules, {.i = +1} },
{ MODKEY, XKB_KEY_i, incnmaster, {.i = +1} },
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
{ MODKEY, XKB_KEY_Return, zoom, {0} },
{ MODKEY, XKB_KEY_Tab, view, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
{ 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_r, setlayout, {.v = &layouts[3]} },
{ MODKEY, XKB_KEY_space, setlayout, {0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} },
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_colon, tagmon, {.i = WLR_DIRECTION_RIGHT} },
{ MODKEY, XKB_KEY_r, spawn, {.v = menucmd} },
{ MODKEY, XKB_KEY_f, spawn, {.v = filecmd} },
{ MODKEY, XKB_KEY_Return, spawn, {.v = termcmd} },
{ MODKEY, XKB_KEY_space, togglepointer, {0} },
{ WLR_MODIFIER_ALT, XKB_KEY_Tab, focusstack, {.i = +1} },
TAGKEYS(XKB_KEY_1, XKB_KEY_exclam, 0),
TAGKEYS(XKB_KEY_2, XKB_KEY_quotedbl, 1),
TAGKEYS(XKB_KEY_3, XKB_KEY_section, 2),
TAGKEYS(XKB_KEY_4, XKB_KEY_dollar, 3),
TAGKEYS(XKB_KEY_5, XKB_KEY_percent, 4),
TAGKEYS(XKB_KEY_6, XKB_KEY_ampersand, 5),
TAGKEYS(XKB_KEY_7, XKB_KEY_slash, 6),
TAGKEYS(XKB_KEY_8, XKB_KEY_parenleft, 7),
TAGKEYS(XKB_KEY_9, XKB_KEY_parenright, 8),
TAGKEYS(XKB_KEY_0, XKB_KEY_equal, 9),
// TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
// TAGKEYS( XKB_KEY_2, XKB_KEY_quotedbl, 1),
// TAGKEYS( XKB_KEY_3, XKB_KEY_paragraph, 2),
// TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
// TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
// TAGKEYS( XKB_KEY_6, XKB_KEY_ampersand, 5),
// TAGKEYS( XKB_KEY_7, XKB_KEY_asciicircum, 6),
// TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 7),
// TAGKEYS( XKB_KEY_9, XKB_KEY_parenright, 8),
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} },
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3),
TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4),
TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5),
TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6),
TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7),
TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8),
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} },
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },

8
config.mk
View File

@@ -24,11 +24,11 @@ WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19`
# -I$(PWD)/wlroots/0.19/include/wlroots-0.19
#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19
# XWAYLAND =
# XLIBS =
XWAYLAND =
XLIBS =
# Uncomment to build XWayland support
XWAYLAND = -DXWAYLAND
XLIBS = xcb xcb-icccm
#XWAYLAND = -DXWAYLAND
#XLIBS = xcb xcb-icccm
# dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11).
# To avoid warnings about them, we do not use -std=c99 and instead of using the

87
deck.patch Normal file
View File

@@ -0,0 +1,87 @@
From d56f732d3b5bba4ea0bdf56a91d0992b0cb25bfb Mon Sep 17 00:00:00 2001
From: anabasis <anabasis@noreply.codeberg.org>
Date: Fri, 10 May 2024 13:45:33 -0400
Subject: [PATCH] add deck layout
---
config.def.h | 2 ++
dwl.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/config.def.h b/config.def.h
index 8f498d2..9238da0 100644
--- a/config.def.h
+++ b/config.def.h
@@ -33,6 +33,7 @@ static const Layout layouts[] = {
{ "[]=", tile },
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
+ { "[D]", deck },
};
/* monitors */
@@ -134,6 +135,7 @@ 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_r, setlayout, {.v = &layouts[3]} },
{ 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 bf763df..1a7ce8e 100644
--- a/dwl.c
+++ b/dwl.c
@@ -267,6 +267,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data);
static void cursorwarptohint(void);
+static void deck(Monitor *m);
static void destroydecoration(struct wl_listener *listener, void *data);
static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -1080,6 +1081,41 @@ cursorwarptohint(void)
}
}
+void
+deck(Monitor *m)
+{
+ unsigned int mw, my;
+ int i, n = 0;
+ Client *c;
+
+ wl_list_for_each(c, &clients, link)
+ if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
+ n++;
+ if (n == 0)
+ return;
+
+ if (n > m->nmaster)
+ mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0;
+ else
+ mw = m->w.width;
+ i = my = 0;
+ wl_list_for_each(c, &clients, link) {
+ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
+ continue;
+ if (i < m->nmaster) {
+ resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
+ .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
+ my += c->geom.height;
+ } else {
+ resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
+ .width = m->w.width - mw, .height = m->w.height}, 0);
+ if (c == focustop(m))
+ wlr_scene_node_raise_to_top(&c->scene->node);
+ }
+ i++;
+ }
+}
+
void
destroydecoration(struct wl_listener *listener, void *data)
{
--
2.45.0

39
dwl.c
View File

@@ -271,6 +271,7 @@ static void createpopup(struct wl_listener *listener, void *data);
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
static void cursorframe(struct wl_listener *listener, void *data);
static void cursorwarptohint(void);
static void deck(Monitor *m);
static void destroydecoration(struct wl_listener *listener, void *data);
static void destroydragicon(struct wl_listener *listener, void *data);
static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -1234,6 +1235,42 @@ cursorwarptohint(void)
}
}
void
deck(Monitor *m)
{
unsigned int mw, my;
int i, n = 0;
Client *c;
wl_list_for_each(c, &clients, link)
if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
n++;
if (n == 0)
return;
if (n > m->nmaster)
mw = m->nmaster ? round(m->w.width * m->mfact) : 0;
else
mw = m->w.width;
i = my = 0;
wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue;
if (i < m->nmaster) {
resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
my += c->geom.height;
} else {
resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
.width = m->w.width - mw, .height = m->w.height}, 0);
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n-1);
if (c == focustop(m))
wlr_scene_node_raise_to_top(&c->scene->node);
}
i++;
}
}
void
destroydecoration(struct wl_listener *listener, void *data)
{
@@ -1829,7 +1866,7 @@ monocle(Monitor *m)
n++;
}
if (n)
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n);
snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n);
if ((c = focustop(m)))
wlr_scene_node_raise_to_top(&c->scene->node);
}