From 7b317a5fbaf53bf2bb5c2f0fc418b05b53e82707 Mon Sep 17 00:00:00 2001
From: David <dmaciejak@fortinet.com>
Date: Tue, 28 Feb 2023 10:58:10 +0800
Subject: [PATCH] wmiv: use W_KeycodeToKeysym instead of XkbKeycodeToKeysym

This patch replaces XkbKeycodeToKeysym in wmiv by our
own function W_KeycodeToKeysym.
---
 util/Makefile.am | 7 +++++--
 util/wmiv.c      | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/util/Makefile.am b/util/Makefile.am
index 8ff2de65..0c148702 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -70,10 +70,13 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_misc.c \
 	wmmenugen_parse_wmconfig.c \
 	wmmenugen_parse_xdg.c
 
+wmiv_CFLAGS = @PANGO_CFLAGS@ @PTHREAD_CFLAGS@
+
 wmiv_LDADD = \
 	$(top_builddir)/wrlib/libwraster.la \
-	@XLFLAGS@ @XLIBS@ \
-	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
+	$(top_builddir)/WINGs/libWINGs.la \
+	@XLFLAGS@ @XLIBS@ @GFXLIBS@ \
+	@PANGO_LIBS@ @PTHREAD_LIBS@ @LIBEXIF@
 
 wmiv_SOURCES = wmiv.c wmiv.h
 
diff --git a/util/wmiv.c b/util/wmiv.c
index 947f03fe..becd16e7 100755
--- a/util/wmiv.c
+++ b/util/wmiv.c
@@ -22,11 +22,10 @@
 #define _GNU_SOURCE
 #endif
 
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include "wraster.h"
+#include <WINGs/WINGsP.h>
+#include <wraster.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -932,7 +931,7 @@ int main(int argc, char **argv)
 			continue;
 		}
 		if (e.type == KeyPress) {
-			keysym = XkbKeycodeToKeysym(dpy, e.xkey.keycode, 0, e.xkey.state & ShiftMask?1:0);
+			keysym = W_KeycodeToKeysym(dpy, e.xkey.keycode, e.xkey.state & ShiftMask?1:0);
 #ifdef HAVE_PTHREAD
 			if (keysym != XK_Right)
 				diaporama_flag = False;