diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/newt/classes/jogamp/newt/driver/x11/X11Window.java | 12 | ||||
| -rw-r--r-- | src/newt/native/X11Window.c | 13 |
2 files changed, 4 insertions, 21 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11Window.java b/src/newt/classes/jogamp/newt/driver/x11/X11Window.java index 8e2e823e4..416bdbdf0 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/X11Window.java +++ b/src/newt/classes/jogamp/newt/driver/x11/X11Window.java @@ -98,8 +98,6 @@ public class X11Window extends WindowImpl { System.err.println("X11Window reconfig: "+x+"/"+y+" "+width+"x"+height+", "+ getReconfigureFlagsAsString(null, flags)); } - reparentHandle=0; - reparentCount=0; if(0 == ( FLAG_IS_UNDECORATED & flags)) { final InsetsImmutable i = getInsets(); @@ -151,15 +149,5 @@ public class X11Window extends WindowImpl { private native void setTitle0(long display, long windowHandle, String title); private native void requestFocus0(long display, long windowHandle, boolean force); - private void windowReparented(long gotParentHandle) { - reparentHandle = gotParentHandle; - reparentCount++; - if(DEBUG_IMPLEMENTATION) { - System.err.println("******** new parent ("+reparentCount+"): " + toHexString(reparentHandle) ); - } - } - private long windowHandleClose; - private volatile long reparentHandle; - private volatile int reparentCount; } diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index 95ce7b91c..b6c239479 100644 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -172,7 +172,6 @@ static jmethodID focusChangedID = NULL; static jmethodID visibleChangedID = NULL; static jmethodID windowDestroyNotifyID = NULL; static jmethodID windowRepaintID = NULL; -static jmethodID windowReparentedID = NULL; static jmethodID enqueueMouseEventID = NULL; static jmethodID sendMouseEventID = NULL; static jmethodID enqueueKeyEventID = NULL; @@ -490,8 +489,8 @@ static Status NewtWindows_getFrameExtends(Display *dpy, Window window, int *left if(nitems<nitems_32 || NULL==frame_extends_data_pp) { XFree(frame_extends_data_pp); - DBG_PRINT( "Warning: NEWT X11Window: Fetched invalid Atom _NET_FRAME_EXTENTS window property (res %d) nitems %ld, bytes_after %ld, actual_type %ld, actual_format %d, _NET_FRAME_EXTENTS %ld, result 0!\n", - res, nitems, bytes_after, (long)actual_type, actual_format, _NET_FRAME_EXTENTS); + // DBG_PRINT( "Warning: NEWT X11Window: Fetched invalid Atom _NET_FRAME_EXTENTS window property (res %d) nitems %ld, bytes_after %ld, actual_type %ld, actual_format %d, _NET_FRAME_EXTENTS %ld, result 0!\n", + // res, nitems, bytes_after, (long)actual_type, actual_format, _NET_FRAME_EXTENTS); return 0; // Error, but ok - ie window not mapped } } @@ -501,8 +500,8 @@ static Status NewtWindows_getFrameExtends(Display *dpy, Window window, int *left *top = (int) *(extends + 2); *bottom = (int) *(extends + 3); - DBG_PRINT( "X11: _NET_FRAME_EXTENTS: window %p insets [ l %d, r %d, t %d, b %d ]\n", - (void*)window, *left, *right, *top, *bottom); + // DBG_PRINT( "X11: _NET_FRAME_EXTENTS: window %p insets [ l %d, r %d, t %d, b %d ]\n", + // (void*)window, *left, *right, *top, *bottom); XFree(frame_extends_data_pp); @@ -878,8 +877,6 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_x11_X11Display_DispatchMessages0 (void*)evt.xreparent.parent, (void*)parentRoot, (void*)parentTopParent, (void*)evt.xreparent.window, (void*)winRoot, (void*)winTopParent); #endif - - (*env)->CallVoidMethod(env, jwindow, windowReparentedID, parentResult); } break; @@ -1350,7 +1347,6 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_x11_X11Window_initIDs0 visibleChangedID = (*env)->GetMethodID(env, clazz, "visibleChanged", "(Z)V"); windowDestroyNotifyID = (*env)->GetMethodID(env, clazz, "windowDestroyNotify", "()V"); windowRepaintID = (*env)->GetMethodID(env, clazz, "windowRepaint", "(IIII)V"); - windowReparentedID = (*env)->GetMethodID(env, clazz, "windowReparented", "(J)V"); enqueueMouseEventID = (*env)->GetMethodID(env, clazz, "enqueueMouseEvent", "(ZIIIIII)V"); sendMouseEventID = (*env)->GetMethodID(env, clazz, "sendMouseEvent", "(IIIIII)V"); enqueueKeyEventID = (*env)->GetMethodID(env, clazz, "enqueueKeyEvent", "(ZIIIC)V"); @@ -1365,7 +1361,6 @@ JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_x11_X11Window_initIDs0 visibleChangedID == NULL || windowDestroyNotifyID == NULL || windowRepaintID == NULL || - windowReparentedID == NULL || enqueueMouseEventID == NULL || sendMouseEventID == NULL || enqueueKeyEventID == NULL || |