| Message ID | 20200510184304.9267-5-vr_qemu@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] ui/win32-kbd-hook: handle AltGr in a hook procedure | expand |
On 5/10/20 8:42 PM, Volker Rümelin wrote: > Since the removal of GTK2 code "... in commit 89d85cde7 ..." > the code around ignore_keys is > unused. See commit 1a01716a30 "gtk: Avoid accel key leakage > into guest on console switch" why it was needed before. > > Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> With description updated: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > ui/gtk.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/ui/gtk.c b/ui/gtk.c > index c70bfc2be4..5a25e3fa4c 100644 > --- a/ui/gtk.c > +++ b/ui/gtk.c > @@ -168,8 +168,6 @@ struct GtkDisplayState { > > bool external_pause_update; > > - bool ignore_keys; > - > DisplayOptions *opts; > }; > > @@ -1085,14 +1083,8 @@ static gboolean gd_text_key_down(GtkWidget *widget, > static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) > { > VirtualConsole *vc = opaque; > - GtkDisplayState *s = vc->s; > int qcode; > > - if (s->ignore_keys) { > - s->ignore_keys = (key->type == GDK_KEY_PRESS); > - return TRUE; > - } > - > #ifdef WIN32 > /* on windows, we ought to ignore the reserved key event? */ > if (key->hardware_keycode == 0xff) > @@ -1189,7 +1181,6 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) > gtk_notebook_set_current_page(nb, page); > gtk_widget_grab_focus(vc->focus); > } > - s->ignore_keys = false; > } > > static void gd_accel_switch_vc(void *opaque) >
diff --git a/ui/gtk.c b/ui/gtk.c index c70bfc2be4..5a25e3fa4c 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -168,8 +168,6 @@ struct GtkDisplayState { bool external_pause_update; - bool ignore_keys; - DisplayOptions *opts; }; @@ -1085,14 +1083,8 @@ static gboolean gd_text_key_down(GtkWidget *widget, static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) { VirtualConsole *vc = opaque; - GtkDisplayState *s = vc->s; int qcode; - if (s->ignore_keys) { - s->ignore_keys = (key->type == GDK_KEY_PRESS); - return TRUE; - } - #ifdef WIN32 /* on windows, we ought to ignore the reserved key event? */ if (key->hardware_keycode == 0xff) @@ -1189,7 +1181,6 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) gtk_notebook_set_current_page(nb, page); gtk_widget_grab_focus(vc->focus); } - s->ignore_keys = false; } static void gd_accel_switch_vc(void *opaque)
Since the removal of GTK2 code the code around ignore_keys is unused. See commit 1a01716a30 "gtk: Avoid accel key leakage into guest on console switch" why it was needed before. Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> --- ui/gtk.c | 9 --------- 1 file changed, 9 deletions(-)