Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2597] trunk/LWJGL/src
|
From: <eli...@us...> - 2006-10-23 20:41:22
|
Revision: 2597
http://svn.sourceforge.net/java-game-lib/?rev=2597&view=rev
Author: elias_naur
Date: 2006-10-23 13:40:48 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
Linux: Moved current_win to java
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
trunk/LWJGL/src/native/linux/org_lwjgl_input_Cursor.c
trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
Removed Paths:
-------------
trunk/LWJGL/src/native/linux/Window.h
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Cursor.java 2006-10-23 20:40:48 UTC (rev 2597)
@@ -115,6 +115,8 @@
* @return the maximum size of a native cursor
*/
public static int getMinCursorSize() {
+ if (!Mouse.isCreated())
+ throw new IllegalStateException("Mouse must be created.");
return Mouse.getImplementation().getMinCursorSize();
}
@@ -126,6 +128,8 @@
* @return the maximum size of a native cursor
*/
public static int getMaxCursorSize() {
+ if (!Mouse.isCreated())
+ throw new IllegalStateException("Mouse must be created.");
return Mouse.getImplementation().getMaxCursorSize();
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java 2006-10-23 20:40:48 UTC (rev 2597)
@@ -78,6 +78,7 @@
/** Current X11 Display pointer */
private static long display;
+ private static long current_window;
private static int display_connection_usage_count = 0;
@@ -294,7 +295,9 @@
}
private static native int nGetDefaultScreen(long display);
- private static native long getWindow();
+ static long getWindow() {
+ return current_window;
+ }
private void ungrabKeyboard() {
if (keyboard_grabbed) {
@@ -383,7 +386,7 @@
ByteBuffer handle = peer_info.lockAndGetHandle();
try {
current_window_mode = getWindowMode(fullscreen);
- nCreateWindow(getDisplay(), getDefaultScreen(), handle, mode, current_window_mode, x, y);
+ current_window = nCreateWindow(getDisplay(), getDefaultScreen(), handle, mode, current_window_mode, x, y);
blank_cursor = createBlankCursor();
current_cursor = null;
focused = true;
@@ -407,7 +410,7 @@
unlockAWT();
}
}
- private static native void nCreateWindow(long display, int screen, ByteBuffer peer_info_handle, DisplayMode mode, int window_mode, int x, int y) throws LWJGLException;
+ private static native long nCreateWindow(long display, int screen, ByteBuffer peer_info_handle, DisplayMode mode, int window_mode, int x, int y) throws LWJGLException;
private void updateInputGrab() {
updatePointerGrab();
@@ -425,14 +428,14 @@
nDestroyCursor(getDisplay(), blank_cursor);
blank_cursor = null;
ungrabKeyboard();
- nDestroyWindow(getDisplay());
+ nDestroyWindow(getDisplay(), getWindow());
nSetRepeatMode(getDisplay(), AutoRepeatModeDefault);
decDisplay();
} finally {
unlockAWT();
}
}
- private static native void nDestroyWindow(long display);
+ private static native void nDestroyWindow(long display, long window);
public void switchDisplayMode(DisplayMode mode) throws LWJGLException {
lockAWT();
@@ -594,12 +597,12 @@
public void setTitle(String title) {
lockAWT();
try {
- nSetTitle(getDisplay(), title);
+ nSetTitle(getDisplay(), getWindow(), title);
} finally {
unlockAWT();
}
}
- private static native void nSetTitle(long display, String title);
+ private static native void nSetTitle(long display, long window, String title);
public boolean isCloseRequested() {
boolean result = close_requested;
@@ -629,7 +632,7 @@
public void update() {
lockAWT();
try {
- nUpdate(getDisplay(), warp_atom);
+ nUpdate(getDisplay(), getWindow(), warp_atom);
checkInput();
} catch (LWJGLException e) {
LWJGLUtil.log("Caught exception while processing messages: " + e);
@@ -637,17 +640,17 @@
unlockAWT();
}
}
- private native void nUpdate(long display, long warp_atom) throws LWJGLException;
+ private native void nUpdate(long display, long window, long warp_atom) throws LWJGLException;
public void reshape(int x, int y, int width, int height) {
lockAWT();
try {
- nReshape(getDisplay(), x, y, width, height);
+ nReshape(getDisplay(), getWindow(), x, y, width, height);
} finally {
unlockAWT();
}
}
- private static native void nReshape(long display, int x, int y, int width, int height);
+ private static native void nReshape(long display, long window, int x, int y, int width, int height);
public DisplayMode[] getAvailableDisplayModes() throws LWJGLException {
lockAWT();
@@ -810,7 +813,7 @@
try {
incDisplay();
try {
- return nGetMinCursorSize(getDisplay());
+ return nGetMinCursorSize(getDisplay(), getWindow());
} finally {
decDisplay();
}
@@ -821,14 +824,14 @@
unlockAWT();
}
}
- private static native int nGetMinCursorSize(long display);
+ private static native int nGetMinCursorSize(long display, long window);
public int getMaxCursorSize() {
lockAWT();
try {
incDisplay();
try {
- return nGetMaxCursorSize(getDisplay());
+ return nGetMaxCursorSize(getDisplay(), getWindow());
} finally {
decDisplay();
}
@@ -839,7 +842,7 @@
unlockAWT();
}
}
- private static native int nGetMaxCursorSize(long display);
+ private static native int nGetMaxCursorSize(long display, long window);
/* Keyboard */
public void createKeyboard() throws LWJGLException {
@@ -1003,7 +1006,7 @@
int size = icons[i].limit() / 4;
int dimension = (int)Math.sqrt(size);
ByteBuffer icon = convertIcon(icons[i], dimension, dimension);
- nSetWindowIcon(getDisplay(), icon, icon.capacity(), dimension, dimension);
+ nSetWindowIcon(getDisplay(), getWindow(), icon, icon.capacity(), dimension, dimension);
return 1;
}
return 0;
@@ -1018,7 +1021,7 @@
}
}
- private static native void nSetWindowIcon(long display, ByteBuffer icon, int icons_size, int width, int height);
+ private static native void nSetWindowIcon(long display, long window, ByteBuffer icon, int icons_size, int width, int height);
/* Callbacks from nUpdate() */
private void handleButtonEvent(long millis, int type, int button, int state) {
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplayPeerInfo.java 2006-10-23 20:40:48 UTC (rev 2597)
@@ -67,12 +67,12 @@
protected void doLockAndInitHandle() throws LWJGLException {
LinuxDisplay.lockAWT();
try {
- initDrawable(getHandle());
+ initDrawable(LinuxDisplay.getWindow(), getHandle());
} finally {
LinuxDisplay.unlockAWT();
}
}
- private static native void initDrawable(ByteBuffer peer_info_handle);
+ private static native void initDrawable(long window, ByteBuffer peer_info_handle);
protected void doUnlock() throws LWJGLException {
// NO-OP
Deleted: trunk/LWJGL/src/native/linux/Window.h
===================================================================
--- trunk/LWJGL/src/native/linux/Window.h 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/native/linux/Window.h 2006-10-23 20:40:48 UTC (rev 2597)
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * $Id$
- *
- * Include file to access public window features
- *
- * @author elias_naur <eli...@us...>
- * @version $Revision$
- */
-
-#ifndef _LWJGL_WINDOW_H_INCLUDED_
- #define _LWJGL_WINDOW_H_INCLUDED_
-
- #include <jni.h>
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include "extgl.h"
- #include "extgl_glx.h"
-
- extern bool checkXError(JNIEnv *, Display *);
-
- /*
- * get the current window
- */
- extern Window getCurrentWindow(void);
-
-#endif /* _LWJGL_WINDOW_H_INCLUDED_ */
Modified: trunk/LWJGL/src/native/linux/org_lwjgl_input_Cursor.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_input_Cursor.c 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_input_Cursor.c 2006-10-23 20:40:48 UTC (rev 2597)
@@ -61,22 +61,24 @@
}
JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetMinCursorSize
- (JNIEnv *env, jclass clazz, jlong display)
+ (JNIEnv *env, jclass clazz, jlong display, jlong window_ptr)
{
Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
unsigned int width_return = 0;
unsigned int height_return = 0;
- XQueryBestCursor(disp, getCurrentWindow(), 1, 1, &width_return, &height_return);
+ XQueryBestCursor(disp, window, 1, 1, &width_return, &height_return);
return width_return > height_return ? width_return : height_return;
}
JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetMaxCursorSize
- (JNIEnv *env, jclass clazz, jlong display)
+ (JNIEnv *env, jclass clazz, jlong display, jlong window_ptr)
{
Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
unsigned int width_return = 0;
unsigned int height_return = 0;
- XQueryBestCursor(disp, getCurrentWindow(), 0xffffffff, 0xffffffff, &width_return, &height_return);
+ XQueryBestCursor(disp, window, 0xffffffff, 0xffffffff, &width_return, &height_return);
return width_return > height_return ? height_return : width_return;
}
Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2006-10-23 20:14:45 UTC (rev 2596)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c 2006-10-23 20:40:48 UTC (rev 2597)
@@ -72,7 +72,6 @@
static Atom delete_atom;
static Colormap cmap;
-static Window current_win;
static int current_depth;
static Pixmap current_icon_pixmap;
@@ -148,19 +147,19 @@
XCloseDisplay(disp);
}
-static void setDecorations(Display *disp, int dec) {
+static void setDecorations(Display *disp, Window window, int dec) {
Atom motif_hints_atom = XInternAtom(disp, "_MOTIF_WM_HINTS", False);
MotifWmHints motif_hints;
motif_hints.flags = MWM_HINTS_DECORATIONS;
motif_hints.decorations = dec;
- XChangeProperty(disp, getCurrentWindow(), motif_hints_atom, motif_hints_atom, 32, PropModeReplace, (unsigned char *)&motif_hints, sizeof(MotifWmHints)/sizeof(long));
+ XChangeProperty(disp, window, motif_hints_atom, motif_hints_atom, 32, PropModeReplace, (unsigned char *)&motif_hints, sizeof(MotifWmHints)/sizeof(long));
}
static bool isLegacyFullscreen(jint window_mode) {
return window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_LEGACY;
}
-static void handleMessages(JNIEnv *env, Display *disp, jobject disp_obj, Atom warp_atom) {
+static void handleMessages(JNIEnv *env, jobject disp_obj, Display *disp, Window window, Atom warp_atom) {
XEvent event;
jclass disp_class = (*env)->GetObjectClass(env, disp_obj);
if (disp_class == NULL)
@@ -194,7 +193,7 @@
if (XFilterEvent(&event, None) == True)
continue;
// Ignore events from old windows
- if (event.xany.window != getCurrentWindow())
+ if (event.xany.window != window)
continue;
switch (event.type) {
case ClientMessage:
@@ -227,8 +226,8 @@
}
}
-static void setWindowTitle(Display *disp, const char *title) {
- XStoreName(disp, current_win, title);
+static void setWindowTitle(Display *disp, Window window, const char *title) {
+ XStoreName(disp, window, title);
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_openDisplay(JNIEnv *env, jclass clazz) {
@@ -240,12 +239,12 @@
XCloseDisplay(disp);
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplayPeerInfo_initDrawable(JNIEnv *env, jclass clazz, jobject peer_info_handle) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplayPeerInfo_initDrawable(JNIEnv *env, jclass clazz, jlong window, jobject peer_info_handle) {
X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
if (peer_info->glx13)
peer_info->drawable = glx_window;
else
- peer_info->drawable = getCurrentWindow();
+ peer_info->drawable = window;
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplayPeerInfo_initDefaultPeerInfo(JNIEnv *env, jclass clazz, jlong display, jint screen, jobject peer_info_handle, jobject pixel_format) {
@@ -253,10 +252,11 @@
initPeerInfo(env, peer_info_handle, disp, screen, pixel_format, true, GLX_WINDOW_BIT, true, false);
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetTitle(JNIEnv * env, jclass clazz, jlong display, jstring title_obj) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetTitle(JNIEnv * env, jclass clazz, jlong display, jlong window_ptr, jstring title_obj) {
Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
char * title = GetStringNativeChars(env, title_obj);
- setWindowTitle(disp, title);
+ setWindowTitle(disp, window, title);
free(title);
}
@@ -267,12 +267,12 @@
}
}
-static void destroyWindow(JNIEnv *env, Display *disp) {
+static void destroyWindow(JNIEnv *env, Display *disp, Window window) {
if (glx_window != None) {
lwjgl_glXDestroyWindow(disp, glx_window);
glx_window = None;
}
- XDestroyWindow(disp, current_win);
+ XDestroyWindow(disp, window);
XFreeColormap(disp, cmap);
freeIconPixmap(disp);
}
@@ -307,12 +307,13 @@
return isNetWMFullscreenSupported(env, disp, screen) ? JNI_TRUE : JNI_FALSE;
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReshape(JNIEnv *env, jclass clazz, jlong display, jint x, jint y, jint width, jint height) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReshape(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr, jint x, jint y, jint width, jint height) {
Display *disp = (Display *)(intptr_t)display;
- XMoveWindow(disp, getCurrentWindow(), x, y);
+ Window window = (Window)window_ptr;
+ XMoveWindow(disp, window, x, y);
}
-static bool createWindow(JNIEnv* env, Display *disp, int screen, jint window_mode, X11PeerInfo *peer_info, int x, int y, int width, int height) {
+static Window createWindow(JNIEnv* env, Display *disp, int screen, jint window_mode, X11PeerInfo *peer_info, int x, int y, int width, int height) {
bool undecorated = getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated");
Window root_win;
Window win;
@@ -344,10 +345,9 @@
return false;
}
printfDebugJava(env, "Created window");
- current_win = win;
if (window_mode != org_lwjgl_opengl_LinuxDisplay_WINDOWED || undecorated) {
// Use Motif decoration hint property and hope the window manager respects them
- setDecorations(disp, 0);
+ setDecorations(disp, win, 0);
}
XSizeHints * size_hints = XAllocSizeHints();
size_hints->flags = PMinSize | PMaxSize;
@@ -361,60 +361,59 @@
XSetWMProtocols(disp, win, &delete_atom, 1);
if (window_mode == org_lwjgl_opengl_LinuxDisplay_FULLSCREEN_NETWM) {
Atom fullscreen_atom = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False);
- XChangeProperty(disp, getCurrentWindow(), XInternAtom(disp, "_NET_WM_STATE", False),
+ XChangeProperty(disp, win, XInternAtom(disp, "_NET_WM_STATE", False),
XInternAtom(disp, "ATOM", False), 32, PropModeReplace, (const unsigned char*)&fullscreen_atom, 1);
}
XMapRaised(disp, win);
waitMapped(disp, win);
XClearWindow(disp, win);
if (!checkXError(env, disp)) {
- destroyWindow(env, disp);
- return false;
+ destroyWindow(env, disp, win);
+ return 0;
}
- return true;
+ return win;
}
-Window getCurrentWindow(void) {
- return current_win;
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUpdate(JNIEnv *env, jobject disp_obj, jlong display, jlong warp_atom_ptr) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUpdate(JNIEnv *env, jobject disp_obj, jlong display, jlong window_ptr, jlong warp_atom_ptr) {
Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
Atom warp_atom = (Atom)warp_atom_ptr;
- handleMessages(env, disp, disp_obj, warp_atom);
+ handleMessages(env, disp_obj, disp, window, warp_atom);
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateWindow(JNIEnv *env, jclass clazz, jlong display, jint screen, jobject peer_info_handle, jobject mode, jint window_mode, jint x, jint y) {
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateWindow(JNIEnv *env, jclass clazz, jlong display, jint screen, jobject peer_info_handle, jobject mode, jint window_mode, jint x, jint y) {
Display *disp = (Display *)(intptr_t)display;
X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle);
GLXFBConfig *fb_config = NULL;
if (peer_info->glx13) {
fb_config = getFBConfigFromPeerInfo(env, peer_info);
if (fb_config == NULL)
- return;
+ return 0;
}
jclass cls_displayMode = (*env)->GetObjectClass(env, mode);
jfieldID fid_width = (*env)->GetFieldID(env, cls_displayMode, "width", "I");
jfieldID fid_height = (*env)->GetFieldID(env, cls_displayMode, "height", "I");
int width = (*env)->GetIntField(env, mode, fid_width);
int height = (*env)->GetIntField(env, mode, fid_height);
- bool window_created = createWindow(env, disp, screen, window_mode, peer_info, x, y, width, height);
- if (!window_created) {
- return;
+ Window win = createWindow(env, disp, screen, window_mode, peer_info, x, y, width, height);
+ if ((*env)->ExceptionOccurred(env)) {
+ return 0;
}
if (peer_info->glx13) {
- glx_window = lwjgl_glXCreateWindow(disp, *fb_config, getCurrentWindow(), NULL);
+ glx_window = lwjgl_glXCreateWindow(disp, *fb_config, win, NULL);
XFree(fb_config);
}
if (!checkXError(env, disp)) {
lwjgl_glXDestroyWindow(disp, glx_window);
- destroyWindow(env, disp);
+ destroyWindow(env, disp, win);
}
+ return win;
}
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nDestroyWindow(JNIEnv *env, jclass clazz, jlong display) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nDestroyWindow(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr) {
Display *disp = (Display *)(intptr_t)display;
- destroyWindow(env, disp);
+ Window window = (Window)window_ptr;
+ destroyWindow(env, disp, window);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nLockAWT(JNIEnv *env, jclass clazz) {
@@ -437,10 +436,10 @@
jawt.Unlock(env);
}
-static void setIcon(JNIEnv *env, Display *disp, char *data, int icon_size, int width,int height) {
+static void setIcon(JNIEnv *env, Display *disp, Window window, char *data, int icon_size, int width,int height) {
XWMHints* win_hints;
freeIconPixmap(disp);
- current_icon_pixmap = XCreatePixmap(disp, getCurrentWindow(), width, height, current_depth);
+ current_icon_pixmap = XCreatePixmap(disp, window, width, height, current_depth);
/* We need to copy the image data since XDestroyImage will also free its data buffer, which can't be allowed
* since the data buffer is managed by the jvm (it's the storage for the direct ByteBuffer)
*/
@@ -474,24 +473,21 @@
win_hints->flags = IconPixmapHint;
win_hints->icon_pixmap = current_icon_pixmap;
- XSetWMHints(disp, getCurrentWindow(), win_hints);
+ XSetWMHints(disp, window, win_hints);
XFree(win_hints);
XFlush(disp);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetWindowIcon
- (JNIEnv *env, jclass clazz, jlong display, jobject iconBuffer, jint icon_size, jint width, jint height)
+ (JNIEnv *env, jclass clazz, jlong display, jlong window_ptr, jobject iconBuffer, jint icon_size, jint width, jint height)
{
Display *disp = (Display *)(intptr_t)display;
+ Window window = (Window)window_ptr;
char *imgData = (char *)(*env)->GetDirectBufferAddress(env, iconBuffer);
- setIcon(env, disp, imgData, icon_size, width, height);
+ setIcon(env, disp, window, imgData, icon_size, width, height);
}
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_getWindow(JNIEnv *env, jclass unused) {
- return getCurrentWindow();
-}
-
JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nUngrabKeyboard(JNIEnv *env, jclass unused, jlong display_ptr) {
Display *disp = (Display *)(intptr_t)display_ptr;
return XUngrabKeyboard(disp, CurrentTime);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
