diff options
author | Alexander Kurtakov <akurtako@redhat.com> | 2012-04-11 14:02:51 +0300 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-06-26 15:37:19 -0400 |
commit | 5071ad7501576ca4bf33cc2ffa94f42f644a2102 (patch) | |
tree | e3376d77062b0445255347f45cebbf73d4a5a191 | |
parent | 5d27960036a124e29d079704c28d3c5d84b6b86a (diff) | |
download | eclipse.platform.swt-5071ad7501576ca4bf33cc2ffa94f42f644a2102.tar.gz eclipse.platform.swt-5071ad7501576ca4bf33cc2ffa94f42f644a2102.tar.xz eclipse.platform.swt-5071ad7501576ca4bf33cc2ffa94f42f644a2102.zip |
Remove unused X functions binding.
Conflicts:
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
4 files changed, 2 insertions, 105 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 9d1890cd4e..253f970e4d 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 @@ -17,9 +17,7 @@ #include "os_structs.h" #include "os_stats.h" -#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func -#endif #if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64)) #ifndef JNI64 @@ -1837,30 +1835,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent) } #endif -#ifndef NO__1XCheckMaskEvent -JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1XCheckMaskEvent_FUNC); - rc = (jboolean)XCheckMaskEvent((Display *)arg0, (long)arg1, (XEvent *)arg2); - OS_NATIVE_EXIT(env, that, _1XCheckMaskEvent_FUNC); - return rc; -} -#endif - -#ifndef NO__1XCheckWindowEvent -JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1XCheckWindowEvent_FUNC); - rc = (jboolean)XCheckWindowEvent((Display *)arg0, (Window)arg1, (long)arg2, (XEvent *)arg3); - OS_NATIVE_EXIT(env, that, _1XCheckWindowEvent_FUNC); - return rc; -} -#endif - #ifndef NO__1XDefaultRootWindow JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow) (JNIEnv *env, jclass that, jintLong arg0) @@ -2023,31 +1997,6 @@ fail: } #endif -#ifndef NO__1XQueryTree -JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryTree) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5) -{ - jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong *lparg4=NULL; - jint *lparg5=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1XQueryTree_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; - rc = (jint)XQueryTree((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (Window **)lparg4, (unsigned int *)lparg5); -fail: - if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, _1XQueryTree_FUNC); - return rc; -} -#endif - #ifndef NO__1XReconfigureWMWindow JNIEXPORT jint JNICALL OS_NATIVE(_1XReconfigureWMWindow) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4) 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 ce88501003..7f377aea17 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 @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1405; -int OS_nativeFunctionCallCount[1405]; +int OS_nativeFunctionCount = 1402; +int OS_nativeFunctionCallCount[1402]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -180,8 +180,6 @@ char * OS_nativeFunctionNames[] = { "_1PANGO_1TYPE_1FONT_1DESCRIPTION", "_1PANGO_1TYPE_1LAYOUT", "_1XCheckIfEvent", - "_1XCheckMaskEvent", - "_1XCheckWindowEvent", "_1XDefaultRootWindow", "_1XDefaultScreen", "_1XFlush", @@ -192,7 +190,6 @@ char * OS_nativeFunctionNames[] = { "_1XKeysymToKeycode", "_1XListProperties", "_1XQueryPointer", - "_1XQueryTree", "_1XReconfigureWMWindow", "_1XRenderComposite", "_1XRenderCreatePicture", 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 4348ecdbcd..b947253983 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 @@ -188,8 +188,6 @@ typedef enum { _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC, _1PANGO_1TYPE_1LAYOUT_FUNC, _1XCheckIfEvent_FUNC, - _1XCheckMaskEvent_FUNC, - _1XCheckWindowEvent_FUNC, _1XDefaultRootWindow_FUNC, _1XDefaultScreen_FUNC, _1XFlush_FUNC, @@ -200,7 +198,6 @@ typedef enum { _1XKeysymToKeycode_FUNC, _1XListProperties_FUNC, _1XQueryPointer_FUNC, - _1XQueryTree_FUNC, _1XReconfigureWMWindow_FUNC, _1XRenderComposite_FUNC, _1XRenderCreatePicture_FUNC, 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 9a5db196bf..e967446d72 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 @@ -823,35 +823,6 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) { } /** * @param display cast=(Display *) - * @param event_mask cast=(long) - * @param event_return cast=(XEvent *) - */ -public static final native boolean _XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return); -public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return) { - lock.lock(); - try { - return _XCheckMaskEvent(display, event_mask, event_return); - } finally { - lock.unlock(); - } -} -/** - * @param display cast=(Display *) - * @param window cast=(Window) - * @param event_mask cast=(long) - * @param event_return cast=(XEvent *) - */ -public static final native boolean _XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return); -public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return) { - lock.lock(); - try { - return _XCheckWindowEvent(display, window, event_mask, event_return); - } finally { - lock.unlock(); - } -} -/** - * @param display cast=(Display *) * @param event_return cast=(XEvent *) * @param predicate cast=(Bool (*)()) * @param arg cast=(XPointer) @@ -992,23 +963,6 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int } /** * @param display cast=(Display *) - * @param w cast=(Window) - * @param root_return cast=(Window *) - * @param parent_return cast=(Window *) - * @param children_return cast=(Window **) - * @param nchildren_return cast=(unsigned int *) - */ -public static final native int _XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return); -public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return) { - lock.lock(); - try { - return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return); - } finally { - lock.unlock(); - } -} -/** - * @param display cast=(Display *) * @param keysym cast=(KeySym) */ public static final native int _XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym); |