Re: [Qemu-devel] [PATCH] gtk: Support keyboard translation for hosts running Windows

[Stefan Weil]

Am 18.12.2013 19:28, schrieb Andreas Färber:
> Am 07.12.2013 16:25, schrieb Stefan Weil:
>> GTK uses different hardware keycodes on Windows hosts, so some special
>> handling is needed to get the QEMU keycode.
>>
>> Signed-off-by: Stefan Weil <address@hidden>
>> ---
>>  ui/gtk.c |   18 +++++++++++++++---
>>  1 file changed, 15 insertions(+), 3 deletions(-)
>>
>> diff --git a/ui/gtk.c b/ui/gtk.c
>> index 6316f5b..a633d89 100644
>> --- a/ui/gtk.c
>> +++ b/ui/gtk.c
>> @@ -34,6 +34,10 @@
>>  #define GETTEXT_PACKAGE "qemu"
>>  #define LOCALEDIR "po"
>>  
>> +#ifdef _WIN32
>> +# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC 
>> */
> IIRC that symbol forces compilation for that particular Windows version
> and later versions but won't work on lower versions then, right?
> In that case shouldn't that live somewhere more central than gtk.c, like
> QEMU_CFLAGS in configure?

The MinGW include files only define MAPVK_VK_TO_VSC if _WIN32_WINNT >=
0x0601 (== _WIN32_WINNT_WIN7). By default, _WIN32_WINNT == 0x0502 (==
_WIN32_WINNT_WS03).

A more central place is fine for the future, but for now I'd prefer to
minimize potential cross effects. We already have a name conflict
between Windows macros and local QEMU macros in a file which is not
Windows related at all. Ideally, only few source files would include
Windows include file - then _WIN32_WINNT could be defined in 
include/sysemu/os-win32.h.

>> +#endif
>> +
>>  #include "qemu-common.h"
>>  
>>  #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
>> @@ -704,11 +708,18 @@ static gboolean gd_button_event(GtkWidget *widget, 
>> GdkEventButton *button,
>>  static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void 
>> *opaque)
>>  {
>>      GtkDisplayState *s = opaque;
>> -    int gdk_keycode;
>> -    int qemu_keycode;
>> +    int gdk_keycode = key->hardware_keycode;
>>      int i;
>>  
>> -    gdk_keycode = key->hardware_keycode;
>> +#ifdef _WIN32
>> +    UINT qemu_keycode = MapVirtualKey(gdk_keycode, MAPVK_VK_TO_VSC);
> Possibly handle the #ifndef MAPVK_VK_TO_VSC case?
> What Windows version are we talking about anyway? XP? Vista? 7?

I have no solution for the #ifndef MAPVK_VK_TO_VSC case. The code works
for me with Windows 7 and 8.1, but might work with older versions, too.
If someone has Windows XP, a test can be run with
http://qemu.weilnetz.de/w32/qemu-w32-setup-20131128.exe. According to
MSDN, MapVirtualKey is available since Windows 2000 Professional.

> Regards,
> Andreas


Regards,
Stefan