updated config

config.def.h

@@ -6,6 +6,7 @@
 /* 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);
@@ -13,42 +14,53 @@ 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 (9)
+#define TAGCOUNT (10)
 
 /* 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   monitor */
+	/* app_id                 title       tags mask     isfloating   isterm   noswallow   monitor */
 	/* examples: */
-	{ "firefox",          NULL,                                1 << 1, 0,  -1 },
+	{ "firefox",              NULL,                                1 << 1, 0, 0, 0, -1 },
-	{ "zen",              NULL,                                1 << 1, 0,  -1 },
+	{ "zen",                  NULL,                                1 << 1, 0, 0, 0, -1 },
-	{ "Lutris",           NULL,                                1 << 2, 0,   0 },
+	{ "Lutris",               NULL,                                1 << 2, 0, 0, 0,  0 },
-	{ "zenity",           NULL,                                     0, 1,  -1 },
+	{ "zenity",               NULL,                                     0, 1, 0, 0, -1 },
-	{ "steam",            NULL,                                1 << 2, 0,   0 },
+	{ "steam",                NULL,                                1 << 2, 0, 0, 0,  0 },
-	{ "discord",          NULL,                                1 << 2, 0,   1 },
+	{ "discord",              NULL,                                1 << 2, 0, 0, 0,  1 },
-	{ "TeamSpeak",        NULL,                                1 << 2, 0,   1 },
+	{ "TeamSpeak",            NULL,                                1 << 2, 0, 0, 0,  1 },
-	{ "Element",          NULL,                                1 << 2, 0,   1 },
+	{ "Mattermost",           NULL,                                1 << 2, 0, 0, 0,  1 },
-	{ "Signal",           NULL,                                1 << 4, 0,   1 },
+	{ "Element",              NULL,                                1 << 2, 0, 0, 0,  1 },
-	{ "TelegramDesktop",  NULL,                                1 << 4, 0,   1 },
+	{ "signal",               NULL,                                1 << 4, 0, 0, 0,  1 },
-	{ "threema-web",      NULL,                                1 << 4, 0,   1 },
+	{ "telegram",             NULL,                                1 << 4, 0, 0, 0,  1 },
-	{ "thunderbird",      NULL,                                1 << 4, 0,   1 },
+	{ "Threema",              NULL,                                1 << 4, 0, 0, 0,  1 },
-	{ "Sonixd",           NULL,                                1 << 8, 0,   1 },
+	{ "Thunderbird",          NULL,                                1 << 4, 0, 0, 0,  1 },
-	{ "KeePassXC",        "Unlock Database - KeePassXC",       1 << 1, 0,   0 },
+	{ "Sonixd",               NULL,                                1 << 8, 0, 0, 0,  1 },
-	{ "KeePassXC",        NULL,                                1 << 8, 0,   0 },
+	{ "KeePassXC",            "Unlock Database - KeePassXC",       1 << 1, 1, 0, 0,  0 },
-	{ "easyeffects",      NULL,                                1 << 8, 0,   1 },
+	{ "KeePassXC",            NULL,                                1 << 9, 0, 0, 0,  0 },
-	{ "pavucontrol",      NULL,                                1 << 8, 0,   1 },
+	{ "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 },
+	{ "M",      monocle },
-	{ "T",      tile },
+	{ "T",      tile },
-	{ "F",      NULL },    /* no layout function means floating behavior */
+	{ "D",      deck },
+	{ "B",      bstack },
+	{ "B",      bstackhoriz },
+	{ "F",      NULL },    /* no layout function means floating behavior */
 };
 
 /* monitors */
@@ -67,13 +79,33 @@ 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 */
+	{
-	/* example:
-	.options = "ctrl:nocaps",
-	*/
 		.layout = "de",
 	        .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;
@@ -122,6 +154,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
 
@@ -136,45 +170,65 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
 
 /* 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 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_D,         togglefloating,   {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_f,         togglefullscreen, {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|WLR_MODIFIER_SHIFT, XKB_KEY_H,         zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_j,         focusstack,       {.i = +1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_j,         zoom,             {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J,         incnmaster,       {.i = -1} },
 	{ MODKEY,                    XKB_KEY_k,         focusstack,       {.i = -1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_k,         zoom,             {0} },
+	{ 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_o,         setmfact,         {.f = +0.05f} },
+	{ 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_h,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,         setlayout,        {.v = &layouts[2]} },
-	{ MODKEY,                    XKB_KEY_0,         view,             {.ui = ~0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_V,         setlayout,        {.v = &layouts[3]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0,         tag,              {.ui = ~0} },
+	{ 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_comma,     focusmon,         {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY,                    XKB_KEY_period,    focusmon,         {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,      tagmon,           {.i = WLR_DIRECTION_LEFT} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_semicolon, tagmon,           {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,   tagmon,           {.i = WLR_DIRECTION_RIGHT} },
+	{ 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_at,                         1),
+        TAGKEYS(XKB_KEY_2, XKB_KEY_quotedbl,    1),
-	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
+        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_asciicircum,                5),
+        TAGKEYS(XKB_KEY_6, XKB_KEY_ampersand,   5),
-	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
+        TAGKEYS(XKB_KEY_7, XKB_KEY_slash,       6),
-	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
+        TAGKEYS(XKB_KEY_8, XKB_KEY_parenleft,   7),
-	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
+        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} },

dwl.c

@@ -1829,7 +1829,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);
 }