*** keyword substitution change ***

5 files changed, 431 insertions, 446 deletions

diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/glx.c b/bundles/org.eclipse.swt.opengl/gtk/library/glx.c
index c0987fe77b..7b4aa72991 100644
--- a/bundles/org.eclipse.swt.opengl/gtk/library/glx.c
+++ b/bundles/org.eclipse.swt.opengl/gtk/library/glx.c
@@ -1,247 +1,232 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-#include <GL/glx.h>

-#include <string.h>

-#include "swt.h"

-#include "structs.h"

-

-#define XGL_NATIVE(func) Java_org_eclipse_swt_opengl_internal_gtk_XGL_##func

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXChooseVisual)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)

-{

-	jint *lparg2=NULL;

-	jint rc;

-

-	NATIVE_ENTER(env, that, "glXChooseVisual\n")

-	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);

-	rc = (jint)glXChooseVisual((Display *)arg0, arg1, (int *)lparg2);

-	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);

-	NATIVE_EXIT(env, that, "glXChooseVisual\n")

-	return rc;

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXCopyContext)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)

-{

-	NATIVE_ENTER(env, that, "glXCopyContext\n")

-	glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);

-	NATIVE_EXIT(env, that, "glXCopyContext\n")

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateContext)

-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)

-{

-	XVisualInfo _arg1, *lparg1=NULL;

-	jint rc;

-

-	NATIVE_ENTER(env, that, "glXCreateContext\n")

-	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);

-	rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);

-	if (arg1) setXVisualInfoFields(env, arg1, lparg1);

-	NATIVE_EXIT(env, that, "glXCreateContext\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateGLXPixmap)

-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)

-{

-	XVisualInfo _arg1, *lparg1=NULL;

-	jint rc;

-

-	NATIVE_ENTER(env, that, "glXCreateGLXPixmap\n")

-	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);

-	rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, arg2);

-	if (arg1) setXVisualInfoFields(env, arg1, lparg1);

-	NATIVE_EXIT(env, that, "glXCreateGLXPixmap\n")

-	return rc;

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyContext)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-	NATIVE_ENTER(env, that, "glXDestroyContext\n")

-	glXDestroyContext((Display *)arg0, (GLXContext)arg1);

-	NATIVE_EXIT(env, that, "glXDestroyContext\n")

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyGLXPixmap)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-	NATIVE_ENTER(env, that, "glXDestroyGLXPixmap\n")

-	glXDestroyGLXPixmap((Display *)arg0, arg1);

-	NATIVE_EXIT(env, that, "glXDestroyGLXPixmap\n")

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetClientString)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-    jint rc;

-	NATIVE_ENTER(env, that, "glXGetClientString\n")

-	rc = (jint)glXGetClientString((Display *)arg0, arg1);

-	NATIVE_EXIT(env, that, "glXGetClientString\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetConfig)

-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)

-{

-	XVisualInfo _arg1, *lparg1=NULL;

-	jint *lparg3=NULL;

-	jint rc;

-

-	NATIVE_ENTER(env, that, "glXGetConfig\n")

-	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);

-	if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);

-	rc = (jint)glXGetConfig((Display *)arg0, lparg1, arg2, (int *)lparg3);

-	if (arg1) setXVisualInfoFields(env, arg1, lparg1);

-	if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);

-	NATIVE_EXIT(env, that, "glXGetConfig\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentContext)

-	(JNIEnv *env, jclass that)

-{

-    jint rc;

-	NATIVE_ENTER(env, that, "glXGetCurrentContext\n")

-	rc = (jint)glXGetCurrentContext();

-	NATIVE_EXIT(env, that, "glXGetCurrentContext\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentDrawable)

-	(JNIEnv *env, jclass that)

-{

-    jint rc;

-	NATIVE_ENTER(env, that, "glXGetCurrentDrawable\n")

-	rc = (jint)glXGetCurrentDrawable();

-	NATIVE_EXIT(env, that, "glXGetCurrentDrawable\n")

-	return rc;

-}

-

-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXIsDirect)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-    jboolean result;

-	NATIVE_ENTER(env, that, "glXIsDirect\n")

-	result = (jboolean)glXIsDirect((Display *)arg0, (GLXContext)arg1);

-	NATIVE_EXIT(env, that, "glXIsDirect\n")

-	return result;

-}

-

-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXMakeCurrent)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)

-{

-    jboolean result;

-	NATIVE_ENTER(env, that, "glXMakeCurrent\n")

-	result = (jboolean)glXMakeCurrent((Display *)arg0, (GLXDrawable)arg1, (GLXContext)arg2);

-	NATIVE_EXIT(env, that, "glXMakeCurrent\n")

-	return result;

-}

-

-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryExtension)

-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)

-{

-	jint *lparg1=NULL;

-	jint *lparg2=NULL;

-	jboolean rc;

-

-	NATIVE_ENTER(env, that, "glXQueryExtension\n")

-	if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);

-	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);

-	rc = (jboolean)glXQueryExtension((Display *)arg0, (int *)lparg1, (int *)lparg2);

-	if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);

-	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);

-	NATIVE_EXIT(env, that, "glXQueryExtension\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryExtensionsString)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-    jint rc;

-	NATIVE_ENTER(env, that, "glXQueryExtensionsString\n")

-	rc = (jint)glXQueryExtensionsString((Display *)arg0, arg1);

-	NATIVE_EXIT(env, that, "glXQueryExtensionsString\n")

-	return rc;

-}

-

-JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryServerString)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)

-{

-    jint rc;

-	NATIVE_ENTER(env, that, "glXQueryServerString\n")

-	rc = (jint)glXQueryServerString((Display *)arg0, arg1, arg2);

-	NATIVE_EXIT(env, that, "glXQueryServerString\n")

-	return rc;

-}

-

-JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryVersion)

-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)

-{

-	jint *lparg1=NULL;

-	jint *lparg2=NULL;

-	jboolean rc;

-

-	NATIVE_ENTER(env, that, "glXQueryVersion\n")

-	if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);

-	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);

-	rc = (jboolean)glXQueryVersion((Display *)arg0, (int *)lparg1, (int *)lparg2);

-	if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);

-	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);

-	NATIVE_EXIT(env, that, "glXQueryVersion\n")

-	return rc;

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXSwapBuffers)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1)

-{

-	NATIVE_ENTER(env, that, "glXSwapBuffers\n")

-	glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);

-	NATIVE_EXIT(env, that, "glXSwapBuffers\n")

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXUseXFont)

-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)

-{

-	NATIVE_ENTER(env, that, "glXUseXFont\n")

-	glXUseXFont(arg0, arg1, arg2, arg3);

-	NATIVE_EXIT(env, that, "glXUseXFont\n")

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXWaitGL)

-	(JNIEnv *env, jclass that)

-{

-	NATIVE_ENTER(env, that, "glXWaitGL\n")

-	glXWaitGL();

-	NATIVE_EXIT(env, that, "glXWaitGL\n")

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(glXWaitX)

-	(JNIEnv *env, jclass that)

-{

-	NATIVE_ENTER(env, that, "glXWaitX\n")

-	glXWaitX();

-	NATIVE_EXIT(env, that, "glXWaitX\n")

-}

-

-JNIEXPORT void JNICALL XGL_NATIVE(memmove__Lorg_eclipse_swt_opengl_internal_gtk_XVisualInfo_2II)

-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)

-{

-	XVisualInfo _arg0, *lparg0=NULL;

-

-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_opengl_internal_gtk_XVisualInfo_2II\n")

-	if (arg0) lparg0 = &_arg0;

-	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);

-	if (arg0) setXVisualInfoFields(env, arg0, lparg0);

-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_opengl_internal_gtk_XVisualInfo_2II\n")

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <GL/glx.h>
+#include "swt.h"
+#include "structs.h"
+
+#define XGL_NATIVE(func) Java_org_eclipse_swt_opengl_internal_gtk_XGL_##func
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXChooseVisual)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+{
+	jint *lparg2=NULL;
+	jint rc;
+
+	DEBUG_CALL("glXChooseVisual\n")
+
+	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+	rc = (jint)glXChooseVisual((Display *)arg0, arg1, (int *)lparg2);
+	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXCopyContext)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+	DEBUG_CALL("glXCopyContext\n")
+
+	glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateContext)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
+{
+	XVisualInfo _arg1, *lparg1=NULL;
+	jint rc;
+
+	DEBUG_CALL("glXCreateContext\n")
+
+	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+	rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
+	if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+	return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXCreateGLXPixmap)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+{
+	XVisualInfo _arg1, *lparg1=NULL;
+	jint rc;
+
+	DEBUG_CALL("glXCreateGLXPixmap\n")
+
+	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+	rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, arg2);
+	if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+	return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyContext)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXDestroyContext\n")
+
+	glXDestroyContext((Display *)arg0, (GLXContext)arg1);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXDestroyGLXPixmap)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXDestroyGLXPixmap\n")
+
+	glXDestroyGLXPixmap((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetClientString)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXGetClientString\n")
+
+	return (jint)glXGetClientString((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetConfig)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+{
+	XVisualInfo _arg1, *lparg1=NULL;
+	jint *lparg3=NULL;
+	jint rc;
+
+	DEBUG_CALL("glXGetConfig\n")
+
+	if (arg1) lparg1 = getXVisualInfoFields(env, arg1, &_arg1);
+	if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);
+	rc = (jint)glXGetConfig((Display *)arg0, lparg1, arg2, (int *)lparg3);
+	if (arg1) setXVisualInfoFields(env, arg1, lparg1);
+	if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentContext)
+	(JNIEnv *env, jclass that)
+{
+	DEBUG_CALL("glXGetCurrentContext\n")
+
+	return (jint)glXGetCurrentContext();
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXGetCurrentDrawable)
+	(JNIEnv *env, jclass that)
+{
+	DEBUG_CALL("glXGetCurrentDrawable\n")
+
+	return (jint)glXGetCurrentDrawable();
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXIsDirect)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXIsDirect\n")
+
+	return (jboolean)glXIsDirect((Display *)arg0, (GLXContext)arg1);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXMakeCurrent)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	DEBUG_CALL("glXMakeCurrent\n")
+
+	return (jboolean)glXMakeCurrent((Display *)arg0, (GLXDrawable)arg1, (GLXContext)arg2);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryExtension)
+	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	jboolean rc;
+
+	DEBUG_CALL("glXQueryExtension\n")
+
+	if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+	rc = (jboolean)glXQueryExtension((Display *)arg0, (int *)lparg1, (int *)lparg2);
+	if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	return rc;
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryExtensionsString)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXQueryExtensionsString\n")
+
+	return (jint)glXQueryExtensionsString((Display *)arg0, arg1);
+}
+
+JNIEXPORT jint JNICALL XGL_NATIVE(glXQueryServerString)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	DEBUG_CALL("glXQueryServerString\n")
+
+	return (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
+}
+
+JNIEXPORT jboolean JNICALL XGL_NATIVE(glXQueryVersion)
+	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	jboolean rc;
+
+	DEBUG_CALL("glXQueryVersion\n")
+
+	if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+	rc = (jboolean)glXQueryVersion((Display *)arg0, (int *)lparg1, (int *)lparg2);
+	if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	return rc;
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXSwapBuffers)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	DEBUG_CALL("glXSwapBuffers\n")
+
+	glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXUseXFont)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+{
+	DEBUG_CALL("glXUseXFont\n")
+
+	glXUseXFont(arg0, arg1, arg2, arg3);
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXWaitGL)
+	(JNIEnv *env, jclass that)
+{
+	DEBUG_CALL("glXWaitGL\n")
+
+	glXWaitGL();
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(glXWaitX)
+	(JNIEnv *env, jclass that)
+{
+	DEBUG_CALL("glXWaitX\n")
+
+	glXWaitX();
+}
+
+JNIEXPORT void JNICALL XGL_NATIVE(memmove__Lorg_eclipse_swt_opengl_internal_gtk_XVisualInfo_2II)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+{
+	XVisualInfo _arg0, *lparg0=NULL;
+
+	DEBUG_CALL("memmove__Lorg_eclipse_swt_opengl_internal_gtk_XVisualInfo_2II\n")
+
+	if (arg0) lparg0 = &_arg0;
+	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+	if (arg0) setXVisualInfoFields(env, arg0, lparg0);
+}
diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/make_gtk.mak b/bundles/org.eclipse.swt.opengl/gtk/library/make_gtk.mak
index d765b8bd5e..7d04043da8 100644
--- a/bundles/org.eclipse.swt.opengl/gtk/library/make_gtk.mak
+++ b/bundles/org.eclipse.swt.opengl/gtk/library/make_gtk.mak
@@ -19,7 +19,7 @@ LD=gcc
 WS_PREFIX    = gtk
 GL_PREFIX   = gl
 GL_DLL      = lib$(GL_PREFIX)-$(WS_PREFIX).so
-GL_OBJ      = gl.o glu.o structs.o glx.o
+GL_OBJ      = swt.o gl.o glu.o structs.o glx.o
 GL_LIB      = -shared -L/usr/X11R6/lib -lGL -lGLU -lm
 XGTK_PREFIX   = xgtk
 XGTK_DLL      = lib$(XGTK_PREFIX)-$(WS_PREFIX).so
diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/structs.c b/bundles/org.eclipse.swt.opengl/gtk/library/structs.c
index 368852dc33..bf8db55dfa 100644
--- a/bundles/org.eclipse.swt.opengl/gtk/library/structs.c
+++ b/bundles/org.eclipse.swt.opengl/gtk/library/structs.c
@@ -1,73 +1,73 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-#include <X11/X.h>

-#include <X11/Xlib.h>

-#include "swt.h"

-#include "structs.h"

-

-typedef struct XVisualInfo_FID_CACHE {

-	int cached;

-	jclass clazz;

-	jfieldID visual, visualid, screen, depth, cclass, red_mask, green_mask, blue_mask, colormap_size, bits_per_rgb;

-} XVisualInfo_FID_CACHE;

-typedef XVisualInfo_FID_CACHE *PXVisualInfo_FID_CACHE;

-

-XVisualInfo_FID_CACHE XVisualInfoFc;

-

-void cacheXVisualInfoFids(JNIEnv *env, jobject lpObject, PXVisualInfo_FID_CACHE lpCache)

-{

-	if (lpCache->cached) return;

-	lpCache->clazz = (*env)->GetObjectClass(env, lpObject);

-	lpCache->visual = (*env)->GetFieldID(env, lpCache->clazz, "visual", "I");

-	lpCache->visualid = (*env)->GetFieldID(env, lpCache->clazz, "visualid", "I");

-	lpCache->screen = (*env)->GetFieldID(env, lpCache->clazz, "screen", "I");

-	lpCache->depth = (*env)->GetFieldID(env, lpCache->clazz, "depth", "I");

-	lpCache->cclass = (*env)->GetFieldID(env, lpCache->clazz, "cclass", "I");

-	lpCache->red_mask = (*env)->GetFieldID(env, lpCache->clazz, "red_mask", "I");

-	lpCache->green_mask = (*env)->GetFieldID(env, lpCache->clazz, "green_mask", "I");

-	lpCache->blue_mask = (*env)->GetFieldID(env, lpCache->clazz, "blue_mask", "I");

-	lpCache->colormap_size = (*env)->GetFieldID(env, lpCache->clazz, "colormap_size", "I");

-	lpCache->bits_per_rgb = (*env)->GetFieldID(env, lpCache->clazz, "bits_per_rgb", "I");

-	lpCache->cached = 1;

-}

-

-XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)

-{

-	PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;

-	if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);

-	lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, lpCache->visual);

-	lpStruct->visualid = (*env)->GetIntField(env, lpObject, lpCache->visualid);

-	lpStruct->screen = (*env)->GetIntField(env, lpObject, lpCache->screen);

-	lpStruct->depth = (*env)->GetIntField(env, lpObject, lpCache->depth);

-	lpStruct->class = (*env)->GetIntField(env, lpObject, lpCache->cclass);

-	lpStruct->red_mask = (*env)->GetIntField(env, lpObject, lpCache->red_mask);

-	lpStruct->green_mask = (*env)->GetIntField(env, lpObject, lpCache->green_mask);

-	lpStruct->blue_mask = (*env)->GetIntField(env, lpObject, lpCache->blue_mask);

-	lpStruct->colormap_size = (*env)->GetIntField(env, lpObject, lpCache->colormap_size);

-	lpStruct->bits_per_rgb = (*env)->GetIntField(env, lpObject, lpCache->bits_per_rgb);

-	return lpStruct;

-}

-

-void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)

-{

-	PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;

-	if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);

-	(*env)->SetIntField(env, lpObject, lpCache->visual, (jint)lpStruct->visual);

-	(*env)->SetIntField(env, lpObject, lpCache->visualid, (jint)lpStruct->visualid);

-	(*env)->SetIntField(env, lpObject, lpCache->screen, (jint)lpStruct->screen);

-	(*env)->SetIntField(env, lpObject, lpCache->depth, (jint)lpStruct->depth);

-	(*env)->SetIntField(env, lpObject, lpCache->cclass, (jint)lpStruct->class);

-	(*env)->SetIntField(env, lpObject, lpCache->red_mask, (jint)lpStruct->red_mask);

-	(*env)->SetIntField(env, lpObject, lpCache->green_mask, (jint)lpStruct->green_mask);

-	(*env)->SetIntField(env, lpObject, lpCache->blue_mask, (jint)lpStruct->blue_mask);

-	(*env)->SetIntField(env, lpObject, lpCache->colormap_size, (jint)lpStruct->colormap_size);

-	(*env)->SetIntField(env, lpObject, lpCache->bits_per_rgb, (jint)lpStruct->bits_per_rgb);

-}

+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include "swt.h"
+#include "structs.h"
+
+typedef struct XVisualInfo_FID_CACHE {
+	int cached;
+	jclass clazz;
+	jfieldID visual, visualid, screen, depth, cclass, red_mask, green_mask, blue_mask, colormap_size, bits_per_rgb;
+} XVisualInfo_FID_CACHE;
+typedef XVisualInfo_FID_CACHE *PXVisualInfo_FID_CACHE;
+
+XVisualInfo_FID_CACHE XVisualInfoFc;
+
+void cacheXVisualInfoFids(JNIEnv *env, jobject lpObject, PXVisualInfo_FID_CACHE lpCache)
+{
+	if (lpCache->cached) return;
+	lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+	lpCache->visual = (*env)->GetFieldID(env, lpCache->clazz, "visual", "I");
+	lpCache->visualid = (*env)->GetFieldID(env, lpCache->clazz, "visualid", "I");
+	lpCache->screen = (*env)->GetFieldID(env, lpCache->clazz, "screen", "I");
+	lpCache->depth = (*env)->GetFieldID(env, lpCache->clazz, "depth", "I");
+	lpCache->cclass = (*env)->GetFieldID(env, lpCache->clazz, "cclass", "I");
+	lpCache->red_mask = (*env)->GetFieldID(env, lpCache->clazz, "red_mask", "I");
+	lpCache->green_mask = (*env)->GetFieldID(env, lpCache->clazz, "green_mask", "I");
+	lpCache->blue_mask = (*env)->GetFieldID(env, lpCache->clazz, "blue_mask", "I");
+	lpCache->colormap_size = (*env)->GetFieldID(env, lpCache->clazz, "colormap_size", "I");
+	lpCache->bits_per_rgb = (*env)->GetFieldID(env, lpCache->clazz, "bits_per_rgb", "I");
+	lpCache->cached = 1;
+}
+
+XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
+{
+	PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
+	if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
+	lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, lpCache->visual);
+	lpStruct->visualid = (*env)->GetIntField(env, lpObject, lpCache->visualid);
+	lpStruct->screen = (*env)->GetIntField(env, lpObject, lpCache->screen);
+	lpStruct->depth = (*env)->GetIntField(env, lpObject, lpCache->depth);
+	lpStruct->class = (*env)->GetIntField(env, lpObject, lpCache->cclass);
+	lpStruct->red_mask = (*env)->GetIntField(env, lpObject, lpCache->red_mask);
+	lpStruct->green_mask = (*env)->GetIntField(env, lpObject, lpCache->green_mask);
+	lpStruct->blue_mask = (*env)->GetIntField(env, lpObject, lpCache->blue_mask);
+	lpStruct->colormap_size = (*env)->GetIntField(env, lpObject, lpCache->colormap_size);
+	lpStruct->bits_per_rgb = (*env)->GetIntField(env, lpObject, lpCache->bits_per_rgb);
+	return lpStruct;
+}
+
+void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
+{
+	PXVisualInfo_FID_CACHE lpCache = &XVisualInfoFc;
+	if (!lpCache->cached) cacheXVisualInfoFids(env, lpObject, lpCache);
+	(*env)->SetIntField(env, lpObject, lpCache->visual, (jint)lpStruct->visual);
+	(*env)->SetIntField(env, lpObject, lpCache->visualid, (jint)lpStruct->visualid);
+	(*env)->SetIntField(env, lpObject, lpCache->screen, (jint)lpStruct->screen);
+	(*env)->SetIntField(env, lpObject, lpCache->depth, (jint)lpStruct->depth);
+	(*env)->SetIntField(env, lpObject, lpCache->cclass, (jint)lpStruct->class);
+	(*env)->SetIntField(env, lpObject, lpCache->red_mask, (jint)lpStruct->red_mask);
+	(*env)->SetIntField(env, lpObject, lpCache->green_mask, (jint)lpStruct->green_mask);
+	(*env)->SetIntField(env, lpObject, lpCache->blue_mask, (jint)lpStruct->blue_mask);
+	(*env)->SetIntField(env, lpObject, lpCache->colormap_size, (jint)lpStruct->colormap_size);
+	(*env)->SetIntField(env, lpObject, lpCache->bits_per_rgb, (jint)lpStruct->bits_per_rgb);
+}
diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/structs.h b/bundles/org.eclipse.swt.opengl/gtk/library/structs.h
index 80791498e6..4121f7f488 100644
--- a/bundles/org.eclipse.swt.opengl/gtk/library/structs.h
+++ b/bundles/org.eclipse.swt.opengl/gtk/library/structs.h
@@ -1,16 +1,16 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-#include <X11/X.h>

-#include <X11/Xutil.h>

-

-XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);

-void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);

-

+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include <X11/X.h>
+#include <X11/Xutil.h>
+
+XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
+void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct);
+
diff --git a/bundles/org.eclipse.swt.opengl/gtk/library/xgtk.c b/bundles/org.eclipse.swt.opengl/gtk/library/xgtk.c
index 2de68a4c37..0f97a7846d 100644
--- a/bundles/org.eclipse.swt.opengl/gtk/library/xgtk.c
+++ b/bundles/org.eclipse.swt.opengl/gtk/library/xgtk.c
@@ -1,109 +1,109 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-#include "swt.h"

-#include <gdk/gdkx.h>

-#include <stdlib.h>

-

-#define XGTK_NATIVE(func) Java_org_eclipse_swt_opengl_internal_gtk_XGTK_##func

-

-#ifndef NO_free

-JNIEXPORT void JNICALL XGTK_NATIVE(free)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	NATIVE_ENTER(env, that, "free\n")

-	free((char *)arg0);

-	NATIVE_EXIT(env, that, "free\n")

-}

-#endif

-

-#ifndef NO_malloc

-JNIEXPORT jint JNICALL XGTK_NATIVE(malloc)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "malloc\n")

-	rc = (jint)malloc(arg0);

-	NATIVE_EXIT(env, that, "malloc\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_gdk_1x11_1gc_1get_1xdisplay

-JNIEXPORT int JNICALL XGTK_NATIVE(gdk_1x11_1gc_1get_1xdisplay)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "gdk_1x11_1gc_1get_1xdisplay\n")

-	rc = (jint)gdk_x11_gc_get_xdisplay((GdkGC *)arg0);

-	NATIVE_EXIT(env, that, "gdk_1x11_1gc_1get_1xdisplay\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_gdk_1x11_1drawable_1get_1xid

-JNIEXPORT int JNICALL XGTK_NATIVE(gdk_1x11_1drawable_1get_1xid)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "gdk_1x11_1drawable_1get_1xid\n")

-	rc = (jint)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);

-	NATIVE_EXIT(env, that, "gdk_1x11_1drawable_1get_1xid\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_XDefaultScreen

-JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultScreen)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "XDefaultScreen\n")

-	rc = (jint)XDefaultScreen((Display *)arg0);

-	NATIVE_EXIT(env, that, "XDefaultScreen\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_XDefaultScreenOfDisplay

-JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultScreenOfDisplay)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "XDefaultScreenOfDisplay\n")

-	rc = (jint)XDefaultScreenOfDisplay((Display *)arg0);

-	NATIVE_EXIT(env, that, "XDefaultScreenOfDisplay\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_XDefaultDepthOfScreen

-JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultDepthOfScreen)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "XDefaultDepthOfScreen\n")

-	rc = (jint)XDefaultDepthOfScreen((Screen *)arg0);

-	NATIVE_EXIT(env, that, "XDefaultDepthOfScreen\n")

-	return rc;

-}

-#endif

-

-#ifndef NO_XFree

-JNIEXPORT jint JNICALL XGTK_NATIVE(XFree)

-	(JNIEnv *env, jclass that, jint arg0)

-{

-	jint rc;

-	NATIVE_ENTER(env, that, "XFree\n")

-	rc = (jint)XFree((char *)arg0);

-	NATIVE_EXIT(env, that, "XFree\n")

-	return rc;

-}

-#endif

+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+#include "swt.h"
+#include <gdk/gdkx.h>
+#include <stdlib.h>
+
+#define XGTK_NATIVE(func) Java_org_eclipse_swt_opengl_internal_gtk_XGTK_##func
+
+#ifndef NO_free
+JNIEXPORT void JNICALL XGTK_NATIVE(free)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	NATIVE_ENTER(env, that, "free\n")
+	free((char *)arg0);
+	NATIVE_EXIT(env, that, "free\n")
+}
+#endif
+
+#ifndef NO_malloc
+JNIEXPORT jint JNICALL XGTK_NATIVE(malloc)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "malloc\n")
+	rc = (jint)malloc(arg0);
+	NATIVE_EXIT(env, that, "malloc\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gdk_1x11_1gc_1get_1xdisplay
+JNIEXPORT int JNICALL XGTK_NATIVE(gdk_1x11_1gc_1get_1xdisplay)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gdk_1x11_1gc_1get_1xdisplay\n")
+	rc = (jint)gdk_x11_gc_get_xdisplay((GdkGC *)arg0);
+	NATIVE_EXIT(env, that, "gdk_1x11_1gc_1get_1xdisplay\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gdk_1x11_1drawable_1get_1xid
+JNIEXPORT int JNICALL XGTK_NATIVE(gdk_1x11_1drawable_1get_1xid)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gdk_1x11_1drawable_1get_1xid\n")
+	rc = (jint)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
+	NATIVE_EXIT(env, that, "gdk_1x11_1drawable_1get_1xid\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_XDefaultScreen
+JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultScreen)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "XDefaultScreen\n")
+	rc = (jint)XDefaultScreen((Display *)arg0);
+	NATIVE_EXIT(env, that, "XDefaultScreen\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_XDefaultScreenOfDisplay
+JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultScreenOfDisplay)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "XDefaultScreenOfDisplay\n")
+	rc = (jint)XDefaultScreenOfDisplay((Display *)arg0);
+	NATIVE_EXIT(env, that, "XDefaultScreenOfDisplay\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_XDefaultDepthOfScreen
+JNIEXPORT jint JNICALL XGTK_NATIVE(XDefaultDepthOfScreen)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "XDefaultDepthOfScreen\n")
+	rc = (jint)XDefaultDepthOfScreen((Screen *)arg0);
+	NATIVE_EXIT(env, that, "XDefaultDepthOfScreen\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_XFree
+JNIEXPORT jint JNICALL XGTK_NATIVE(XFree)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "XFree\n")
+	rc = (jint)XFree((char *)arg0);
+	NATIVE_EXIT(env, that, "XFree\n")
+	return rc;
+}
+#endif