diff options
author | Alexander Kurtakov | 2018-02-01 10:34:02 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2018-02-01 10:34:02 +0000 |
commit | d6947ce0570835012180bd7b4b2435c752248b31 (patch) | |
tree | 2ec5439bcc8d3eb8ff1eea14d15f05cda81d6ac8 | |
parent | ff86304b282e67e71c8b53f12a4bc1773d1b7ecf (diff) | |
download | eclipse.platform.swt-d6947ce0570835012180bd7b4b2435c752248b31.tar.gz eclipse.platform.swt-d6947ce0570835012180bd7b4b2435c752248b31.tar.xz eclipse.platform.swt-d6947ce0570835012180bd7b4b2435c752248b31.zip |
Bug 530602 - Remove atom based OpenDocument
There is new dbus based implementation (used by launcher) and the
atom/property based one is not supportable under wayland.
Change-Id: I18e594b2690ddb8b91f8532d2216b536e6d05ed6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
8 files changed, 2 insertions, 260 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 cc6b7a846d..0694d3bb6e 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 @@ -11418,18 +11418,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GdkEventMotion_1sizeof) } #endif -#ifndef NO_GdkEventProperty_1sizeof -JNIEXPORT jint JNICALL OS_NATIVE(GdkEventProperty_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, GdkEventProperty_1sizeof_FUNC); - rc = (jint)GdkEventProperty_sizeof(); - OS_NATIVE_EXIT(env, that, GdkEventProperty_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_GdkEventScroll_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(GdkEventScroll_1sizeof) (JNIEnv *env, jclass that) @@ -12026,34 +12014,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFree) } #endif -#ifndef NO__1XGetWindowProperty -JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetWindowProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jboolean arg5, jintLong arg6, jintLongArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jintLongArray arg11) -{ - jintLong *lparg7=NULL; - jint *lparg8=NULL; - jint *lparg9=NULL; - jint *lparg10=NULL; - jintLong *lparg11=NULL; - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1XGetWindowProperty_FUNC); - if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail; - if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail; - if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail; - if (arg10) if ((lparg10 = (*env)->GetIntArrayElements(env, arg10, NULL)) == NULL) goto fail; - if (arg11) if ((lparg11 = (*env)->GetIntLongArrayElements(env, arg11, NULL)) == NULL) goto fail; - rc = (jintLong)XGetWindowProperty((Display *)arg0, (Window)arg1, (Atom)arg2, arg3, arg4, arg5, (Atom)arg6, (Atom*)lparg7, (int *)lparg8, (unsigned long *)lparg9, (unsigned long *)lparg10, (unsigned char **)lparg11); -fail: - if (arg11 && lparg11) (*env)->ReleaseIntLongArrayElements(env, arg11, lparg11, 0); - if (arg10 && lparg10) (*env)->ReleaseIntArrayElements(env, arg10, lparg10, 0); - if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0); - if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0); - if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0); - OS_NATIVE_EXIT(env, that, _1XGetWindowProperty_FUNC); - return rc; -} -#endif - #ifndef NO__1XKeysymToKeycode JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) @@ -17698,18 +17658,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised) } #endif -#ifndef NO__1gdk_1x11_1atom_1to_1xatom -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC); - rc = (jintLong)gdk_x11_atom_to_xatom((GdkAtom)arg0); - OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1x11_1display_1get_1xdisplay JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1display_1get_1xdisplay) (JNIEnv *env, jclass that, jintLong arg0) @@ -19937,27 +19885,6 @@ fail: } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) -#endif -{ -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC); -#endif - if (arg0) setGdkEventPropertyFields(env, arg0, (GdkEventProperty *)arg1); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) 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 5cecf1cc0c..480a802ffc 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 @@ -989,7 +989,6 @@ char * OS_nativeFunctionNames[] = { "GdkEventFocus_1sizeof", "GdkEventKey_1sizeof", "GdkEventMotion_1sizeof", - "GdkEventProperty_1sizeof", "GdkEventScroll_1sizeof", "GdkEventWindowState_1sizeof", "GdkEvent_1sizeof", @@ -1039,7 +1038,6 @@ char * OS_nativeFunctionNames[] = { "_1XDefaultScreen", "_1XFlush", "_1XFree", - "_1XGetWindowProperty", "_1XKeysymToKeycode", "_1XQueryPointer", "_1XSetErrorHandler", @@ -1477,7 +1475,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1window_1shape_1combine_1region", "_1gdk_1window_1show", "_1gdk_1window_1show_1unraised", - "_1gdk_1x11_1atom_1to_1xatom", "_1gdk_1x11_1display_1get_1xdisplay", "_1gdk_1x11_1display_1utf8_1to_1compound_1text", "_1gdk_1x11_1drawable_1get_1xid", @@ -1740,11 +1737,6 @@ char * OS_nativeFunctionNames[] = { "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ", #endif #ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I", -#else - "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J", -#endif -#ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II", #else "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ", 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 5084b210fe..f6ac01ddca 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 @@ -987,7 +987,6 @@ typedef enum { GdkEventFocus_1sizeof_FUNC, GdkEventKey_1sizeof_FUNC, GdkEventMotion_1sizeof_FUNC, - GdkEventProperty_1sizeof_FUNC, GdkEventScroll_1sizeof_FUNC, GdkEventWindowState_1sizeof_FUNC, GdkEvent_1sizeof_FUNC, @@ -1037,7 +1036,6 @@ typedef enum { _1XDefaultScreen_FUNC, _1XFlush_FUNC, _1XFree_FUNC, - _1XGetWindowProperty_FUNC, _1XKeysymToKeycode_FUNC, _1XQueryPointer_FUNC, _1XSetErrorHandler_FUNC, @@ -1475,7 +1473,6 @@ typedef enum { _1gdk_1window_1shape_1combine_1region_FUNC, _1gdk_1window_1show_FUNC, _1gdk_1window_1show_1unraised_FUNC, - _1gdk_1x11_1atom_1to_1xatom_FUNC, _1gdk_1x11_1display_1get_1xdisplay_FUNC, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC, _1gdk_1x11_1drawable_1get_1xid_FUNC, @@ -1738,11 +1735,6 @@ typedef enum { memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC, #endif #ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2I_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_gtk_GdkEventProperty_2J_FUNC, -#endif -#ifndef JNI64 memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC, #else memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c index a349d45cf4..a665a781f6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -714,52 +714,6 @@ void setGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventMotion *lpSt } #endif -#ifndef NO_GdkEventProperty -typedef struct GdkEventProperty_FID_CACHE { - int cached; - jclass clazz; - jfieldID window, send_event, atom, time, state; -} GdkEventProperty_FID_CACHE; - -GdkEventProperty_FID_CACHE GdkEventPropertyFc; - -void cacheGdkEventPropertyFields(JNIEnv *env, jobject lpObject) -{ - if (GdkEventPropertyFc.cached) return; - cacheGdkEventFields(env, lpObject); - GdkEventPropertyFc.clazz = (*env)->GetObjectClass(env, lpObject); - GdkEventPropertyFc.window = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "window", I_J); - GdkEventPropertyFc.send_event = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "send_event", "B"); - GdkEventPropertyFc.atom = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "atom", I_J); - GdkEventPropertyFc.time = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "time", "I"); - GdkEventPropertyFc.state = (*env)->GetFieldID(env, GdkEventPropertyFc.clazz, "state", "I"); - GdkEventPropertyFc.cached = 1; -} - -GdkEventProperty *getGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct) -{ - if (!GdkEventPropertyFc.cached) cacheGdkEventPropertyFields(env, lpObject); - getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventPropertyFc.window); - lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventPropertyFc.send_event); - lpStruct->atom = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GdkEventPropertyFc.atom); - lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventPropertyFc.time); - lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventPropertyFc.state); - return lpStruct; -} - -void setGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct) -{ - if (!GdkEventPropertyFc.cached) cacheGdkEventPropertyFields(env, lpObject); - setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct); - (*env)->SetIntLongField(env, lpObject, GdkEventPropertyFc.window, (jintLong)lpStruct->window); - (*env)->SetByteField(env, lpObject, GdkEventPropertyFc.send_event, (jbyte)lpStruct->send_event); - (*env)->SetIntLongField(env, lpObject, GdkEventPropertyFc.atom, (jintLong)lpStruct->atom); - (*env)->SetIntField(env, lpObject, GdkEventPropertyFc.time, (jint)lpStruct->time); - (*env)->SetIntField(env, lpObject, GdkEventPropertyFc.state, (jint)lpStruct->state); -} -#endif - #ifndef NO_GdkEventScroll typedef struct GdkEventScroll_FID_CACHE { int cached; diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h index 0b4731e42c..969c9c182f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2018 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -186,18 +186,6 @@ void setGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventMotion *lpSt #define GdkEventMotion_sizeof() 0 #endif -#ifndef NO_GdkEventProperty -void cacheGdkEventPropertyFields(JNIEnv *env, jobject lpObject); -GdkEventProperty *getGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct); -void setGdkEventPropertyFields(JNIEnv *env, jobject lpObject, GdkEventProperty *lpStruct); -#define GdkEventProperty_sizeof() sizeof(GdkEventProperty) -#else -#define cacheGdkEventPropertyFields(a,b) -#define getGdkEventPropertyFields(a,b,c) NULL -#define setGdkEventPropertyFields(a,b,c) -#define GdkEventProperty_sizeof() 0 -#endif - #ifndef NO_GdkEventScroll void cacheGdkEventScrollFields(JNIEnv *env, jobject lpObject); GdkEventScroll *getGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventScroll *lpStruct); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java deleted file mode 100644 index 768f3641e0..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. All rights reserved. - * The contents of this file are made available under the terms - * of the GNU Lesser General Public License (LGPL) Version 2.1 that - * accompanies this distribution (lgpl-v21.txt). The LGPL is also - * available at http://www.gnu.org/licenses/lgpl.html. If the version - * of the LGPL at http://www.gnu.org is different to the version of - * the LGPL accompanying this distribution and there is any conflict - * between the two license versions, the terms of the LGPL accompanying - * this distribution shall govern. - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.internal.gtk; - -public class GdkEventProperty extends GdkEvent { - /** @field cast=(GdkWindow *) */ - public long /*int*/ window; - /** @field cast=(gint8) */ - public byte send_event; - /** @field cast=(GdkAtom) */ - public long /*int*/ atom; - /** @field cast=(guint32) */ - public int time; - /** @field cast=(guint) */ - public int state; - public static final int sizeof = OS.GdkEventProperty_sizeof(); -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 6f5f4a7d92..c45a0b48d3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -135,7 +135,6 @@ public class OS extends C { } /** Constants */ - public static final long /*int*/ AnyPropertyType = 0; public static final int G_FILE_TEST_IS_DIR = 1 << 2; public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3; public static final int G_SIGNAL_MATCH_FUNC = 1 << 3; @@ -676,7 +675,6 @@ public static final native int GdkEventExpose_sizeof(); public static final native int GdkEventFocus_sizeof(); public static final native int GdkEventKey_sizeof(); public static final native int GdkEventMotion_sizeof(); -public static final native int GdkEventProperty_sizeof(); public static final native int GdkEventScroll_sizeof(); public static final native int GdkEventWindowState_sizeof(); public static final native int GdkGeometry_sizeof(); @@ -869,26 +867,6 @@ public static final void XFree(long /*int*/ address) { /** * @param display cast=(Display *) - * @param window cast=(Window) - * @param property cast=(Atom) - * @param req_type cast=(Atom) - * @param actual_type_return cast=(Atom*) - * @param actual_format_return cast=(int *) - * @param nitems_return cast=(unsigned long *) - * @param bytes_after_return cast=(unsigned long *) - * @param prop_return cast=(unsigned char **) - */ -public static final native long /*int*/ _XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return , int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return); -public static final long /*int*/ XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return, int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return) { - lock.lock(); - try { - return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return); - } finally { - lock.unlock(); - } -} -/** - * @param display cast=(Display *) * @param w cast=(Window) * @param root_return cast=(Window *) * @param child_return cast=(Window *) @@ -991,16 +969,6 @@ public static final void XTestFakeKeyEvent(long /*int*/ display, int keycode, bo lock.unlock(); } } -/** @param atom cast=(GdkAtom) */ -public static final native long /*int*/ _gdk_x11_atom_to_xatom(long /*int*/ atom); -public static final long /*int*/ gdk_x11_atom_to_xatom(long /*int*/ atom) { - lock.lock(); - try { - return _gdk_x11_atom_to_xatom(atom); - } finally { - lock.unlock(); - } -} /** @param gdkdisplay cast=(GdkDisplay *) */ public static final native long /*int*/ _gdk_x11_display_get_xdisplay(long /*int*/ gdkdisplay); public static final long /*int*/ gdk_x11_display_get_xdisplay (long /*int*/ gdkdisplay) { @@ -5519,11 +5487,6 @@ public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) - */ -public static final native void memmove(GdkEventProperty dest, long /*int*/ src); -/** - * @param dest cast=(void *),flags=no_in - * @param src cast=(const void *) * @param size cast=(size_t) */ public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size); 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 6ffc569e05..d76cf88750 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 @@ -5738,51 +5738,6 @@ long /*int*/ signalProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ u case STYLE_SET: settingsChanged = true; break; - case PROPERTY_NOTIFY: - - // Bug 528414 This whole mechanism is to be removed. - // Files passed by changing a window property. Uses X, which doesn't work on wayland. - GdkEventProperty gdkEvent = new GdkEventProperty (); - OS.memmove (gdkEvent, arg1); - if (gdkEvent.type == OS.GDK_PROPERTY_NOTIFY) { - byte[] name = Converter.wcsToMbcs ("org.eclipse.swt.filePath.message", true); //$NON-NLS-1$ - long /*int*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true)); - if (atom == OS.gdk_x11_atom_to_xatom (gdkEvent.atom)) { - long /*int*/ xWindow; - if (GTK.GTK3) { - xWindow = OS.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (shellHandle)); - } else { - xWindow = OS.gdk_x11_drawable_get_xid (GTK.gtk_widget_get_window( shellHandle)); - } - long /*int*/ [] type = new long /*int*/ [1]; - int [] format = new int [1]; - int [] nitems = new int [1]; - int [] bytes_after = new int [1]; - long /*int*/ [] data = new long /*int*/ [1]; - OS.XGetWindowProperty (OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), xWindow, atom, 0, -1, true, OS.AnyPropertyType, - type, format, nitems, bytes_after, data); - - if (nitems [0] > 0) { - byte [] buffer = new byte [nitems [0]]; - C.memmove(buffer, data [0], buffer.length); - OS.XFree (data [0]); - char[] chars = Converter.mbcsToWcs(buffer); - String string = new String (chars); - - int lastIndex = 0; - int index = string.indexOf (':'); - while (index != -1) { - String file = string.substring (lastIndex, index); - Event event = new Event (); - event.text = file; - sendEvent (SWT.OpenDocument, event); - lastIndex = index+1; - index = string.indexOf(':', lastIndex); - } - } - } - } - break; } return 0; } |