diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-26 16:29:51 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-26 16:51:25 +0200 |
| commit | b80e7f0f2d59dabc6d0e969e8d481e624fa8f67c (patch) | |
| tree | 0bc33150ab9c78ba0f8b2d95b99b11d13a4ea72d /src/virt-viewer-window.c | |
| parent | 6a5fdf5a24fe97cc75cd84ca137e5a7bb62a42cd (diff) | |
| download | virt-viewer-b80e7f0f2d59dabc6d0e969e8d481e624fa8f67c.tar.gz virt-viewer-b80e7f0f2d59dabc6d0e969e8d481e624fa8f67c.tar.xz virt-viewer-b80e7f0f2d59dabc6d0e969e8d481e624fa8f67c.zip | |
hotkeys: send modifiers before non-modifier key
This fixes the "send menu" for hotkeys set with non-modifiers keys. The
current order of press events is wrong, as it sends first non-modifiers
keys, and in general ctrl+t will work, t+ctrl will not.
https://bugzilla.redhat.com/show_bug.cgi?id=846006
Diffstat (limited to 'src/virt-viewer-window.c')
| -rw-r--r-- | src/virt-viewer-window.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index 7593e3c..0f62feb 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -632,12 +632,10 @@ accel_key_to_keys(const GtkAccelKey *key) guint val; GArray *a = g_array_new(FALSE, FALSE, sizeof(guint)); - val = key->accel_key; - g_array_append_val(a, val); - g_warn_if_fail((key->accel_mods & ~(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 0); + /* first, send the modifiers */ if (key->accel_mods & GDK_SHIFT_MASK) { val = GDK_Shift_L; g_array_append_val(a, val); @@ -653,6 +651,10 @@ accel_key_to_keys(const GtkAccelKey *key) g_array_append_val(a, val); } + /* only after, the non-modifier key (ctrl-t, not t-ctrl) */ + val = key->accel_key; + g_array_append_val(a, val); + val = GDK_VoidSymbol; g_array_append_val(a, val); |