[gtk/keymap-rework-2] fixup: rename some of the new key event apis
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/keymap-rework-2] fixup: rename some of the new key event apis
- Date: Mon, 6 Apr 2020 12:26:37 +0000 (UTC)
commit d66db677adf1f1a9c17b3d1e9c21e6e87fc4adef
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Apr 6 08:20:16 2020 -0400
fixup: rename some of the new key event apis
gdk/gdkevents.c | 40 ++++++++++++++++++++--------------------
gdk/gdkevents.h | 30 +++++++++++++++---------------
gtk/gtkcellrendereraccel.c | 2 +-
gtk/gtkshortcutcontroller.c | 6 +++---
gtk/gtkshortcuttrigger.c | 26 +++++++++++++-------------
gtk/gtkshortcuttrigger.h | 2 +-
testsuite/gtk/shortcuts.c | 14 +++++++-------
7 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 5b81c41d1c..e99b95a3cd 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -2112,23 +2112,23 @@ gdk_grab_broken_event_get_grab_surface (GdkEvent *event)
}
/**
- * gdk_event_matches:
- * @event: the #GdkEvent
+ * gdk_key_event_matches:
+ * @event: a key #GdkEvent
* @keyval: the keyval to match
* @modifiers: the modifiers to match
*
- * Matches an event against a keyboard shortcut that is specified
+ * Matches a key event against a keyboard shortcut that is specified
* as a keyval and modifiers. Partial matches are possible where the
* combination matches if the currently active group is ignored.
*
* Note that we ignore Caps Lock for matching.
*
- * Returns: a GdkEventMatch value describing whether @event matches
+ * Returns: a GdkKeyMatch value describing whether @event matches
*/
-GdkEventMatch
-gdk_event_matches (GdkEvent *event,
- guint keyval,
- GdkModifierType modifiers)
+GdkKeyMatch
+gdk_key_event_matches (GdkEvent *event,
+ guint keyval,
+ GdkModifierType modifiers)
{
guint keycode;
GdkModifierType state;
@@ -2140,8 +2140,8 @@ gdk_event_matches (GdkEvent *event,
GdkModifierType shift_group_mask;
gboolean group_mod_is_accel_mod = FALSE;
- if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
- return GDK_EVENT_MATCH_NONE;
+ g_return_val_if_fail (event->any.type == GDK_KEY_PRESS ||
+ event->any.type == GDK_KEY_RELEASE, GDK_KEY_MATCH_NONE);
keycode = event->key.keycode;
state = event->key.state & ~GDK_LOCK_MASK;
@@ -2187,7 +2187,7 @@ gdk_event_matches (GdkEvent *event,
(!group_mod_is_accel_mod ||
(state & shift_group_mask) == (modifiers & shift_group_mask)))
{
- return GDK_EVENT_MATCH_EXACT;
+ return GDK_KEY_MATCH_EXACT;
}
gdk_display_map_keyval (gdk_event_get_display (event), keyval, &keys, &n_keys);
@@ -2202,7 +2202,7 @@ gdk_event_matches (GdkEvent *event,
/* partial match */
g_free (keys);
- return GDK_EVENT_MATCH_PARTIAL;
+ return GDK_KEY_MATCH_PARTIAL;
}
}
@@ -2210,12 +2210,12 @@ gdk_event_matches (GdkEvent *event,
}
- return GDK_EVENT_MATCH_NONE;
+ return GDK_KEY_MATCH_NONE;
}
/**
- * gdk_event_get_match:
- * @event: a #GdkEvent
+ * gdk_key_event_get_match:
+ * @event: a key #GdkEvent
* @keyval: (out): return location for a keyval
* @modifiers: (out): return location for modifiers
*
@@ -2225,9 +2225,9 @@ gdk_event_matches (GdkEvent *event,
* Returns: %TRUE on success
*/
gboolean
-gdk_event_get_match (GdkEvent *event,
- guint *keyval,
- GdkModifierType *modifiers)
+gdk_key_event_get_match (GdkEvent *event,
+ guint *keyval,
+ GdkModifierType *modifiers)
{
GdkModifierType mask;
guint key;
@@ -2235,8 +2235,8 @@ gdk_event_get_match (GdkEvent *event,
GdkModifierType accel_mods;
GdkModifierType consumed_modifiers;
- if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
- return FALSE;
+ g_return_val_if_fail (event->any.type == GDK_KEY_PRESS ||
+ event->any.type == GDK_KEY_RELEASE, FALSE);
mask = GDK_CONTROL_MASK|GDK_SHIFT_MASK|GDK_ALT_MASK|
GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK;
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 016186118c..d697cb8c20 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -431,30 +431,30 @@ gboolean gdk_events_get_center (GdkEvent *event1,
double *y);
/**
- * GdkEventMatch:
- * @GDK_EVENT_MATCH_NONE: The key event does not match
- * @GDK_EVENT_MATCH_PARTIAL: The key event matches if keyboard state
+ * GdkKeyMatch:
+ * @GDK_KEY_MATCH_NONE: The key event does not match
+ * @GDK_KEY_MATCH_PARTIAL: The key event matches if keyboard state
* (specifically, the currently active group) is ignored
- * @GDK_EVENT_MATCH_EXACT: The key event matches
+ * @GDK_KEY_MATCH_EXACT: The key event matches
*
- * The possible return values from gdk_event_matches()
+ * The possible return values from gdk_key_event_matches()
* describe how well an event matches a given keyval and modifiers.
*/
typedef enum {
- GDK_EVENT_MATCH_NONE,
- GDK_EVENT_MATCH_PARTIAL,
- GDK_EVENT_MATCH_EXACT
-} GdkEventMatch;
+ GDK_KEY_MATCH_NONE,
+ GDK_KEY_MATCH_PARTIAL,
+ GDK_KEY_MATCH_EXACT
+} GdkKeyMatch;
GDK_AVAILABLE_IN_ALL
-GdkEventMatch gdk_event_matches (GdkEvent *event,
- guint keyval,
- GdkModifierType modifiers);
+GdkKeyMatch gdk_key_event_matches (GdkEvent *event,
+ guint keyval,
+ GdkModifierType modifiers);
GDK_AVAILABLE_IN_ALL
-gboolean gdk_event_get_match (GdkEvent *event,
- guint *keyval,
- GdkModifierType *modifiers);
+gboolean gdk_key_event_get_match (GdkEvent *event,
+ guint *keyval,
+ GdkModifierType *modifiers);
G_END_DECLS
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index b02aebb69b..7d172432e1 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -540,7 +540,7 @@ key_controller_key_pressed (GtkEventControllerKey *key,
GdkModifierType accel_mods = 0;
guint accel_key;
- if (!gdk_event_get_match (gtk_get_current_event (), &accel_key, &accel_mods))
+ if (!gdk_key_event_get_match (gtk_get_current_event (), &accel_key, &accel_mods))
return FALSE;
if (accel_mods == 0)
diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c
index 6398b04831..a3c62ead72 100644
--- a/gtk/gtkshortcutcontroller.c
+++ b/gtk/gtkshortcutcontroller.c
@@ -313,16 +313,16 @@ gtk_shortcut_controller_run_controllers (GtkEventController *controller,
switch (gtk_shortcut_trigger_trigger (gtk_shortcut_get_trigger (shortcut), event, enable_mnemonics))
{
- case GDK_EVENT_MATCH_PARTIAL:
+ case GDK_KEY_MATCH_PARTIAL:
if (!has_exact)
break;
G_GNUC_FALLTHROUGH;
- case GDK_EVENT_MATCH_NONE:
+ case GDK_KEY_MATCH_NONE:
g_object_unref (shortcut);
continue;
- case GDK_EVENT_MATCH_EXACT:
+ case GDK_KEY_MATCH_EXACT:
if (!has_exact)
{
g_slist_free_full (shortcuts, shortcut_data_free);
diff --git a/gtk/gtkshortcuttrigger.c b/gtk/gtkshortcuttrigger.c
index ad58a14c80..30ab0411ca 100644
--- a/gtk/gtkshortcuttrigger.c
+++ b/gtk/gtkshortcuttrigger.c
@@ -59,7 +59,7 @@ struct _GtkShortcutTriggerClass
{
GObjectClass parent_class;
- GdkEventMatch (* trigger) (GtkShortcutTrigger *trigger,
+ GdkKeyMatch (* trigger) (GtkShortcutTrigger *trigger,
GdkEvent *event,
gboolean enable_mnemonics);
guint (* hash) (GtkShortcutTrigger *trigger);
@@ -96,12 +96,12 @@ gtk_shortcut_trigger_init (GtkShortcutTrigger *self)
*
* Returns: Whether the event triggered the shortcut
**/
-GdkEventMatch
+GdkKeyMatch
gtk_shortcut_trigger_trigger (GtkShortcutTrigger *self,
GdkEvent *event,
gboolean enable_mnemonics)
{
- g_return_val_if_fail (GTK_IS_SHORTCUT_TRIGGER (self), GDK_EVENT_MATCH_NONE);
+ g_return_val_if_fail (GTK_IS_SHORTCUT_TRIGGER (self), GDK_KEY_MATCH_NONE);
return GTK_SHORTCUT_TRIGGER_GET_CLASS (self)->trigger (self, event, enable_mnemonics);
}
@@ -409,12 +409,12 @@ gtk_never_trigger_finalize (GObject *gobject)
G_OBJECT_CLASS (gtk_never_trigger_parent_class)->finalize (gobject);
}
-static GdkEventMatch
+static GdkKeyMatch
gtk_never_trigger_trigger (GtkShortcutTrigger *trigger,
GdkEvent *event,
gboolean enable_mnemonics)
{
- return GDK_EVENT_MATCH_NONE;
+ return GDK_KEY_MATCH_NONE;
}
static guint
@@ -509,14 +509,14 @@ enum
static GParamSpec *keyval_props[KEYVAL_N_PROPS];
-static GdkEventMatch
+static GdkKeyMatch
gtk_keyval_trigger_trigger (GtkShortcutTrigger *trigger,
GdkEvent *event,
gboolean enable_mnemonics)
{
GtkKeyvalTrigger *self = GTK_KEYVAL_TRIGGER (trigger);
- return gdk_event_matches (event, self->keyval, self->modifiers);
+ return gdk_key_event_matches (event, self->keyval, self->modifiers);
}
static guint
@@ -752,7 +752,7 @@ enum
static GParamSpec *mnemonic_props[MNEMONIC_N_PROPS];
-static GdkEventMatch
+static GdkKeyMatch
gtk_mnemonic_trigger_trigger (GtkShortcutTrigger *trigger,
GdkEvent *event,
gboolean enable_mnemonics)
@@ -761,10 +761,10 @@ gtk_mnemonic_trigger_trigger (GtkShortcutTrigger *trigger,
guint keyval;
if (!enable_mnemonics)
- return GDK_EVENT_MATCH_NONE;
+ return GDK_KEY_MATCH_NONE;
if (gdk_event_get_event_type (event) != GDK_KEY_PRESS)
- return GDK_EVENT_MATCH_NONE;
+ return GDK_KEY_MATCH_NONE;
/* XXX: This needs to deal with groups */
keyval = gdk_key_event_get_keyval (event);
@@ -775,9 +775,9 @@ gtk_mnemonic_trigger_trigger (GtkShortcutTrigger *trigger,
keyval = gdk_keyval_to_lower (keyval);
if (keyval != self->keyval)
- return GDK_EVENT_MATCH_NONE;
+ return GDK_KEY_MATCH_NONE;
- return GDK_EVENT_MATCH_EXACT;
+ return GDK_KEY_MATCH_EXACT;
}
static guint
@@ -988,7 +988,7 @@ gtk_alternative_trigger_dispose (GObject *gobject)
G_OBJECT_CLASS (gtk_alternative_trigger_parent_class)->dispose (gobject);
}
-static GdkEventMatch
+static GdkKeyMatch
gtk_alternative_trigger_trigger (GtkShortcutTrigger *trigger,
GdkEvent *event,
gboolean enable_mnemonics)
diff --git a/gtk/gtkshortcuttrigger.h b/gtk/gtkshortcuttrigger.h
index 36f092339d..2701429c98 100644
--- a/gtk/gtkshortcuttrigger.h
+++ b/gtk/gtkshortcuttrigger.h
@@ -65,7 +65,7 @@ gint gtk_shortcut_trigger_compare (gconstpointer
gconstpointer trigger2);
GDK_AVAILABLE_IN_ALL
-GdkEventMatch gtk_shortcut_trigger_trigger (GtkShortcutTrigger *self,
+GdkKeyMatch gtk_shortcut_trigger_trigger (GtkShortcutTrigger *self,
GdkEvent *event,
gboolean enable_mnemonics);
diff --git a/testsuite/gtk/shortcuts.c b/testsuite/gtk/shortcuts.c
index e9fa23ad85..a1b93afca2 100644
--- a/testsuite/gtk/shortcuts.c
+++ b/testsuite/gtk/shortcuts.c
@@ -344,14 +344,14 @@ test_trigger_trigger (void)
guint keyval;
GdkModifierType state;
gboolean mnemonic;
- GdkEventMatch result[4];
+ GdkKeyMatch result[4];
} tests[] = {
- { GDK_KEY_a, GDK_CONTROL_MASK, FALSE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_EXACT,
GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_EXACT } },
- { GDK_KEY_a, GDK_CONTROL_MASK, TRUE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_EXACT,
GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_EXACT } },
- { GDK_KEY_a, GDK_SHIFT_MASK, FALSE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE,
GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE } },
- { GDK_KEY_a, GDK_SHIFT_MASK, TRUE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE,
GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE } },
- { GDK_KEY_u, GDK_SHIFT_MASK, FALSE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE,
GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE } },
- { GDK_KEY_u, GDK_SHIFT_MASK, TRUE, { GDK_EVENT_MATCH_NONE, GDK_EVENT_MATCH_NONE,
GDK_EVENT_MATCH_EXACT, GDK_EVENT_MATCH_EXACT } },
+ { GDK_KEY_a, GDK_CONTROL_MASK, FALSE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_EXACT, GDK_KEY_MATCH_NONE,
GDK_KEY_MATCH_EXACT } },
+ { GDK_KEY_a, GDK_CONTROL_MASK, TRUE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_EXACT, GDK_KEY_MATCH_NONE,
GDK_KEY_MATCH_EXACT } },
+ { GDK_KEY_a, GDK_SHIFT_MASK, FALSE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE,
GDK_KEY_MATCH_NONE } },
+ { GDK_KEY_a, GDK_SHIFT_MASK, TRUE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE,
GDK_KEY_MATCH_NONE } },
+ { GDK_KEY_u, GDK_SHIFT_MASK, FALSE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE,
GDK_KEY_MATCH_NONE } },
+ { GDK_KEY_u, GDK_SHIFT_MASK, TRUE, { GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_NONE, GDK_KEY_MATCH_EXACT,
GDK_KEY_MATCH_EXACT } },
};
int i, j;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]