From 240014321b0aa5d6eb00a70865fa9935fd888d60 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 20 Mar 2021 12:36:46 +0100 Subject: patch 8.2.2626: GTK3: error when starting up and -geometry is given MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: GTK3: error when starting up and -geometry is given. (Dominique Pellé) Solution: Use another function to get the monitor if the window has not been created yet. (closes #7978) --- src/gui_gtk_x11.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/gui_gtk_x11.c') diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 3fdff4d3f3..249b20877a 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4168,9 +4168,17 @@ gui_gtk_get_screen_geom_of_win( GdkRectangle geometry; GdkWindow *win = gtk_widget_get_window(wid); #if GTK_CHECK_VERSION(3,22,0) - GdkDisplay *dpy = gtk_widget_get_display(wid); - GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win); + GdkDisplay *dpy; + GdkMonitor *monitor; + if (wid != NULL && gtk_widget_get_realized(wid)) + dpy = gtk_widget_get_display(wid); + else + dpy = gdk_display_get_default(); + if (win != NULL) + monitor = gdk_display_get_monitor_at_window(dpy, win); + else + monitor = gdk_display_get_monitor_at_point(dpy, point_x, point_y); gdk_monitor_get_geometry(monitor, &geometry); #else GdkScreen* screen; @@ -4180,10 +4188,10 @@ gui_gtk_get_screen_geom_of_win( screen = gtk_widget_get_screen(wid); else screen = gdk_screen_get_default(); - if (win == NULL) - monitor = gdk_screen_get_monitor_at_point(screen, point_x, point_y); - else + if (win != NULL) monitor = gdk_screen_get_monitor_at_window(screen, win); + else + monitor = gdk_screen_get_monitor_at_point(screen, point_x, point_y); gdk_screen_get_monitor_geometry(screen, monitor, &geometry); #endif *screen_x = geometry.x; -- cgit v1.2.3