Re: [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule
On Thu, Aug 10, 2017 at 01:23:08PM -0500, Eric Blake wrote: > On 08/10/2017 10:55 AM, Daniel P. Berrange wrote: > > 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 > > --- > > > + > > +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs > > + $(call quiet-command,\ > > + $(PYTHON) $(KEYCODEMAP_GEN) \ > > + --lang glib2 \ > > + --varname qemu_input_map_$$(echo $@ | sed -e > > "s,^ui/input-keymap-,," -e "s,\.c$$,,") \ > > + code-map $(KEYCODEMAP_CSV) \ > > + $$(echo $@ | sed -E -e > > "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \ > > + $$(echo $@ | sed -E -e > > "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \ > > Can this text transformation be done using intrinsic make functions, > instead of requiring the shell to spawn external processes? Suggestions welcome :-) > The regex looks fragile: if we ever have one keymap named '2abc' and > another named 'xyz2', then the input-keymap-xyz222abc may be difficult > to extract based on greedy matching favoring 'xyz22' 2 'abc'. Would it > be better to have 'xyz2-to-2abc' as the preferred naming in the > keycodemapdb project, to make sure the conversion names are unambiguous? The names may end in a digit, but they won't start in a digit, so its unambiguous Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
Re: [Qemu-devel] [PATCH 01/15] ui: add keycodemapdb repository as a GIT submodule
On 08/10/2017 10:55 AM, Daniel P. Berrange wrote: > 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 > --- > + > +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs > + $(call quiet-command,\ > + $(PYTHON) $(KEYCODEMAP_GEN) \ > + --lang glib2 \ > + --varname qemu_input_map_$$(echo $@ | sed -e > "s,^ui/input-keymap-,," -e "s,\.c$$,,") \ > + code-map $(KEYCODEMAP_CSV) \ > + $$(echo $@ | sed -E -e > "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \ > + $$(echo $@ | sed -E -e > "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \ Can this text transformation be done using intrinsic make functions, instead of requiring the shell to spawn external processes? The regex looks fragile: if we ever have one keymap named '2abc' and another named 'xyz2', then the input-keymap-xyz222abc may be difficult to extract based on greedy matching favoring 'xyz22' 2 'abc'. Would it be better to have 'xyz2-to-2abc' as the preferred naming in the keycodemapdb project, to make sure the conversion names are unambiguous? But as this is dependent on keymap names, I don't think it's a showstopper for this patch. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org signature.asc Description: OpenPGP digital signature
[Qemu-devel] [PATCH 01/15] 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 --- .gitignore | 2 ++ .gitmodules | 3 +++ ui/Makefile.objs | 18 ++ ui/keycodemapdb | 1 + 4 files changed, 24 insertions(+) create mode 16 ui/keycodemapdb diff --git a/.gitignore b/.gitignore index cf65316863..6e5a1202c8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ /trace/generated-tcg-tracers.h /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h +/ui/keycodemap_*.c +/ui/input-keymap-*.c *-timestamp /*-softmmu /*-darwin-user diff --git a/.gitmodules b/.gitmodules index 5b0c212622..369989f19e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "roms/QemuMacDrivers"] path = roms/QemuMacDrivers url = git://git.qemu.org/QemuMacDrivers.git +[submodule "ui/keycodemapdb"] + path = ui/keycodemapdb + url = https://gitlab.com/keycodemap/keycodemapdb.git diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 3369451285..d94d1ca183 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -49,3 +49,21 @@ gtk-egl.o-libs += $(OPENGL_LIBS) shader.o-libs += $(OPENGL_LIBS) console-gl.o-libs += $(OPENGL_LIBS) egl-helpers.o-libs += $(OPENGL_LIBS) + +KEYCODEMAP_GEN = ui/keycodemapdb/tools/keymap-gen +KEYCODEMAP_CSV = ui/keycodemapdb/data/keymaps.csv + +KEYCODEMAP_FILES = \ +$(NULL) + +GENERATED_FILES += $(KEYCODEMAP_FILES) + +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) ui/Makefile.objs + $(call quiet-command,\ + $(PYTHON) $(KEYCODEMAP_GEN) \ + --lang glib2 \ + --varname qemu_input_map_$$(echo $@ | sed -e "s,^ui/input-keymap-,," -e "s,\.c$$,,") \ + code-map $(KEYCODEMAP_CSV) \ + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\1,") \ + $$(echo $@ | sed -E -e "s,^ui/input-keymap-([a-zA-Z0-9]+)2([a-zA-Z0-9]+)\.c$$,\2,") \ + > $@ || rm $@, "GEN", "$@") diff --git a/ui/keycodemapdb b/ui/keycodemapdb new file mode 16 index 00..aed87bb2aa --- /dev/null +++ b/ui/keycodemapdb @@ -0,0 +1 @@ +Subproject commit aed87bb2aa6ed83b49574eb982e3bdd4c36acf17 -- 2.13.3
