From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtLrO-0001UY-LR for qemu-devel@nongnu.org; Wed, 18 Dec 2013 13:28:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtLrI-0004By-Jj for qemu-devel@nongnu.org; Wed, 18 Dec 2013 13:28:42 -0500 Received: from cantor2.suse.de ([195.135.220.15]:44403 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtLrI-0004Bs-Dh for qemu-devel@nongnu.org; Wed, 18 Dec 2013 13:28:36 -0500 Message-ID: <52B1E94F.2070200@suse.de> Date: Wed, 18 Dec 2013 19:28:31 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1386429917-7629-1-git-send-email-sw@weilnetz.de> In-Reply-To: <1386429917-7629-1-git-send-email-sw@weilnetz.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] gtk: Support keyboard translation for hosts running Windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil , qemu-devel Cc: Anthony Liguori 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. >=20 > Signed-off-by: Stefan Weil > --- > ui/gtk.c | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) >=20 > 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" > =20 > +#ifdef _WIN32 > +# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_T= O_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? > +#endif > + > #include "qemu-common.h" > =20 > #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 =3D opaque; > - int gdk_keycode; > - int qemu_keycode; > + int gdk_keycode =3D key->hardware_keycode; > int i; > =20 > - gdk_keycode =3D key->hardware_keycode; > +#ifdef _WIN32 > + UINT qemu_keycode =3D 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? Regards, Andreas > + switch (qemu_keycode) { > + case 103: /* alt gr */ > + qemu_keycode =3D 56 | SCANCODE_GREY; > + break; > + } > +#else > + int qemu_keycode; > =20 > if (gdk_keycode < 9) { > qemu_keycode =3D 0; > @@ -723,6 +734,7 @@ static gboolean gd_key_event(GtkWidget *widget, Gdk= EventKey *key, void *opaque) > } else { > qemu_keycode =3D 0; > } > +#endif > =20 > trace_gd_key_event(gdk_keycode, qemu_keycode, > (key->type =3D=3D GDK_KEY_PRESS) ? "down" : "up= "); >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg