Skip to content

Commit 992e08d

Browse files
akurtakovakurtakov
committed
[Gtk] Remove Control.fixGdkEventTypeValues
This is a leftover from very first efforts to create Gtk 4 port when a mapping between event types in Gtk 3 and 4 was still smth supposed to work. With Gtk 4.0 deciding to go the event controlled path - this is all no-op now. What's worse - values of Gtk 4 GdkEventType constants are totally wrong when comparing with https://docs.gtk.org/gdk4/enum.EventType.html thus best to drop entirely to prevent the chances that this breaks some corner case.
1 parent 6171cf3 commit 992e08d

File tree

15 files changed

+4
-68
lines changed

15 files changed

+4
-68
lines changed

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,6 @@ public class GDK extends OS {
222222
public static final int GDK_WINDOW_TYPE_HINT_UTILITY = 5;
223223
public static final int GDK_WINDOW_TYPE_HINT_TOOLTIP = 10;
224224

225-
/** GdkEventType constants are different on GTK4 */
226-
public static final int GDK4_EXPOSE = 3;
227-
public static final int GDK4_MOTION_NOTIFY = 4;
228-
public static final int GDK4_BUTTON_PRESS = 5;
229-
public static final int GDK4_BUTTON_RELEASE = 6;
230-
public static final int GDK4_KEY_PRESS = 7;
231-
public static final int GDK4_KEY_RELEASE = 8;
232-
public static final int GDK4_ENTER_NOTIFY = 9;
233-
public static final int GDK4_LEAVE_NOTIFY = 10;
234-
public static final int GDK4_FOCUS_CHANGE = 11;
235-
public static final int GDK4_CONFIGURE = 12;
236-
public static final int GDK4_MAP = 13;
237-
public static final int GDK4_UNMAP = 14;
238-
239225
/** sizeof(TYPE) for 32/64 bit support */
240226
public static final native int GdkKeymapKey_sizeof();
241227
public static final native int GdkRGBA_sizeof();

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,6 @@ long gtk_changed (long widget) {
14931493
long eventPtr = GTK.GTK4 ? 0 : GTK3.gtk_get_current_event ();
14941494
if (eventPtr != 0) {
14951495
int eventType = GDK.gdk_event_get_event_type(eventPtr);
1496-
eventType = fixGdkEventTypeValues(eventType);
14971496
switch (eventType) {
14981497
case GDK.GDK_KEY_PRESS:
14991498
keyPress = true;
@@ -1675,7 +1674,6 @@ long gtk3_event_after (long widget, long gdkEvent) {
16751674
* field.
16761675
*/
16771676
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
1678-
eventType = fixGdkEventTypeValues(eventType);
16791677
switch (eventType) {
16801678
case GDK.GDK_BUTTON_PRESS: {
16811679
int [] eventButton = new int [1];
@@ -2752,7 +2750,6 @@ String verifyText (String string, int start, int end) {
27522750
long eventPtr = GTK.GTK4 ? 0 : GTK3.gtk_get_current_event ();
27532751
if (eventPtr != 0) {
27542752
int type = GDK.gdk_event_get_event_type(eventPtr);
2755-
type = fixGdkEventTypeValues(type);
27562753
switch (type) {
27572754
case GDK.GDK_KEY_PRESS:
27582755
setKeyState (event, eventPtr);

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -286,30 +286,6 @@ long eventSurface () {
286286
return gtk_widget_get_surface (eventHandle);
287287
}
288288

289-
/**
290-
* GdkEventType constants different on GTK4 and GTK3.
291-
* This checks for GTK versions and return the correct constants defined in GDK.java
292-
* @return constant defined
293-
*/
294-
static int fixGdkEventTypeValues(int eventType) {
295-
if (GTK.GTK4) {
296-
switch (eventType) {
297-
case GDK.GDK4_EXPOSE: return GDK.GDK_EXPOSE;
298-
case GDK.GDK4_MOTION_NOTIFY: return GDK.GDK_MOTION_NOTIFY;
299-
case GDK.GDK4_BUTTON_PRESS: return GDK.GDK_BUTTON_PRESS;
300-
case GDK.GDK4_BUTTON_RELEASE: return GDK.GDK_BUTTON_RELEASE;
301-
case GDK.GDK4_KEY_PRESS: return GDK.GDK_KEY_PRESS;
302-
case GDK.GDK4_ENTER_NOTIFY: return GDK.GDK_ENTER_NOTIFY;
303-
case GDK.GDK4_LEAVE_NOTIFY: return GDK.GDK_LEAVE_NOTIFY;
304-
case GDK.GDK4_FOCUS_CHANGE: return GDK.GDK_FOCUS_CHANGE;
305-
case GDK.GDK4_CONFIGURE: return GDK.GDK_CONFIGURE;
306-
case GDK.GDK4_MAP: return GDK.GDK_MAP;
307-
case GDK.GDK4_UNMAP: return GDK.GDK_UNMAP;
308-
}
309-
}
310-
return eventType;
311-
}
312-
313289
void fixFocus (Control focusControl) {
314290
Shell shell = getShell ();
315291
Control control = this;
@@ -2714,7 +2690,6 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
27142690
if (dragging) return true; //428852
27152691
if (eventPtr == 0) return dragOnTimeout;
27162692
int eventType = GDK.gdk_event_get_event_type(eventPtr);
2717-
eventType = fixGdkEventTypeValues(eventType);
27182693
switch (eventType) {
27192694
case GDK.GDK_MOTION_NOTIFY: {
27202695
long gdkResource = gdk_event_get_surface_or_window(eventPtr);
@@ -3718,7 +3693,6 @@ boolean checkSubwindow () {
37183693
@Override
37193694
long gtk3_event_after (long widget, long gdkEvent) {
37203695
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
3721-
eventType = fixGdkEventTypeValues(eventType);
37223696
switch (eventType) {
37233697
case GDK.GDK_BUTTON_PRESS: {
37243698
if (widget != eventHandle ()) break;
@@ -4100,7 +4074,6 @@ long gtk_mnemonic_activate (long widget, long arg1) {
41004074
long eventPtr = GTK3.gtk_get_current_event ();
41014075
if (eventPtr != 0) {
41024076
int type = GDK.gdk_event_get_event_type(eventPtr);
4103-
type = fixGdkEventTypeValues(type);
41044077
if (type == GDK.GDK_KEY_PRESS) {
41054078
Control focusControl = display.getFocusControl ();
41064079
long focusHandle = focusControl != null ? focusControl.focusHandle () : 0;

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ long gtk_button_press_event (long widget, long event) {
341341
if (result != 0) return result;
342342

343343
int eventType = GDK.gdk_event_get_event_type(event);
344-
eventType = fixGdkEventTypeValues(eventType);
345344

346345
int [] eventButton = new int [1];
347346
if (GTK.GTK4) {

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@ void _setVisible (boolean visible) {
366366
*/
367367
eventPtr = GTK3.gtk_get_current_event();
368368
if (eventPtr == 0) {
369-
eventPtr = GDK.gdk_event_new(GTK.GTK4 ? GDK.GDK4_BUTTON_PRESS : GDK.GDK_BUTTON_PRESS);
369+
eventPtr = GDK.gdk_event_new(GDK.GDK_BUTTON_PRESS);
370370
GdkEventButton event = new GdkEventButton ();
371-
event.type = GTK.GTK4 ? GDK.GDK4_BUTTON_PRESS : GDK.GDK_BUTTON_PRESS;
371+
event.type = GDK.GDK_BUTTON_PRESS;
372372
// Only assign a window on X11, as on Wayland the window is that of the mouse pointer
373373
if (OS.isX11()) {
374374
event.window = OS.g_object_ref(GTK3.gtk_widget_get_window (getShell().handle));
@@ -1415,7 +1415,6 @@ void adjustParentWindowWayland (long eventPtr) {
14151415
}
14161416
OS.g_object_ref(deviceResource);
14171417
int eventType = GDK.gdk_event_get_event_type(eventPtr);
1418-
eventType = Control.fixGdkEventTypeValues(eventType);
14191418
switch (eventType) {
14201419
case GDK.GDK_BUTTON_PRESS:
14211420
GdkEventButton eventButton = new GdkEventButton();

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ long gtk_value_changed (long range) {
550550
@Override
551551
long gtk3_event_after (long widget, long gdkEvent) {
552552
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
553-
eventType = Control.fixGdkEventTypeValues(eventType);
554553
switch (eventType) {
555554
case GDK.GDK_BUTTON_RELEASE: {
556555
int [] eventButton = new int [1];

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ long gtk_value_changed(long range) {
232232
@Override
233233
long gtk3_event_after (long widget, long gdkEvent) {
234234
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
235-
eventType = Control.fixGdkEventTypeValues(eventType);
236235
switch (eventType) {
237236
case GDK.GDK_BUTTON_RELEASE: {
238237
int [] eventButton = new int [1];

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,6 @@ long gtk_changed (long widget) {
660660
long eventPtr = GTK.GTK4 ? 0 : GTK3.gtk_get_current_event();
661661
if (eventPtr != 0) {
662662
int eventType = GDK.gdk_event_get_event_type(eventPtr);
663-
eventType = fixGdkEventTypeValues(eventType);
664663
switch (eventType) {
665664
case GDK.GDK_KEY_PRESS:
666665
keyPress = true;
@@ -1315,7 +1314,6 @@ String verifyText (String string, int start, int end) {
13151314
long eventPtr = GTK3.gtk_get_current_event ();
13161315
if (eventPtr != 0) {
13171316
int type = GDK.gdk_event_get_event_type(eventPtr);
1318-
type = fixGdkEventTypeValues(type);
13191317
switch (type) {
13201318
case GDK.GDK_KEY_PRESS:
13211319
setKeyState (event, eventPtr);

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ long gtk_clicked (long widget) {
352352
}
353353

354354
int eventType = GDK.gdk_event_get_event_type(eventPtr);
355-
eventType = Control.fixGdkEventTypeValues(eventType);
356355
int eventTime = GDK.gdk_event_get_time(eventPtr);
357356
switch (eventType) {
358357
case GDK.GDK_BUTTON_RELEASE: {
@@ -374,7 +373,6 @@ long gtk_clicked (long widget) {
374373
@Override
375374
long gtk3_event_after (long widget, long gdkEvent) {
376375
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
377-
eventType = Control.fixGdkEventTypeValues(eventType);
378376
switch (eventType) {
379377
case GDK.GDK_BUTTON_PRESS: {
380378
int [] eventButton = new int [1];

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,6 @@ long gtk_changed (long widget) {
15761576
long eventPtr = GTK.GTK4 ? 0 : GTK3.gtk_get_current_event ();
15771577
if (eventPtr != 0) {
15781578
int eventType = GDK.gdk_event_get_event_type(eventPtr);
1579-
eventType = fixGdkEventTypeValues(eventType);
15801579
switch (eventType) {
15811580
case GDK.GDK_KEY_PRESS:
15821581
keyPress = true;
@@ -1733,7 +1732,6 @@ long gtk3_event_after (long widget, long gdkEvent) {
17331732
*/
17341733
if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
17351734
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
1736-
eventType = fixGdkEventTypeValues(eventType);
17371735
switch (eventType) {
17381736
case GDK.GDK_FOCUS_CHANGE:
17391737
boolean [] focusIn = new boolean [1];
@@ -2926,7 +2924,6 @@ String verifyText (String string, int start, int end) {
29262924
long eventPtr = GTK.GTK4 ? 0 : GTK3.gtk_get_current_event();
29272925
if (eventPtr != 0) {
29282926
int type = GDK.gdk_event_get_event_type(eventPtr);
2929-
type = fixGdkEventTypeValues(type);
29302927
switch (type) {
29312928
case GDK.GDK_KEY_PRESS:
29322929
setKeyState (event, eventPtr);

0 commit comments

Comments
 (0)