AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkentry: Stop using ::key-press-event

Browse Source 
Use GtkEventControllerKey for the task
This commit is contained in:
Carlos Garnacho 2018-03-05 14:59:33 +01:00
parent 0d884d22fb
commit 568054a034
1 changed files with 55 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
gtk/gtkentry.c
View File

@ -72,6 +72,7 @@
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkeventcontrollerkey.h"
#include "a11y/gtkentryaccessible.h" #include "a11y/gtkentryaccessible.h"
@ -213,6 +214,7 @@ struct _GtkEntryPrivate
GtkGesture *drag_gesture; GtkGesture *drag_gesture;
GtkGesture *multipress_gesture; GtkGesture *multipress_gesture;
GtkEventController *motion_controller; GtkEventController *motion_controller;
GtkEventController *key_controller;
GtkWidget *progress_widget; GtkWidget *progress_widget;
GtkCssNode *selection_node; GtkCssNode *selection_node;
@ -274,7 +276,6 @@ struct _GtkEntryPrivate
guint cursor_handle_dragged : 1; guint cursor_handle_dragged : 1;
guint selection_handle_dragged : 1; guint selection_handle_dragged : 1;
guint populate_all : 1; guint populate_all : 1;
guint handling_key_event : 1;
}; };
struct _EntryIconInfo struct _EntryIconInfo
@ -418,10 +419,6 @@ static void gtk_entry_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot); GtkSnapshot *snapshot);
static gboolean gtk_entry_event (GtkWidget *widget, static gboolean gtk_entry_event (GtkWidget *widget,
GdkEvent *event); GdkEvent *event);
static gint gtk_entry_key_press (GtkWidget *widget,
GdkEventKey *event);
static gint gtk_entry_key_release (GtkWidget *widget,
GdkEventKey *event);
static void gtk_entry_focus_in (GtkWidget *widget); static void gtk_entry_focus_in (GtkWidget *widget);
static void gtk_entry_focus_out (GtkWidget *widget); static void gtk_entry_focus_out (GtkWidget *widget);
static void gtk_entry_grab_focus (GtkWidget *widget); static void gtk_entry_grab_focus (GtkWidget *widget);
@ -556,6 +553,11 @@ static void gtk_entry_drag_gesture_end (GtkGestureDrag *gesture,
gdouble offset_x, gdouble offset_x,
gdouble offset_y, gdouble offset_y,
GtkEntry *entry); GtkEntry *entry);
static gboolean gtk_entry_key_controller_key_pressed (GtkEventControllerKey *controller,
guint keyval,
guint keycode,
GdkModifierType state,
GtkWidget *widget);
/* Internal routines /* Internal routines
*/ */
@ -796,8 +798,6 @@ gtk_entry_class_init (GtkEntryClass *class)
widget_class->size_allocate = gtk_entry_size_allocate; widget_class->size_allocate = gtk_entry_size_allocate;
widget_class->snapshot = gtk_entry_snapshot; widget_class->snapshot = gtk_entry_snapshot;
widget_class->event = gtk_entry_event; widget_class->event = gtk_entry_event;
widget_class->key_press_event = gtk_entry_key_press;
widget_class->key_release_event = gtk_entry_key_release;
widget_class->grab_focus = gtk_entry_grab_focus; widget_class->grab_focus = gtk_entry_grab_focus;
widget_class->style_updated = gtk_entry_style_updated; widget_class->style_updated = gtk_entry_style_updated;
widget_class->query_tooltip = gtk_entry_query_tooltip; widget_class->query_tooltip = gtk_entry_query_tooltip;
@ -1974,6 +1974,9 @@ gtk_entry_set_property (GObject *object,
if (new_value && gtk_widget_has_focus (widget)) if (new_value && gtk_widget_has_focus (widget))
gtk_im_context_focus_in (priv->im_context); gtk_im_context_focus_in (priv->im_context);
gtk_event_controller_key_set_im_context (GTK_EVENT_CONTROLLER_KEY (priv->key_controller),
new_value ? priv->im_context : NULL);
g_object_notify_by_pspec (object, pspec); g_object_notify_by_pspec (object, pspec);
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
} }
@ -2490,6 +2493,16 @@ find_invisible_char (GtkWidget *widget)
return '*'; return '*';
} }
static void
gtk_entry_schedule_im_reset (GtkEntry *entry)
{
GtkEntryPrivate *priv;
priv = gtk_entry_get_instance_private (entry);
priv->need_im_reset = TRUE;
}
static void static void
gtk_entry_init (GtkEntry *entry) gtk_entry_init (GtkEntry *entry)
{ {
@ -2553,6 +2566,14 @@ gtk_entry_init (GtkEntry *entry)
g_signal_connect (priv->motion_controller, "motion", g_signal_connect (priv->motion_controller, "motion",
G_CALLBACK (entry_motion_cb), entry); G_CALLBACK (entry_motion_cb), entry);
priv->key_controller = gtk_event_controller_key_new (GTK_WIDGET (entry));
g_signal_connect (priv->key_controller, "key-pressed",
G_CALLBACK (gtk_entry_key_controller_key_pressed), entry);
g_signal_connect_swapped (priv->key_controller, "im-update",
G_CALLBACK (gtk_entry_schedule_im_reset), entry);
gtk_event_controller_key_set_im_context (GTK_EVENT_CONTROLLER_KEY (priv->key_controller),
priv->im_context);
widget_node = gtk_widget_get_css_node (GTK_WIDGET (entry)); widget_node = gtk_widget_get_css_node (GTK_WIDGET (entry));
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
@ -4040,90 +4061,40 @@ gtk_entry_obscure_mouse_cursor (GtkEntry *entry)
priv->mouse_cursor_obscured = TRUE; priv->mouse_cursor_obscured = TRUE;
} }
static gint static gboolean
gtk_entry_key_press (GtkWidget *widget, gtk_entry_key_controller_key_pressed (GtkEventControllerKey *controller,
GdkEventKey *ev) guint keyval,
guint keycode,
GdkModifierType state,
GtkWidget *widget)
{ {
GtkEntry *entry = GTK_ENTRY (widget); GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
GdkEvent *event = (GdkEvent *) ev; gunichar unichar;
gboolean retval = FALSE;
guint keyval;
const char *string;
if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval))
return GDK_EVENT_PROPAGATE;
priv->handling_key_event = TRUE;
gtk_entry_reset_blink_time (entry); gtk_entry_reset_blink_time (entry);
gtk_entry_pend_cursor_blink (entry); gtk_entry_pend_cursor_blink (entry);
gtk_entry_selection_bubble_popup_unset (entry); gtk_entry_selection_bubble_popup_unset (entry);
if (!gdk_event_is_sent (event) && priv->text_handle) if (priv->text_handle)
_gtk_text_handle_set_mode (priv->text_handle, _gtk_text_handle_set_mode (priv->text_handle,
GTK_TEXT_HANDLE_MODE_NONE); GTK_TEXT_HANDLE_MODE_NONE);
if (priv->editable)
{
if (gtk_im_context_filter_keypress (priv->im_context, ev))
{
priv->need_im_reset = TRUE;
retval = TRUE;
goto out;
}
}
if (keyval == GDK_KEY_Return || if (keyval == GDK_KEY_Return ||
keyval == GDK_KEY_KP_Enter || keyval == GDK_KEY_KP_Enter ||
keyval == GDK_KEY_ISO_Enter || keyval == GDK_KEY_ISO_Enter ||
keyval == GDK_KEY_Escape) keyval == GDK_KEY_Escape)
gtk_entry_reset_im_context (entry); gtk_entry_reset_im_context (entry);
if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->key_press_event (widget, ev)) unichar = gdk_keyval_to_unicode (keyval);
{
/* Activate key bindings */
retval = TRUE;
goto out;
}
gdk_event_get_string (event, &string); if (!priv->editable && unichar != 0)
if (!priv->editable && string[0] != '\0')
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
out: gtk_entry_obscure_mouse_cursor (entry);
priv->handling_key_event = FALSE;
return retval; return FALSE;
}
static gint
gtk_entry_key_release (GtkWidget *widget,
GdkEventKey *event)
{
GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
gboolean retval = FALSE;
priv->handling_key_event = TRUE;
if (priv->editable)
{
if (gtk_im_context_filter_keypress (priv->im_context, event))
{
priv->need_im_reset = TRUE;
retval = TRUE;
goto out;
}
}
retval = GTK_WIDGET_CLASS (gtk_entry_parent_class)->key_release_event (widget, event);
out:
priv->handling_key_event = FALSE;
return retval;
} }
static void static void
@ -4139,7 +4110,7 @@ gtk_entry_focus_in (GtkWidget *widget)
if (priv->editable) if (priv->editable)
{ {
priv->need_im_reset = TRUE; gtk_entry_schedule_im_reset (entry);
gtk_im_context_focus_in (priv->im_context); gtk_im_context_focus_in (priv->im_context);
keymap_state_changed (keymap, entry); keymap_state_changed (keymap, entry);
g_signal_connect (keymap, "state-changed", g_signal_connect (keymap, "state-changed",
@ -4181,7 +4152,7 @@ gtk_entry_focus_out (GtkWidget *widget)
if (priv->editable) if (priv->editable)
{ {
priv->need_im_reset = TRUE; gtk_entry_schedule_im_reset (entry);
gtk_im_context_focus_out (priv->im_context); gtk_im_context_focus_out (priv->im_context);
remove_capslock_feedback (entry); remove_capslock_feedback (entry);
} }
@ -4278,6 +4249,12 @@ gtk_entry_state_flags_changed (GtkWidget *widget,
GtkEntry *entry = GTK_ENTRY (widget); GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
if (gtk_widget_get_realized (widget))
{
set_text_cursor (widget);
priv->mouse_cursor_obscured = FALSE;
}
if (!gtk_widget_is_sensitive (widget)) if (!gtk_widget_is_sensitive (widget))
{ {
/* Clear any selection */ /* Clear any selection */
@ -4666,11 +4643,6 @@ buffer_notify_text (GtkEntryBuffer *buffer,
GParamSpec *spec, GParamSpec *spec,
GtkEntry *entry) GtkEntry *entry)
{ {
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
if (priv->handling_key_event)
gtk_entry_obscure_mouse_cursor (entry);
emit_changed (entry); emit_changed (entry);
g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_TEXT]); g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_TEXT]);
} }
@ -5245,7 +5217,10 @@ gtk_entry_commit_cb (GtkIMContext *context,
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
if (priv->editable) if (priv->editable)
{
gtk_entry_enter_text (entry, str); gtk_entry_enter_text (entry, str);
gtk_entry_obscure_mouse_cursor (entry);
}
} }
static void static void
@ -5259,6 +5234,8 @@ gtk_entry_preedit_changed_cb (GtkIMContext *context,
gchar *preedit_string; gchar *preedit_string;
gint cursor_pos; gint cursor_pos;
gtk_entry_obscure_mouse_cursor (entry);
gtk_im_context_get_preedit_string (priv->im_context, gtk_im_context_get_preedit_string (priv->im_context,
&preedit_string, NULL, &preedit_string, NULL,
&cursor_pos); &cursor_pos);