Hi,

I just applied it to a fresh copy of dwm to make sure there wouldn't be
any mistakes and it does apply just fine. Steps I took:

1) git clone https://git.suckless.org:/dwm

2) patch -Np1 -i dwm-systray-20200610-f09418b.diff

3) patch -Np1 -i dwm-systray_toggle-6.2.diff

Is there anything I should do differently? I'm guessing the issue is
most likely going to be that the patch only works ontop of another patch...

Best wishes,

Christopher

On 08.07.20 21:01, [email protected] wrote:
> commit 04350def97572383730cfa37dcba05eef62eac82
> Author: Hiltjo Posthuma <[email protected]>
> Date:   Wed Jul 8 20:57:57 2020 +0200
>
>     dwm systray toggle: remove corrupt/broken patch
>     
>     Reasons:
>     - The patch is corrupt broken and does not apply 
> (https://gunther.suckless.org/patches/).
>     - The link and filename was broken.
>     
>     Feel free to reupload a fixed version.
>     
>     Please keep the wiki tidy.
>
> diff --git a/dwm.suckless.org/patches/systray/dwm-systray-toogle-6.2.diff 
> b/dwm.suckless.org/patches/systray/dwm-systray-toogle-6.2.diff
> deleted file mode 100644
> index d7ce348b..00000000
> --- a/dwm.suckless.org/patches/systray/dwm-systray-toogle-6.2.diff
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From 727d0569a7bb7920887cb5b34707201ba72d1e76 Mon Sep 17 00:00:00 2001
> -From: Christopher Witt <[email protected]>
> -Date: Sat, 25 Apr 2020 21:37:15 +0200
> -Subject: [PATCH] systray-toggle to show/hide the systray
> -
> ----
> - config.def.h |  3 ++-
> - dwm.c        | 14 ++++++++++++++
> - 2 files changed, 16 insertions(+), 1 deletion(-)
> -
> -diff --git a/config.def.h b/config.def.h
> -index 2d824d1..fb7dc0c 100644
> ---- a/config.def.h
> -+++ b/config.def.h
> -@@ -6,7 +6,7 @@ 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 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 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 */
> - static const char *fonts[]          = { "monospace:size=10" };
> -@@ -68,6 +68,7 @@ static Key keys[] = {
> -     { MODKEY,                       XK_p,      spawn,          {.v = 
> dmenucmd } },
> -     { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = 
> termcmd } },
> -     { MODKEY,                       XK_b,      togglebar,      {0} },
> -+    { MODKEY|ShiftMask,             XK_b,      togglesystray,  {0} },
> -     { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
> -     { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
> -     { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
> -diff --git a/dwm.c b/dwm.c
> -index 1b90b7b..530ef32 100644
> ---- a/dwm.c
> -+++ b/dwm.c
> -@@ -240,6 +240,7 @@ static void tag(const Arg *arg);
> - static void tagmon(const Arg *arg);
> - static void tile(Monitor *);
> - static void togglebar(const Arg *arg);
> -+static void togglesystray();
> - static void togglefloating(const Arg *arg);
> - static void toggletag(const Arg *arg);
> - static void toggleview(const Arg *arg);
> -@@ -1908,6 +1909,19 @@ togglebar(const Arg *arg)
> -     arrange(selmon);
> - }
> - 
> -+void
> -+togglesystray()
> -+{
> -+    if (showsystray)
> -+            XUnmapWindow(dpy, systray->win);
> -+    showsystray = !showsystray;
> -+    updatesystray();
> -+    drawbar(selmon);
> -+}
> -+
> - void
> - togglefloating(const Arg *arg)
> - {
> --- 
> -2.26.2
> -
> diff --git a/dwm.suckless.org/patches/systray/index.md 
> b/dwm.suckless.org/patches/systray/index.md
> index b1cc2c6c..4cb174f8 100644
> --- a/dwm.suckless.org/patches/systray/index.md
> +++ b/dwm.suckless.org/patches/systray/index.md
> @@ -18,10 +18,6 @@ Download
>  * [dwm-git-20130119-systray.diff](dwm-git-20130119-systray.diff) (19946b)
>  * [dwm-systray-6.0.diff](dwm-systray-6.0.diff) (19788b) (20130119)
>  
> -Apply the following patch on top of the systray patch to have a keybind for 
> showing/hiding the systray.
> -
> -* [dwm-systray-toggle-6.2.diff](dwm-systray-6.2.diff) (2465b)
> -
>  Author
>  ------
>  * Jan Christoph Ebersbach <[email protected]>
> @@ -29,5 +25,4 @@ Author
>  * David Phillips (5ed9c48 (6.1), 20160103, 20180314)
>  * Eric Pruitt (7af4d43 (20160626))
>  * Igor Gevka (cb3f58a (6.2), 20200216)
> -* Christopher Witt <[email protected]> (systray-toggle-6.2)
>  * Michel Boaventura <[email protected]> (f09418b)
>
>

Reply via email to