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/GtkWindow.java

@@ -130,16 +130,19 @@ protected boolean _setVisible(long ptr, boolean visible) {
     @Override
     protected boolean _minimize(long ptr, boolean minimize) {
         minimizeImpl(ptr, minimize);
-        notifyStateChanged(WindowEvent.MINIMIZE);
-        return minimize;
+
+        if (!isVisible()) {
+            notifyStateChanged(WindowEvent.MINIMIZE);
+        }
+
+        return isMinimized();
     }
 
     @Override
     protected boolean _maximize(long ptr, boolean maximize,
                                 boolean wasMaximized) {
         maximizeImpl(ptr, maximize, wasMaximized);
-        notifyStateChanged(WindowEvent.MAXIMIZE);
-        return maximize;
+        return isMaximized();
     }
 
     protected void notifyStateChanged(final int state) {

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

@@ -488,13 +488,13 @@ static void process_events(GdkEvent* event, gpointer data)
         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);
+                    // Let gtk handle it first, so state values are updated
                     gtk_main_do_event(event);
+                    ctx->process_configure(&event->configure);
                     break;
                 case GDK_FOCUS_CHANGE:
                     ctx->process_focus(&event->focus_change);
@@ -512,8 +512,9 @@ static void process_events(GdkEvent* event, gpointer data)
                     ctx->process_expose(&event->expose);
                     break;
                 case GDK_WINDOW_STATE:
-                    ctx->process_state(&event->window_state);
+                    // Let gtk handle it first, so state values are updated
                     gtk_main_do_event(event);
+                    ctx->process_state(&event->window_state);
                     break;
                 case GDK_BUTTON_PRESS:
                 case GDK_2BUTTON_PRESS:
@@ -542,7 +543,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/GlassCommonDialogs.cpp

@@ -65,12 +65,21 @@ static void jstring_to_utf_release(JNIEnv *env, jstring jstr,
     }
 }
 
-static GtkWindow *gdk_window_handle_to_gtk(jlong handle) {
+static GdkWindow *get_gdk_window(jlong handle) {
     return  (handle != 0)
-                ? ((WindowContext*)JLONG_TO_PTR(handle))->get_gtk_window()
+                ? ((WindowContext*)JLONG_TO_PTR(handle))->get_gdk_window()
                 : NULL;
 }
 
+static void on_dialog_realize_set_parent(GtkWidget *dialog, gpointer user_data) {
+    GdkWindow *parent_gdk_window = (GdkWindow *) user_data;
+    GdkWindow *dialog_gdk_window = gtk_widget_get_window(dialog);
+
+    if (dialog_gdk_window && parent_gdk_window) {
+        gdk_window_set_transient_for(dialog_gdk_window, parent_gdk_window);
+    }
+}
+
 static jobject create_empty_result() {
     jclass jFileChooserResult = (jclass) mainEnv->FindClass("com/sun/glass/ui/CommonDialogs$FileChooserResult");
     if (EXCEPTION_OCCURED(mainEnv)) return NULL;
@@ -112,14 +121,16 @@ JNIEXPORT jobject JNICALL Java_com_sun_glass_ui_gtk_GtkCommonDialogs__1showFileC
         return create_empty_result();
     }
 
-    GtkWidget* chooser = gtk_file_chooser_dialog_new(chooser_title, gdk_window_handle_to_gtk(parent),
+    GtkWidget* chooser = gtk_file_chooser_dialog_new(chooser_title, NULL,
             static_cast<GtkFileChooserAction>(chooser_type),
             GTK_STOCK_CANCEL,
             GTK_RESPONSE_CANCEL,
             (chooser_type == GTK_FILE_CHOOSER_ACTION_OPEN ? GTK_STOCK_OPEN : GTK_STOCK_SAVE),
             GTK_RESPONSE_ACCEPT,
             NULL);
 
+    g_signal_connect(chooser, "realize", G_CALLBACK(on_dialog_realize_set_parent), get_gdk_window(parent));
+
     if (chooser_type == GTK_FILE_CHOOSER_ACTION_SAVE) {
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), chooser_filename);
         gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (chooser), TRUE);
@@ -208,14 +219,16 @@ JNIEXPORT jstring JNICALL Java_com_sun_glass_ui_gtk_GtkCommonDialogs__1showFolde
 
     GtkWidget* chooser = gtk_file_chooser_dialog_new(
             chooser_title,
-            gdk_window_handle_to_gtk(parent),
+            NULL,
             GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
             GTK_STOCK_CANCEL,
             GTK_RESPONSE_CANCEL,
             GTK_STOCK_OPEN,
             GTK_RESPONSE_ACCEPT,
             NULL);
 
+    g_signal_connect(chooser, "realize", G_CALLBACK(on_dialog_realize_set_parent), get_gdk_window(parent));
+
     if (chooser_folder != NULL) {
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),
                                             chooser_folder);

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,24 +269,24 @@ JNIEXPORT void JNICALL Java_com_sun_glass_ui_gtk_GtkView__1uploadPixelsByteArray
     }
 }
 
+
 /*
  * Class:     com_sun_glass_ui_gtk_GtkView
  * Method:    _enterFullscreen
  * Signature: (JZZZ)Z
  */
 JNIEXPORT jboolean JNICALL Java_com_sun_glass_ui_gtk_GtkView__1enterFullscreen
-  (JNIEnv * env, jobject obj, jlong ptr, jboolean animate, jboolean keepRation, jboolean hideCursor)
-{
+    (JNIEnv * env, jobject obj, jlong ptr, jboolean animate, jboolean keepRation, jboolean hideCursor) {
+
     (void)animate;
     (void)keepRation;
     (void)hideCursor;
 
     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);
 }
@@ -408,8 +408,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;
@@ -535,13 +533,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"