From 233e612ef8977a9cfe9c53b1b5a299b23cc031e8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 16 May 2023 11:24:21 +0200 Subject: [PATCH] core: Rename MetaPadActionType to MetaPadFeatureType We want to separate pad buttons from strips and rings for purposes of labeling. Start by renaming the enum "features" to use a less englobing word. Part-of: --- src/core/display.c | 6 +-- src/core/meta-pad-action-mapper.c | 74 +++++++++++++-------------- src/core/meta-pad-action-mapper.h | 2 +- src/meta/display.h | 10 ++-- src/wayland/meta-wayland-tablet-pad.c | 12 ++--- src/wayland/meta-wayland-tablet-pad.h | 4 +- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/core/display.c b/src/core/display.c index 60b3ef898..e8c8a1d3c 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2736,14 +2736,14 @@ meta_display_request_pad_osd (MetaDisplay *display, gchar * meta_display_get_pad_action_label (MetaDisplay *display, ClutterInputDevice *pad, - MetaPadActionType action_type, + MetaPadFeatureType feature, guint action_number) { gchar *label; /* First, lookup the action, as imposed by settings */ label = meta_pad_action_mapper_get_action_label (display->pad_action_mapper, - pad, action_type, + pad, feature, action_number); if (label) return label; @@ -2764,7 +2764,7 @@ meta_display_get_pad_action_label (MetaDisplay *display, if (tablet_pad) { - label = meta_wayland_tablet_pad_get_label (tablet_pad, action_type, + label = meta_wayland_tablet_pad_get_label (tablet_pad, feature, action_number); } diff --git a/src/core/meta-pad-action-mapper.c b/src/core/meta-pad-action-mapper.c index d7e325d4e..1a0232cc9 100644 --- a/src/core/meta-pad-action-mapper.c +++ b/src/core/meta-pad-action-mapper.c @@ -65,7 +65,7 @@ struct _MetaPadActionMapper /* Pad ring/strip emission */ struct { ClutterInputDevice *pad; - MetaPadActionType action; + MetaPadFeatureType feature; guint number; double value; } last_pad_action_info; @@ -193,7 +193,7 @@ meta_pad_action_mapper_new (MetaMonitorManager *monitor_manager) static GSettings * lookup_pad_action_settings (ClutterInputDevice *device, - MetaPadActionType action, + MetaPadFeatureType feature, guint number, MetaPadDirection direction, int mode) @@ -208,18 +208,18 @@ lookup_pad_action_settings (ClutterInputDevice *device, action_label = 'A' + number; - switch (action) + switch (feature) { - case META_PAD_ACTION_BUTTON: + case META_PAD_FEATURE_BUTTON: action_type = "button"; break; - case META_PAD_ACTION_RING: + case META_PAD_FEATURE_RING: g_assert (direction == META_PAD_DIRECTION_CW || direction == META_PAD_DIRECTION_CCW); action_type = "ring"; detail_type = (direction == META_PAD_DIRECTION_CW) ? "cw" : "ccw"; break; - case META_PAD_ACTION_STRIP: + case META_PAD_FEATURE_STRIP: g_assert (direction == META_PAD_DIRECTION_UP || direction == META_PAD_DIRECTION_DOWN); action_type = "strip"; @@ -261,7 +261,7 @@ meta_pad_action_mapper_get_button_action (MetaPadActionMapper *mapper, g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad), G_DESKTOP_PAD_BUTTON_ACTION_NONE); - settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON, + settings = lookup_pad_action_settings (pad, META_PAD_FEATURE_BUTTON, button, META_PAD_DIRECTION_NONE, -1); action = g_settings_get_enum (settings, "action"); g_object_unref (settings); @@ -589,7 +589,7 @@ meta_pad_action_mapper_handle_button (MetaPadActionMapper *mapper, meta_display_request_pad_osd (display_from_mapper (mapper), pad, FALSE); return TRUE; case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING: - settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON, + settings = lookup_pad_action_settings (pad, META_PAD_FEATURE_BUTTON, button, META_PAD_DIRECTION_NONE, -1); accel = g_settings_get_string (settings, "keybinding"); meta_pad_action_mapper_emulate_keybinding (mapper, accel, is_press); @@ -608,7 +608,7 @@ meta_pad_action_mapper_get_action_direction (MetaPadActionMapper *mapper, MetaPadDirection *direction) { ClutterInputDevice *pad = clutter_event_get_device (event); - MetaPadActionType pad_action; + MetaPadFeatureType pad_feature; gboolean has_direction = FALSE; MetaPadDirection inc_dir, dec_dir; guint number; @@ -619,14 +619,14 @@ meta_pad_action_mapper_get_action_direction (MetaPadActionMapper *mapper, switch (event->type) { case CLUTTER_PAD_RING: - pad_action = META_PAD_ACTION_RING; + pad_feature = META_PAD_FEATURE_RING; number = event->pad_ring.ring_number; value = event->pad_ring.angle; inc_dir = META_PAD_DIRECTION_CW; dec_dir = META_PAD_DIRECTION_CCW; break; case CLUTTER_PAD_STRIP: - pad_action = META_PAD_ACTION_STRIP; + pad_feature = META_PAD_FEATURE_STRIP; number = event->pad_strip.strip_number; value = event->pad_strip.value; inc_dir = META_PAD_DIRECTION_DOWN; @@ -637,7 +637,7 @@ meta_pad_action_mapper_get_action_direction (MetaPadActionMapper *mapper, } if (mapper->last_pad_action_info.pad == pad && - mapper->last_pad_action_info.action == pad_action && + mapper->last_pad_action_info.feature == pad_feature && mapper->last_pad_action_info.number == number && value >= 0 && mapper->last_pad_action_info.value >= 0) { @@ -647,7 +647,7 @@ meta_pad_action_mapper_get_action_direction (MetaPadActionMapper *mapper, } mapper->last_pad_action_info.pad = pad; - mapper->last_pad_action_info.action = pad_action; + mapper->last_pad_action_info.feature = pad_feature; mapper->last_pad_action_info.number = number; mapper->last_pad_action_info.value = value; return has_direction; @@ -657,7 +657,7 @@ static gboolean meta_pad_action_mapper_handle_action (MetaPadActionMapper *mapper, ClutterInputDevice *pad, const ClutterEvent *event, - MetaPadActionType action, + MetaPadFeatureType feature, guint number, guint mode) { @@ -666,18 +666,18 @@ meta_pad_action_mapper_handle_action (MetaPadActionMapper *mapper, g_autofree char *accel1 = NULL, *accel2 = NULL; gboolean handled; - if (action == META_PAD_ACTION_RING) + if (feature == META_PAD_FEATURE_RING) { - settings1 = lookup_pad_action_settings (pad, action, number, + settings1 = lookup_pad_action_settings (pad, feature, number, META_PAD_DIRECTION_CW, mode); - settings2 = lookup_pad_action_settings (pad, action, number, + settings2 = lookup_pad_action_settings (pad, feature, number, META_PAD_DIRECTION_CCW, mode); } - else if (action == META_PAD_ACTION_STRIP) + else if (feature == META_PAD_FEATURE_STRIP) { - settings1 = lookup_pad_action_settings (pad, action, number, + settings1 = lookup_pad_action_settings (pad, feature, number, META_PAD_DIRECTION_UP, mode); - settings2 = lookup_pad_action_settings (pad, action, number, + settings2 = lookup_pad_action_settings (pad, feature, number, META_PAD_DIRECTION_DOWN, mode); } else @@ -726,12 +726,12 @@ meta_pad_action_mapper_handle_event (MetaPadActionMapper *mapper, &event->pad_button); case CLUTTER_PAD_RING: return meta_pad_action_mapper_handle_action (mapper, pad, event, - META_PAD_ACTION_RING, + META_PAD_FEATURE_RING, event->pad_ring.ring_number, event->pad_ring.mode); case CLUTTER_PAD_STRIP: return meta_pad_action_mapper_handle_action (mapper, pad, event, - META_PAD_ACTION_STRIP, + META_PAD_FEATURE_STRIP, event->pad_strip.strip_number, event->pad_strip.mode); default: @@ -804,9 +804,9 @@ meta_pad_action_mapper_get_ring_label (MetaPadActionMapper *mapper, char *label; /* We only allow keybinding actions with those */ - settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number, + settings1 = lookup_pad_action_settings (pad, META_PAD_FEATURE_RING, number, META_PAD_DIRECTION_CW, mode); - settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number, + settings2 = lookup_pad_action_settings (pad, META_PAD_FEATURE_RING, number, META_PAD_DIRECTION_CCW, mode); label = compose_directional_action_label (META_PAD_DIRECTION_CW, settings1, META_PAD_DIRECTION_CCW, settings2); @@ -826,9 +826,9 @@ meta_pad_action_mapper_get_strip_label (MetaPadActionMapper *mapper, char *label; /* We only allow keybinding actions with those */ - settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number, + settings1 = lookup_pad_action_settings (pad, META_PAD_FEATURE_STRIP, number, META_PAD_DIRECTION_UP, mode); - settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number, + settings2 = lookup_pad_action_settings (pad, META_PAD_FEATURE_STRIP, number, META_PAD_DIRECTION_DOWN, mode); label = compose_directional_action_label (META_PAD_DIRECTION_UP, settings1, META_PAD_DIRECTION_DOWN, settings2); @@ -870,7 +870,7 @@ meta_pad_action_mapper_get_button_label (MetaPadActionMapper *mapper, GSettings *settings; char *accel; - settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON, + settings = lookup_pad_action_settings (pad, META_PAD_FEATURE_BUTTON, button, META_PAD_DIRECTION_NONE, -1); accel = g_settings_get_string (settings, "keybinding"); g_object_unref (settings); @@ -893,7 +893,7 @@ meta_pad_action_mapper_get_button_label (MetaPadActionMapper *mapper, static guint get_current_pad_mode (MetaPadActionMapper *mapper, ClutterInputDevice *pad, - MetaPadActionType action_type, + MetaPadFeatureType feature, guint number) { PadMappingInfo *info; @@ -905,8 +905,8 @@ get_current_pad_mode (MetaPadActionMapper *mapper, if (!info->group_modes || n_groups == 0) return 0; - if (action_type == META_PAD_ACTION_RING || - action_type == META_PAD_ACTION_STRIP) + if (feature == META_PAD_FEATURE_RING || + feature == META_PAD_FEATURE_STRIP) { /* Assume features are evenly distributed in groups */ group = number % n_groups; @@ -918,20 +918,20 @@ get_current_pad_mode (MetaPadActionMapper *mapper, char * meta_pad_action_mapper_get_action_label (MetaPadActionMapper *mapper, ClutterInputDevice *pad, - MetaPadActionType action_type, + MetaPadFeatureType feature, guint number) { guint mode; - switch (action_type) + switch (feature) { - case META_PAD_ACTION_BUTTON: + case META_PAD_FEATURE_BUTTON: return meta_pad_action_mapper_get_button_label (mapper, pad, number); - case META_PAD_ACTION_RING: - mode = get_current_pad_mode (mapper, pad, action_type, number); + case META_PAD_FEATURE_RING: + mode = get_current_pad_mode (mapper, pad, feature, number); return meta_pad_action_mapper_get_ring_label (mapper, pad, number, mode); - case META_PAD_ACTION_STRIP: - mode = get_current_pad_mode (mapper, pad, action_type, number); + case META_PAD_FEATURE_STRIP: + mode = get_current_pad_mode (mapper, pad, feature, number); return meta_pad_action_mapper_get_strip_label (mapper, pad, number, mode); } diff --git a/src/core/meta-pad-action-mapper.h b/src/core/meta-pad-action-mapper.h index 63fc2261b..642d4e82a 100644 --- a/src/core/meta-pad-action-mapper.h +++ b/src/core/meta-pad-action-mapper.h @@ -40,7 +40,7 @@ gboolean meta_pad_action_mapper_handle_event (MetaPadActionMapper *mapper, const ClutterEvent *event); gchar * meta_pad_action_mapper_get_action_label (MetaPadActionMapper *mapper, ClutterInputDevice *pad, - MetaPadActionType action, + MetaPadFeatureType feature, guint number); #endif /* META_PAD_ACTION_MAPPER_H */ diff --git a/src/meta/display.h b/src/meta/display.h index 78048e5e2..10e3e1400 100644 --- a/src/meta/display.h +++ b/src/meta/display.h @@ -58,10 +58,10 @@ typedef enum typedef enum { - META_PAD_ACTION_BUTTON, /* Action is a button */ - META_PAD_ACTION_RING, /* Action is a ring */ - META_PAD_ACTION_STRIP, /* Action is a strip */ -} MetaPadActionType; + META_PAD_FEATURE_BUTTON, + META_PAD_FEATURE_RING, + META_PAD_FEATURE_STRIP, +} MetaPadFeatureType; typedef struct _MetaDisplayClass MetaDisplayClass; @@ -195,7 +195,7 @@ void meta_display_request_pad_osd (MetaDisplay *display, META_EXPORT gchar * meta_display_get_pad_action_label (MetaDisplay *display, ClutterInputDevice *pad, - MetaPadActionType action_type, + MetaPadFeatureType feature_type, guint action_number); META_EXPORT diff --git a/src/wayland/meta-wayland-tablet-pad.c b/src/wayland/meta-wayland-tablet-pad.c index 55bfe1fe6..cafd76cba 100644 --- a/src/wayland/meta-wayland-tablet-pad.c +++ b/src/wayland/meta-wayland-tablet-pad.c @@ -535,22 +535,22 @@ meta_wayland_tablet_pad_label_mode_switch_button (MetaWaylandTabletPad *pad, gchar * meta_wayland_tablet_pad_get_label (MetaWaylandTabletPad *pad, - MetaPadActionType type, - guint action) + MetaPadFeatureType feature, + guint action) { const gchar *label = NULL; gchar *mode_label; - switch (type) + switch (feature) { - case META_PAD_ACTION_BUTTON: + case META_PAD_FEATURE_BUTTON: mode_label = meta_wayland_tablet_pad_label_mode_switch_button (pad, action); if (mode_label) return mode_label; label = g_hash_table_lookup (pad->feedback, GUINT_TO_POINTER (action)); break; - case META_PAD_ACTION_RING: + case META_PAD_FEATURE_RING: { MetaWaylandTabletPadRing *ring; @@ -559,7 +559,7 @@ meta_wayland_tablet_pad_get_label (MetaWaylandTabletPad *pad, label = ring->feedback; break; } - case META_PAD_ACTION_STRIP: + case META_PAD_FEATURE_STRIP: { MetaWaylandTabletPadStrip *strip; diff --git a/src/wayland/meta-wayland-tablet-pad.h b/src/wayland/meta-wayland-tablet-pad.h index 63eaa03ed..aaa39dc34 100644 --- a/src/wayland/meta-wayland-tablet-pad.h +++ b/src/wayland/meta-wayland-tablet-pad.h @@ -75,7 +75,7 @@ void meta_wayland_tablet_pad_set_focus (MetaWaylandTabletPad * MetaWaylandSurface *surface); gchar * meta_wayland_tablet_pad_get_label (MetaWaylandTabletPad *pad, - MetaPadActionType type, - guint action); + MetaPadFeatureType feature, + guint action); #endif /* META_WAYLAND_TABLET_PAD_H */