8354943: [Linux] Simplify and update glass gtk backend: window sizing, positioning, and state management issues

modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java

@@ -164,7 +164,8 @@ private static float getFloat(String propname, float defval, String description)
             throw new UnsupportedOperationException("Unable to load glass GTK library.");
         }
 
-        _initGTK(gtkVersion, gtkVersionVerbose, overrideUIScale);
+        _initGTK(gtkVersion, gtkVersionVerbose, overrideUIScale,
+                System.getProperty("glass.gtk.logCategories", "all"));
 
         // Embedded in SWT, with shared event thread
         boolean isEventThread = Boolean.getBoolean("javafx.embed.isEventThread");
@@ -186,7 +187,7 @@ private static float getFloat(String propname, float defval, String description)
      */
     private static native int _queryLibrary(int version, boolean verbose);
 
-    private static native void _initGTK(int version, boolean verbose, float overrideUIScale);
+    private static native void _initGTK(int version, boolean verbose, float overrideUIScale, String logCategories);
 
     private void initDisplay() {
         Map ds = getDeviceDetails();

modules/javafx.graphics/src/main/java/com/sun/glass/ui/gtk/GtkWindow.java

@@ -130,15 +130,13 @@ protected boolean _setVisible(long ptr, boolean visible) {
     @Override
     protected boolean _minimize(long ptr, boolean minimize) {
         minimizeImpl(ptr, minimize);
-        notifyStateChanged(WindowEvent.MINIMIZE);
         return minimize;
     }
 
     @Override
     protected boolean _maximize(long ptr, boolean maximize,
                                 boolean wasMaximized) {
         maximizeImpl(ptr, maximize, wasMaximized);
-        notifyStateChanged(WindowEvent.MAXIMIZE);
         return maximize;
     }
 

modules/javafx.graphics/src/main/native-glass/gtk/GlassApplication.cpp

@@ -119,7 +119,7 @@ jboolean gtk_verbose = JNI_FALSE;
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkApplication__1initGTK
-  (JNIEnv *env, jclass clazz, jint version, jboolean verbose, jfloat uiScale)
+  (JNIEnv *env, jclass clazz, jint version, jboolean verbose, jfloat uiScale, jstring logCategories)
 {
     (void) clazz;
     (void) version;
@@ -133,6 +133,10 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkApplication__1initGTK
     gdk_threads_enter();
     gtk_init(NULL, NULL);
 
+    const char* categories = env->GetStringUTFChars(logCategories, nullptr);
+    glass_gtk_log_init(categories);
+    env->ReleaseStringUTFChars(logCategories, categories);
+
     checkGtkVersion(env, version);
 }
 
@@ -459,7 +463,7 @@ bool is_window_enabled_for_event(GdkWindow * window, WindowContext *ctx, gint ev
             break;
     }//switch
 
-    if (ctx != NULL ) {
+    if (ctx != NULL) {
         return ctx->isEnabled();
     }
     return TRUE;
@@ -484,17 +488,16 @@ static void process_events(GdkEvent* event, gpointer data)
 
     glass_evloop_call_hooks(event);
 
-    if (ctx != NULL) {
+    if (ctx != nullptr) {
         try {
             switch (event->type) {
                 case GDK_PROPERTY_NOTIFY:
-                    // let gtk handle it first to prevent a glitch
-                    gtk_main_do_event(event);
                     ctx->process_property_notify(&event->property);
+                    gtk_main_do_event(event);
                     break;
                 case GDK_CONFIGURE:
-                    ctx->process_configure(&event->configure);
                     gtk_main_do_event(event);
+                    ctx->process_configure(&event->configure);
                     break;
                 case GDK_FOCUS_CHANGE:
                     ctx->process_focus(&event->focus_change);
@@ -512,8 +515,8 @@ static void process_events(GdkEvent* event, gpointer data)
                     ctx->process_expose(&event->expose);
                     break;
                 case GDK_WINDOW_STATE:
-                    ctx->process_state(&event->window_state);
                     gtk_main_do_event(event);
+                    ctx->process_state(&event->window_state);
                     break;
                 case GDK_BUTTON_PRESS:
                 case GDK_2BUTTON_PRESS:
@@ -542,7 +545,8 @@ static void process_events(GdkEvent* event, gpointer data)
                     process_dnd_target(ctx, &event->dnd);
                     break;
                 case GDK_MAP:
-                    // fall-through
+                    ctx->process_map();
+                    break;
                 case GDK_UNMAP:
                 case GDK_CLIENT_EVENT:
                 case GDK_VISIBILITY_NOTIFY:

modules/javafx.graphics/src/main/native-glass/gtk/GlassRobot.cpp

@@ -273,7 +273,7 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkRobot__1getScreenCapture
     GdkPixbuf *screenshot, *tmp;
     GdkWindow *root_window = gdk_get_default_root_window();
 
-    tmp = glass_pixbuf_from_window(root_window, x, y, width, height);
+    tmp = gdk_pixbuf_get_from_window(root_window, x, y, width, height);
     if (!tmp) {
         return;
     }

modules/javafx.graphics/src/main/native-glass/gtk/GlassView.cpp

@@ -102,7 +102,7 @@ JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkView__1getX
 
     GlassView* view = JLONG_TO_GLASSVIEW(ptr);
     if (view && view->current_window) {
-        return view->current_window->get_geometry().view_x;
+        return view->current_window->get_view_position().x;
     }
     return 0;
 }
@@ -120,7 +120,7 @@ JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkView__1getY
 
     GlassView* view = JLONG_TO_GLASSVIEW(ptr);
     if (view && view->current_window) {
-        return view->current_window->get_geometry().view_y;
+        return view->current_window->get_view_position().y;
     }
     return 0;
 }
@@ -269,6 +269,7 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkView__1uploadPixelsByteArray
     }
 }
 
+
 /*
  * Class:     com_sun_glass_ui_gtk_GtkView
  * Method:    _enterFullscreen
@@ -284,9 +285,8 @@ JNIEXPORT jboolean JNICALL Java_com_sun_glass_ui_gtk_GtkView__1enterFullscreen
     GlassView* view = JLONG_TO_GLASSVIEW(ptr);
     if (view->current_window) {
         view->current_window->enter_fullscreen();
-        env->CallVoidMethod(obj, jViewNotifyView, com_sun_glass_events_ViewEvent_FULLSCREEN_ENTER);
-        CHECK_JNI_EXCEPTION_RET(env, JNI_FALSE)
     }
+
     return JNI_TRUE;
 }
 
@@ -307,10 +307,7 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkView__1exitFullscreen
         } else {
             view->current_window->exit_fullscreen();
         }
-        env->CallVoidMethod(obj, jViewNotifyView, com_sun_glass_events_ViewEvent_FULLSCREEN_EXIT);
-        CHECK_JNI_EXCEPTION(env)
     }
-
 }
 
 } // extern "C"

modules/javafx.graphics/src/main/native-glass/gtk/GlassWindow.cpp

@@ -87,13 +87,13 @@ JNIEXPORT jlong JNICALL Java_com_sun_glass_ui_gtk_GtkWindow__1createWindow
 
     WindowContext* parent = JLONG_TO_WINDOW_CTX(owner);
 
-    WindowContext* ctx = new WindowContextTop(obj,
-            parent,
-            screen,
-            glass_mask_to_window_frame_type(mask),
-            glass_mask_to_window_type(mask),
-            glass_mask_to_wm_function(mask)
-            );
+    WindowType type = glass_mask_to_window_type(mask);
+    WindowFrameType frameType = glass_mask_to_window_frame_type(mask);
+    GdkWMFunction wmFunctions = glass_mask_to_wm_function(mask);
+
+    WindowContext* ctx = (frameType == EXTENDED)
+        ? new WindowContextExtended(obj, parent, screen, wmFunctions)
+        : new WindowContext(obj, parent, screen, frameType, type, wmFunctions);
 
     return PTR_TO_JLONG(ctx);
 }
@@ -409,8 +409,6 @@ JNIEXPORT jboolean JNICALL Java_com_sun_glass_ui_gtk_GtkWindow__1setMaximumSize
 
     WindowContext* ctx = JLONG_TO_WINDOW_CTX(ptr);
     if (w == 0 || h == 0) return JNI_FALSE;
-    if (w == -1) w = G_MAXSHORT;
-    if (h == -1) h = G_MAXSHORT;
 
     ctx->set_maximum_size(w, h);
     return JNI_TRUE;
@@ -536,13 +534,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_glass_ui_gtk_GtkWindow__1getNativeWindowImp
     (void)obj;
 
     WindowContext* ctx = JLONG_TO_WINDOW_CTX(ptr);
-    GdkWindow *win = ctx->get_gdk_window();
-
-    if (win == NULL) {
-        return 0;
-    }
-
-    return GDK_WINDOW_XID(win);
+    return ctx->get_native_window();
 }
 
 } // extern "C"