reverted to user config

config.def.h

@@ -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,27 @@ 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 },
+	{ "Gimp_EXAMPLE",     NULL,       0,            1,           -1 }, /* Start on currently visible tags floating, not tiled */
-	{ "zen",                  NULL,                                1 << 1, 0, 0, 0, -1 },
+	{ "firefox_EXAMPLE",  NULL,       1 << 8,       0,           -1 }, /* Start on ONLY tag "9" */
-	{ "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 },
 };
 
 /* layout(s) */
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "M",      monocle },
+	{ "[]=",      tile },
-	{ "T",      tile },
+	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "D",      deck },
+	{ "[M]",      monocle },
-	{ "B",      bstack },
-	{ "B",      bstackhoriz },
-	{ "F",      NULL },    /* no layout function means floating behavior */
 };
 
 /* monitors */
@@ -79,33 +52,12 @@ static const MonitorRule monrules[] = {
 };
 
 /* keyboard */
-static const struct xkb_rule_names xkb_rules[] = {
+static const struct xkb_rule_names xkb_rules = {
-	{
+	/* can specify fields: rules, model, layout, variant, options */
-		.layout = "de",
+	/* example:
-	        .options = NULL,
+	.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 +106,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 +119,45 @@ 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 *termcmd[] = { "foot", NULL };
-static const char *filecmd[] = { "st", "-e", "vifmrun", NULL };
+static const char *menucmd[] = { "wmenu-run", NULL };
-static const char *menucmd[] = { "dmenu_run", "-F", "-i", "-c", "-l", "20", NULL };
 
 static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
-	/* modifier                  key                function          argument */
+	/* modifier                  key                 function        argument */
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Escape,    quit,             {0} },
+	{ MODKEY,                    XKB_KEY_p,          spawn,          {.v = menucmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D,         togglefloating,   {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F,         togglefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL,  XKB_KEY_F,    togglefakefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
-	{ MODKEY,                    XKB_KEY_h,         focusstack,       {.i = -1} },
+	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         zoom,             {0} },
+	{ MODKEY,                    XKB_KEY_d,          incnmaster,     {.i = -1} },
-	{ MODKEY,                    XKB_KEY_j,         focusstack,       {.i = +1} },
+	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05f} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J,         incnmaster,       {.i = -1} },
+	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05f} },
-	{ MODKEY,                    XKB_KEY_k,         focusstack,       {.i = -1} },
+	{ MODKEY,                    XKB_KEY_Return,     zoom,           {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K,         incnmaster,       {.i = +1} },
+	{ MODKEY,                    XKB_KEY_Tab,        view,           {0} },
-	{ MODKEY,                    XKB_KEY_l,         focusstack,       {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M,         setlayout,        {.v = &layouts[0]} },
+	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_U,         setmfact,         {.f = -0.05f} },
+	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I,         setmfact,         {.f = -0.05f} },
+	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O,         setmfact,         {.f = +0.05f} },
+	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P,         setmfact,         {.f = +0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,         killclient,       {0} },
+	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T,         setlayout,        {.v = &layouts[1]} },
+	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,         setlayout,        {.v = &layouts[2]} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_V,         setlayout,        {.v = &layouts[3]} },
+	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S,         setlayout,        {.v = &layouts[4]} },
+	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L,         incxkbrules,    {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY,                    XKB_KEY_comma,     focusmon,         {.i = WLR_DIRECTION_LEFT} },
+	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
-	{ MODKEY,                    XKB_KEY_period,    focusmon,         {.i = WLR_DIRECTION_RIGHT} },
+	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon,           {.i = WLR_DIRECTION_LEFT} },
+	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_colon,     tagmon,           {.i = WLR_DIRECTION_RIGHT} },
+	TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
-
+	TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
-	{ MODKEY,                    XKB_KEY_r,          spawn,          {.v = menucmd} },
+	TAGKEYS(          XKB_KEY_6, XKB_KEY_asciicircum,                5),
-	{ MODKEY,                    XKB_KEY_f,          spawn,          {.v = filecmd} },
+	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
-	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
-	{ MODKEY,                    XKB_KEY_space,      togglepointer,  {0} },
+	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
-	{ WLR_MODIFIER_ALT,          XKB_KEY_Tab,        focusstack,     {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
-
-        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),
 
 	/* 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} },

config.mk

@@ -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 =
+XWAYLAND =
-# XLIBS =
+XLIBS =
 # Uncomment to build XWayland support
-XWAYLAND = -DXWAYLAND
+#XWAYLAND = -DXWAYLAND
-XLIBS = xcb xcb-icccm
+#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

dwl.c

@@ -436,6 +436,11 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
 static struct wl_listener start_drag = {.notify = startdrag};
 static struct wl_listener new_session_lock = {.notify = locksession};
 
+static const struct xkb_rule_names en_rules = {.layout = "de"};
+static struct xkb_context *en_context;
+static struct xkb_keymap *en_keymap;
+static struct xkb_state *en_state;
+
 #ifdef XWAYLAND
 static void activatex11(struct wl_listener *listener, void *data);
 static void associatex11(struct wl_listener *listener, void *data);
@@ -717,6 +722,9 @@ cleanup(void)
 	wlr_backend_destroy(backend);
 
 	wl_display_destroy(dpy);
+	xkb_state_unref(en_state);
+	xkb_keymap_unref(en_keymap);
+	xkb_context_unref(en_context);
 	/* Destroy after the wayland display (when the monitors are already destroyed)
 	   to avoid destroying them with an invalid scene output. */
 	wlr_scene_node_destroy(&scene->tree.node);
@@ -1628,16 +1636,19 @@ keypress(struct wl_listener *listener, void *data)
 	/* This event is raised when a key is pressed or released. */
 	KeyboardGroup *group = wl_container_of(listener, group, key);
 	struct wlr_keyboard_key_event *event = data;
+	int nsyms, handled;
 
 	/* Translate libinput keycode -> xkbcommon */
 	uint32_t keycode = event->keycode + 8;
 	/* Get a list of keysyms based on the keymap for this keyboard */
 	const xkb_keysym_t *syms;
-	int nsyms = xkb_state_key_get_syms(
-			group->wlr_group->keyboard.xkb_state, keycode, &syms);
-
-	int handled = 0;
 	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
+	xkb_state_update_key(en_state, keycode,
+			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
+			? XKB_KEY_DOWN : XKB_KEY_UP);
+	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
+
+	handled = 0;
 
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 
@@ -1829,7 +1840,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);
 }
@@ -2619,6 +2630,10 @@ setup(void)
 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
 	 * let us know when new input devices are available on the backend.
 	 */
+        en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+        en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
+        	XKB_KEYMAP_COMPILE_NO_FLAGS);
+        en_state = xkb_state_new(en_keymap);
 	wl_signal_add(&backend->events.new_input, &new_input_device);
 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
 	wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,

en-keycodes.patch

@@ -0,0 +1,73 @@
+From cd61fac9cb6e9d0172e2f7a01e6a514d676ba5f0 Mon Sep 17 00:00:00 2001
+From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
+Date: Tue, 4 Feb 2025 23:53:11 +0100
+Subject: [PATCH] Always use the English keymap to get keycodes
+
+---
+ dwl.c | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/dwl.c b/dwl.c
+index def2562..c299365 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -413,6 +413,11 @@ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
+ 
++static const struct xkb_rule_names en_rules = {.layout = "us"};
++static struct xkb_context *en_context;
++static struct xkb_keymap *en_keymap;
++static struct xkb_state *en_state;
++
+ #ifdef XWAYLAND
+ static void activatex11(struct wl_listener *listener, void *data);
+ static void associatex11(struct wl_listener *listener, void *data);
+@@ -694,6 +699,9 @@ cleanup(void)
+ 	wlr_backend_destroy(backend);
+ 
+ 	wl_display_destroy(dpy);
++	xkb_state_unref(en_state);
++	xkb_keymap_unref(en_keymap);
++	xkb_context_unref(en_context);
+ 	/* Destroy after the wayland display (when the monitors are already destroyed)
+ 	   to avoid destroying them with an invalid scene output. */
+ 	wlr_scene_node_destroy(&scene->tree.node);
+@@ -1582,16 +1590,19 @@ keypress(struct wl_listener *listener, void *data)
+ 	/* This event is raised when a key is pressed or released. */
+ 	KeyboardGroup *group = wl_container_of(listener, group, key);
+ 	struct wlr_keyboard_key_event *event = data;
++	int nsyms, handled;
+ 
+ 	/* Translate libinput keycode -> xkbcommon */
+ 	uint32_t keycode = event->keycode + 8;
+ 	/* Get a list of keysyms based on the keymap for this keyboard */
+ 	const xkb_keysym_t *syms;
+-	int nsyms = xkb_state_key_get_syms(
+-			group->wlr_group->keyboard.xkb_state, keycode, &syms);
+-
+-	int handled = 0;
+ 	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
++	xkb_state_update_key(en_state, keycode,
++			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
++			? XKB_KEY_DOWN : XKB_KEY_UP);
++	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
++
++	handled = 0;
+ 
+ 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
+ 
+@@ -2607,6 +2618,10 @@ setup(void)
+ 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
+ 	 * let us know when new input devices are available on the backend.
+ 	 */
++	en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
++		XKB_KEYMAP_COMPILE_NO_FLAGS);
++	en_state = xkb_state_new(en_keymap);
+ 	LISTEN_STATIC(&backend->events.new_input, inputdevice);
+ 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
+ 	LISTEN_STATIC(&virtual_keyboard_mgr->events.new_virtual_keyboard, virtualkeyboard);
+-- 
+2.48.1
+