Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

dmenu: fix crash with XMODIFIERS

Fixes #59625

(cherry picked from commit 1f16d0496ce86d4c903e2e4ed6cbe4e952a7196f)

+32 -1
+1 -1
pkgs/applications/misc/dmenu/default.nix
··· 1 - { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: 2 3 stdenv.mkDerivation rec { 4 name = "dmenu-4.9";
··· 1 + { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }: 2 3 stdenv.mkDerivation rec { 4 name = "dmenu-4.9";
+31
pkgs/applications/misc/dmenu/xim.patch
···
··· 1 + Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html 2 + 3 + Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html 4 + --- a/dmenu.c 5 + +++ b/dmenu.c 6 + @@ -552,7 +552,7 @@ run(void) 7 + XEvent ev; 8 + 9 + while (!XNextEvent(dpy, &ev)) { 10 + - if (XFilterEvent(&ev, None)) 11 + + if (XFilterEvent(&ev, win)) 12 + continue; 13 + switch(ev.type) { 14 + case Expose: 15 + @@ -664,7 +664,6 @@ setup(void) 16 + XNClientWindow, win, XNFocusWindow, win, NULL); 17 + 18 + XMapRaised(dpy, win); 19 + - XSetInputFocus(dpy, win, RevertToParent, CurrentTime); 20 + if (embed) { 21 + XSelectInput(dpy, parentwin, FocusChangeMask); 22 + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { 23 + @@ -730,8 +729,6 @@ main(int argc, char *argv[]) 24 + 25 + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) 26 + fputs("warning: no locale support\n", stderr); 27 + - if (!XSetLocaleModifiers("")) 28 + - fputs("warning: no locale modifiers support\n", stderr); 29 + if (!(dpy = XOpenDisplay(NULL))) 30 + die("cannot open display"); 31 + screen = DefaultScreen(dpy);