|
From: Elias N. <eli...@us...> - 2004-08-21 00:18:31
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5586/linux Modified Files: Makefile.am org_lwjgl_input_Mouse.cpp org_lwjgl_input_Cursor.cpp Removed Files: extxcursor.h extxcursor.cpp Log Message: Made Xcursor library static linked instead of dynamically loaded Index: org_lwjgl_input_Mouse.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- org_lwjgl_input_Mouse.cpp 30 Jul 2004 13:30:15 -0000 1.59 +++ org_lwjgl_input_Mouse.cpp 21 Aug 2004 00:18:19 -0000 1.60 @@ -48,7 +48,8 @@ #include "Window.h" #include "common_tools.h" #include "org_lwjgl_input_Mouse.h" -#include "extxcursor.h" +#include <X11/Xcursor/Xcursor.h> +//#include "extxcursor.h" #define NUM_BUTTONS 3 @@ -139,8 +140,12 @@ if (result == GrabSuccess) { pointer_grabbed = true; // make sure we have a centered window - if (isFullscreen()) - XF86VidModeSetViewPort(getDisplay(), getCurrentScreen(), 0, 0); + if (isFullscreen()) { + XWindowAttributes win_attribs; + XGetWindowAttributes(getDisplay(), getCurrentWindow(), &win_attribs); +// XF86VidModeSetViewPort(getDisplay(), getCurrentScreen(), 0, 0); + XF86VidModeSetViewPort(getDisplay(), getCurrentScreen(), win_attribs.x, win_attribs.y); + } XFlush(getDisplay()); } } @@ -191,8 +196,8 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetNativeCursorCaps (JNIEnv *env, jclass clazz) { int caps = 0; - if (!isXcursorLoaded()) - return caps; +/* if (!isXcursorLoaded()) + return caps;*/ XcursorBool argb_supported = XcursorSupportsARGB(getDisplay()); XcursorBool anim_supported = XcursorSupportsAnim(getDisplay()); if (argb_supported) @@ -205,7 +210,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor(JNIEnv *env, jclass clazz, jobject cursor_handle) { if (cursor_handle != NULL) { Cursor *cursor = (Cursor *)env->GetDirectBufferAddress(cursor_handle); -// Cursor cursor = (Cursor)cursor_handle; current_cursor = *cursor; } else current_cursor = None; @@ -259,14 +263,14 @@ buffer_enabled = false; updatePointerGrab(); initEventQueue(&event_queue); - loadXcursor(); +// loadXcursor(); doWarpPointer(); } JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy (JNIEnv * env, jclass clazz) { - closeXcursor(); +// closeXcursor(); ungrabPointer(); XFreeCursor(getDisplay(), blank_cursor); created = false; --- extxcursor.cpp DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 6 Jul 2004 08:06:15 -0000 1.16 +++ Makefile.am 21 Aug 2004 00:18:19 -0000 1.17 @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libnative.la libnative_la_SOURCES = $(NATIVE) +#libnative_la_LIBADD = -lXrender -lXcursor +#libnative_la_LDFLAGS = -Wl,-static,-lXcursor,-lXrender,-call_shared INCLUDES = -I../common NATIVE = \ @@ -12,6 +14,6 @@ org_lwjgl_opengl_Display.cpp \ org_lwjgl_opengl_Pbuffer.cpp \ display.cpp \ - extgl_glx.cpp \ - extxcursor.cpp + extgl_glx.cpp +# extxcursor.cpp --- extxcursor.h DELETED --- Index: org_lwjgl_input_Cursor.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- org_lwjgl_input_Cursor.cpp 30 Jul 2004 13:30:15 -0000 1.15 +++ org_lwjgl_input_Cursor.cpp 21 Aug 2004 00:18:19 -0000 1.16 @@ -39,8 +39,11 @@ * @version $Revision$ */ +#include <X11/X.h> +#include <X11/Xlib.h> +#include <X11/Xcursor/Xcursor.h> #include "org_lwjgl_input_Cursor.h" -#include "extxcursor.h" +//#include "extxcursor.h" #include "Window.h" #include "common_tools.h" |