Bug 539331: [GTK3] Replace deprecated gdk_keymap_get_default()

Replace gdk_keymap_get_default() with gdk_keymap_get_for_display().

Change-Id: Ibccccec051c8fa2153583ded9bc2357231c27981
Signed-off-by: Eric Williams <ericwill@redhat.com>

6 files changed, 25 insertions, 20 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 05801e84f6..148f7c8eef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -1105,18 +1105,6 @@ JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1get_1default_1root_1window)
 }
 #endif
 
-#ifndef NO__1gdk_1keymap_1get_1default
-JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1default)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	GDK_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
-	rc = (jintLong)gdk_keymap_get_default();
-	GDK_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO__1gdk_1keymap_1get_1entries_1for_1keyval
 JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1entries_1for_1keyval)
 	(JNIEnv *env, jclass that, jintLong arg0, jlong arg1, jintLongArray arg2, jintArray arg3)
@@ -1136,6 +1124,18 @@ fail:
 }
 #endif
 
+#ifndef NO__1gdk_1keymap_1get_1for_1display
+JNIEXPORT jintLong JNICALL GDK_NATIVE(_1gdk_1keymap_1get_1for_1display)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	GDK_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1for_1display_FUNC);
+	rc = (jintLong)gdk_keymap_get_for_display((GdkDisplay *)arg0);
+	GDK_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1for_1display_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gdk_1keyval_1to_1lower
 JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1keyval_1to_1lower)
 	(JNIEnv *env, jclass that, jlong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index 4c9ee4b5c2..9edd81f826 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -91,8 +91,8 @@ char * GDK_nativeFunctionNames[] = {
 	"_1gdk_1gc_1set_1fill",
 	"_1gdk_1gc_1set_1stipple",
 	"_1gdk_1get_1default_1root_1window",
-	"_1gdk_1keymap_1get_1default",
 	"_1gdk_1keymap_1get_1entries_1for_1keyval",
+	"_1gdk_1keymap_1get_1for_1display",
 	"_1gdk_1keyval_1to_1lower",
 	"_1gdk_1keyval_1to_1unicode",
 	"_1gdk_1monitor_1get_1geometry",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index bb8ecc19ae..1dadd780f8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -101,8 +101,8 @@ typedef enum {
 	_1gdk_1gc_1set_1fill_FUNC,
 	_1gdk_1gc_1set_1stipple_FUNC,
 	_1gdk_1get_1default_1root_1window_FUNC,
-	_1gdk_1keymap_1get_1default_FUNC,
 	_1gdk_1keymap_1get_1entries_1for_1keyval_FUNC,
+	_1gdk_1keymap_1get_1for_1display_FUNC,
 	_1gdk_1keyval_1to_1lower_FUNC,
 	_1gdk_1keyval_1to_1unicode_FUNC,
 	_1gdk_1monitor_1get_1geometry_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
index a91be36b54..6dddfb11f4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
@@ -962,11 +962,14 @@ public class GDK extends OS {
 			lock.unlock();
 		}
 	}
-	public static final native long /*int*/ _gdk_keymap_get_default();
-	public static final long /*int*/ gdk_keymap_get_default() {
+	/**
+	 * @param display cast=(GdkDisplay *)
+	 */
+	public static final native long /*int*/ _gdk_keymap_get_for_display(long /*int*/ display);
+	public static final long /*int*/ gdk_keymap_get_for_display(long /*int*/ display) {
 		lock.lock();
 		try {
-			return _gdk_keymap_get_default();
+			return _gdk_keymap_get_for_display(display);
 		} finally {
 			lock.unlock();
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index d5f04f2378..d064dc26c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1124,7 +1124,8 @@ void createDisplay (DeviceData data) {
 	keysChangedCallback = new Callback (this, "keysChangedProc", 2); //$NON-NLS-1$
 	keysChangedProc = keysChangedCallback.getAddress ();
 	if (keysChangedProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	OS.g_signal_connect (GDK.gdk_keymap_get_default (), OS.keys_changed, keysChangedProc, 0);
+	long /*int*/ keymap = GDK.gdk_keymap_get_for_display(GDK.gdk_display_get_default());
+	OS.g_signal_connect (keymap, OS.keys_changed, keysChangedProc, 0);
 }
 
 /**
@@ -1136,7 +1137,7 @@ void createDisplay (DeviceData data) {
 private int findLatinKeyGroup () {
 	int result = 0;
 	groupKeysCount = new HashMap<> ();
-	long /*int*/ keymap = GDK.gdk_keymap_get_default ();
+	long /*int*/ keymap = GDK.gdk_keymap_get_for_display(GDK.gdk_display_get_default());
 
 	// count all key groups for Latin alphabet
 	for (int keyval = GDK.GDK_KEY_a; keyval <= GDK.GDK_KEY_z; keyval++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index fe6648b75b..172dde0fde 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -1670,7 +1670,8 @@ boolean setKeyState (Event event, GdkEventKey keyEvent) {
 				if (!groupLatinKeysCount.containsKey(keyLayoutGroup)) {
 					keyLayoutGroup = display.getLatinKeyGroup();
 				}
-				if (OS.gdk_keymap_translate_keyboard_state (GDK.gdk_keymap_get_default (), keyEvent.hardware_keycode,
+				long /*int*/ keymap = GDK.gdk_keymap_get_for_display(GDK.gdk_display_get_default());
+				if (OS.gdk_keymap_translate_keyboard_state (keymap, keyEvent.hardware_keycode,
 						0, keyLayoutGroup, keyval, effective_group, level, consumed_modifiers)) {
 					event.keyCode = (int) GDK.gdk_keyval_to_unicode (keyval [0]);
 				}