bump version to 5.0

... and bump LICENSE year.
Fix memory leaks in drw
2020-09-02 18:31:23 +02:00 · 2020-06-11 18:45:33 +02:00 · 2019-03-03 13:08:54 +01:00 · 2019-02-12 22:58:35 +01:00 · 2019-02-12 22:13:58 +01:00 · 2019-02-12 19:10:43 +01:00
5 changed files with 16 additions and 10 deletions
--- a/4
+++ b/4
@ -8,8 +8,8 @@ MIT/X Consortium License
 © 2009 Markus Schnalke <meillo@marmaro.de>
 © 2009 Evan Gates <evan.gates@gmail.com>
 © 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2014-2019 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2015-2018 Quentin Rameau <quinq@fifth.space>
+© 2014-2020 Hiltjo Posthuma <hiltjo@codemadness.org>
+© 2015-2019 Quentin Rameau <quinq@fifth.space>

 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 4.9
+VERSION = 5.0

 # paths
 PREFIX = /usr/local
--- a/dmenu.c
+++ b/dmenu.c
@ -553,9 +553,14 @@ run(void)
 	XEvent ev;

 	while (!XNextEvent(dpy, &ev)) {
-		if (XFilterEvent(&ev, None))
+		if (XFilterEvent(&ev, win))
 			continue;
 		switch(ev.type) {
+		case DestroyNotify:
+			if (ev.xdestroywindow.window != win)
+				break;
+			cleanup();
+			exit(1);
 		case Expose:
 			if (ev.xexpose.count == 0)
 				drw_map(drw, win, 0, 0, mw, mh);
@ -659,15 +664,17 @@ setup(void)
 	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 	XSetClassHint(dpy, win, &ch);

-	/* open input methods */
-	xim = XOpenIM(dpy, NULL, NULL, NULL);
+
+	/* input methods */
+	if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
+		die("XOpenIM failed: could not open input device");
+
 	xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
 	                XNClientWindow, win, XNFocusWindow, win, NULL);

 	XMapRaised(dpy, win);
-	XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
 	if (embed) {
-		XSelectInput(dpy, parentwin, FocusChangeMask);
+		XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
 		if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
 			for (i = 0; i < du && dws[i] != win; ++i)
 				XSelectInput(dpy, dws[i], FocusChangeMask);
@ -731,8 +738,6 @@ main(int argc, char *argv[])

 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fputs("warning: no locale support\n", stderr);
-	if (!XSetLocaleModifiers(""))
-		fputs("warning: no locale modifiers support\n", stderr);
 	if (!(dpy = XOpenDisplay(NULL)))
 		die("cannot open display");
 	screen = DefaultScreen(dpy);
--- a/0
+++ b/0
--- a/drw.c
+++ b/drw.c
@ -95,6 +95,7 @@ drw_free(Drw *drw)
 {
 	XFreePixmap(drw->dpy, drw->drawable);
 	XFreeGC(drw->dpy, drw->gc);
+	drw_fontset_free(drw->fonts);
 	free(drw);
 }
Author	SHA1	Message	Date
Hiltjo Posthuma	1a13d0465d	bump version to 5.0 ... and bump LICENSE year.	2020-09-02 18:31:23 +02:00
Hiltjo Posthuma	9b38fda6fe	Fix memory leaks in drw Synced from dwm. Patch by Alex Flierl <shad0w73@freenet.de>, thanks.	2020-06-11 18:45:33 +02:00
Hiltjo Posthuma	db6093f6ec	revert IME support dmenu will not handle IME support (st will, atleast for now). revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22 this commit also broke input focus.	2019-03-03 13:08:54 +01:00
Hiltjo Posthuma	a9b1de384a	improve xopenim error message die() already prints a newline.	2019-02-12 22:58:35 +01:00
Hiltjo Posthuma	43b0c2c3dd	make dmenu_path script executable (as dmenu_run is)	2019-02-12 22:13:58 +01:00
Hiltjo Posthuma	f5036b90ef	fix crash when XOpenIM returns NULL for example when IME variables are set, but the program is not started (yet).	2019-02-12 19:10:43 +01:00
Quentin Rameau	153aaf88bf	Close when the embedding window is destroyed	2019-02-04 19:49:34 +01:00