callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
47b4a0fa101102ef3e954324bbe087784e82b20b
gtk3/debian/patches/3001_primary-accelerator-command.patch

1283 lines
60 KiB
Diff
Raw Blame History

Description: Use Command as primary modifier (new and more comprehensive)
Origin: Callisto Desktop
Author: Maia <maia@tsundoku.ne.jp>
Last-Update: 2025-06-09 gtk+3.0 3.24.49
diff -urN a/gdk/gdkkeys.c b/gdk/gdkkeys.c
--- a/gdk/gdkkeys.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gdk/gdkkeys.c 2025-06-09 11:48:59.566799986 -0700
@@ -638,7 +638,7 @@
switch (intent)
{
case GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR:
- return GDK_CONTROL_MASK;
+ return GDK_SUPER_MASK;
case GDK_MODIFIER_INTENT_CONTEXT_MENU:
return 0;
@@ -647,10 +647,10 @@
return GDK_SHIFT_MASK;
case GDK_MODIFIER_INTENT_MODIFY_SELECTION:
- return GDK_CONTROL_MASK;
+ return GDK_SUPER_MASK;
case GDK_MODIFIER_INTENT_NO_TEXT_INPUT:
- return GDK_MOD1_MASK | GDK_CONTROL_MASK;
+ return GDK_MOD1_MASK | GDK_SUPER_MASK | GDK_CONTROL_MASK;
case GDK_MODIFIER_INTENT_SHIFT_GROUP:
return 0;
diff -urN a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
--- a/gdk/x11/gdkdnd-x11.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gdk/x11/gdkdnd-x11.c 2025-06-09 13:01:33.269570451 -0700
@@ -2892,9 +2892,9 @@
*suggested_action = GDK_ACTION_ASK;
*possible_actions = actions;
}
- else if (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
+ else if (state & (GDK_SHIFT_MASK | GDK_SUPER_MASK))
{
- if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK))
+ if ((state & GDK_SHIFT_MASK) && (state & GDK_SUPER_MASK))
{
if (actions & GDK_ACTION_LINK)
{
@@ -2902,7 +2902,7 @@
*possible_actions = GDK_ACTION_LINK;
}
}
- else if (state & GDK_CONTROL_MASK)
+ else if (state & GDK_SUPER_MASK)
{
if (actions & GDK_ACTION_COPY)
{
diff -urN a/gtk/deprecated/gtkstock.c b/gtk/deprecated/gtkstock.c
--- a/gtk/deprecated/gtkstock.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/deprecated/gtkstock.c 2025-06-09 11:48:59.566799986 -0700
@@ -104,7 +104,7 @@
{
item = gtk_stock_item_copy (item);
((GtkStockItem *)item)->modifier = (NON_STATIC_MASK |
- _gtk_get_primary_accel_mod ());
+ GDK_SUPER_MASK);
}
else
{
diff -urN a/gtk/gtkdnd.c b/gtk/gtkdnd.c
--- a/gtk/gtkdnd.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkdnd.c 2025-06-09 13:03:23.998533938 -0700
@@ -708,9 +708,9 @@
*suggested_action = GDK_ACTION_ASK;
*possible_actions = actions;
}
- else if (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
+ else if (state & (GDK_SHIFT_MASK | GDK_SUPER_MASK))
{
- if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK))
+ if ((state & GDK_SHIFT_MASK) && (state & GDK_SUPER_MASK))
{
if (actions & GDK_ACTION_LINK)
{
@@ -718,7 +718,7 @@
*possible_actions = GDK_ACTION_LINK;
}
}
- else if (state & GDK_CONTROL_MASK)
+ else if (state & GDK_SUPER_MASK)
{
if (actions & GDK_ACTION_COPY)
{
diff -urN a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
--- a/gtk/gtkemojichooser.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkemojichooser.c 2025-06-09 13:04:27.132242310 -0700
@@ -266,7 +266,7 @@
gdk_device_get_state (device, gtk_widget_get_window (GTK_WIDGET (chooser)),
NULL, &state);
- return (state & GDK_CONTROL_MASK) == 0;
+ return (state & GDK_SUPER_MASK) == 0;
}
static void
diff -urN a/gtk/gtkentry.c b/gtk/gtkentry.c
--- a/gtk/gtkentry.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkentry.c 2025-06-09 13:05:33.993579880 -0700
@@ -1963,16 +1963,16 @@
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_KEY_Home, 0,
@@ -1987,49 +1987,49 @@
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
/* Select all
*/
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* Unselect all
*/
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"move-cursor", 3,
GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 0,
@@ -2058,7 +2058,7 @@
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
"backspace", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_u, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_u, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, -1);
@@ -2067,40 +2067,40 @@
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
"backspace", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_SUPER_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_SUPER_MASK,
"copy-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_SUPER_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SUPER_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_SUPER_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
@@ -2111,7 +2111,7 @@
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, 0,
"toggle-overwrite", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_t, GDK_CONTROL_MASK|GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_t, GDK_SUPER_MASK|GDK_SHIFT_MASK,
"toggle-direction", 0);
/**
* GtkEntry:inner-border:
@@ -2132,9 +2132,9 @@
GTK_PARAM_READABLE |
G_PARAM_DEPRECATED));
/* Emoji */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_period, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_period, GDK_SUPER_MASK,
"insert-emoji", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_SUPER_MASK,
"insert-emoji", 0);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
diff -urN a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
--- a/gtk/gtkfilechooserentry.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkfilechooserentry.c 2025-06-09 14:03:17.549485300 -0700
@@ -524,6 +524,10 @@
(state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
return FALSE;
+ if (gtk_get_current_event_state (&state) &&
+ (state & GDK_SUPER_MASK) == GDK_SUPER_MASK)
+ return FALSE;
+
/* This is a bit evil -- it makes Tab never leave the entry. It basically
* makes it 'safe' for people to hit. */
gtk_editable_get_selection_bounds (editable, &start, &end);
diff -urN a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
--- a/gtk/gtkfilechooserwidget.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkfilechooserwidget.c 2025-06-09 14:13:54.894082506 -0700
@@ -8577,21 +8577,21 @@
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_l, GDK_CONTROL_MASK,
+ GDK_KEY_l, GDK_SUPER_MASK,
"location-toggle-popup",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_v, GDK_CONTROL_MASK,
+ GDK_KEY_v, GDK_SUPER_MASK,
"location-popup-on-paste",
0);
add_normal_and_shifted_binding (binding_set,
- GDK_KEY_Up, GDK_MOD1_MASK,
+ GDK_KEY_Up, GDK_SUPER_MASK,
"up-folder");
add_normal_and_shifted_binding (binding_set,
- GDK_KEY_KP_Up, GDK_MOD1_MASK,
+ GDK_KEY_KP_Up, GDK_SUPER_MASK,
"up-folder");
add_normal_and_shifted_binding (binding_set,
@@ -8602,6 +8602,10 @@
"down-folder");
gtk_binding_entry_add_signal (binding_set,
+ GDK_KEY_h, GDK_SHIFT_MASK | GDK_SUPER_MASK,
+ "home-folder",
+ 0);
+ gtk_binding_entry_add_signal (binding_set,
GDK_KEY_Home, GDK_MOD1_MASK,
"home-folder",
0);
@@ -8610,27 +8614,23 @@
"home-folder",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_d, GDK_MOD1_MASK,
+ GDK_KEY_d, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"desktop-folder",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_h, GDK_CONTROL_MASK,
+ GDK_KEY_h, GDK_SUPER_MASK,
"show-hidden",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_s, GDK_MOD1_MASK,
- "search-shortcut",
- 0);
- gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_f, GDK_CONTROL_MASK,
+ GDK_KEY_f, GDK_SUPER_MASK,
"search-shortcut",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_r, GDK_MOD1_MASK,
+ GDK_KEY_r, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"recent-shortcut",
0);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_p, GDK_MOD1_MASK,
+ GDK_KEY_p, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"places-shortcut",
0);
diff -urN a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
--- a/gtk/gtkflowbox.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkflowbox.c 2025-06-09 14:15:23.445274245 -0700
@@ -3386,7 +3386,7 @@
{
GdkDisplay *display;
GdkModifierType extend_mod_mask = GDK_SHIFT_MASK;
- GdkModifierType modify_mod_mask = GDK_CONTROL_MASK;
+ GdkModifierType modify_mod_mask = GDK_SUPER_MASK;
display = gdk_display_get_default ();
if (display)
@@ -4090,14 +4090,14 @@
gtk_flow_box_add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SUPER_MASK,
"toggle-cursor-child", 0, NULL);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_SUPER_MASK,
"toggle-cursor-child", 0, NULL);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"select-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK | GDK_SHIFT_MASK,
"unselect-all", 0);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FLOW_BOX_ACCESSIBLE);
diff -urN a/gtk/gtkiconview.c b/gtk/gtkiconview.c
--- a/gtk/gtkiconview.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkiconview.c 2025-06-09 15:30:08.796412321 -0700
@@ -899,13 +899,13 @@
_gtk_marshal_BOOLEAN__ENUM_INTv);
/* Key bindings */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"select-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK | GDK_SHIFT_MASK,
"unselect-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SUPER_MASK,
"toggle-cursor-item", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_SUPER_MASK,
"toggle-cursor-item", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
@@ -929,10 +929,10 @@
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
- gtk_icon_view_add_move_binding (binding_set, GDK_KEY_p, GDK_CONTROL_MASK,
+ gtk_icon_view_add_move_binding (binding_set, GDK_KEY_p, GDK_SUPER_MASK,
GTK_MOVEMENT_DISPLAY_LINES, -1);
- gtk_icon_view_add_move_binding (binding_set, GDK_KEY_n, GDK_CONTROL_MASK,
+ gtk_icon_view_add_move_binding (binding_set, GDK_KEY_n, GDK_SUPER_MASK,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_icon_view_add_move_binding (binding_set, GDK_KEY_Home, 0,
@@ -2446,7 +2446,7 @@
static gboolean
button_event_modifies_selection (GdkEventButton *event)
{
- return (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
+ return (event->state & (GDK_SUPER_MASK | GDK_SHIFT_MASK)) != 0;
}
static gboolean
@@ -3651,15 +3651,15 @@
G_TYPE_ENUM, step,
G_TYPE_INT, count);
- if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+ if ((modmask & GDK_SUPER_MASK) == GDK_SUPER_MASK)
return;
- gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, keyval, GDK_SUPER_MASK | GDK_SHIFT_MASK,
"move-cursor", 2,
G_TYPE_ENUM, step,
G_TYPE_INT, count);
- gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keyval, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, step,
G_TYPE_INT, count);
diff -urN a/gtk/gtklabel.c b/gtk/gtklabel.c
--- a/gtk/gtklabel.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtklabel.c 2025-06-09 15:34:11.324839546 -0700
@@ -1097,57 +1097,57 @@
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_KEY_f, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_f, GDK_SUPER_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
- add_move_binding (binding_set, GDK_KEY_b, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_b, GDK_SUPER_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
/* select all */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* unselect all */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_SUPER_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
@@ -1171,20 +1171,20 @@
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
/* copy */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_SUPER_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
diff -urN a/gtk/gtklistbox.c b/gtk/gtklistbox.c
--- a/gtk/gtklistbox.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtklistbox.c 2025-06-09 15:37:12.751233882 -0700
@@ -653,14 +653,14 @@
gtk_list_box_add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SUPER_MASK,
"toggle-cursor-row", 0, NULL);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_SUPER_MASK,
"toggle-cursor-row", 0, NULL);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"select-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK | GDK_SHIFT_MASK,
"unselect-all", 0);
gtk_widget_class_set_css_name (widget_class, "list");
@@ -1488,7 +1488,7 @@
{
GdkDisplay *display;
GdkModifierType extend_mod_mask = GDK_SHIFT_MASK;
- GdkModifierType modify_mod_mask = GDK_CONTROL_MASK;
+ GdkModifierType modify_mod_mask = GDK_SUPER_MASK;
display = gdk_display_get_default ();
if (display)
diff -urN a/gtk/gtknotebook.c b/gtk/gtknotebook.c
--- a/gtk/gtknotebook.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtknotebook.c 2025-06-09 16:12:07.387442017 -0700
@@ -622,10 +622,10 @@
{
guint keypad_keysym = keysym - GDK_KEY_Left + GDK_KEY_KP_Left;
- gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keysym, GDK_SUPER_MASK,
"move_focus_out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
- gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_SUPER_MASK,
"move_focus_out", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@@ -1246,20 +1246,20 @@
GTK_TYPE_NOTEBOOK_TAB, GTK_NOTEBOOK_TAB_LAST);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_Page_Up, GDK_CONTROL_MASK,
+ GDK_KEY_Page_Up, GDK_SUPER_MASK,
"change-current-page", 1,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_Page_Down, GDK_CONTROL_MASK,
+ GDK_KEY_Page_Down, GDK_SUPER_MASK,
"change-current-page", 1,
G_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_Page_Up, GDK_CONTROL_MASK | GDK_MOD1_MASK,
+ GDK_KEY_Page_Up, GDK_SUPER_MASK | GDK_MOD1_MASK,
"change-current-page", 1,
G_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_Page_Down, GDK_CONTROL_MASK | GDK_MOD1_MASK,
+ GDK_KEY_Page_Down, GDK_SUPER_MASK | GDK_MOD1_MASK,
"change-current-page", 1,
G_TYPE_INT, 1);
@@ -1277,8 +1277,8 @@
add_reorder_bindings (binding_set, GDK_KEY_End, GTK_DIR_RIGHT, TRUE);
add_reorder_bindings (binding_set, GDK_KEY_End, GTK_DIR_DOWN, TRUE);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+ add_tab_bindings (binding_set, GDK_MOD1L_MASK, GTK_DIR_TAB_FORWARD);
+ add_tab_bindings (binding_set, GDK_MOD1_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
gtk_container_class_handle_border_width (container_class);
diff -urN a/gtk/gtkpaned.c b/gtk/gtkpaned.c
--- a/gtk/gtkpaned.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkpaned.c 2025-06-09 16:15:53.172751398 -0700
@@ -637,9 +637,9 @@
G_TYPE_BOOLEAN, TRUE);
add_tab_bindings (binding_set, 0);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK);
+ add_tab_bindings (binding_set, GDK_SUPER_MASK);
add_tab_bindings (binding_set, GDK_SHIFT_MASK);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK);
+ add_tab_bindings (binding_set, GDK_SUPER_MASK | GDK_SHIFT_MASK);
/* accept and cancel positions */
gtk_binding_entry_add_signal (binding_set,
@@ -665,25 +665,25 @@
/* move handle */
add_move_binding (binding_set, GDK_KEY_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_KEY_KP_Left, 0, GTK_SCROLL_STEP_LEFT);
- add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
- add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_LEFT);
+ add_move_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK, GTK_SCROLL_PAGE_LEFT);
+ add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK, GTK_SCROLL_PAGE_LEFT);
add_move_binding (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_RIGHT);
- add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
+ add_move_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_KP_Right, 0, GTK_SCROLL_STEP_RIGHT);
- add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_RIGHT);
+ add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_STEP_UP);
- add_move_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
+ add_move_binding (binding_set, GDK_KEY_Up, GDK_SUPER_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_KP_Up, 0, GTK_SCROLL_STEP_UP);
- add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_UP);
+ add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_SUPER_MASK, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_KP_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_move_binding (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_STEP_DOWN);
- add_move_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
+ add_move_binding (binding_set, GDK_KEY_Down, GDK_SUPER_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_KEY_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
- add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_DOWN);
+ add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_SUPER_MASK, GTK_SCROLL_PAGE_DOWN);
add_move_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0, GTK_SCROLL_PAGE_RIGHT);
diff -urN a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
--- a/gtk/gtkplacessidebar.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkplacessidebar.c 2025-06-09 15:44:24.356937307 -0700
@@ -3479,7 +3479,7 @@
if ((event->state & modifiers) == GDK_SHIFT_MASK)
open_flags = GTK_PLACES_OPEN_NEW_TAB;
- else if ((event->state & modifiers) == GDK_CONTROL_MASK)
+ else if ((event->state & modifiers) == GDK_SUPER_MASK)
open_flags = GTK_PLACES_OPEN_NEW_WINDOW;
open_row (GTK_SIDEBAR_ROW (row), open_flags);
@@ -3831,7 +3831,7 @@
{
GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;
- open_flags = (event->state & GDK_CONTROL_MASK) ?
+ open_flags = (event->state & GDK_SUPER_MASK) ?
GTK_PLACES_OPEN_NEW_WINDOW :
GTK_PLACES_OPEN_NEW_TAB;
diff -urN a/gtk/gtkscale.c b/gtk/gtkscale.c
--- a/gtk/gtkscale.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkscale.c 2025-06-09 15:46:08.394687441 -0700
@@ -835,55 +835,55 @@
add_slider_binding (binding_set, GDK_KEY_Left, 0,
GTK_SCROLL_STEP_LEFT);
- add_slider_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_SCROLL_STEP_LEFT);
- add_slider_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_KEY_Right, 0,
GTK_SCROLL_STEP_RIGHT);
- add_slider_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_SCROLL_STEP_RIGHT);
- add_slider_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_KEY_Up, 0,
GTK_SCROLL_STEP_UP);
- add_slider_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Up, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_KEY_KP_Up, 0,
GTK_SCROLL_STEP_UP);
- add_slider_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Up, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_UP);
add_slider_binding (binding_set, GDK_KEY_Down, 0,
GTK_SCROLL_STEP_DOWN);
- add_slider_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Down, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_DOWN);
add_slider_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_SCROLL_STEP_DOWN);
- add_slider_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Down, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_DOWN);
- add_slider_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Page_Up, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_LEFT);
- add_slider_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_LEFT);
add_slider_binding (binding_set, GDK_KEY_Page_Up, 0,
@@ -892,10 +892,10 @@
add_slider_binding (binding_set, GDK_KEY_KP_Page_Up, 0,
GTK_SCROLL_PAGE_UP);
- add_slider_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_Page_Down, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_RIGHT);
- add_slider_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_RIGHT);
add_slider_binding (binding_set, GDK_KEY_Page_Down, 0,
@@ -912,10 +912,10 @@
add_slider_binding (binding_set, GDK_KEY_minus, 0,
GTK_SCROLL_STEP_BACKWARD);
- add_slider_binding (binding_set, GDK_KEY_plus, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_plus, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_FORWARD);
- add_slider_binding (binding_set, GDK_KEY_minus, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_minus, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_BACKWARD);
@@ -925,10 +925,10 @@
add_slider_binding (binding_set, GDK_KEY_KP_Subtract, 0,
GTK_SCROLL_STEP_BACKWARD);
- add_slider_binding (binding_set, GDK_KEY_KP_Add, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Add, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_FORWARD);
- add_slider_binding (binding_set, GDK_KEY_KP_Subtract, GDK_CONTROL_MASK,
+ add_slider_binding (binding_set, GDK_KEY_KP_Subtract, GDK_SUPER_MASK,
GTK_SCROLL_PAGE_BACKWARD);
diff -urN a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
--- a/gtk/gtkscrolledwindow.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkscrolledwindow.c 2025-06-09 16:17:27.455300733 -0700
@@ -878,23 +878,23 @@
binding_set = gtk_binding_set_by_class (class);
- add_scroll_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
- add_scroll_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, TRUE);
- add_scroll_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
- add_scroll_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD, FALSE);
+ add_scroll_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK, GTK_SCROLL_STEP_BACKWARD, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK, GTK_SCROLL_STEP_FORWARD, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_Up, GDK_SUPER_MASK, GTK_SCROLL_STEP_BACKWARD, FALSE);
+ add_scroll_binding (binding_set, GDK_KEY_Down, GDK_SUPER_MASK, GTK_SCROLL_STEP_FORWARD, FALSE);
- add_scroll_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
- add_scroll_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_PAGE_FORWARD, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_Page_Up, GDK_SUPER_MASK, GTK_SCROLL_PAGE_BACKWARD, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_Page_Down, GDK_SUPER_MASK, GTK_SCROLL_PAGE_FORWARD, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_BACKWARD, FALSE);
add_scroll_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_FORWARD, FALSE);
- add_scroll_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK, GTK_SCROLL_START, TRUE);
- add_scroll_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK, GTK_SCROLL_END, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_Home, GDK_SUPER_MASK, GTK_SCROLL_START, TRUE);
+ add_scroll_binding (binding_set, GDK_KEY_End, GDK_SUPER_MASK, GTK_SCROLL_END, TRUE);
add_scroll_binding (binding_set, GDK_KEY_Home, 0, GTK_SCROLL_START, FALSE);
add_scroll_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END, FALSE);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+ add_tab_bindings (binding_set, GDK_MOD1_MASK, GTK_DIR_TAB_FORWARD);
+ add_tab_bindings (binding_set, GDK_MOD1_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "scrolledwindow");
diff -urN a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
--- a/gtk/gtksearchentry.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtksearchentry.c 2025-06-09 15:48:26.465064095 -0700
@@ -254,9 +254,9 @@
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_SUPER_MASK,
"next-match", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_g, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"previous-match", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0,
"stop-search", 0);
@@ -409,7 +409,7 @@
keyval == GDK_KEY_End || keyval == GDK_KEY_KP_End ||
keyval == GDK_KEY_Page_Up || keyval == GDK_KEY_KP_Page_Up ||
keyval == GDK_KEY_Page_Down || keyval == GDK_KEY_KP_Page_Down ||
- ((state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) != 0))
+ ((state & (GDK_SUPER_MASK | GDK_MOD1_MASK)) != 0))
return TRUE;
/* Other navigation events should get automatically
diff -urN a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
--- a/gtk/gtkspinbutton.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkspinbutton.c 2025-06-09 15:49:40.097790987 -0700
@@ -587,10 +587,10 @@
add_spin_binding (binding_set, GDK_KEY_KP_Down, 0, GTK_SCROLL_STEP_DOWN);
add_spin_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_UP);
add_spin_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_DOWN);
- add_spin_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK, GTK_SCROLL_END);
- add_spin_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK, GTK_SCROLL_START);
- add_spin_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
- add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
+ add_spin_binding (binding_set, GDK_KEY_End, GDK_SUPER_MASK, GTK_SCROLL_END);
+ add_spin_binding (binding_set, GDK_KEY_Home, GDK_SUPER_MASK, GTK_SCROLL_START);
+ add_spin_binding (binding_set, GDK_KEY_Page_Up, GDK_SUPER_MASK, GTK_SCROLL_END);
+ add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_SUPER_MASK, GTK_SCROLL_START);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPIN_BUTTON_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "spinbutton");
diff -urN a/gtk/gtktextview.c b/gtk/gtktextview.c
--- a/gtk/gtktextview.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtktextview.c 2025-06-09 16:19:18.940139675 -0700
@@ -1502,16 +1502,16 @@
add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK,
GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_KEY_Up, 0,
@@ -1526,16 +1526,16 @@
add_move_binding (binding_set, GDK_KEY_KP_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
- add_move_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Up, GDK_SUPER_MASK,
GTK_MOVEMENT_PARAGRAPHS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Up, GDK_SUPER_MASK,
GTK_MOVEMENT_PARAGRAPHS, -1);
- add_move_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Down, GDK_SUPER_MASK,
GTK_MOVEMENT_PARAGRAPHS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Down, GDK_SUPER_MASK,
GTK_MOVEMENT_PARAGRAPHS, 1);
add_move_binding (binding_set, GDK_KEY_Home, 0,
@@ -1550,16 +1550,16 @@
add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
- add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_End, GDK_SUPER_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_KEY_Page_Up, 0,
@@ -1574,33 +1574,33 @@
add_move_binding (binding_set, GDK_KEY_KP_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
- add_move_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Page_Up, GDK_SUPER_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
- add_move_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Page_Up, GDK_SUPER_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, -1);
- add_move_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Page_Down, GDK_SUPER_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
- add_move_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Page_Down, GDK_SUPER_MASK,
GTK_MOVEMENT_HORIZONTAL_PAGES, 1);
/* Select all */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, TRUE);
/* Unselect all */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_SUPER_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"select-all", 1,
G_TYPE_BOOLEAN, FALSE);
@@ -1622,55 +1622,55 @@
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK,
"backspace", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
G_TYPE_INT, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SHIFT_MASK | GDK_SUPER_MASK,
"delete-from-cursor", 2,
G_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
G_TYPE_INT, -1);
/* Cut/copy/paste */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_x, GDK_SUPER_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_SUPER_MASK,
"copy-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_v, GDK_SUPER_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_SUPER_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK,
"cut-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SUPER_MASK,
"copy-clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK,
"paste-clipboard", 0);
@@ -1682,9 +1682,9 @@
"toggle-overwrite", 0);
/* Emoji */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_period, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_period, GDK_SUPER_MASK,
"insert-emoji", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_SUPER_MASK,
"insert-emoji", 0);
/* Caret mode */
@@ -1692,17 +1692,17 @@
"toggle-cursor-visible", 0);
/* Control-tab focus motion */
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_MOD1_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_MOD1_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, GDK_SHIFT_MASK | GDK_MOD1_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, GDK_SHIFT_MASK | GDK_MOD1_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
@@ -5527,11 +5527,12 @@
gtk_text_view_commit_text (text_view, "\n");
retval = TRUE;
}
- /* Pass through Tab as literal tab, unless Control is held down */
+ /* Pass through Tab as literal tab, unless Command or Control is held down */
else if ((event->keyval == GDK_KEY_Tab ||
event->keyval == GDK_KEY_KP_Tab ||
event->keyval == GDK_KEY_ISO_Left_Tab) &&
- !(event->state & GDK_CONTROL_MASK))
+ !(event->state & GDK_MOD1_MASK)) &&
+ !(event->state & GDK_SUPER_MASK)
{
/* If the text widget isn't editable overall, or if the application
* has turned off "accepts_tab", move the focus instead
diff -urN a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
--- a/gtk/gtktoolbar.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtktoolbar.c 2025-06-09 16:20:26.305401667 -0700
@@ -379,11 +379,11 @@
GtkDirectionType direction)
{
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_Tab, GDK_CONTROL_MASK | modifiers,
+ GDK_KEY_Tab, GDK_MOD1_MASK | modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_KP_Tab, GDK_CONTROL_MASK | modifiers,
+ GDK_KEY_KP_Tab, GDK_MOD1_MASK | modifiers,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
diff -urN a/gtk/gtktreeview.c b/gtk/gtktreeview.c
--- a/gtk/gtktreeview.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtktreeview.c 2025-06-09 15:53:32.390819395 -0700
@@ -1609,10 +1609,10 @@
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_KP_Down, 0, TRUE,
GTK_MOVEMENT_DISPLAY_LINES, 1);
- gtk_tree_view_add_move_binding (binding_set, GDK_KEY_p, GDK_CONTROL_MASK, FALSE,
+ gtk_tree_view_add_move_binding (binding_set, GDK_KEY_p, GDK_SUPER_MASK, FALSE,
GTK_MOVEMENT_DISPLAY_LINES, -1);
- gtk_tree_view_add_move_binding (binding_set, GDK_KEY_n, GDK_CONTROL_MASK, FALSE,
+ gtk_tree_view_add_move_binding (binding_set, GDK_KEY_n, GDK_SUPER_MASK, FALSE,
GTK_MOVEMENT_DISPLAY_LINES, 1);
gtk_tree_view_add_move_binding (binding_set, GDK_KEY_Home, 0, TRUE,
@@ -1652,34 +1652,34 @@
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
G_TYPE_INT, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK, "toggle-cursor-row", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SUPER_MASK, "toggle-cursor-row", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_SUPER_MASK, "toggle-cursor-row", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK, "select-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK, "select-all", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SUPER_MASK, "select-all", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_SUPER_MASK, "select-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_A, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK, "unselect-all", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_A, GDK_SUPER_MASK | GDK_SHIFT_MASK, "unselect-all", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_SUPER_MASK, "unselect-all", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_SHIFT_MASK, "select-cursor-row", 1,
G_TYPE_BOOLEAN, TRUE);
@@ -1753,13 +1753,13 @@
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right,
- GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ GDK_SUPER_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right,
- GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ GDK_SUPER_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE,
@@ -1792,24 +1792,24 @@
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left,
- GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ GDK_SUPER_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left,
- GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ GDK_SUPER_MASK | GDK_SHIFT_MASK,
"expand-collapse-cursor-row", 3,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, FALSE,
G_TYPE_BOOLEAN, TRUE);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0, "select-cursor-parent", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_CONTROL_MASK, "select-cursor-parent", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, GDK_SUPER_MASK, "select-cursor-parent", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_f, GDK_CONTROL_MASK, "start-interactive-search", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_f, GDK_SUPER_MASK, "start-interactive-search", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_SUPER_MASK, "start-interactive-search", 0);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TREE_VIEW_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "treeview");
@@ -9886,15 +9886,15 @@
G_TYPE_ENUM, step,
G_TYPE_INT, count);
- if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+ if ((modmask & GDK_SUPER_MASK) == GDK_SUPER_MASK)
return;
- gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ gtk_binding_entry_add_signal (binding_set, keyval, GDK_SUPER_MASK | GDK_SHIFT_MASK,
"move-cursor", 2,
G_TYPE_ENUM, step,
G_TYPE_INT, count);
- gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keyval, GDK_SUPER_MASK,
"move-cursor", 2,
G_TYPE_ENUM, step,
G_TYPE_INT, count);
diff -urN a/gtk/gtkwindow.c b/gtk/gtkwindow.c
--- a/gtk/gtkwindow.c 2025-03-05 15:31:26.000000000 -0800
+++ b/gtk/gtkwindow.c 2025-06-09 16:20:58.830149911 -0700
@@ -641,13 +641,13 @@
gtk_binding_entry_add_signal (binding_set, keysym, 0,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
- gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keysym, GDK_SUPER_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
- gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_SUPER_MASK,
"move-focus", 1,
GTK_TYPE_DIRECTION_TYPE, direction);
}
@@ -1268,9 +1268,9 @@
add_arrow_bindings (binding_set, GDK_KEY_Right, GTK_DIR_RIGHT);
add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
+ add_tab_bindings (binding_set, GDK_MOD1_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+ add_tab_bindings (binding_set, GDK_MOD1_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_WINDOW_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "window");
Reference in New Issue View Git Blame Copy Permalink