GTK4: gtk_window_move(), gtk_window_set_position()

GTK4 migration

- gtk_window_move() set to a stub, requires completion
- gtk_window_set_position() set to a stub, requires completion

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 584f957..bcc1c25 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -443,7 +443,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gtk_window_resize(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.w, lw->options.advanced_exif_window.h);
        if (lw->options.advanced_exif_window.x != 0 && lw->options.advanced_exif_window.y != 0)
                {
-               gtk_window_move(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.x, lw->options.advanced_exif_window.y);
+               gq_gtk_window_move(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.x, lw->options.advanced_exif_window.y);
                }
 
        g_object_set_data(G_OBJECT(ew->window), "advanced_exif_data", ew);

diff --git a/src/bar.cc b/src/bar.cc
index c97a9d8..bdd924c 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -318,7 +318,7 @@ static void bar_expander_height_cb(GtkWidget *, gpointer data)
        gtk_window_set_default_size(GTK_WINDOW(window), 50, 30); //** @FIXME set these values in a more sensible way */
        g_signal_connect(window, "key-press-event", G_CALLBACK(expander_height_cb), nullptr);
 
-       gtk_window_move(GTK_WINDOW(window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(window), x, y);
        gtk_widget_show(window);
 
        gtk_widget_get_size_request(GTK_WIDGET(data_box), &w, &h);

diff --git a/src/collect-table.cc b/src/collect-table.cc
index ffae68e..6284164 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -592,7 +592,7 @@ static void tip_show(CollectTable *ct)
        gdk_device_get_position(device, nullptr, &x, &y);
 
        if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
-       gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
+       gq_gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
        gtk_widget_show(ct->tip_window);
 }
 
@@ -651,7 +651,7 @@ static void tip_update(CollectTable *ct, CollectInfo *info)
                gint x, y;
                gdk_device_get_position(device, nullptr, &x, &y);
 
-               gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
+               gq_gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
 
                if (info != ct->tip_info)
                        {

diff --git a/src/collect.cc b/src/collect.cc
index 544a6aa..fc2e35c 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -1348,7 +1348,7 @@ CollectWindow *collection_window_new(const gchar *path)
        if (options->save_window_positions && path && collection_load_only_geometry(cw->cd, path))
                {
                gtk_window_set_default_size(GTK_WINDOW(cw->window), cw->cd->window_w, cw->cd->window_h);
-               gtk_window_move(GTK_WINDOW(cw->window), cw->cd->window_x, cw->cd->window_y);
+               gq_gtk_window_move(GTK_WINDOW(cw->window), cw->cd->window_x, cw->cd->window_y);
                }
        else
                {

diff --git a/src/compat.h b/src/compat.h
index 6bb00f2..818db2f 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -38,7 +38,9 @@
        #define gq_gtk_widget_destroy(widget) gtk_window_destroy(widget)
        #define gq_gtk_widget_queue_draw_area(widget, x, y, width, height) gtk_widget_queue_draw(widget);
        #define gq_gtk_widget_show_all(widget) ;
+       #define gq_gtk_window_move(window, x, y) ;
        #define gq_gtk_window_set_keep_above(window, setting) ;
+       #define gq_gtk_window_set_position(window, position) ;
 
        void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget);
 #else
@@ -50,7 +52,9 @@
        #define gq_gtk_widget_destroy(widget) gtk_widget_destroy(widget)
        #define gq_gtk_widget_queue_draw_area(widget, x, y, width, height) gtk_widget_queue_draw_area(widget, x, y, width, height);
        #define gq_gtk_widget_show_all(widget) gtk_widget_show_all(widget)
+       #define gq_gtk_window_move(window, x, y) gtk_window_move(window, x, y)
        #define gq_gtk_window_set_keep_above(window, setting) gtk_window_set_keep_above(window, setting)
+       #define gq_gtk_window_set_position(window, position) gtk_window_set_position(window, position)
 
        void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget);
 #endif

diff --git a/src/dupe.cc b/src/dupe.cc
index 73b4e35..358d084 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4613,7 +4613,7 @@ DupeWindow *dupe_window_new()
        if (lw && options->save_window_positions)
                {
                gtk_window_set_default_size(GTK_WINDOW(dw->window), lw->options.dupe_window.w, lw->options.dupe_window.h);
-               gtk_window_move(GTK_WINDOW(dw->window), lw->options.dupe_window.x, lw->options.dupe_window.y);
+               gq_gtk_window_move(GTK_WINDOW(dw->window), lw->options.dupe_window.x, lw->options.dupe_window.y);
                }
        else
                {

diff --git a/src/fullscreen.cc b/src/fullscreen.cc
index c3d1958..a9e64f6 100644 (file)
--- a/src/fullscreen.cc
+++ b/src/fullscreen.cc
@@ -259,7 +259,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        /* set default size and position, so the window appears where it was before */
        gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
-       gtk_window_move(GTK_WINDOW(fs->window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(fs->window), x, y);
 
        /* By setting USER_POS and USER_SIZE, most window managers will
         * not request positioning of the full screen window (for example twm).

diff --git a/src/layout.cc b/src/layout.cc
index c2ec03b..37ed8e2 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -1673,7 +1673,7 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
                if (options->save_window_positions)
                        {
                        gtk_window_set_default_size(GTK_WINDOW(lw->tools), lw->options.float_window.w, lw->options.float_window.h);
-                       gtk_window_move(GTK_WINDOW(lw->tools), lw->options.float_window.x, lw->options.float_window.y);
+                       gq_gtk_window_move(GTK_WINDOW(lw->tools), lw->options.float_window.x, lw->options.float_window.y);
                        }
                else
                        {
@@ -2667,7 +2667,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
        if (options->save_window_positions || isfile(default_path))
                {
                gtk_window_set_default_size(GTK_WINDOW(lw->window), lw->options.main_window.w, lw->options.main_window.h);
-               gtk_window_move(GTK_WINDOW(lw->window), lw->options.main_window.x, lw->options.main_window.y);
+               gq_gtk_window_move(GTK_WINDOW(lw->window), lw->options.main_window.x, lw->options.main_window.y);
                if (lw->options.main_window.maximized) gtk_window_maximize(GTK_WINDOW(lw->window));
 
                g_idle_add(move_window_to_workspace_cb, lw);

diff --git a/src/logwindow.cc b/src/logwindow.cc
index 86ac4a1..47d86cf 100644 (file)
--- a/src/logwindow.cc
+++ b/src/logwindow.cc
@@ -410,7 +410,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
 
        gtk_window_resize(GTK_WINDOW(window), lw->options.log_window.w,
                                                                                        lw->options.log_window.h);
-       gtk_window_move(GTK_WINDOW(window), lw->options.log_window.x, lw->options.log_window.y);
+       gq_gtk_window_move(GTK_WINDOW(window), lw->options.log_window.x, lw->options.log_window.y);
 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(gtk_widget_hide_on_delete), NULL);

diff --git a/src/preferences.cc b/src/preferences.cc
index dd16ba3..1cbbecf 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -4027,7 +4027,7 @@ static void config_window_create(LayoutWindow *lw)
        if (options->save_dialog_window_positions)
                {
                gtk_window_resize(GTK_WINDOW(configwindow), lw->options.preferences_window.w, lw->options.preferences_window.h);
-               gtk_window_move(GTK_WINDOW(configwindow), lw->options.preferences_window.x, lw->options.preferences_window.y);
+               gq_gtk_window_move(GTK_WINDOW(configwindow), lw->options.preferences_window.x, lw->options.preferences_window.y);
                }
        else
                {

diff --git a/src/remote.cc b/src/remote.cc
index b94134d..db6096f 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -1177,7 +1177,7 @@ static gboolean wait_cb(gpointer data)
        gint x = position >> 16;
        gint y = position - (x << 16);
 
-       gtk_window_move(GTK_WINDOW(lw_id->window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(lw_id->window), x, y);
 
        return G_SOURCE_REMOVE;
 }
@@ -1196,7 +1196,7 @@ static void gr_geometry(const gchar *text, GIOChannel *, gpointer)
                geometry = g_strsplit_set(text, "+", 3);
                if (geometry[1] != nullptr && geometry[2] != nullptr )
                        {
-                       gtk_window_move(GTK_WINDOW(lw_id->window), atoi(geometry[1]), atoi(geometry[2]));
+                       gq_gtk_window_move(GTK_WINDOW(lw_id->window), atoi(geometry[1]), atoi(geometry[2]));
                        }
                }
        else

diff --git a/src/search.cc b/src/search.cc
index 20d5b35..95331e1 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -3351,7 +3351,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        if (lw && options->save_window_positions)
                {
                gtk_window_set_default_size(GTK_WINDOW(sd->window), lw->options.search_window.w, lw->options.search_window.h);
-               gtk_window_move(GTK_WINDOW(sd->window), lw->options.search_window.x, lw->options.search_window.y);
+               gq_gtk_window_move(GTK_WINDOW(sd->window), lw->options.search_window.x, lw->options.search_window.y);
                }
        else
                {

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index d56f167..b9b61be 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -957,7 +957,7 @@ static void date_selection_popup(DateSelection *ds)
        if (x < 0) x = 0;
        if (y < 0) y = 0;
 
-       gtk_window_move(GTK_WINDOW(ds->window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(ds->window), x, y);
        gtk_widget_show(ds->window);
 
        gtk_widget_grab_focus(ds->calendar);

diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc
index 131ff8f..2a53ce6 100644 (file)
--- a/src/ui-tree-edit.cc
+++ b/src/ui-tree-edit.cc
@@ -159,7 +159,7 @@ static gboolean tree_edit_by_path_idle_cb(gpointer data)
        /* now show it */
        gtk_widget_set_size_request(ted->window, w, h);
        gtk_widget_realize(ted->window);
-       gtk_window_move(GTK_WINDOW(ted->window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(ted->window), x, y);
        gtk_window_resize(GTK_WINDOW(ted->window), w, h);
        gtk_widget_show(ted->window);
 

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
index 03e7c91..cac1969 100644 (file)
--- a/src/ui-utildlg.cc
+++ b/src/ui-utildlg.cc
@@ -400,7 +400,7 @@ static void generic_dialog_setup(GenericDialog *gd,
                if (generic_dialog_find_window(title, role, &x, &y, &w, &h))
                        {
                        gtk_window_set_default_size(GTK_WINDOW(gd->dialog), w, h);
-                       gtk_window_move(GTK_WINDOW(gd->dialog), x, y);
+                       gq_gtk_window_move(GTK_WINDOW(gd->dialog), x, y);
                        }
                }
 
@@ -579,7 +579,7 @@ static void show_notification_message(AppImageData *appimage_data)
        GdkRectangle workarea;
        gdk_monitor_get_workarea(gdk_display_get_primary_monitor(gdk_display_get_default()),
                              &workarea);
-       gtk_window_move(GTK_WINDOW(appimage_data->window), workarea.width * 0.8, workarea.height / 20);
+       gq_gtk_window_move(GTK_WINDOW(appimage_data->window), workarea.width * 0.8, workarea.height / 20);
        g_signal_connect(appimage_data->window, "focus-in-event", G_CALLBACK(user_close_cb), appimage_data);
        appimage_data->id = g_timeout_add(100, appimage_notification_fade_cb, appimage_data);
 

diff --git a/src/utilops.cc b/src/utilops.cc
index 7ab35fa..d5e100d 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -195,7 +195,7 @@ GenericDialog *file_util_gen_dlg(const gchar *title,
        gd = generic_dialog_new(title, role, parent, auto_close, cancel_cb, data);
        if (options->place_dialogs_under_mouse)
                {
-               gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
+               gq_gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
                }
 
        return gd;
@@ -222,7 +222,7 @@ FileDialog *file_util_file_dlg(const gchar *title,
        fdlg = file_dialog_new(title, role, parent, cancel_cb, data);
        if (options->place_dialogs_under_mouse)
                {
-               gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);
+               gq_gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);
                }
 
        gtk_window_set_modal(GTK_WINDOW(fdlg->gd.dialog), TRUE);
@@ -249,7 +249,7 @@ GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *messa
        generic_dialog_add_button(gd, GQ_ICON_OK, "OK", file_util_warning_dialog_ok_cb, TRUE);
        if (options->place_dialogs_under_mouse)
                {
-               gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
+               gq_gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
                }
        gtk_widget_show(gd->dialog);
 

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index 32d6955..a5d5f27 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -362,7 +362,7 @@ static void tip_show(ViewFile *vf)
        gdk_device_get_position(device, nullptr, &x, &y);
 
        if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
-       gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
+       gq_gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
        gtk_widget_show(VFICON(vf)->tip_window);
 }
 
@@ -430,7 +430,7 @@ static void tip_update(ViewFile *vf, FileData *fd)
 
                gdk_device_get_position(device, nullptr, &x, &y);
 
-               gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
+               gq_gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
 
                if (fd != VFICON(vf)->tip_fd)
                        {