test: the xkb modifier mask and the forwarded key bitmap
The two pure things in the Wayland frontend, in the shape the XIM adapter test already uses: wl.c included behind one define that makes the virtual keyboard inert, and a keymap built from a string, so no compositor and no xkb data files are wanted. The mask test holds Caps Lock apart from Shift, which is what a Korean key turns on; the bitmap test holds a release of a key we never passed on, a code the bitmap cannot hold, and the release of everything still down when the context goes. wayland-scanner's output is the parent Makefile's to write, as ../strans already is. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -20,7 +20,9 @@ X11_CFLAGS = $(shell $(PKG_CONFIG) --cflags x11)
|
||||
X11_LIBS = $(shell $(PKG_CONFIG) --libs x11)
|
||||
XIM_CFLAGS = $(shell $(PKG_CONFIG) --cflags xcb-imdkit xcb-aux xcb-xkb xkbcommon-x11)
|
||||
XIM_LIBS = $(shell $(PKG_CONFIG) --libs xcb-imdkit xcb-aux xcb-xkb xkbcommon-x11)
|
||||
UNIT_LDLIBS = -lthread -lbio $(TEXT_LIBS) $(IBUS_LIBS) $(XIM_LIBS)
|
||||
WL_CFLAGS = $(shell $(PKG_CONFIG) --cflags wayland-client xkbcommon)
|
||||
WL_LIBS = $(shell $(PKG_CONFIG) --libs wayland-client xkbcommon)
|
||||
UNIT_LDLIBS = -lthread -lbio $(TEXT_LIBS) $(IBUS_LIBS) $(XIM_LIBS) $(WL_LIBS)
|
||||
|
||||
PROG = unit_test
|
||||
STRESS = stress_test
|
||||
@@ -33,10 +35,11 @@ LIVE = $(SMOKE) $(FAULT)
|
||||
TESTSRC = test_util.c str_test.c trie_test.c \
|
||||
ko_test.c vi_test.c engine_test.c dict_test.c ipc_test.c \
|
||||
popup_test.c font_test.c ibus_test.c server_test.c compose_test.c \
|
||||
xim_adapter_test.c
|
||||
xim_adapter_test.c wl_adapter_test.c
|
||||
TESTOBJ = $(TESTSRC:.c=.o)
|
||||
# imv2.c and vkv1.c are wayland-scanner's; the parent Makefile writes them.
|
||||
PARENTSRC = str.c trie.c dict.c ko.c vi.c ipc.c popup_layout.c \
|
||||
font.c compose.c
|
||||
font.c compose.c imv2.c vkv1.c
|
||||
PARENTOBJ = $(PARENTSRC:%.c=unit_%.o)
|
||||
COMMONOBJ = $(TESTOBJ) $(PARENTOBJ)
|
||||
OBJS = unit_test.o stress_test.o $(COMMONOBJ)
|
||||
@@ -92,6 +95,9 @@ gtk_live_test: gtk_live_test.c $(LIVESRC) ../ipc.c ../ipc.h
|
||||
../strans:
|
||||
$(MAKE) -C .. strans
|
||||
|
||||
../imv2.c ../imv2.h ../vkv1.c ../vkv1.h:
|
||||
$(MAKE) -C .. $(@F)
|
||||
|
||||
xim_live_test: xim_live_test.c $(LIVESRC) ../ipc.c ../ipc.h
|
||||
$(HOSTCC) $(CPPFLAGS) -I.. $(X11_CFLAGS) $(HOST_CFLAGS) $(CFLAGS) \
|
||||
$(LDFLAGS) -o $@ xim_live_test.c live.c ../ipc.c $(X11_LIBS) \
|
||||
@@ -124,6 +130,8 @@ ibus_test.o: UNIT_CPPFLAGS += $(IBUS_CFLAGS)
|
||||
ibus_test.o: ../ibus.c
|
||||
xim_adapter_test.o: UNIT_CPPFLAGS += $(XIM_CFLAGS)
|
||||
xim_adapter_test.o: ../xim.c
|
||||
wl_adapter_test.o unit_imv2.o unit_vkv1.o: UNIT_CPPFLAGS += $(WL_CFLAGS)
|
||||
wl_adapter_test.o: ../wl.c ../imv2.h ../vkv1.h
|
||||
server_test.o: ../srv.c
|
||||
unit_font.o: UNIT_CPPFLAGS += $(TEXT_CFLAGS)
|
||||
unit_compose.o compose_test.o: UNIT_CPPFLAGS += $(IBUS_CFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user