[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] ui/gtk: fix handling of AltGr key on Windows
From: |
Gerd Hoffmann |
Subject: |
[PULL 02/11] ui/gtk: fix handling of AltGr key on Windows |
Date: |
Wed, 20 May 2020 10:43:07 +0200 |
From: Volker Rümelin <address@hidden>
Wire up the keyboard hooking code on Windows to fix the AltGr
key and improve keyboard grabbing.
Signed-off-by: Volker Rümelin <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 83f2f5d49b2a..a0b10a140330 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -38,6 +38,10 @@
#include "ui/console.h"
#include "ui/gtk.h"
+#ifdef G_OS_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+#include "ui/win32-kbd-hook.h"
#include <glib/gi18n.h>
#include <locale.h>
@@ -428,6 +432,16 @@ static void gd_widget_reparent(GtkWidget *from, GtkWidget
*to,
g_object_unref(G_OBJECT(widget));
}
+static void *gd_win32_get_hwnd(VirtualConsole *vc)
+{
+#ifdef G_OS_WIN32
+ return gdk_win32_window_get_impl_hwnd(
+ gtk_widget_get_window(vc->window ? vc->window : vc->s->window));
+#else
+ return NULL;
+#endif
+}
+
/** DisplayState Callbacks **/
static void gd_update(DisplayChangeListener *dcl,
@@ -1451,6 +1465,7 @@ static void gd_grab_keyboard(VirtualConsole *vc, const
char *reason)
}
}
+ win32_kbd_set_grab(true);
#if GTK_CHECK_VERSION(3, 20, 0)
gd_grab_update(vc, true, vc->s->ptr_owner == vc);
#else
@@ -1472,6 +1487,7 @@ static void gd_ungrab_keyboard(GtkDisplayState *s)
}
s->kbd_owner = NULL;
+ win32_kbd_set_grab(false);
#if GTK_CHECK_VERSION(3, 20, 0)
gd_grab_update(vc, false, vc->s->ptr_owner == vc);
#else
@@ -1614,12 +1630,22 @@ static gboolean gd_leave_event(GtkWidget *widget,
GdkEventCrossing *crossing,
return TRUE;
}
+static gboolean gd_focus_in_event(GtkWidget *widget,
+ GdkEventFocus *event, gpointer opaque)
+{
+ VirtualConsole *vc = opaque;
+
+ win32_kbd_set_window(gd_win32_get_hwnd(vc));
+ return TRUE;
+}
+
static gboolean gd_focus_out_event(GtkWidget *widget,
- GdkEventCrossing *crossing, gpointer opaque)
+ GdkEventFocus *event, gpointer opaque)
{
VirtualConsole *vc = opaque;
GtkDisplayState *s = vc->s;
+ win32_kbd_set_window(NULL);
gtk_release_modifiers(s);
return TRUE;
}
@@ -1878,6 +1904,8 @@ static void gd_connect_vc_gfx_signals(VirtualConsole *vc)
G_CALLBACK(gd_enter_event), vc);
g_signal_connect(vc->gfx.drawing_area, "leave-notify-event",
G_CALLBACK(gd_leave_event), vc);
+ g_signal_connect(vc->gfx.drawing_area, "focus-in-event",
+ G_CALLBACK(gd_focus_in_event), vc);
g_signal_connect(vc->gfx.drawing_area, "focus-out-event",
G_CALLBACK(gd_focus_out_event), vc);
g_signal_connect(vc->gfx.drawing_area, "configure-event",
--
2.18.4
- [PULL 00/11] Ui 20200520 patches, Gerd Hoffmann, 2020/05/20
- [PULL 04/11] ui/gtk: remove unused code, Gerd Hoffmann, 2020/05/20
- [PULL 02/11] ui/gtk: fix handling of AltGr key on Windows,
Gerd Hoffmann <=
- [PULL 10/11] ui/gtk: use native keyboard scancodes on Windows, Gerd Hoffmann, 2020/05/20
- [PULL 06/11] ui/sdl2: fix handling of AltGr key on Windows, Gerd Hoffmann, 2020/05/20
- [PULL 11/11] ui: increase min required GTK version to 3.22.0, Gerd Hoffmann, 2020/05/20
- [PULL 07/11] ui/sdl2: start in full screen with grab enabled, Gerd Hoffmann, 2020/05/20
- [PULL 08/11] ui/sdl2-input: use trace-events to debug key events, Gerd Hoffmann, 2020/05/20
- [PULL 03/11] ui/gkt: release all keys on grab-broken-event, Gerd Hoffmann, 2020/05/20
- [PULL 05/11] ui/gtk: remove unused variable ignore_keys, Gerd Hoffmann, 2020/05/20
- [PULL 09/11] ui/gtk: don't pass on win keys without keyboard grab, Gerd Hoffmann, 2020/05/20
- [PULL 01/11] ui/win32-kbd-hook: handle AltGr in a hook procedure, Gerd Hoffmann, 2020/05/20