[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] ui/gtk: fix handling of AltGr key on Windows
From: |
Volker Rümelin |
Subject: |
[PATCH 02/10] ui/gtk: fix handling of AltGr key on Windows |
Date: |
Sun, 10 May 2020 20:42:56 +0200 |
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>
---
ui/gtk.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 83f2f5d49b..68c63532b1 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -38,6 +38,10 @@
#include "ui/console.h"
#include "ui/gtk.h"
+#ifdef CONFIG_WIN32
+#include <gdk/gdkwin32.h>
+#include "win32-kbd-hook.h"
+#endif
#include <glib/gi18n.h>
#include <locale.h>
@@ -1451,6 +1455,9 @@ static void gd_grab_keyboard(VirtualConsole *vc, const
char *reason)
}
}
+#ifdef CONFIG_WIN32
+ win32_kbd_set_grab(true);
+#endif
#if GTK_CHECK_VERSION(3, 20, 0)
gd_grab_update(vc, true, vc->s->ptr_owner == vc);
#else
@@ -1472,6 +1479,9 @@ static void gd_ungrab_keyboard(GtkDisplayState *s)
}
s->kbd_owner = NULL;
+#ifdef CONFIG_WIN32
+ win32_kbd_set_grab(false);
+#endif
#if GTK_CHECK_VERSION(3, 20, 0)
gd_grab_update(vc, false, vc->s->ptr_owner == vc);
#else
@@ -1614,12 +1624,28 @@ static gboolean gd_leave_event(GtkWidget *widget,
GdkEventCrossing *crossing,
return TRUE;
}
+static gboolean gd_focus_in_event(GtkWidget *widget,
+ GdkEventFocus *event, gpointer opaque)
+{
+#ifdef CONFIG_WIN32
+ VirtualConsole *vc = opaque;
+ GtkDisplayState *s = vc->s;
+
+ win32_kbd_set_window(gdk_win32_window_get_impl_hwnd(
+ gtk_widget_get_window(vc->window ? vc->window : s->window)));
+#endif
+ 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;
+#ifdef CONFIG_WIN32
+ win32_kbd_set_window(NULL);
+#endif
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.26.1
- Patches for ui/gtk and ui/sdl, Volker Rümelin, 2020/05/10
- [PATCH 03/10] ui/gkt: release all keys on grab-broken-event, Volker Rümelin, 2020/05/10
- [PATCH 02/10] ui/gtk: fix handling of AltGr key on Windows,
Volker Rümelin <=
- [PATCH 01/10] ui/win32-kbd-hook: handle AltGr in a hook procedure, Volker Rümelin, 2020/05/10
- [PATCH 05/10] ui/gtk: remove unused variable ignore_keys, Volker Rümelin, 2020/05/10
- [PATCH 06/10] ui/sdl2: fix handling of AltGr key on Windows, Volker Rümelin, 2020/05/10
- [PATCH 04/10] ui/gtk: remove unused code, Volker Rümelin, 2020/05/10
- [PATCH 07/10] ui/sdl2: start in full screen with grab enabled, Volker Rümelin, 2020/05/10
- [PATCH 08/10] ui/sdl2-input: use trace-events to debug key events, Volker Rümelin, 2020/05/10