ui: add keycodemapdb repository as a GIT submodule
The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a data file mapping between all the different scancode/keycode/keysym sets that are known, and a tool to auto-generate lookup tables for different combinations. It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys. Using it in QEMU will let us replace many hand written lookup tables with auto-generated tables from a master data source, reducing bugs. Adding new QKeyCodes will now only require the master table to be updated, all ~20 other tables will be automatically updated to follow. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 20170929101201.21039-4-berrange@redhat.com [ kraxel: fix build ] [ kraxel: switch repo to qemu.git mirror ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
		
				
					committed by
					
						
						Gerd Hoffmann
					
				
			
			
				
	
			
			
			
						parent
						
							47bb908dd1
						
					
				
				
					commit
					927128222b
				
			
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -14,6 +14,7 @@
 | 
			
		||||
/trace/generated-tcg-tracers.h
 | 
			
		||||
/ui/shader/texture-blit-frag.h
 | 
			
		||||
/ui/shader/texture-blit-vert.h
 | 
			
		||||
/ui/input-keymap-*.c
 | 
			
		||||
*-timestamp
 | 
			
		||||
/*-softmmu
 | 
			
		||||
/*-darwin-user
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -34,3 +34,6 @@
 | 
			
		||||
[submodule "roms/QemuMacDrivers"]
 | 
			
		||||
	path = roms/QemuMacDrivers
 | 
			
		||||
	url = git://git.qemu.org/QemuMacDrivers.git
 | 
			
		||||
[submodule "ui/keycodemapdb"]
 | 
			
		||||
	path = ui/keycodemapdb
 | 
			
		||||
	url = git://git.qemu.org/keycodemapdb.git
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										24
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								Makefile
									
									
									
									
									
								
							@@ -33,7 +33,7 @@ git-submodule-update:
 | 
			
		||||
endif
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
.git-submodule-status: git-submodule-update
 | 
			
		||||
.git-submodule-status: git-submodule-update config-host.mak
 | 
			
		||||
 | 
			
		||||
# Check that we're not trying to do an out-of-tree build from
 | 
			
		||||
# a tree that's been used for an in-tree build.
 | 
			
		||||
@@ -213,6 +213,28 @@ trace-dtrace-root.h: trace-dtrace-root.dtrace
 | 
			
		||||
 | 
			
		||||
trace-dtrace-root.o: trace-dtrace-root.dtrace
 | 
			
		||||
 | 
			
		||||
KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
 | 
			
		||||
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
 | 
			
		||||
 | 
			
		||||
KEYCODEMAP_FILES = \
 | 
			
		||||
		 $(NULL)
 | 
			
		||||
 | 
			
		||||
GENERATED_FILES += $(KEYCODEMAP_FILES)
 | 
			
		||||
 | 
			
		||||
ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile.objs
 | 
			
		||||
	$(call quiet-command,\
 | 
			
		||||
	    src=$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\1,") && \
 | 
			
		||||
	    dst=$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\2,") && \
 | 
			
		||||
	    test -e $(KEYCODEMAP_GEN) && \
 | 
			
		||||
	    $(PYTHON) $(KEYCODEMAP_GEN) \
 | 
			
		||||
	          --lang glib2 \
 | 
			
		||||
	          --varname qemu_input_map_$${src}_to_$${dst} \
 | 
			
		||||
	          code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
 | 
			
		||||
	        > $@ || rm -f $@, "GEN", "$@")
 | 
			
		||||
 | 
			
		||||
$(KEYCODEMAP_GEN): .git-submodule-status
 | 
			
		||||
$(KEYCODEMAP_CSV): .git-submodule-status
 | 
			
		||||
 | 
			
		||||
# Don't try to regenerate Makefile or configure
 | 
			
		||||
# We don't generate any of them
 | 
			
		||||
Makefile: ;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -264,7 +264,13 @@ cc_i386=i386-pc-linux-gnu-gcc
 | 
			
		||||
libs_qga=""
 | 
			
		||||
debug_info="yes"
 | 
			
		||||
stack_protector=""
 | 
			
		||||
git_submodules=""
 | 
			
		||||
 | 
			
		||||
if test -e "$source_path/.git"
 | 
			
		||||
then
 | 
			
		||||
    git_submodules="ui/keycodemapdb"
 | 
			
		||||
else
 | 
			
		||||
    git_submodules=""
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# Don't accept a target_list environment variable.
 | 
			
		||||
unset target_list
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot"
 | 
			
		||||
# independent of what the developer currently has initialized
 | 
			
		||||
# in their checkout, because the build environment is completely
 | 
			
		||||
# different to the host OS.
 | 
			
		||||
submodules="dtc"
 | 
			
		||||
submodules="dtc ui/keycodemapdb"
 | 
			
		||||
 | 
			
		||||
trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								ui/keycodemapdb
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								ui/keycodemapdb
									
									
									
									
									
										Submodule
									
								
							 Submodule ui/keycodemapdb added at 56ce5650d2
									
								
							
		Reference in New Issue
	
	Block a user