aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1084: GTK build has compiler warnings

Browse Source 
Problem:    GTK build has compiler warnings. (Christian Brabandt)
Solution:   Get screen size with a different function. (Ken Takata, Yasuhiro
            Matsumoto)
This commit is contained in:
Bram Moolenaar
2017-09-09 18:45:26 +02:00
parent 5b5adf5b9c
commit 7be9b50fd7
5 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/gui_gtk_x11.c
View File

@@ -4941,6 +4941,29 @@ gui_mch_set_shellsize(int width, int height,
gui_mch_update();
}
void
gui_gtk_get_screen_size_of_win(GtkWidget *win, int *width, int *height)
{
#if GTK_CHECK_VERSION(3,22,0)
GdkDisplay *dpy = gtk_widget_get_display(win);
GdkWindow *win = gtk_widget_get_window(win);
GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
GdkRectangle geometry;
gdk_monitor_get_geometry(monitor, &geometry);
*width = geometry.width;
*height = geometry.height;
#else
GdkScreen* screen;
if (win != NULL && gtk_widget_has_screen(win))
screen = gtk_widget_get_screen(win);
else
screen = gdk_screen_get_default();
*width = gdk_screen_get_width(screen);
*height = gdk_screen_get_height(screen);
#endif
}
/*
* The screen size is used to make sure the initial window doesn't get bigger
@@ -4950,30 +4973,11 @@ gui_mch_set_shellsize(int width, int height,
void
gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
{
#if GTK_CHECK_VERSION(3,22,2)
GdkRectangle rect;
GdkMonitor * const mon = gdk_display_get_monitor_at_window(
gtk_widget_get_display(gui.mainwin),
gtk_widget_get_window(gui.mainwin));
gdk_monitor_get_geometry(mon, &rect);
gui_gtk_get_screen_size_of_win(gui.mainwin, screen_w, screen_h);
*screen_w = rect.width;
/* Subtract 'guiheadroom' from the height to allow some room for the
* window manager (task list and window title bar). */
*screen_h = rect.height - p_ghr;
#else
GdkScreen* screen;
if (gui.mainwin != NULL && gtk_widget_has_screen(gui.mainwin))
screen = gtk_widget_get_screen(gui.mainwin);
else
screen = gdk_screen_get_default();
*screen_w = gdk_screen_get_width(screen);
/* Subtract 'guiheadroom' from the height to allow some room for the
* window manager (task list and window title bar). */
*screen_h = gdk_screen_get_height(screen) - p_ghr;
#endif
*screen_h -= p_ghr;
/*
* FIXME: dirty trick: Because the gui_get_base_height() doesn't include