From 9332937b86f329f483f3281780278c275b422e39 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 10 Sep 2019 01:38:08 +0200 Subject: NEWT Cleanup: WindowImpl::visibleChanged(ZZ): Remove unused 'defer' argument. Method only changes state. --- src/newt/classes/jogamp/newt/OffscreenWindow.java | 4 ++-- src/newt/classes/jogamp/newt/WindowImpl.java | 18 +++++++++--------- .../jogamp/newt/driver/android/WindowDriver.java | 4 ++-- .../classes/jogamp/newt/driver/awt/WindowDriver.java | 4 ++-- .../jogamp/newt/driver/bcm/egl/WindowDriver.java | 2 +- .../jogamp/newt/driver/intel/gdl/WindowDriver.java | 2 +- .../classes/jogamp/newt/driver/ios/WindowDriver.java | 12 ++++++------ .../classes/jogamp/newt/driver/kd/WindowDriver.java | 4 ++-- .../jogamp/newt/driver/macosx/WindowDriver.java | 12 ++++++------ .../jogamp/newt/driver/windows/WindowDriver.java | 2 +- src/newt/native/IOSNewtUIWindow.m | 4 ++-- src/newt/native/KDWindow.c | 6 +++--- src/newt/native/MacNewtNSWindow.m | 6 +++--- src/newt/native/WindowsWindow.c | 4 ++-- src/newt/native/X11Display.c | 8 ++++---- src/newt/native/X11Event.c | 4 ++-- src/newt/native/X11Window.c | 2 +- src/newt/native/bcm_vc_iv.c | 4 ++-- 18 files changed, 51 insertions(+), 51 deletions(-) (limited to 'src') diff --git a/src/newt/classes/jogamp/newt/OffscreenWindow.java b/src/newt/classes/jogamp/newt/OffscreenWindow.java index f4b8ecd42..da940541e 100644 --- a/src/newt/classes/jogamp/newt/OffscreenWindow.java +++ b/src/newt/classes/jogamp/newt/OffscreenWindow.java @@ -72,7 +72,7 @@ public class OffscreenWindow extends WindowImpl implements MutableSurface { synchronized(OffscreenWindow.class) { setWindowHandle(nextWindowHandle++); // just a marker } - visibleChanged(false, true); + visibleChanged(true); } @Override @@ -124,7 +124,7 @@ public class OffscreenWindow extends WindowImpl implements MutableSurface { protected boolean reconfigureWindowImpl(final int x, final int y, final int width, final int height, final int flags) { sizeChanged(false, width, height, false); if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } else { /** * silently ignore: diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index b2e727355..953935071 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -924,7 +924,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer * * @see #windowDestroyNotify(boolean) * @see #focusChanged(boolean, boolean) - * @see #visibleChanged(boolean, boolean) + * @see #visibleChanged(boolean) * @see #sizeChanged(int,int) * @see #positionChanged(boolean,int, int) * @see #windowDestroyNotify(boolean) @@ -4428,10 +4428,10 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } /** Triggered by implementation's WM events to update the visibility state. */ - protected final void visibleChanged(final boolean defer, final boolean visible) { + protected final void visibleChanged(final boolean visible) { if( stateMask.put(STATE_BIT_VISIBLE, visible) != visible ) { if(DEBUG_IMPLEMENTATION) { - System.err.println("Window.visibleChanged ("+getThreadName()+"): (defer: "+defer+") visible "+(!visible)+" -> state "+getStateMaskString()+" - windowHandle "+toHexString(windowHandle)+" parentWindowHandle "+toHexString(parentWindowHandle)); + System.err.println("Window.visibleChanged ("+getThreadName()+"): visible "+(!visible)+" -> state "+getStateMaskString()+" - windowHandle "+toHexString(windowHandle)+" parentWindowHandle "+toHexString(parentWindowHandle)); } } } @@ -4741,7 +4741,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer final short eventType, final int modifiers, final int x, final int y, final short button, final float rotation) { if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } if( 0 < eventType ) { if( defer ) { @@ -4763,7 +4763,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer protected final void visibleChangedWindowRepaint(final boolean defer, final int visibleChange, final int x, final int y, final int width, final int height) { if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } windowRepaint(defer, x, y, width, height); } @@ -4781,7 +4781,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer focusChanged(defer, 0 < focusChange); } if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4799,7 +4799,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer final int visibleChange) { insetsChanged(defer, left, right, top, bottom); if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4832,7 +4832,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer focusChanged(defer, 0 < focusChange); } if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4866,7 +4866,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } insetsChanged(defer, left, right, top, bottom); if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } diff --git a/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java index af5d08da0..890680e93 100644 --- a/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java @@ -366,7 +366,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl implements Callback2 { // propagate data .. setGraphicsConfiguration(eglConfig); setWindowHandle(surfaceHandle); - visibleChanged(false, true); + visibleChanged(true); focusChanged(false, true); setupInputListener(true); @@ -483,7 +483,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl implements Callback2 { } } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return res; } diff --git a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java index aa93dd9aa..523fbf336 100644 --- a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java @@ -118,7 +118,7 @@ public class WindowDriver extends WindowImpl { if( withinLocalDispose ) { setupHandleAndGC(); definePosition(getX(), getY()); // clear AUTOPOS - visibleChanged(false, true); + visibleChanged(true); withinLocalDispose = false; } else { if(0!=getParentWindowHandle()) { @@ -316,7 +316,7 @@ public class WindowDriver extends WindowImpl { setGraphicsConfiguration(cfg); } } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if( isVisible() ) { windowRepaint(false, 0, 0, getSurfaceWidth(), getSurfaceHeight()); diff --git a/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java index d19618bd1..df6c2336a 100644 --- a/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java @@ -121,7 +121,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; } diff --git a/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java index b01928449..f00c075b5 100644 --- a/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java @@ -115,7 +115,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl { if(0 != ( STATE_MASK_VISIBLE & flags)) { ((DisplayDriver)getScreen().getDisplay()).setFocus(this); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; diff --git a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java index cc8a419d7..7706b9fe1 100644 --- a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java @@ -205,7 +205,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl try { if(DEBUG_IMPLEMENTATION) { System.err.println("MacWindow.CloseAction "+Thread.currentThread().getName()); } final long handle = getWindowHandle(); - visibleChanged(true, false); + visibleChanged(false); setWindowHandle(0); surfaceHandle = 0; sscSurfaceHandle = 0; @@ -427,10 +427,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderOut0(getWindowHandle()); - visibleChanged(true, false); + visibleChanged(false); } } ); } else { - visibleChanged(true, false); + visibleChanged(false); } } final long oldWindowHandle = getWindowHandle(); @@ -458,7 +458,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl updateSizePosInsets0(getWindowHandle(), false); } } ); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); if( hasFocus ) { requestFocusImpl(true); } @@ -491,10 +491,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderFront0(getWindowHandle()); - visibleChanged(true, true); + visibleChanged(true); } } ); } else { - visibleChanged(true, true); + visibleChanged(true); } } } else { diff --git a/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java index ce5d208db..6b5943ff1 100644 --- a/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java @@ -103,7 +103,7 @@ public class WindowDriver extends WindowImpl { protected boolean reconfigureWindowImpl(final int x, final int y, int width, int height, final int flags) { if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { setVisible0(eglWindowHandle, 0 != ( STATE_MASK_VISIBLE & flags)); - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if(0!=eglWindowHandle) { @@ -127,7 +127,7 @@ public class WindowDriver extends WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; diff --git a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java index bea07d976..d41411e02 100644 --- a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java @@ -210,7 +210,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl try { if(DEBUG_IMPLEMENTATION) { System.err.println("MacWindow.CloseAction "+Thread.currentThread().getName()); } final long handle = getWindowHandle(); - visibleChanged(true, false); + visibleChanged(false); setWindowHandle(0); surfaceHandle = 0; sscSurfaceHandle = 0; @@ -432,10 +432,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderOut0(getWindowHandle()); - visibleChanged(true, false); + visibleChanged(false); } } ); } else { - visibleChanged(true, false); + visibleChanged(false); } } final long oldWindowHandle = getWindowHandle(); @@ -463,7 +463,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl updateSizePosInsets0(getWindowHandle(), false); } } ); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); if( hasFocus ) { requestFocusImpl(true); } @@ -496,10 +496,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderFront0(getWindowHandle()); - visibleChanged(true, true); + visibleChanged(true); } } ); } else { - visibleChanged(true, true); + visibleChanged(true); } } } else { diff --git a/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java index 020fe599b..2c6b4a37e 100644 --- a/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java @@ -251,7 +251,7 @@ public class WindowDriver extends WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if(DEBUG_IMPLEMENTATION) { System.err.println("WindowsWindow reconfig.X: "+getX()+"/"+getY()+" "+getWidth()+"x"+getHeight()+", "+getStateMaskString()); diff --git a/src/newt/native/IOSNewtUIWindow.m b/src/newt/native/IOSNewtUIWindow.m index c20dad1a8..c9895a994 100644 --- a/src/newt/native/IOSNewtUIWindow.m +++ b/src/newt/native/IOSNewtUIWindow.m @@ -443,7 +443,7 @@ static jmethodID windowRepaintID = NULL; sendTouchScreenEventID = (*env)->GetMethodID(env, clazz, "sendTouchScreenEvent", "(SI[I[S[I[I[I[FF)V"); sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V"); updatePixelScaleID = (*env)->GetMethodID(env, clazz, "updatePixelScale", "(ZFFFZ)V"); - visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); insetsChangedID = (*env)->GetMethodID(env, clazz, "insetsChanged", "(ZIIII)V"); sizeScreenPosInsetsChangedID = (*env)->GetMethodID(env, clazz, "sizeScreenPosInsetsChanged", "(ZIIIIIIIIZZ)V"); screenPositionChangedID = (*env)->GetMethodID(env, clazz, "screenPositionChanged", "(ZII)V"); @@ -823,7 +823,7 @@ static jmethodID windowRepaintID = NULL; DBG_PRINT("visibilityChanged: null JNIEnv\n"); return; } - (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, JNI_FALSE, (visible == YES) ? JNI_TRUE : JNI_FALSE); + (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, (visible == YES) ? JNI_TRUE : JNI_FALSE); // detaching thread not required - daemon // NewtCommon_ReleaseJNIEnv(shallBeDetached); diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c index cb82b96eb..b3e9e1f69 100644 --- a/src/newt/native/KDWindow.c +++ b/src/newt/native/KDWindow.c @@ -145,7 +145,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_kd_DisplayDriver_DispatchMessages KDboolean visible; kdGetWindowPropertybv(kdWindow, KD_WINDOWPROPERTY_VISIBILITY, &visible); DBG_PRINT( "event window visibility: src: %p, v:%d\n", userData, visible); - (*env)->CallVoidMethod(env, javaWindow, visibleChangedID, JNI_FALSE, visible?JNI_TRUE:JNI_FALSE); + (*env)->CallVoidMethod(env, javaWindow, visibleChangedID, visible?JNI_TRUE:JNI_FALSE); } break; default: @@ -192,7 +192,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_kd_WindowDriver_initIDs #endif windowCreatedID = (*env)->GetMethodID(env, clazz, "windowCreated", "(J)V"); sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V"); - visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z"); sendMouseEventID = (*env)->GetMethodID(env, clazz, "sendMouseEvent", "(SIIISF)V"); sendKeyEventID = (*env)->GetMethodID(env, clazz, "sendKeyEvent", "(SISSC)V"); @@ -277,7 +277,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_kd_WindowDriver_setVisible0 KDboolean v = (visible==JNI_TRUE)?KD_TRUE:KD_FALSE; kdSetWindowPropertybv(w, KD_WINDOWPROPERTY_VISIBILITY, &v); DBG_PRINT( "[setVisible] v=%d\n", visible); - (*env)->CallVoidMethod(env, obj, visibleChangedID, JNI_FALSE, visible); // FIXME: or defer=true ? + (*env)->CallVoidMethod(env, obj, visibleChangedID, visible); } JNIEXPORT void JNICALL Java_jogamp_newt_driver_kd_WindowDriver_setFullScreen0 diff --git a/src/newt/native/MacNewtNSWindow.m b/src/newt/native/MacNewtNSWindow.m index e75890349..87cdb7b96 100644 --- a/src/newt/native/MacNewtNSWindow.m +++ b/src/newt/native/MacNewtNSWindow.m @@ -357,7 +357,7 @@ static jmethodID windowRepaintID = NULL; return; } - (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, JNI_FALSE, JNI_FALSE); + (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, JNI_FALSE); // detaching thread not required - daemon // NewtCommon_ReleaseJNIEnv(shallBeDetached); @@ -378,7 +378,7 @@ static jmethodID windowRepaintID = NULL; return; } - (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, JNI_FALSE, JNI_TRUE); + (*env)->CallVoidMethod(env, javaWindowObject, visibleChangedID, JNI_TRUE); // detaching thread not required - daemon // NewtCommon_ReleaseJNIEnv(shallBeDetached); @@ -834,7 +834,7 @@ NS_ENDHANDLER enqueueKeyEventID = (*env)->GetMethodID(env, clazz, "enqueueKeyEvent", "(ZSISCC)V"); sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V"); updatePixelScaleID = (*env)->GetMethodID(env, clazz, "updatePixelScale", "(ZFFFZ)V"); - visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); insetsChangedID = (*env)->GetMethodID(env, clazz, "insetsChanged", "(ZIIII)V"); sizeScreenPosInsetsChangedID = (*env)->GetMethodID(env, clazz, "sizeScreenPosInsetsChanged", "(ZIIIIIIIIZZ)V"); screenPositionChangedID = (*env)->GetMethodID(env, clazz, "screenPositionChanged", "(ZII)V"); diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c index 2571a3e63..167adb848 100644 --- a/src/newt/native/WindowsWindow.c +++ b/src/newt/native/WindowsWindow.c @@ -1062,7 +1062,7 @@ static LRESULT CALLBACK wndProc(HWND wnd, UINT message, WPARAM wParam, LPARAM lP DBG_PRINT("*** WindowsWindow: WM_SHOWWINDOW window %p: %d, at-init %d\n", wnd, wParam==TRUE, wud->isInCreation); wud->visible = wParam==TRUE; if( !wud->isInCreation ) { - (*env)->CallVoidMethod(env, window, visibleChangedID, JNI_FALSE, wParam==TRUE?JNI_TRUE:JNI_FALSE); + (*env)->CallVoidMethod(env, window, visibleChangedID, wParam==TRUE?JNI_TRUE:JNI_FALSE); } break; @@ -2127,7 +2127,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_windows_WindowDriver_initIDs0 maximizedChangedID = (*env)->GetMethodID(env, clazz, "maximizedChanged", "(ZZ)V"); positionChangedID = (*env)->GetMethodID(env, clazz, "positionChanged", "(ZII)V"); focusChangedID = (*env)->GetMethodID(env, clazz, "focusChanged", "(ZZ)V"); - visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); sizePosInsetsFocusVisibleChangedID = (*env)->GetMethodID(env, clazz, "sizePosInsetsFocusVisibleChanged", "(ZIIIIIIIIIIZ)V"); windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z"); windowRepaintID = (*env)->GetMethodID(env, clazz, "windowRepaint", "(ZIIII)V"); diff --git a/src/newt/native/X11Display.c b/src/newt/native/X11Display.c index b16734e62..09c3e2c4b 100644 --- a/src/newt/native/X11Display.c +++ b/src/newt/native/X11Display.c @@ -257,7 +257,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_x11_DisplayDriver_initIDs0 sizeChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "sizeChanged", "(ZIIZ)V"); positionChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "positionChanged", "(ZII)V"); focusVisibleChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "focusVisibleChanged", "(ZII)V"); - visibleChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "visibleChanged", "(Z)V"); insetsVisibleChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "insetsVisibleChanged", "(ZIIIII)V"); sizePosMaxInsetsVisibleChangedID = (*env)->GetMethodID(env, X11NewtWindowClazz, "sizePosMaxInsetsVisibleChanged", "(ZIIIIIIIIIIIZ)V"); reparentNotifyID = (*env)->GetMethodID(env, X11NewtWindowClazz, "reparentNotify", "(J)V"); @@ -803,7 +803,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_DisplayDriver_DispatchMessage uint32_t netWMState = NewtWindows_getNET_WM_STATE(dpy, jw); int visibleChange = NewtWindows_updateVisibility(env, dpy, jw, netWMState, "VisibilityNotify"); if( 0 <= visibleChange ) { - (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, JNI_FALSE, 0 < visibleChange ? JNI_TRUE : JNI_FALSE); + (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, 0 < visibleChange ? JNI_TRUE : JNI_FALSE); } #endif } @@ -837,7 +837,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_DisplayDriver_DispatchMessage if( NewtWindows_updateInsets(dpy, jw, &left, &right, &top, &bottom) ) { (*env)->CallVoidMethod(env, jw->jwindow, insetsVisibleChangedID, JNI_FALSE, left, right, top, bottom, 1); } else { - (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, JNI_FALSE, JNI_TRUE); + (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, JNI_TRUE); } } break; @@ -849,7 +849,7 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_DisplayDriver_DispatchMessage if( evt.xunmap.event == evt.xunmap.window ) { // ignore child window notification jw->isMapped = False; - (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, JNI_FALSE, JNI_FALSE); + (*env)->CallVoidMethod(env, jw->jwindow, visibleChangedID, JNI_FALSE); } break; diff --git a/src/newt/native/X11Event.c b/src/newt/native/X11Event.c index d0567c16b..aca9da675 100644 --- a/src/newt/native/X11Event.c +++ b/src/newt/native/X11Event.c @@ -249,7 +249,7 @@ void X11EventPoll(JNIEnv *env, jobject obj, Display *dpy, jlong javaObjectAtom, int left, right, top, bottom; NewtWindows_updateInsets(env, w->jwindow, dpy, evt.xany.window, &left, &right, &top, &bottom); } - (*env)->CallVoidMethod(env, w->jwindow, visibleChangedID, JNI_FALSE, JNI_TRUE); + (*env)->CallVoidMethod(env, w->jwindow, visibleChangedID, JNI_TRUE); } break; @@ -259,7 +259,7 @@ void X11EventPoll(JNIEnv *env, jobject obj, Display *dpy, jlong javaObjectAtom, evt.xunmap.event!=evt.xunmap.window); if( evt.xunmap.event == evt.xunmap.window ) { // ignore child window notification - (*env)->CallVoidMethod(env, w->jwindow, visibleChangedID, JNI_FALSE, JNI_FALSE); + (*env)->CallVoidMethod(env, w->jwindow, visibleChangedID, JNI_FALSE); } break; diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index 1c2c8e80f..930d758a2 100644 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -917,7 +917,7 @@ JNIEXPORT jlongArray JNICALL Java_jogamp_newt_driver_x11_WindowDriver_CreateWind if( NewtWindows_updateInsets(dpy, javaWindow, &left, &right, &top, &bottom) ) { (*env)->CallVoidMethod(env, javaWindow->jwindow, insetsVisibleChangedID, JNI_FALSE, left, right, top, bottom, 1); } else { - (*env)->CallVoidMethod(env, javaWindow->jwindow, visibleChangedID, JNI_FALSE, JNI_TRUE); + (*env)->CallVoidMethod(env, javaWindow->jwindow, visibleChangedID, JNI_TRUE); left=0; right=0; top=0; bottom=0; } diff --git a/src/newt/native/bcm_vc_iv.c b/src/newt/native/bcm_vc_iv.c index 611dd5a4a..dc753157e 100644 --- a/src/newt/native/bcm_vc_iv.c +++ b/src/newt/native/bcm_vc_iv.c @@ -336,7 +336,7 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_bcm_vc_iv_WindowDriver_initID { sizeChangedID = (*env)->GetMethodID(env, clazz, "sizeChanged", "(ZIIZ)V"); positionChangedID = (*env)->GetMethodID(env, clazz, "positionChanged", "(ZII)V"); - visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(ZZ)V"); + visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "(Z)Z"); if (sizeChangedID == NULL || positionChangedID == NULL || @@ -401,7 +401,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt_driver_bcm_vc_iv_WindowDriver_CreateWin vc_dispmanx_update_submit_sync( dispman_update ); - (*env)->CallVoidMethod(env, obj, visibleChangedID, JNI_FALSE, JNI_TRUE); // FIXME: or defer=true ? + (*env)->CallVoidMethod(env, obj, visibleChangedID, JNI_TRUE); DBG_PRINT( "BCM.Display Window.Create.X %p, element %p\n", (void*)(intptr_t)dispman_display, (void*)(intptr_t)p->handle); -- cgit v1.2.3