Commit 0c0d4273 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

kbd-state: use state tracker for gtk 



Use the new keyboard state tracked for gtk.  Allows to drop the
gtk-specific modifier state tracking code.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-id: 20190122092814.14919-6-kraxel@redhat.com
parent 06f894db

include/ui/gtk.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <gdk/gdkwayland.h>

#endif



#include "ui/kbd-state.h"

#if defined(CONFIG_OPENGL)

#include "ui/egl-helpers.h"

#include "ui/egl-context.h"
@@ -32,6 +33,7 @@ typedef struct GtkDisplayState GtkDisplayState; 
typedef struct VirtualGfxConsole {

    GtkWidget *drawing_area;

    DisplayChangeListener dcl;

    QKbdState *kbd;

    DisplaySurface *ds;

    pixman_image_t *convert;

    cairo_surface_t *surface;

ui/gtk.c

+6 −32
Original line number Diff line number Diff line
@@ -122,17 +122,6 @@ 


#define HOTKEY_MODIFIERS        (GDK_CONTROL_MASK | GDK_MOD1_MASK)



static const int modifier_keycode[] = {

    Q_KEY_CODE_SHIFT,

    Q_KEY_CODE_SHIFT_R,

    Q_KEY_CODE_CTRL,

    Q_KEY_CODE_CTRL_R,

    Q_KEY_CODE_ALT,

    Q_KEY_CODE_ALT_R,

    Q_KEY_CODE_META_L,

    Q_KEY_CODE_META_R,

};



static const guint16 *keycode_map;

static size_t keycode_maplen;
@@ -187,7 +176,6 @@ struct GtkDisplayState { 


    bool external_pause_update;



    bool modifier_pressed[ARRAY_SIZE(modifier_keycode)];

    bool ignore_keys;



    DisplayOptions *opts;
@@ -426,20 +414,12 @@ static void gd_update_full_redraw(VirtualConsole *vc) 
static void gtk_release_modifiers(GtkDisplayState *s)

{

    VirtualConsole *vc = gd_vc_find_current(s);

    int i, qcode;



    if (vc->type != GD_VC_GFX ||

        !qemu_console_is_graphic(vc->gfx.dcl.con)) {

        return;

    }

    for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) {

        qcode = modifier_keycode[i];

        if (!s->modifier_pressed[i]) {

            continue;

        }

        qemu_input_event_send_key_qcode(vc->gfx.dcl.con, qcode, false);

        s->modifier_pressed[i] = false;

    }

    qkbd_state_lift_all_keys(vc->gfx.kbd);

}



static void gd_widget_reparent(GtkWidget *from, GtkWidget *to,
@@ -1115,7 +1095,6 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) 
    VirtualConsole *vc = opaque;

    GtkDisplayState *s = vc->s;

    int qcode;

    int i;



    if (s->ignore_keys) {

        s->ignore_keys = (key->type == GDK_KEY_PRESS);
@@ -1136,7 +1115,7 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) 
        || key->hardware_keycode == VK_PAUSE

#endif

        ) {

        qemu_input_event_send_key_qcode(vc->gfx.dcl.con, Q_KEY_CODE_PAUSE,

        qkbd_state_key_event(vc->gfx.kbd, Q_KEY_CODE_PAUSE,

                             key->type == GDK_KEY_PRESS);

        return TRUE;

    }
@@ -1146,13 +1125,7 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) 
    trace_gd_key_event(vc->label, key->hardware_keycode, qcode,

                       (key->type == GDK_KEY_PRESS) ? "down" : "up");



    for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) {

        if (qcode == modifier_keycode[i]) {

            s->modifier_pressed[i] = (key->type == GDK_KEY_PRESS);

        }

    }



    qemu_input_event_send_key_qcode(vc->gfx.dcl.con, qcode,

    qkbd_state_key_event(vc->gfx.kbd, qcode,

                         key->type == GDK_KEY_PRESS);



    return TRUE;
@@ -2055,6 +2028,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, 
    gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook),

                             vc->tab_item, gtk_label_new(vc->label));



    vc->gfx.kbd = qkbd_state_init(con);

    vc->gfx.dcl.con = con;

    register_displaychangelistener(&vc->gfx.dcl);