From 642b2559d522034785c1c1203c6d426855ec19ca Mon Sep 17 00:00:00 2001
From: choc <notchoc@disroot.org>
Date: Tue, 16 Jul 2024 19:12:04 +0800
Subject: [PATCH] ipc: 2024-07-16

replaces 2024-07-15 which had a typo
---
 patches/ipc/README.md |  2 +-
 patches/ipc/ipc.patch | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/patches/ipc/README.md b/patches/ipc/README.md
index 81afc66..503cd2e 100644
--- a/patches/ipc/README.md
+++ b/patches/ipc/README.md
@@ -5,7 +5,7 @@ Status information to stdout is currently disabled as dwl tends to freeze. For n
 
 ### Download
 - [git branch](https://codeberg.org/notchoc/dwl/src/branch/ipc)
-- [2024-07-15](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/ipc/ipc.patch)
+- [2024-07-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/ipc/ipc.patch)
 - [2024-06-30](https://codeberg.org/dwl/dwl-patches/raw/commit/9a751e5020133d3ab9219e68a43109c6f3c931a7/patches/ipc/ipc.patch)
 - [2024-06-21](https://codeberg.org/dwl/dwl-patches/raw/commit/f96ee44cbaef06bd38b8fa29ac7ecba8b1b5abd5/patches/ipc/ipc.patch)
 - [2024-06-19](https://codeberg.org/dwl/dwl-patches/raw/commit/e69afc7263b8d982a7923e5d4910f2e1f7140bb8/patches/ipc/ipc.patch)
diff --git a/patches/ipc/ipc.patch b/patches/ipc/ipc.patch
index 28ef2bc..fb79005 100644
--- a/patches/ipc/ipc.patch
+++ b/patches/ipc/ipc.patch
@@ -1,4 +1,4 @@
-From 74015b683466c5f1eace0a336f9418eaefdf0133 Mon Sep 17 00:00:00 2001
+From 13efb1a89457df2acd138d671c298e07b3d34683 Mon Sep 17 00:00:00 2001
 From: choc <notchoc@proton.me>
 Date: Mon, 23 Oct 2023 10:35:17 +0800
 Subject: [PATCH] implement dwl-ipc-unstable-v2
@@ -7,9 +7,9 @@ Subject: [PATCH] implement dwl-ipc-unstable-v2
 ---
  Makefile                          |  14 +-
  config.def.h                      |   1 +
- dwl.c                             | 259 ++++++++++++++++++++++++++----
+ dwl.c                             | 258 ++++++++++++++++++++++++++----
  protocols/dwl-ipc-unstable-v2.xml | 181 +++++++++++++++++++++
- 4 files changed, 417 insertions(+), 38 deletions(-)
+ 4 files changed, 417 insertions(+), 37 deletions(-)
  create mode 100644 protocols/dwl-ipc-unstable-v2.xml
 
 diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ index 22d2171..1593033 100644
  	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
  	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
 diff --git a/dwl.c b/dwl.c
-index 5bf995e..fbdf13a 100644
+index 5bf995e..3aed40b 100644
 --- a/dwl.c
 +++ b/dwl.c
 @@ -67,6 +67,7 @@
@@ -346,7 +346,7 @@ index 5bf995e..fbdf13a 100644
 -	Client *c;
 -	uint32_t occ, urg, sel;
 -	const char *appid, *title;
--
+ 
 -	wl_list_for_each(m, &mons, link) {
 -		occ = urg = 0;
 -		wl_list_for_each(c, &clients, link) {
@@ -371,7 +371,7 @@ index 5bf995e..fbdf13a 100644
 -			printf("%s floating \n", m->wlr_output->name);
 -			sel = 0;
 -		}
- 
+-
 -		printf("%s selmon %u\n", m->wlr_output->name, m == selmon);
 -		printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n",
 -			m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg);
@@ -383,7 +383,7 @@ index 5bf995e..fbdf13a 100644
  }
  
  void
-@@ -2624,11 +2805,12 @@ setup(void)
+@@ -2624,6 +2805,8 @@ setup(void)
  	LISTEN_STATIC(&output_mgr->events.apply, outputmgrapply);
  	LISTEN_STATIC(&output_mgr->events.test, outputmgrtest);
  
@@ -392,12 +392,7 @@ index 5bf995e..fbdf13a 100644
  	/* Make sure XWayland clients don't connect to the parent X server,
  	 * e.g when running in the x11 backend or the wayland backend and the
  	 * compositor has Xwayland support */
- 	unsetenv("DISPLAY");
--#ifdef XWAYLAND
- 	/*
- 	 * Initialise the XWayland X server.
- 	 * It will be started when the first X client is started.
-@@ -2721,6 +2903,13 @@ tile(Monitor *m)
+@@ -2721,6 +2904,13 @@ tile(Monitor *m)
  	}
  }