commit a96f450

dmenu: fix patches

1@@ -1,4 +1,4 @@
2 17ac5095774b227168a2236cd2ce6a7dcaa2258adce5aaebbb58825731a6223287
3-6b55b0be7cc2f1f339e3ec88ab0bc9e65007e04d36366c0cf900627069f11e4c28
4-2e6ff3de46fe11146128f38a402c234444bb037b44e155640da3831d950be7813a
5-30bcc44dabdc569164d618a0240c6e41b847c87f935490e85aa8f61e33cc07e07f
6+9ff7bed464c09fa747121bd53a0b9e2d172995a0ff343d27241405dccacde83137
7+a4b98d67e802e4ce5efd801d8744cfd1aa77832278b203f5792e09adc15fac497e
8+1abc1b4279dbfc4fc302e6f89a8410e3223a9a7762ed7f22aaccc36fc99d9bfa5d

 1@@ -1,7 +1,7 @@
 2-From 3e64cfceb4d343b241bebd869aa3ef8c7803d042 Mon Sep 17 00:00:00 2001
 3+From b32856b94eeafb320a7b6715663d1b3dd638a811 Mon Sep 17 00:00:00 2001
 4 From: hovercats <hovercatswithlasereyes@protonmail.com>
 5 Date: Wed, 29 Mar 2023 19:48:06 +0200
 6-Subject: [PATCH 1/4] apply center patch
 7+Subject: [PATCH 1/3] apply center patch
 8 
 9 ---
10  README       |  4 ++++
11@@ -53,10 +53,10 @@ index 323f93c..c036baa 100644
12  dmenu grabs the keyboard before reading stdin if not reading from a tty. This
13  is faster, but will lock up X until stdin reaches end\-of\-file.
14 diff --git a/dmenu.c b/dmenu.c
15-index 4e7df12..5edb037 100644
16+index 40f93e0..b6cfd65 100644
17 --- a/dmenu.c
18 +++ b/dmenu.c
19-@@ -96,6 +96,15 @@ calcoffsets(void)
20+@@ -95,6 +95,15 @@ calcoffsets(void)
21  			break;
22  }
23  
24@@ -72,7 +72,7 @@ index 4e7df12..5edb037 100644
25  static void
26  cleanup(void)
27  {
28-@@ -637,6 +646,7 @@ setup(void)
29+@@ -636,6 +645,7 @@ setup(void)
30  	bh = drw->fonts->h + 2;
31  	lines = MAX(lines, 0);
32  	mh = (lines + 1) * bh;
33@@ -80,7 +80,7 @@ index 4e7df12..5edb037 100644
34  #ifdef XINERAMA
35  	i = 0;
36  	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
37-@@ -663,9 +673,16 @@ setup(void)
38+@@ -662,9 +672,16 @@ setup(void)
39  				if (INTERSECT(x, y, 1, 1, info[i]) != 0)
40  					break;
41  
42@@ -100,7 +100,7 @@ index 4e7df12..5edb037 100644
43  		XFree(info);
44  	} else
45  #endif
46-@@ -673,9 +690,16 @@ setup(void)
47+@@ -672,9 +689,16 @@ setup(void)
48  		if (!XGetWindowAttributes(dpy, parentwin, &wa))
49  			die("could not get embedding window attributes: 0x%lx",
50  			    parentwin);
51@@ -130,5 +130,5 @@ index 4e7df12..5edb037 100644
52  			fstrncmp = strncasecmp;
53  			fstrstr = cistrstr;
54 -- 
55-2.42.0
56+2.44.0
57 

 1@@ -1,15 +1,15 @@
 2-From 531ffb3347100945c4e95951e9304bed7cee97cb Mon Sep 17 00:00:00 2001
 3+From c534a81cff5ebd7b97dcb9dd6b3f7920ebb08d9d Mon Sep 17 00:00:00 2001
 4 From: hovercats <hovercatswithlasereyes@protonmail.com>
 5 Date: Wed, 29 Mar 2023 20:18:05 +0200
 6-Subject: [PATCH 3/4] add border patch
 7+Subject: [PATCH 2/3] add border patch
 8 
 9 ---
10  config.def.h | 3 +++
11  dmenu.c      | 6 +++++-
12- 3 files changed, 9 insertions(+), 1 deletion(-)
13+ 2 files changed, 8 insertions(+), 1 deletion(-)
14 
15 diff --git a/config.def.h b/config.def.h
16-index 88ef264..be7f0d2 100644
17+index 88ef264..5c87304 100644
18 --- a/config.def.h
19 +++ b/config.def.h
20 @@ -23,3 +23,6 @@ static unsigned int lines      = 0;
21@@ -20,14 +20,14 @@ index 88ef264..be7f0d2 100644
22 +/* Size of the window border */
23 +static unsigned int border_width = 2;
24 diff --git a/dmenu.c b/dmenu.c
25-index 5edb037..3c6f6da 100644
26+index b6cfd65..1fae794 100644
27 --- a/dmenu.c
28 +++ b/dmenu.c
29-@@ -709,9 +709,11 @@ setup(void)
30+@@ -708,9 +708,11 @@ setup(void)
31  	swa.override_redirect = True;
32  	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
33  	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
34--	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
35+-	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
36 +	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
37  	                    CopyFromParent, CopyFromParent, CopyFromParent,
38  	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
39@@ -46,5 +46,5 @@ index 5edb037..3c6f6da 100644
40  			usage();
41  
42 -- 
43-2.42.0
44+2.44.0
45 

 1@@ -1,14 +1,14 @@
 2-From df687b9478c0de1f2d7fd1288d214a0812499c58 Mon Sep 17 00:00:00 2001
 3+From 2a965a8e4faafaec25e49527f997b952d4cb4260 Mon Sep 17 00:00:00 2001
 4 From: hovercats <hovercatswithlasereyes@protonmail.com>
 5 Date: Sat, 1 Apr 2023 05:38:34 +0200
 6-Subject: [PATCH 4/4] change colorscheme
 7+Subject: [PATCH 3/3] change colorscheme
 8 
 9 ---
10  config.def.h | 6 +++---
11  1 file changed, 3 insertions(+), 3 deletions(-)
12 
13 diff --git a/config.def.h b/config.def.h
14-index be7f0d2..6a40966 100644
15+index 5c87304..898948d 100644
16 --- a/config.def.h
17 +++ b/config.def.h
18 @@ -11,9 +11,9 @@ static const char *fonts[] = {
19@@ -25,5 +25,5 @@ index be7f0d2..6a40966 100644
20  /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
21  static unsigned int lines      = 0;
22 -- 
23-2.42.0
24+2.44.0
25