From 3358b1473f52876c21e3acafe8f7eac41d01a290 Mon Sep 17 00:00:00 2001 From: Etienne Brateau Date: Sun, 10 Mar 2024 00:48:38 +0100 Subject: console-client: use xkbcommon instead of x11 for xkb extended support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allow to reduce the dependencies, only xkbcommon (keyboard support only) is required instead of the whole x11 library + lex + yacc. This replacement allow to reduce the code size, now features are handled by xkbcommon itself. The functionnalites remain the sames (actions are reimplemented but in the code directly as it’s impossible to add custom actions). The custom xkb data files are removed as we can now directly use the standard ones from xkeyboard-config. The configuration to launch the console keyboard modules changed to now directly configure the model+layout+variat+options directly. Tested by compiling with and without xkbcommon. Tested X11 (ran i3 correctly). Composing is still working. Message-ID: <20240309234838.31923-1-etienne.brateau@gmail.com> --- config.make.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config.make.in') diff --git a/config.make.in b/config.make.in index 4a722a7a..1a30626b 100644 --- a/config.make.in +++ b/config.make.in @@ -51,8 +51,6 @@ MIG = @MIG@ MIGCOM = $(MIG) -cc cat - /dev/null AWK = @AWK@ SED = @SED@ -LEX = @LEX@ -YACC = @YACC@ # Compilation flags. Append these to the definitions already made by # the specific Makefile. @@ -69,12 +67,10 @@ PARTED_LIBS = @PARTED_LIBS@ LIBNCURSESW = @LIBNCURSESW@ NCURSESW_INCLUDE = @NCURSESW_INCLUDE@ -# How to compile and link against X11. -HAVE_X11 = @have_x11@ -X11_CFLAGS = @X11_CFLAGS@ -X11_LIBS = @X11_LIBS@ -XKB_BASE = @XKB_BASE@ -X11_KEYSYMDEF_H = @X11_KEYSYMDEF_H@ +# How to compile and link against xkbcommon. +HAVE_XKBCOMMON = @have_xkbcommon@ +XKBCOMMON_CFLAGS = @xkbcommon_CFLAGS@ +XKBCOMMON_LIBS = @xkbcommon_LIBS@ # How to compile and link against libdaemon. libdaemon_CFLAGS = @libdaemon_CFLAGS@ -- cgit v1.2.3