Skip to content

Commit 1442896

Browse files
committed
[Gtk] Simplify Widget.gdk_event_get_state
It's used only in Gtk 3 implementation thus rename to indicate that and drop if/else covering non-reachable Gtk 4.
1 parent 0ae60e3 commit 1442896

5 files changed

Lines changed: 8 additions & 17 deletions

File tree

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2025 IBM Corporation and others.
2+
* Copyright (c) 2000, 2026 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -965,7 +965,7 @@ long gtk3_button_release_event (long widget, long event) {
965965
* @param event the gtk key press event that was fired.
966966
*/
967967
void keyPressDefaultSelectionHandler (long event, int key) {
968-
int keymask = gdk_event_get_state (event);
968+
int keymask = gdk3_event_get_state (event);
969969
switch (key) {
970970
case GDK.GDK_Return:
971971
// Send DefaultSelectionEvent when:

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,13 +1793,8 @@ long gtk3_key_press_event (long widget, long event) {
17931793
if (keyval [0] != 0) {
17941794
int [] key = new int [1];
17951795
int [] state = new int[1];
1796-
if (GTK.GTK4) {
1797-
key[0] = GDK.gdk_key_event_get_keyval(event);
1798-
state[0] = GDK.gdk_event_get_modifier_state(event);
1799-
} else {
1800-
GDK.gdk_event_get_keyval(event, key);
1801-
GDK.gdk_event_get_state(event, state);
1802-
}
1796+
GDK.gdk_event_get_keyval(event, key);
1797+
GDK.gdk_event_get_state(event, state);
18031798

18041799
int mask = GTK.gtk_accelerator_get_default_mod_mask ();
18051800
if (key[0] == keyval [0] && (state[0] & mask) == (mods [0] & mask)) {

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@ long gtk3_key_press_event (long widget, long event) {
21492149
// when : Enter, Shift+Enter, Ctrl+Enter are pressed.
21502150
// Not when: Alt+Enter, (Meta|Super|Hyper)+Enter, reason is stateMask is not provided on Gtk.
21512151
// Note: alt+Enter creates a selection on GTK, but we filter it out to be a bit more consitent Win32 (521387)
2152-
int keymask = gdk_event_get_state (event);
2152+
int keymask = gdk3_event_get_state (event);
21532153
if ((keymask & (GDK.GDK_SUPER_MASK | GDK.GDK_META_MASK | GDK.GDK_HYPER_MASK | GDK.GDK_MOD1_MASK)) == 0) {
21542154
sendTreeDefaultSelection ();
21552155
}

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@ long gtk3_key_press_event (long widget, long event) {
23292329
// When : Enter, Shift+Enter, Ctrl+Enter are pressed.
23302330
// Not when: Alt+Enter, (Meta|Super|Hyper)+Enter, reason is stateMask is not provided on Gtk.
23312331
// Note: alt+Enter creates a selection on GTK, but we filter it out to be a bit more consistent Win32 (521387)
2332-
int keymask = gdk_event_get_state (event);
2332+
int keymask = gdk3_event_get_state (event);
23332333
if ((keymask & (GDK.GDK_SUPER_MASK | GDK.GDK_META_MASK | GDK.GDK_HYPER_MASK | GDK.GDK_MOD1_MASK)) == 0) {
23342334
sendTreeDefaultSelection ();
23352335
}

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,13 +2369,9 @@ long gdk_event_get_surface_or_window(long event) {
23692369
* @return the keymask to be used with constants like
23702370
* OS.GDK_SHIFT_MASK / OS.GDK_CONTROL_MASK / OS.GDK_MOD1_MASK etc..
23712371
*/
2372-
int gdk_event_get_state (long event) {
2372+
int gdk3_event_get_state (long event) {
23732373
int [] state = new int[1];
2374-
if (GTK.GTK4) {
2375-
state[0] = GDK.gdk_event_get_modifier_state(event);
2376-
} else {
2377-
GDK.gdk_event_get_state(event, state);
2378-
}
2374+
GDK.gdk_event_get_state(event, state);
23792375

23802376
return state[0];
23812377
}

0 commit comments

Comments
 (0)