diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
6 files changed, 1 insertions, 170 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 34ca537b05..6c4ecc273b 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 @@ -1029,18 +1029,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof) } #endif -#ifndef NO_XClientMessageEvent_1sizeof -JNIEXPORT jint JNICALL OS_NATIVE(XClientMessageEvent_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, XClientMessageEvent_1sizeof_FUNC); - rc = (jint)XClientMessageEvent_sizeof(); - OS_NATIVE_EXIT(env, that, XClientMessageEvent_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_XCrossingEvent_1sizeof JNIEXPORT jint JNICALL OS_NATIVE(XCrossingEvent_1sizeof) (JNIEnv *env, jclass that) @@ -2107,18 +2095,6 @@ fail: } #endif -#ifndef NO__1XSendEvent -JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3, jintLong arg4) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1XSendEvent_FUNC); - rc = (jint)XSendEvent((Display *)arg0, (Window)arg1, arg2, arg3, (XEvent *)arg4); - OS_NATIVE_EXIT(env, that, _1XSendEvent_FUNC); - return rc; -} -#endif - #ifndef NO__1XSetErrorHandler JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler) (JNIEnv *env, jclass that, jintLong arg0) @@ -6955,26 +6931,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors) } #endif -#ifndef NO__1gdk_1screen_1get_1number -JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1number_FUNC); -/* - rc = (jint)gdk_screen_get_number((GdkScreen *)arg0); -*/ - { - OS_LOAD_FUNCTION(fp, gdk_screen_get_number) - if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0); - } - } - OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1number_FUNC); - return rc; -} -#endif - #ifndef NO__1gdk_1screen_1height JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1height) (JNIEnv *env, jclass that) @@ -13029,18 +12985,6 @@ fail: } #endif -#ifndef NO__1gtk_1plug_1get_1id -JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1get_1id) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1gtk_1plug_1get_1id_FUNC); - rc = (jintLong)gtk_plug_get_id((GtkPlug *)arg0); - OS_NATIVE_EXIT(env, that, _1gtk_1plug_1get_1id_FUNC); - return rc; -} -#endif - #ifndef NO__1gtk_1plug_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1new) (JNIEnv *env, jclass that, jintLong arg0) @@ -21555,30 +21499,6 @@ fail: } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - XClientMessageEvent _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getXClientMessageEventFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); -fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index 369d98af87..d20fb59a8f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -276,7 +276,6 @@ #define gdk_screen_get_monitor_at_window_LIB LIB_GDK #define gdk_screen_get_monitor_geometry_LIB LIB_GDK #define gdk_screen_get_n_monitors_LIB LIB_GDK -#define gdk_screen_get_number_LIB LIB_GDK #define gdk_pixbuf_render_to_drawable_LIB LIB_GDK #define gdk_visual_get_depth_LIB LIB_GDK #define gtk_scrolled_window_get_hscrollbar_LIB LIB_GTK 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 a8572273ef..449e060be1 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 @@ -111,7 +111,6 @@ char * OS_nativeFunctionNames[] = { "RTLD_1LAZY", "RTLD_1NOW", "XAnyEvent_1sizeof", - "XClientMessageEvent_1sizeof", "XCrossingEvent_1sizeof", "XEvent_1sizeof", "XExposeEvent_1sizeof", @@ -189,7 +188,6 @@ char * OS_nativeFunctionNames[] = { "_1XRenderQueryVersion", "_1XRenderSetPictureClipRectangles", "_1XRenderSetPictureTransform", - "_1XSendEvent", "_1XSetErrorHandler", "_1XSetIOErrorHandler", "_1XSetInputFocus", @@ -542,7 +540,6 @@ char * OS_nativeFunctionNames[] = { "_1gdk_1screen_1get_1monitor_1at_1window", "_1gdk_1screen_1get_1monitor_1geometry", "_1gdk_1screen_1get_1n_1monitors", - "_1gdk_1screen_1get_1number", "_1gdk_1screen_1height", "_1gdk_1screen_1width", "_1gdk_1screen_1width_1mm", @@ -946,7 +943,6 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1paper_1size_1new", "_1gtk_1paper_1size_1new_1custom", "_1gtk_1paper_1size_1new_1from_1ppd", - "_1gtk_1plug_1get_1id", "_1gtk_1plug_1new", "_1gtk_1print_1job_1get_1surface", "_1gtk_1print_1job_1new", @@ -1636,11 +1632,6 @@ char * OS_nativeFunctionNames[] = { "memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J", #endif #ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I", -#else - "memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J", -#endif -#ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I", #else "memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J", 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 804127cd5a..08f8b60564 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 @@ -121,7 +121,6 @@ typedef enum { RTLD_1LAZY_FUNC, RTLD_1NOW_FUNC, XAnyEvent_1sizeof_FUNC, - XClientMessageEvent_1sizeof_FUNC, XCrossingEvent_1sizeof_FUNC, XEvent_1sizeof_FUNC, XExposeEvent_1sizeof_FUNC, @@ -199,7 +198,6 @@ typedef enum { _1XRenderQueryVersion_FUNC, _1XRenderSetPictureClipRectangles_FUNC, _1XRenderSetPictureTransform_FUNC, - _1XSendEvent_FUNC, _1XSetErrorHandler_FUNC, _1XSetIOErrorHandler_FUNC, _1XSetInputFocus_FUNC, @@ -552,7 +550,6 @@ typedef enum { _1gdk_1screen_1get_1monitor_1at_1window_FUNC, _1gdk_1screen_1get_1monitor_1geometry_FUNC, _1gdk_1screen_1get_1n_1monitors_FUNC, - _1gdk_1screen_1get_1number_FUNC, _1gdk_1screen_1height_FUNC, _1gdk_1screen_1width_FUNC, _1gdk_1screen_1width_1mm_FUNC, @@ -956,7 +953,6 @@ typedef enum { _1gtk_1paper_1size_1new_FUNC, _1gtk_1paper_1size_1new_1custom_FUNC, _1gtk_1paper_1size_1new_1from_1ppd_FUNC, - _1gtk_1plug_1get_1id_FUNC, _1gtk_1plug_1new_FUNC, _1gtk_1print_1job_1get_1surface_FUNC, _1gtk_1print_1job_1new_FUNC, @@ -1646,11 +1642,6 @@ typedef enum { memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC, #endif #ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC, -#endif -#ifndef JNI64 memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC, #else memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_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 1fa8f1d9c1..75b244abb0 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 @@ -2127,64 +2127,6 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct) } #endif -#ifndef NO_XClientMessageEvent -typedef struct XClientMessageEvent_FID_CACHE { - int cached; - jclass clazz; - jfieldID type, serial, send_event, display, window, message_type, format, data; -} XClientMessageEvent_FID_CACHE; - -XClientMessageEvent_FID_CACHE XClientMessageEventFc; - -void cacheXClientMessageEventFields(JNIEnv *env, jobject lpObject) -{ - if (XClientMessageEventFc.cached) return; - XClientMessageEventFc.clazz = (*env)->GetObjectClass(env, lpObject); - XClientMessageEventFc.type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "type", "I"); - XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", I_J); - XClientMessageEventFc.send_event = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "send_event", "Z"); - XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", I_J); - XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", I_J); - XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", I_J); - XClientMessageEventFc.format = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "format", "I"); - XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", I_JArray); - XClientMessageEventFc.cached = 1; -} - -XClientMessageEvent *getXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageEvent *lpStruct) -{ - if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject); - lpStruct->type = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.type); - lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.serial); - lpStruct->send_event = (*env)->GetBooleanField(env, lpObject, XClientMessageEventFc.send_event); - lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.display); - lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.window); - lpStruct->message_type = (Atom)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.message_type); - lpStruct->format = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.format); - { - jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data); - (*env)->GetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l); - } - return lpStruct; -} - -void setXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageEvent *lpStruct) -{ - if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject); - (*env)->SetIntField(env, lpObject, XClientMessageEventFc.type, (jint)lpStruct->type); - (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.serial, (jintLong)lpStruct->serial); - (*env)->SetBooleanField(env, lpObject, XClientMessageEventFc.send_event, (jboolean)lpStruct->send_event); - (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.display, (jintLong)lpStruct->display); - (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.window, (jintLong)lpStruct->window); - (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.message_type, (jintLong)lpStruct->message_type); - (*env)->SetIntField(env, lpObject, XClientMessageEventFc.format, (jint)lpStruct->format); - { - jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data); - (*env)->SetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l); - } -} -#endif - #ifndef NO_XCrossingEvent typedef struct XCrossingEvent_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 cbea7c290f..66d638e0c9 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, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2000, 2013 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 @@ -543,18 +543,6 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct); #define XAnyEvent_sizeof() 0 #endif -#ifndef NO_XClientMessageEvent -void cacheXClientMessageEventFields(JNIEnv *env, jobject lpObject); -XClientMessageEvent *getXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageEvent *lpStruct); -void setXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageEvent *lpStruct); -#define XClientMessageEvent_sizeof() sizeof(XClientMessageEvent) -#else -#define cacheXClientMessageEventFields(a,b) -#define getXClientMessageEventFields(a,b,c) NULL -#define setXClientMessageEventFields(a,b,c) -#define XClientMessageEvent_sizeof() 0 -#endif - #ifndef NO_XCrossingEvent void cacheXCrossingEventFields(JNIEnv *env, jobject lpObject); XCrossingEvent *getXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpStruct); |