patched dwm-bar-height-6.2.diff

5 files changed, 31 insertions, 5 deletions

diff --git a/config.def.h b/config.def.h
index 8051317..c128ea2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -2,6 +2,7 @@ static const unsigned int borderpx  = 2;
 static const unsigned int snap      = 32;
 static const int showbar            = 1;
 static const int topbar             = 1;
+static const int user_bh            = 32;
 static const char *fonts[]          = { "Noto Sans:size=16" };
 static const unsigned int gappx     = 8;
 static const char col_gray1[]       = "#222222";
@@ -103,10 +104,10 @@ static const Key keys[] = {
 
   
   /* move floating windows from the keyboard */
-	{ MODKEY|ControlMask,		  XK_up,	movekeyboard_y, 	{.i = -20}},
-	{ MODKEY|ControlMask,		  XK_down,	movekeyboard_y, 	{.i = 20}},
-	{ MODKEY|ControlMask,		  XK_left,	movekeyboard_x, 	{.i = -20}},
-  { MODKEY|ControlMask,		  XK_right,	movekeyboard_x, 	{.i = 20}},
+	{ MODKEY|ControlMask,		  XK_Up,	movekeyboard_y, 	{.i = -20}},
+	{ MODKEY|ControlMask,		  XK_Down,	movekeyboard_y, 	{.i = 20}},
+	{ MODKEY|ControlMask,		  XK_Left,	movekeyboard_x, 	{.i = -20}},
+  { MODKEY|ControlMask,		  XK_Right,	movekeyboard_x, 	{.i = 20}},
 
   /* modify gaps on runtime */
   { MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
diff --git a/dwm b/dwm
index 60d2374..3671921 100755
--- a/dwm
+++ b/dwm
diff --git a/dwm.c b/dwm.c
index 37ca293..026ffc8 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1664,7 +1664,7 @@ setup(void)
 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
 		die("no fonts could be loaded.");
 	lrpad = drw->fonts->h;
-	bh = drw->fonts->h + 2;
+	bh = user_bh ? user_bh : drw->fonts->h + 2;
 	updategeom();
 	/* init atoms */
 	utf8string = XInternAtom(dpy, "UTF8_STRING", False);
diff --git a/dwm.o b/dwm.o
index 3a3e60e..50e78db 100644
--- a/dwm.o
+++ b/dwm.o
diff --git a/patches/dwm-bar-height-6.2.diff b/patches/dwm-bar-height-6.2.diff
new file mode 100644
index 0000000..a576111
--- /dev/null
+++ b/patches/dwm-bar-height-6.2.diff
@@ -0,0 +1,25 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..9814500 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -5,6 +5,7 @@ static const unsigned int borderpx  = 1;        /* border pixel of windows */
+ static const unsigned int snap      = 32;       /* snap pixel */
+ static const int showbar            = 1;        /* 0 means no bar */
+ static const int topbar             = 1;        /* 0 means bottom bar */
++static const int user_bh            = 0;        /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */
+ static const char *fonts[]          = { "monospace:size=10" };
+ static const char dmenufont[]       = "monospace:size=10";
+ static const char col_gray1[]       = "#222222";
+diff --git a/dwm.c b/dwm.c
+index 4465af1..2c27cb3 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -1545,7 +1545,7 @@ setup(void)
+ 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+ 		die("no fonts could be loaded.");
+ 	lrpad = drw->fonts->h;
+-	bh = drw->fonts->h + 2;
++	bh = user_bh ? user_bh : drw->fonts->h + 2;
+ 	updategeom();
+ 	/* init atoms */
+ 	utf8string = XInternAtom(dpy, "UTF8_STRING", False);