merge conflict solved

2 files changed, 56 insertions, 7 deletions

diff --git a/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
index 80e5068b4..3b3cd07ae 100644
--- a/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
+++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
@@ -105,7 +105,7 @@ public class X11Window extends WindowImpl {
 
     protected void reconfigureWindowImpl(int x, int y, int width, int height) {
         reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getDisplayHandle(), getScreenIndex(), getWindowHandle(),
-                            x, y, width, height, isUndecorated(), isVisible());
+                           x, y, width, height, isUndecorated(), isVisible(), isFullscreen());
     }
 
     protected boolean reparentWindowImpl() {
@@ -136,7 +136,7 @@ public class X11Window extends WindowImpl {
     private        native void setVisible0(long display, long windowHandle, boolean visible);
     private        native void setSize0(long display, long windowHandle, int width, int height);
     private        native void reconfigureWindow0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
-                                                  int x, int y, int width, int height, boolean undecorated, boolean isVisible);
+                                                  int x, int y, int width, int height, boolean undecorated, boolean isVisible, boolean fullscreen);
     private        native void setTitle0(long display, long windowHandle, String title);
     private        native void requestFocus0(long display, long windowHandle, boolean reparented);
     private        native void setPosition0(long parentWindowHandle, long display, long windowHandle, int x, int y);
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 8a07067b7..1394b5410 100644
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -463,6 +463,44 @@ static void NewtWindows_setDecorations (Display *dpy, Window w, Bool decorated)
     XChangeProperty( dpy, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *)&types, ntypes);
 }
 
+#define _NET_WM_STATE_REMOVE 0
+#define _NET_WM_STATE_ADD 1
+
+static void NewtWindows_setFullscreen (Display *dpy, Window w, Bool fullscreen) {
+    Atom _NET_WM_STATE = XInternAtom( dpy, "_NET_WM_STATE", False );
+    Atom _NET_WM_STATE_ABOVE = XInternAtom( dpy, "_NET_WM_STATE_ABOVE", False );
+    Atom _NET_WM_STATE_FULLSCREEN = XInternAtom( dpy, "_NET_WM_STATE_FULLSCREEN", False );
+    
+    Atom types[2]={0};
+    int ntypes=0;
+
+    types[ntypes++] = _NET_WM_STATE_FULLSCREEN;
+    types[ntypes++] = _NET_WM_STATE_ABOVE;
+
+    XEvent xev;
+    memset ( &xev, 0, sizeof(xev) );
+    
+    xev.type = ClientMessage;
+    xev.xclient.window = w;
+    xev.xclient.message_type = _NET_WM_STATE;
+    xev.xclient.format = 32;
+        
+    if(True==fullscreen) {
+        xev.xclient.data.l[0] = _NET_WM_STATE_ADD;
+        xev.xclient.data.l[1] = _NET_WM_STATE_FULLSCREEN;
+        xev.xclient.data.l[2] = _NET_WM_STATE_ABOVE;
+        xev.xclient.data.l[3] = 1; //source indication for normal applications
+    } else {
+        xev.xclient.data.l[0] = _NET_WM_STATE_REMOVE;
+        xev.xclient.data.l[1] = _NET_WM_STATE_FULLSCREEN;
+        xev.xclient.data.l[2] = _NET_WM_STATE_ABOVE;
+        xev.xclient.data.l[3] = 1; //source indication for normal applications
+    }
+    
+    XChangeProperty( dpy, w, _NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *)&types, ntypes);
+    XSendEvent (dpy, DefaultRootWindow(dpy), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev );
+}
+
 /*
  * Class:     com_jogamp_newt_impl_x11_X11Display
  * Method:    DispatchMessages
@@ -1037,7 +1075,7 @@ static void NewtWindows_reparentWindow
  */
 JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_reconfigureWindow0
   (JNIEnv *env, jobject obj, jlong jparent, jlong display, jint screen_index, jlong window, 
-   jint x, jint y, jint width, jint height, jboolean undecorated, jboolean isVisible) 
+   jint x, jint y, jint width, jint height, jboolean undecorated, jboolean isVisible, jboolean isFullscreen) 
 {
     Display * dpy = (Display *) (intptr_t) display;
     Window w = (Window)window;
@@ -1045,17 +1083,23 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_reconfigureWindow
 
     XWindowChanges xwc;
     XWindowAttributes xwa;
-
-    DBG_PRINT( "X11: reconfigureWindow0 dpy %p, parent %p, win %p, %d/%d %dx%d undec %d, visible %d\n", 
-        (void*)dpy, (void*) jparent, (void*)w, x, y, width, height, undecorated, isVisible);
+    
+    DBG_PRINT( "X11: reconfigureWindow0 dpy %p, parent %p, win %p, %d/%d %dx%d undec %d, visible %d, fullscreen %d\n", 
+        (void*)dpy, (void*) jparent, (void*)w, x, y, width, height, undecorated, isVisible,isFullscreen);
 
     if(dpy==NULL) {
         _FatalError(env, "invalid display connection..");
     }
 
+    
     XSync(dpy, False);
     XGetWindowAttributes(dpy, w, &xwa);
-
+    
+    if(JNI_FALSE == isFullscreen ) {
+      NewtWindows_setFullscreen(dpy, w, False );
+      XSync(dpy, False);
+    }
+    
     NewtWindows_reparentWindow(env, obj, dpy, scrn, w, &xwa, jparent, x, y, undecorated, isVisible);
     XSync(dpy, False);
 
@@ -1066,6 +1110,11 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Window_reconfigureWindow
     xwc.height=height;
     XConfigureWindow(dpy, w, CWX|CWY|CWWidth|CWHeight, &xwc);
     XSync(dpy, False);
+
+    if(JNI_TRUE == isFullscreen ) {
+      NewtWindows_setFullscreen(dpy, w, True );
+      XSync(dpy, False);
+    }
 }
 
 /*