update patchesHEADmaster

3 files changed, 16 insertions, 19 deletions

diff --git a/6.3+h/0001-dwm-systray.patch b/6.3+h/0001-dwm-systray.patch
index edcf4b8..6c3e314 100644
--- a/6.3+h/0001-dwm-systray.patch
+++ b/6.3+h/0001-dwm-systray.patch
@@ -1,5 +1,5 @@
 diff --git a/config.def.h b/config.def.h
-index a2ac963..86fcc84 100644
+index a2ac963..3d145e8 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -3,8 +3,13 @@
@@ -8,10 +8,10 @@ index a2ac963..86fcc84 100644
  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 unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-+static const unsigned int systrayonleft = 0;   	/* 0: systray in the right corner, >0: systray on left of status text */
-+static const unsigned int systrayspacing = 2;   /* systray spacing */
-+static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
++static const unsigned int systraypinning = 0;	/* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
++static const unsigned int systrayonleft = 0;	/* 0: systray in the right corner, >0: systray on left of status text */
++static const unsigned int systrayspacing = 2;	/* systray spacing */
++static const int systraypinningfailfirst = 1;	/* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
 +static const int showsystray        = 1;     /* 0 means no systray */
 +static const int showbar            = 1;     /* 0 means no bar */
 +static const int topbar             = 1;     /* 0 means bottom bar */
@@ -30,7 +30,7 @@ index a2ac963..86fcc84 100644
  	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
  	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
 diff --git a/dwm.c b/dwm.c
-index 58a8fd5..3ec050d 100644
+index 58a8fd5..aa679eb 100644
 --- a/dwm.c
 +++ b/dwm.c
 @@ -57,12 +57,27 @@
@@ -136,7 +136,7 @@ index 58a8fd5..3ec050d 100644
  	[MapRequest] = maprequest,
  	[MotionNotify] = motionnotify,
  	[PropertyNotify] = propertynotify,
-+    [ResizeRequest] = resizerequest,
++	[ResizeRequest] = resizerequest,
  	[UnmapNotify] = unmapnotify
  };
 -static Atom wmatom[WMLast], netatom[NetLast];
@@ -153,11 +153,10 @@ index 58a8fd5..3ec050d 100644
  			click = ClkStatusText;
  		else
  			click = ClkWinTitle;
-@@ -485,7 +517,14 @@ cleanup(void)
+@@ -485,6 +517,13 @@ cleanup(void)
  	XUngrabKey(dpy, AnyKey, AnyModifier, root);
  	while (mons)
  		cleanupmon(mons);
--	for (i = 0; i < CurLast; i++)
 +
 +	if (showsystray) {
 +		XUnmapWindow(dpy, systray->win);
@@ -165,10 +164,9 @@ index 58a8fd5..3ec050d 100644
 +		free(systray);
 +	}
 +
-+    for (i = 0; i < CurLast; i++)
+ 	for (i = 0; i < CurLast; i++)
  		drw_cur_free(drw, cursor[i]);
  	for (i = 0; i < LENGTH(colors); i++)
- 		free(scheme[i]);
 @@ -516,9 +555,58 @@ cleanupmon(Monitor *mon)
  void
  clientmessage(XEvent *e)
diff --git a/6.3+h/0003-dwm-fullgaps.patch b/6.3+h/0003-dwm-fullgaps.patch
index cbd2058..856c438 100644
--- a/6.3+h/0003-dwm-fullgaps.patch
+++ b/6.3+h/0003-dwm-fullgaps.patch
@@ -1,5 +1,5 @@
 diff --git a/config.def.h b/config.def.h
-index 6d128d6..e77becd 100644
+index 8532de9..6a19285 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -2,6 +2,7 @@
@@ -8,8 +8,8 @@ index 6d128d6..e77becd 100644
  static const unsigned int borderpx  = 1;        /* border pixel of windows */
 +static const unsigned int gappx     = 5;        /* gaps between windows */
  static const unsigned int snap      = 32;       /* snap pixel */
- static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
- static const unsigned int systrayonleft = 0;   	/* 0: systray in the right corner, >0: systray on left of status text */
+ static const unsigned int systraypinning = 0;	/* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
+ static const unsigned int systrayonleft = 0;	/* 0: systray in the right corner, >0: systray on left of status text */
 @@ -90,6 +91,9 @@ static Key keys[] = {
  	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
  	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
@@ -21,7 +21,7 @@ index 6d128d6..e77becd 100644
  	TAGKEYS(                        XK_2,                      1)
  	TAGKEYS(                        XK_3,                      2)
 diff --git a/dwm.c b/dwm.c
-index 23660c6..83bc6bd 100644
+index fbd26cf..0d70f45 100644
 --- a/dwm.c
 +++ b/dwm.c
 @@ -134,6 +134,7 @@ struct Monitor {
diff --git a/6.3+h/0005-add-lock-screenshot-audio-brigthness.patch b/6.3+h/0005-add-lock-screenshot-audio-brigthness.patch
index 209b002..b07a0da 100644
--- a/6.3+h/0005-add-lock-screenshot-audio-brigthness.patch
+++ b/6.3+h/0005-add-lock-screenshot-audio-brigthness.patch
@@ -1,5 +1,5 @@
 diff --git a/config.def.h b/config.def.h
-index 9018dd4..464a2ff 100644
+index 6e87351..41abbba 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -33,8 +33,8 @@ static const Rule rules[] = {
@@ -35,7 +35,7 @@ index 9018dd4..464a2ff 100644
  static Key keys[] = {
  	/* modifier                     key        function        argument */
  	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-@@ -94,6 +109,14 @@ static Key keys[] = {
+@@ -94,6 +109,13 @@ static Key keys[] = {
  	{ MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
  	{ MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
  	{ MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
@@ -46,12 +46,11 @@ index 9018dd4..464a2ff 100644
 +	{ 0,                            XF86XK_MonBrightnessDown, spawn, {.v = brightdowncmd } },
 +	{ 0,                            XF86XK_MonBrightnessUp, spawn, {.v = brightupcmd } },
 +	{ 0,                            XK_Print,  spawn,          {.v = capturecmd } },
-+	{ MODKEY|ControlMask,           XK_l,      spawn,          {.v = lockcmd } },
  	TAGKEYS(                        XK_1,                      0)
  	TAGKEYS(                        XK_2,                      1)
  	TAGKEYS(                        XK_3,                      2)
 diff --git a/dwm.c b/dwm.c
-index 83bc6bd..b724b6a 100644
+index 0d70f45..2af5270 100644
 --- a/dwm.c
 +++ b/dwm.c
 @@ -40,6 +40,7 @@