Diff
Modified: trunk/Source/WebCore/ChangeLog (260868 => 260869)
--- trunk/Source/WebCore/ChangeLog 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebCore/ChangeLog 2020-04-29 05:29:28 UTC (rev 260869)
@@ -1,3 +1,14 @@
+2020-04-28 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Add support for key events
+ https://bugs.webkit.org/show_bug.cgi?id=211128
+
+ Reviewed by Adrian Perez de Castro.
+
+ * platform/gtk/GtkVersioning.h:
+ (gdk_event_get_keyval):
+ (gdk_event_get_keycode):
+
2020-04-28 Wenson Hsieh <[email protected]>
[Text manipulation] Add a userInfo dictionary to _WKTextManipulationToken
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (260868 => 260869)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2020-04-29 05:29:28 UTC (rev 260869)
@@ -135,4 +135,20 @@
*button = gdk_button_event_get_button(const_cast<GdkEvent*>(event));
return true;
}
+
+static inline gboolean
+gdk_event_get_keyval(const GdkEvent* event, guint* keyval)
+{
+ if (keyval)
+ *keyval = gdk_key_event_get_keyval(const_cast<GdkEvent*>(event));
+ return TRUE;
+}
+
+static inline gboolean
+gdk_event_get_keycode(const GdkEvent* event, guint16* keycode)
+{
+ if (keycode)
+ *keycode = gdk_key_event_get_keycode(const_cast<GdkEvent*>(event));
+ return TRUE;
+}
#endif // USE(GTK4)
Modified: trunk/Source/WebKit/ChangeLog (260868 => 260869)
--- trunk/Source/WebKit/ChangeLog 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebKit/ChangeLog 2020-04-29 05:29:28 UTC (rev 260869)
@@ -1,3 +1,37 @@
+2020-04-28 Carlos Garcia Campos <[email protected]>
+
+ [GTK4] Add support for key events
+ https://bugs.webkit.org/show_bug.cgi?id=211128
+
+ Reviewed by Adrian Perez de Castro.
+
+ Handle key-pressed and key-released events using a GtkEventControllerKey. To receive key events the widget needs
+ to be focused, so also implement GtkWidgetClass::grab_focus and handle enter and leave focus events. GTK4 needs
+ the widget used by the key bindings translator to be added to a parent to be able to forward key events, so it's
+ now added as a child internal widget of the WebKitWeViewBase.
+
+ * Shared/gtk/WebEventFactory.cpp:
+ (WebKit::WebEventFactory::createWebKeyboardEvent):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewChildIsInternalWidget):
+ (webkitWebViewBaseContainerRemove):
+ (webkitWebViewBaseContainerForall):
+ (webkitWebViewBaseFocusEnter):
+ (webkitWebViewBaseFocusLeave):
+ (webkitWebViewBaseKeyPressed):
+ (webkitWebViewBaseKeyReleased):
+ (webkitWebViewBaseGrabFocus):
+ (webkitWebViewBaseConstructed):
+ (webkit_web_view_base_class_init):
+ * UIProcess/gtk/KeyBindingTranslator.cpp:
+ (WebKit::KeyBindingTranslator::KeyBindingTranslator):
+ (WebKit::KeyBindingTranslator::~KeyBindingTranslator):
+ (WebKit::handleCustomKeyBindings):
+ (WebKit::KeyBindingTranslator::commandsForKeyEvent):
+ * UIProcess/gtk/KeyBindingTranslator.h:
+ (WebKit::KeyBindingTranslator::widget const):
+ (WebKit::KeyBindingTranslator::destroyed):
+
2020-04-28 Wenson Hsieh <[email protected]>
[Text manipulation] Add a userInfo dictionary to _WKTextManipulationToken
Modified: trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp (260868 => 260869)
--- trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2020-04-29 05:29:28 UTC (rev 260869)
@@ -281,15 +281,10 @@
WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(const GdkEvent* event, const String& text, bool handledByInputMethod, Optional<Vector<CompositionUnderline>>&& preeditUnderlines, Optional<EditingRange>&& preeditSelectionRange, Vector<String>&& commands)
{
-#if USE(GTK4)
- guint keyval = 0;
- guint16 keycode = 0;
-#else
guint keyval;
gdk_event_get_keyval(event, &keyval);
guint16 keycode;
gdk_event_get_keycode(event, &keycode);
-#endif
GdkEventType type = gdk_event_get_event_type(const_cast<GdkEvent*>(event));
return WebKeyboardEvent(
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (260868 => 260869)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2020-04-29 05:29:28 UTC (rev 260869)
@@ -466,7 +466,7 @@
static bool webkitWebViewChildIsInternalWidget(WebKitWebViewBase* webViewBase, GtkWidget* widget)
{
WebKitWebViewBasePrivate* priv = webViewBase->priv;
- return widget == priv->inspectorView || widget == priv->dialog;
+ return widget == priv->inspectorView || widget == priv->dialog || widget == priv->keyBindingTranslator.widget();
}
static void webkitWebViewBaseContainerAdd(GtkContainer* container, GtkWidget* widget)
@@ -528,7 +528,9 @@
priv->dialog = nullptr;
if (gtk_widget_get_visible(widgetContainer))
gtk_widget_grab_focus(widgetContainer);
- } else {
+ } else if (priv->keyBindingTranslator.widget() == widget)
+ priv->keyBindingTranslator.destroyed();
+ else {
ASSERT(priv->children.contains(widget));
priv->children.remove(widget);
}
@@ -553,6 +555,9 @@
(*callback)(child, callbackData);
}
+ if (includeInternals && priv->keyBindingTranslator.widget())
+ (*callback)(priv->keyBindingTranslator.widget(), callbackData);
+
if (includeInternals && priv->inspectorView)
(*callback)(priv->inspectorView, callbackData);
@@ -876,7 +881,71 @@
return GDK_EVENT_STOP;
}
+#endif
+#if USE(GTK4)
+static void webkitWebViewBaseFocusEnter(WebKitWebViewBase* webViewBase, GtkEventController*)
+{
+ webkitWebViewBaseSetFocus(webViewBase, true);
+}
+
+static void webkitWebViewBaseFocusLeave(WebKitWebViewBase* webViewBase, GtkEventController*)
+{
+ webkitWebViewBaseSetFocus(webViewBase, false);
+}
+
+static gboolean webkitWebViewBaseKeyPressed(WebKitWebViewBase* webViewBase, unsigned keyval, unsigned, GdkModifierType state, GtkEventController* controller)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+
+#if ENABLE(DEVELOPER_MODE) && OS(LINUX)
+ if ((state & GDK_CONTROL_MASK) && (state & GDK_SHIFT_MASK) && keyval == GDK_KEY_G) {
+ auto& preferences = priv->pageProxy->preferences();
+ preferences.setResourceUsageOverlayVisible(!preferences.resourceUsageOverlayVisible());
+ return GDK_EVENT_STOP;
+ }
+#endif
+
+ if (priv->dialog)
+ return gtk_event_controller_key_forward(GTK_EVENT_CONTROLLER_KEY(controller), priv->dialog);
+
+#if ENABLE(FULLSCREEN_API)
+ if (priv->fullScreenModeActive) {
+ switch (keyval) {
+ case GDK_KEY_Escape:
+ case GDK_KEY_f:
+ case GDK_KEY_F:
+ priv->pageProxy->fullScreenManager()->requestExitFullScreen();
+ return GDK_EVENT_STOP;
+ default:
+ break;
+ }
+ }
+#endif
+
+ auto* event = gtk_event_controller_get_current_event(controller);
+ auto filterResult = priv->inputMethodFilter.filterKeyEvent(event);
+ if (!filterResult.handled) {
+ priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(event, filterResult.keyText,
+ NativeWebKeyboardEvent::HandledByInputMethod::No, WTF::nullopt, WTF::nullopt, priv->keyBindingTranslator.commandsForKeyEvent(GTK_EVENT_CONTROLLER_KEY(controller))));
+ }
+
+ return GDK_EVENT_STOP;
+}
+
+static void webkitWebViewBaseKeyReleased(WebKitWebViewBase* webViewBase, unsigned, unsigned, GdkModifierType, GtkEventController* controller)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+
+ auto* event = gtk_event_controller_get_current_event(controller);
+ if (!priv->inputMethodFilter.filterKeyEvent(event).handled) {
+ priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(event, { },
+ NativeWebKeyboardEvent::HandledByInputMethod::No, WTF::nullopt, WTF::nullopt, { }));
+ }
+}
+#endif
+
+#if !USE(GTK4)
static void webkitWebViewBaseHandleMouseEvent(WebKitWebViewBase* webViewBase, GdkEvent* event)
{
WebKitWebViewBasePrivate* priv = webViewBase->priv;
@@ -1524,6 +1593,14 @@
}
#endif
+#if USE(GTK4)
+static gboolean webkitWebViewBaseGrabFocus(GtkWidget* widget)
+{
+ gtk_root_set_focus(gtk_widget_get_root(widget), widget);
+ return TRUE;
+}
+#endif
+
static gboolean webkitWebViewBaseFocus(GtkWidget* widget, GtkDirectionType direction)
{
// If a dialog is active, we need to forward focus events there. This
@@ -1553,6 +1630,11 @@
GtkWidget* viewWidget = GTK_WIDGET(object);
gtk_widget_set_can_focus(viewWidget, TRUE);
+
+ WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
+ priv->pageClient = makeUnique<PageClientImpl>(viewWidget);
+ gtk_container_add(GTK_CONTAINER(viewWidget), priv->keyBindingTranslator.widget());
+
#if !USE(GTK4)
gtk_drag_dest_set(viewWidget, static_cast<GtkDestDefaults>(0), nullptr, 0,
static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
@@ -1559,9 +1641,6 @@
gtk_drag_dest_set_target_list(viewWidget, PasteboardHelper::singleton().targetList());
#endif
- WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
- priv->pageClient = makeUnique<PageClientImpl>(viewWidget);
-
#if USE(GTK4)
auto* controller = gtk_event_controller_scroll_new(GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES);
g_signal_connect_object(controller, "scroll", G_CALLBACK(webkitWebViewBaseScroll), viewWidget, G_CONNECT_SWAPPED);
@@ -1572,6 +1651,16 @@
g_signal_connect_object(controller, "motion", G_CALLBACK(webkitWebViewBaseMotion), viewWidget, G_CONNECT_SWAPPED);
g_signal_connect_object(controller, "leave", G_CALLBACK(webkitWebViewBaseLeave), viewWidget, G_CONNECT_SWAPPED);
gtk_widget_add_controller(viewWidget, controller);
+
+ controller = gtk_event_controller_focus_new();
+ g_signal_connect_object(controller, "enter", G_CALLBACK(webkitWebViewBaseFocusEnter), viewWidget, G_CONNECT_SWAPPED);
+ g_signal_connect_object(controller, "leave", G_CALLBACK(webkitWebViewBaseFocusLeave), viewWidget, G_CONNECT_SWAPPED);
+ gtk_widget_add_controller(viewWidget, controller);
+
+ controller = gtk_event_controller_key_new();
+ g_signal_connect_object(controller, "key-pressed", G_CALLBACK(webkitWebViewBaseKeyPressed), viewWidget, G_CONNECT_SWAPPED);
+ g_signal_connect_object(controller, "key-released", G_CALLBACK(webkitWebViewBaseKeyReleased), viewWidget, G_CONNECT_SWAPPED);
+ gtk_widget_add_controller(viewWidget, controller);
#endif
}
@@ -1594,8 +1683,10 @@
#endif
widgetClass->map = webkitWebViewBaseMap;
widgetClass->unmap = webkitWebViewBaseUnmap;
-#if !USE(GTK4)
+#if USE(GTK4)
+ widgetClass->grab_focus = webkitWebViewBaseGrabFocus;
widgetClass->focus = webkitWebViewBaseFocus;
+#else
widgetClass->focus_in_event = webkitWebViewBaseFocusInEvent;
widgetClass->focus_out_event = webkitWebViewBaseFocusOutEvent;
widgetClass->key_press_event = webkitWebViewBaseKeyPressEvent;
Modified: trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp (260868 => 260869)
--- trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.cpp 2020-04-29 05:29:28 UTC (rev 260869)
@@ -173,23 +173,28 @@
KeyBindingTranslator::KeyBindingTranslator()
: m_nativeWidget(gtk_text_view_new())
{
- g_signal_connect(m_nativeWidget.get(), "backspace", G_CALLBACK(backspaceCallback), this);
- g_signal_connect(m_nativeWidget.get(), "cut-clipboard", G_CALLBACK(cutClipboardCallback), this);
- g_signal_connect(m_nativeWidget.get(), "copy-clipboard", G_CALLBACK(copyClipboardCallback), this);
- g_signal_connect(m_nativeWidget.get(), "paste-clipboard", G_CALLBACK(pasteClipboardCallback), this);
- g_signal_connect(m_nativeWidget.get(), "select-all", G_CALLBACK(selectAllCallback), this);
- g_signal_connect(m_nativeWidget.get(), "move-cursor", G_CALLBACK(moveCursorCallback), this);
- g_signal_connect(m_nativeWidget.get(), "delete-from-cursor", G_CALLBACK(deleteFromCursorCallback), this);
- g_signal_connect(m_nativeWidget.get(), "toggle-overwrite", G_CALLBACK(toggleOverwriteCallback), this);
+ g_signal_connect(m_nativeWidget, "backspace", G_CALLBACK(backspaceCallback), this);
+ g_signal_connect(m_nativeWidget, "cut-clipboard", G_CALLBACK(cutClipboardCallback), this);
+ g_signal_connect(m_nativeWidget, "copy-clipboard", G_CALLBACK(copyClipboardCallback), this);
+ g_signal_connect(m_nativeWidget, "paste-clipboard", G_CALLBACK(pasteClipboardCallback), this);
+ g_signal_connect(m_nativeWidget, "select-all", G_CALLBACK(selectAllCallback), this);
+ g_signal_connect(m_nativeWidget, "move-cursor", G_CALLBACK(moveCursorCallback), this);
+ g_signal_connect(m_nativeWidget, "delete-from-cursor", G_CALLBACK(deleteFromCursorCallback), this);
+ g_signal_connect(m_nativeWidget, "toggle-overwrite", G_CALLBACK(toggleOverwriteCallback), this);
#if !USE(GTK4)
- g_signal_connect(m_nativeWidget.get(), "popup-menu", G_CALLBACK(popupMenuCallback), this);
- g_signal_connect(m_nativeWidget.get(), "show-help", G_CALLBACK(showHelpCallback), this);
+ g_signal_connect(m_nativeWidget, "popup-menu", G_CALLBACK(popupMenuCallback), this);
+ g_signal_connect(m_nativeWidget, "show-help", G_CALLBACK(showHelpCallback), this);
#endif
#if GTK_CHECK_VERSION(3, 24, 0)
- g_signal_connect(m_nativeWidget.get(), "insert-emoji", G_CALLBACK(insertEmojiCallback), this);
+ g_signal_connect(m_nativeWidget, "insert-emoji", G_CALLBACK(insertEmojiCallback), this);
#endif
}
+KeyBindingTranslator::~KeyBindingTranslator()
+{
+ ASSERT(!m_nativeWidget);
+}
+
struct KeyCombinationEntry {
unsigned gdkKeyCode;
unsigned state;
@@ -211,24 +216,8 @@
{ GDK_KEY_ISO_Enter, GDK_SHIFT_MASK, "InsertLineBreak" },
};
-Vector<String> KeyBindingTranslator::commandsForKeyEvent(GdkEventKey* event)
+static Vector<String> handleCustomKeyBindings(unsigned keyval, GdkModifierType state)
{
- ASSERT(m_pendingEditorCommands.isEmpty());
-
- guint keyval;
- GdkModifierType state;
-#if USE(GTK4)
- keyval = 0;
- state = static_cast<GdkModifierType>(0);
-#else
- gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
- gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);
-
- gtk_bindings_activate_event(G_OBJECT(m_nativeWidget.get()), event);
-#endif
- if (!m_pendingEditorCommands.isEmpty())
- return WTFMove(m_pendingEditorCommands);
-
// For keypress events, we want charCode(), but keyCode() does that.
unsigned mapKey = (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) << 16 | keyval;
if (!mapKey)
@@ -242,4 +231,33 @@
return { };
}
+#if USE(GTK4)
+Vector<String> KeyBindingTranslator::commandsForKeyEvent(GtkEventControllerKey* controller)
+{
+ ASSERT(m_pendingEditorCommands.isEmpty());
+
+ gtk_event_controller_key_forward(GTK_EVENT_CONTROLLER_KEY(controller), m_nativeWidget);
+ if (!m_pendingEditorCommands.isEmpty())
+ return WTFMove(m_pendingEditorCommands);
+
+ auto* event = gtk_event_controller_get_current_event(GTK_EVENT_CONTROLLER(controller));
+ return handleCustomKeyBindings(gdk_key_event_get_keyval(event), gdk_event_get_modifier_state(event));
+}
+#else
+Vector<String> KeyBindingTranslator::commandsForKeyEvent(GdkEventKey* event)
+{
+ ASSERT(m_pendingEditorCommands.isEmpty());
+
+ gtk_bindings_activate_event(G_OBJECT(m_nativeWidget), event);
+ if (!m_pendingEditorCommands.isEmpty())
+ return WTFMove(m_pendingEditorCommands);
+
+ guint keyval;
+ gdk_event_get_keyval(reinterpret_cast<GdkEvent*>(event), &keyval);
+ GdkModifierType state;
+ gdk_event_get_state(reinterpret_cast<GdkEvent*>(event), &state);
+ return handleCustomKeyBindings(keyval, state);
+}
+#endif
+
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.h (260868 => 260869)
--- trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.h 2020-04-29 05:28:02 UTC (rev 260868)
+++ trunk/Source/WebKit/UIProcess/gtk/KeyBindingTranslator.h 2020-04-29 05:29:28 UTC (rev 260869)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010, 2011 Igalia S.L.
+ * Copyright (C) 2010, 2011, 2020 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,16 +16,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KeyBindingTranslator_h
-#define KeyBindingTranslator_h
+#pragma once
-#include <WebCore/GRefPtrGtk.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
+typedef struct _GtkWidget GtkWidget;
+
#if USE(GTK4)
-typedef struct _GdkKeyEvent GdkKeyEvent;
-typedef GdkKeyEvent GdkEventKey;
+typedef struct _GtkEventControllerKey GtkEventControllerKey;
#else
typedef struct _GdkEventKey GdkEventKey;
#endif
@@ -35,17 +34,22 @@
class KeyBindingTranslator {
public:
KeyBindingTranslator();
+ ~KeyBindingTranslator();
+ GtkWidget* widget() const { return m_nativeWidget; }
+ void destroyed() { m_nativeWidget = nullptr; }
+
+#if USE(GTK4)
+ Vector<String> commandsForKeyEvent(GtkEventControllerKey*);
+#else
Vector<String> commandsForKeyEvent(GdkEventKey*);
+#endif
void addPendingEditorCommand(const char* command) { m_pendingEditorCommands.append(command); }
private:
- GRefPtr<GtkWidget> m_nativeWidget;
+ GtkWidget* m_nativeWidget;
Vector<String> m_pendingEditorCommands;
};
} // namespace WebKit
-#endif
-
-
