michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: Moved Display state booleans to java side

This commit is contained in:
Elias Naur 2006-07-03 18:33:25 +00:00
parent 2f957f816d
commit a417b8f15c
2 changed files with 47 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/java/org/lwjgl/opengl/LinuxDisplay.java
View File

@ -97,6 +97,9 @@ final class LinuxDisplay implements DisplayImplementation {
private static boolean input_released;
private static boolean grab;
private static boolean focused;
private static boolean minimized;
private static boolean dirty;
private static boolean close_requested;
private static ByteBuffer current_cursor;
private static ByteBuffer blank_cursor;
@ -372,7 +375,10 @@ final class LinuxDisplay implements DisplayImplementation {
input_released = false;
pointer_grabbed = false;
keyboard_grabbed = false;
close_requested = false;
grab = false;
minimized = false;
dirty = true;
updateInputGrab();
nSetRepeatMode(getDisplay(), AutoRepeatModeOff);
} finally {
@ -548,41 +554,24 @@ final class LinuxDisplay implements DisplayImplementation {
private static native void nSetTitle(String title);
public boolean isCloseRequested() {
lockAWT();
try {
return nIsCloseRequested();
} finally {
unlockAWT();
}
boolean result = close_requested;
close_requested = false;
return result;
}
private static native boolean nIsCloseRequested();
public boolean isVisible() {
lockAWT();
try {
return nIsVisible();
} finally {
unlockAWT();
}
return !minimized;
}
private static native boolean nIsVisible();
public boolean isActive() {
lockAWT();
try {
return focused || isLegacyFullscreen();
} finally {
unlockAWT();
}
return focused || isLegacyFullscreen();
}
public boolean isDirty() {
lockAWT();
boolean result = nIsDirty();
unlockAWT();
boolean result = dirty;
dirty = false;
return result;
}
private static native boolean nIsDirty();
public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
peer_info = new LinuxDisplayPeerInfo(pixel_format);
@ -1001,4 +990,22 @@ final class LinuxDisplay implements DisplayImplementation {
if (mouse != null)
mouse.handleWarpEvent(x, y);
}
private static void handleExposeEvent() {
dirty = true;
}
private static void handleUnmapNotifyEvent() {
dirty = true;
minimized = true;
}
private static void handleMapNotifyEvent() {
dirty = true;
minimized = false;
}
private static void handleCloseEvent() {
close_requested = true;
}
}

50
src/native/linux/org_lwjgl_opengl_Display.c
View File

@ -79,11 +79,6 @@ static Pixmap current_icon_pixmap;
static Visual *current_visual;
static bool dirty;
static bool minimized;
static bool closerequested;
static bool grab;
static int current_screen;
static Display *display_connection = NULL;
static bool async_x_error;
@ -186,6 +181,18 @@ static void handleMessages(JNIEnv *env, jclass disp_class) {
jmethodID handleWarpEvent_method = (*env)->GetStaticMethodID(env, disp_class, "handleWarpEvent", "(II)V");
if (handleWarpEvent_method == NULL)
return;
jmethodID handleMapNotifyEvent_method = (*env)->GetStaticMethodID(env, disp_class, "handleMapNotifyEvent", "()V");
if (handleMapNotifyEvent_method == NULL)
return;
jmethodID handleUnmapNotifyEvent_method = (*env)->GetStaticMethodID(env, disp_class, "handleUnmapNotifyEvent", "()V");
if (handleUnmapNotifyEvent_method == NULL)
return;
jmethodID handleExposeEvent_method = (*env)->GetStaticMethodID(env, disp_class, "handleExposeEvent", "()V");
if (handleExposeEvent_method == NULL)
return;
jmethodID handleCloseEvent_method = (*env)->GetStaticMethodID(env, disp_class, "handleCloseEvent", "()V");
if (handleCloseEvent_method == NULL)
return;
while (!(*env)->ExceptionOccurred(env) && XPending(getDisplay()) > 0) {
XNextEvent(getDisplay(), &event);
if (XFilterEvent(&event, None) == True)
@ -198,18 +205,16 @@ static void handleMessages(JNIEnv *env, jclass disp_class) {
if (event.xclient.message_type == warp_atom) {
(*env)->CallStaticVoidMethod(env, disp_class, handleWarpEvent_method, (jint)event.xclient.data.l[0], (jint)event.xclient.data.l[1]);
} else if ((event.xclient.format == 32) && ((Atom)event.xclient.data.l[0] == delete_atom))
closerequested = true;
(*env)->CallStaticVoidMethod(env, disp_class, handleCloseEvent_method);
break;
case MapNotify:
dirty = true;
minimized = false;
(*env)->CallStaticVoidMethod(env, disp_class, handleMapNotifyEvent_method);
break;
case UnmapNotify:
dirty = true;
minimized = true;
(*env)->CallStaticVoidMethod(env, disp_class, handleUnmapNotifyEvent_method);
break;
case Expose:
dirty = true;
(*env)->CallStaticVoidMethod(env, disp_class, handleExposeEvent_method);
break;
case ButtonPress: /* Fall through */
case ButtonRelease:
@ -308,10 +313,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReshape(JNIEnv *env,
static bool createWindow(JNIEnv* env, jint window_mode, X11PeerInfo *peer_info, int x, int y, int width, int height) {
bool undecorated = getBooleanProperty(env, "org.lwjgl.opengl.Window.undecorated");
dirty = true;
minimized = false;
closerequested = false;
grab = false;
Window root_win;
Window win;
XSetWindowAttributes attribs;
@ -413,25 +414,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nDestroyWindow(JNIEnv
destroyWindow(env);
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIsDirty
(JNIEnv *env, jclass clazz) {
bool result = dirty;
dirty = false;
return result ? JNI_TRUE : JNI_FALSE;
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIsVisible
(JNIEnv *env, jclass clazz) {
return minimized ? JNI_FALSE : JNI_TRUE;
}
JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nIsCloseRequested
(JNIEnv *env, jclass clazz) {
bool saved = closerequested;
closerequested = false;
return saved;
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nLockAWT(JNIEnv *env, jclass clazz) {
JAWT jawt;
jawt.version = JAWT_VERSION_1_4;