From 11a1cfd00e99e6a72a0f9a73d9a429dd0a2c20ac Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 17 Sep 2009 14:06:03 -0300
Subject: [PATCH 36/38] Fix AltGr and dead keys with VNC

RH-Author: Kevin Wolf <kwolf@redhat.com>
Message-id: <1252419185-9459-1-git-send-email-kwolf@redhat.com>
Patchwork-id: 3380
O-Subject: [PATCH] Fix AltGr and dead keys with VNC
Bugzilla:
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Juan Quintela <quintela@redhat.com>

Bugzilla: 521835
Upstream commit: 74b1b0c1f5aa231be4d41bdbcd2c7ddd00c1e27e

    Fix AltGr and dead keys with VNC

    (Marcel Zumstein)

    git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6586 c046a42c-6fe2-441c-8c8c-71466251a162

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu/keymaps/modifiers |    1 +
 qemu/vnc_keysym.h      |   23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/keymaps/modifiers |    1 +
 qemu/vnc_keysym.h      |   23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/qemu/keymaps/modifiers b/qemu/keymaps/modifiers
index 4013a6f..d73b7a6 100644
--- a/qemu/keymaps/modifiers
+++ b/qemu/keymaps/modifiers
@@ -3,6 +3,7 @@ Shift_L 0x2a
 
 Alt_R 0xb8
 Mode_switch 0xb8
+ISO_Level3_Shift 0xb8
 Alt_L 0x38
 
 Control_R 0x9d
diff --git a/qemu/vnc_keysym.h b/qemu/vnc_keysym.h
index d1527ec..ce355d8 100644
--- a/qemu/vnc_keysym.h
+++ b/qemu/vnc_keysym.h
@@ -204,6 +204,7 @@ static const name2keysym_t name2keysym[]={
 {"EuroSign", 0x20ac},  /* XK_EuroSign */
 
     /* modifiers */
+{"ISO_Level3_Shift", 0xfe03}, /* XK_ISO_Level3_Shift */
 {"Control_L", 0xffe3}, /* XK_Control_L */
 {"Control_R", 0xffe4}, /* XK_Control_R */
 {"Alt_L", 0xffe9},     /* XK_Alt_L */
@@ -286,6 +287,28 @@ static const name2keysym_t name2keysym[]={
 {"Pause", 0xff13},       /* XK_Pause */
 {"Escape", 0xff1b},      /* XK_Escape */
 
+/* dead keys */
+{"dead_grave", 0xfe50}, /* XK_dead_grave */
+{"dead_acute", 0xfe51}, /* XK_dead_acute */
+{"dead_circumflex", 0xfe52}, /* XK_dead_circumflex */
+{"dead_tilde", 0xfe53}, /* XK_dead_tilde */
+{"dead_macron", 0xfe54}, /* XK_dead_macron */
+{"dead_breve", 0xfe55}, /* XK_dead_breve */
+{"dead_abovedot", 0xfe56}, /* XK_dead_abovedot */
+{"dead_diaeresis", 0xfe57}, /* XK_dead_diaeresis */
+{"dead_abovering", 0xfe58}, /* XK_dead_abovering */
+{"dead_doubleacute", 0xfe59}, /* XK_dead_doubleacute */
+{"dead_caron", 0xfe5a}, /* XK_dead_caron */
+{"dead_cedilla", 0xfe5b}, /* XK_dead_cedilla */
+{"dead_ogonek", 0xfe5c}, /* XK_dead_ogonek */
+{"dead_iota", 0xfe5d}, /* XK_dead_iota */
+{"dead_voiced_sound", 0xfe5e}, /* XK_dead_voiced_sound */
+{"dead_semivoiced_sound", 0xfe5f}, /* XK_dead_semivoiced_sound */
+{"dead_belowdot", 0xfe60}, /* XK_dead_belowdot */
+{"dead_hook", 0xfe61}, /* XK_dead_hook */
+{"dead_horn", 0xfe62}, /* XK_dead_horn */
+
+
     /* localized keys */
 {"BackApostrophe", 0xff21},
 {"Muhenkan", 0xff22},
-- 
1.6.3.rc4.29.g8146