callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Remove all non-Roman mnemonics, not just Japanese

Browse Source 
* More complete Command key patch
* Rename patches to match distribution patches
This commit is contained in:
Maia
2025-06-09 20:24:34 -07:00
parent 6efb9edc23
commit f1f0da39d0
9 changed files with 49449 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,8 +1,13 @@
gtk+3.0 (3.24.38-2.30~deb12u3) UNRELEASED; urgency=medium
gtk+3.0 (3.24.38-2.10~deb12u3) unstable; urgency=medium
* Callisto patches for bookworm
- Mnemonic delete
- Command key as primary modifier (newly reworked to be more complete)
- Symbolic accellabel (Mac-style keyboard shortcuts in menus)
- 16px toolbar icons
- Restore old gtkmessagedialog style
-- Maia <maia@tsundoku.ne.jp> Fri, 02 May 2025 09:27:57 -0700
-- Maia <maia@tsundoku.ne.jp> Tue, 09 Jun 2025 20:20:00 -0700
gtk+3.0 (3.24.38-2~deb12u3) bookworm; urgency=medium

27899
debian/patches/300_no-mnemonics.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

21538
debian/patches/301_command-key.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

0
debian/patches/gtk3_3002-symbolic-accellabel.patch → debian/patches/302_symbolic-accellabel.patch vendored
View File

0
debian/patches/gtk3_3003-toolbar-icons-16px.patch → debian/patches/303_toolbar-icons-16px.patch vendored
View File

0
debian/patches/gtk3_3004-gtkmessagedialog-style.patch → debian/patches/304_gtkmessagedialog-style.patch vendored
View File

1497
debian/patches/gtk3_3000-ja-no-mnemonics.patch vendored
View File

File diff suppressed because it is too large Load Diff

192
debian/patches/gtk3_3001-primary-accelerator-command.patch vendored
View File

@ -1,192 +0,0 @@
Description: Change primary accelerator from Control to Command
Origin: tsundoku custom patchset
Author: tsundoku <me@tsundoku.ne.jp>
Last-Update: 2020-07-07
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -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;
--- a/gtk/deprecated/gtkstock.c
+++ b/gtk/deprecated/gtkstock.c
@@ -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
{
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1953,16 +1953,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,
@@ -1977,49 +1977,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,
@@ -2048,7 +2048,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);
@@ -2057,40 +2057,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);
@@ -2120,9 +2120,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);

10
debian/patches/series vendored
View File

@ -5,8 +5,8 @@ reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
reftests-Allow-minor-differences-to-be-tolerated.patch
Stop-looking-for-modules-in-cwd.patch
atk_focus_tracker_notify.deprecated.patch
gtk3_3000-ja-no-mnemonics.patch
gtk3_3001-primary-accelerator-command.patch
gtk3_3002-symbolic-accellabel.patch
gtk3_3003-toolbar-icons-16px.patch
gtk3_3004-gtkmessagedialog-style.patch
300_no-mnemonics.patch
301_command-key.patch
302_symbolic-accellabel.patch
303_toolbar-icons-16px.patch
304_gtkmessagedialog-style.patch