patch 8.1.0368: GTK code has too many #ifdefs and GTK 2.10 building fails
Problem: GTK code has too many #ifdefs and building fails with GTK 2.10.
Solution: Always use gtk_widget_get_window() and define it for older GTK
versions. (Ken Takata, closes #3421)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 196c9dc..d1a705b 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -763,11 +763,7 @@
{
if (event->type == GDK_PROPERTY_NOTIFY
&& event->state == (int)GDK_PROPERTY_NEW_VALUE
-# if GTK_CHECK_VERSION(3,0,0)
&& GDK_WINDOW_XID(event->window) == commWindow
-# else
- && GDK_WINDOW_XWINDOW(event->window) == commWindow
-# endif
&& GET_X_ATOM(event->atom) == commProperty)
{
XEvent xev;
@@ -777,12 +773,8 @@
xev.xproperty.atom = commProperty;
xev.xproperty.window = commWindow;
xev.xproperty.state = PropertyNewValue;
-# if GTK_CHECK_VERSION(3,0,0)
serverEventProc(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(widget)),
&xev, 0);
-# else
- serverEventProc(GDK_WINDOW_XDISPLAY(widget->window), &xev, 0);
-# endif
}
return FALSE;
}
@@ -2653,17 +2645,11 @@
/* Fall back to old method */
/* first get the existing value */
-# if GTK_CHECK_VERSION(3,0,0)
GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin);
if (XGetWMProtocols(GDK_WINDOW_XDISPLAY(mainwin_win),
GDK_WINDOW_XID(mainwin_win),
&existing_atoms, &count))
-# else
- if (XGetWMProtocols(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
- GDK_WINDOW_XWINDOW(gui.mainwin->window),
- &existing_atoms, &count))
-# endif
{
Atom *new_atoms;
Atom save_yourself_xatom;
@@ -2685,13 +2671,8 @@
{
memcpy(new_atoms, existing_atoms, count * sizeof(Atom));
new_atoms[count] = save_yourself_xatom;
-# if GTK_CHECK_VERSION(3,0,0)
XSetWMProtocols(GDK_WINDOW_XDISPLAY(mainwin_win),
GDK_WINDOW_XID(mainwin_win),
-# else
- XSetWMProtocols(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
- GDK_WINDOW_XWINDOW(gui.mainwin->window),
-# endif
new_atoms, count + 1);
vim_free(new_atoms);
}
@@ -2736,13 +2717,8 @@
* know we are done saving ourselves. We don't want to be
* restarted, thus set argv to NULL.
*/
-# if GTK_CHECK_VERSION(3,0,0)
XSetCommand(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(gui.mainwin)),
GDK_WINDOW_XID(gtk_widget_get_window(gui.mainwin)),
-# else
- XSetCommand(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
- GDK_WINDOW_XWINDOW(gui.mainwin->window),
-# endif
NULL, 0);
return GDK_FILTER_REMOVE;
}
@@ -2776,18 +2752,12 @@
#undef magick
# undef static
-#if GTK_CHECK_VERSION(3,0,0)
GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin);
-#endif
/* When started with "--echo-wid" argument, write window ID on stdout. */
if (echo_wid_arg)
{
-#if GTK_CHECK_VERSION(3,0,0)
printf("WID: %ld\n", (long)GDK_WINDOW_XID(mainwin_win));
-#else
- printf("WID: %ld\n", (long)GDK_WINDOW_XWINDOW(gui.mainwin->window));
-#endif
fflush(stdout);
}
@@ -2824,17 +2794,10 @@
if (serverName == NULL && serverDelayedStartName != NULL)
{
/* This is a :gui command in a plain vim with no previous server */
-# if GTK_CHECK_VERSION(3,0,0)
commWindow = GDK_WINDOW_XID(mainwin_win);
(void)serverRegisterName(GDK_WINDOW_XDISPLAY(mainwin_win),
serverDelayedStartName);
-# else
- commWindow = GDK_WINDOW_XWINDOW(gui.mainwin->window);
-
- (void)serverRegisterName(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
- serverDelayedStartName);
-# endif
}
else
{
@@ -2843,13 +2806,8 @@
* have to change the "server" registration to that of the main window
* If we have not registered a name yet, remember the window.
*/
-# if GTK_CHECK_VERSION(3,0,0)
serverChangeRegisteredWindow(GDK_WINDOW_XDISPLAY(mainwin_win),
GDK_WINDOW_XID(mainwin_win));
-# else
- serverChangeRegisteredWindow(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
- GDK_WINDOW_XWINDOW(gui.mainwin->window));
-# endif
}
gtk_widget_add_events(gui.mainwin, GDK_PROPERTY_CHANGE_MASK);
# if GTK_CHECK_VERSION(3,0,0)
@@ -2945,14 +2903,9 @@
gui.blank_pointer = create_blank_pointer();
-#if GTK_CHECK_VERSION(3,0,0)
if (gui.pointer_hidden && gtk_widget_get_window(gui.drawarea) != NULL)
gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea),
gui.blank_pointer);
-#else
- if (gui.pointer_hidden && gui.drawarea->window != NULL)
- gdk_window_set_cursor(gui.drawarea->window, gui.blank_pointer);
-#endif
/*
* Create a new PangoContext for this screen, and initialize it
@@ -3002,11 +2955,7 @@
gui.blank_pointer = create_blank_pointer();
if (gui.pointer_hidden)
-#if GTK_CHECK_VERSION(3,0,0)
gdk_window_set_cursor(gtk_widget_get_window(widget), gui.blank_pointer);
-#else
- gdk_window_set_cursor(widget->window, gui.blank_pointer);
-#endif
/* get the actual size of the scrollbars, if they are realized */
sbar = firstwin->w_scrollbars[SBAR_LEFT].id;
@@ -4923,15 +4872,9 @@
int
gui_mch_maximized(void)
{
-#if GTK_CHECK_VERSION(3,0,0)
return (gui.mainwin != NULL && gtk_widget_get_window(gui.mainwin) != NULL
&& (gdk_window_get_state(gtk_widget_get_window(gui.mainwin))
& GDK_WINDOW_STATE_MAXIMIZED));
-#else
- return (gui.mainwin != NULL && gui.mainwin->window != NULL
- && (gdk_window_get_state(gui.mainwin->window)
- & GDK_WINDOW_STATE_MAXIMIZED));
-#endif
}
/*
@@ -6051,11 +5994,7 @@
cairo_t *cr;
#endif
-#if GTK_CHECK_VERSION(3,0,0)
if (gui.text_context == NULL || gtk_widget_get_window(gui.drawarea) == NULL)
-#else
- if (gui.text_context == NULL || gui.drawarea->window == NULL)
-#endif
return len;
if (output_conv.vc_type != CONV_NONE)
@@ -6366,19 +6305,10 @@
int
gui_get_x11_windis(Window *win, Display **dis)
{
-#if GTK_CHECK_VERSION(3,0,0)
if (gui.mainwin != NULL && gtk_widget_get_window(gui.mainwin) != NULL)
-#else
- if (gui.mainwin != NULL && gui.mainwin->window != NULL)
-#endif
{
-#if GTK_CHECK_VERSION(3,0,0)
*dis = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(gui.mainwin));
*win = GDK_WINDOW_XID(gtk_widget_get_window(gui.mainwin));
-#else
- *dis = GDK_WINDOW_XDISPLAY(gui.mainwin->window);
- *win = GDK_WINDOW_XWINDOW(gui.mainwin->window);
-#endif
return OK;
}
@@ -6394,13 +6324,8 @@
Display *
gui_mch_get_display(void)
{
-#if GTK_CHECK_VERSION(3,0,0)
if (gui.mainwin != NULL && gtk_widget_get_window(gui.mainwin) != NULL)
return GDK_WINDOW_XDISPLAY(gtk_widget_get_window(gui.mainwin));
-#else
- if (gui.mainwin != NULL && gui.mainwin->window != NULL)
- return GDK_WINDOW_XDISPLAY(gui.mainwin->window);
-#endif
else
return NULL;
}
@@ -6555,11 +6480,7 @@
cairo_t *cr;
#endif
-#if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) == NULL)
-#else
- if (gui.drawarea->window == NULL)
-#endif
return;
#if GTK_CHECK_VERSION(3,0,0)
@@ -6600,11 +6521,7 @@
void
gui_mch_draw_part_cursor(int w, int h, guicolor_T color)
{
-#if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) == NULL)
-#else
- if (gui.drawarea->window == NULL)
-#endif
return;
gui_mch_set_fg_color(color);
@@ -6880,18 +6797,15 @@
if (!gui.by_signal)
gdk_window_invalidate_rect(win, &rect, FALSE);
}
+#else
+# define gui_gtk_window_clear(win) gdk_window_clear(win)
#endif
void
gui_mch_clear_all(void)
{
-#if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) != NULL)
gui_gtk_window_clear(gtk_widget_get_window(gui.drawarea));
-#else
- if (gui.drawarea->window != NULL)
- gdk_window_clear(gui.drawarea->window);
-#endif
}
#if !GTK_CHECK_VERSION(3,0,0)
@@ -7084,12 +6998,8 @@
}
/* Final fallback position - use the X CUT_BUFFER0 store */
-#if GTK_CHECK_VERSION(3,0,0)
yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(gui.mainwin)),
cbd);
-#else
- yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd);
-#endif
}
/*
@@ -7269,15 +7179,9 @@
/* Sorry for the Xlib call, but we can't avoid it, since there is no
* internal GDK mechanism present to accomplish this. (and for good
* reason...) */
-#if GTK_CHECK_VERSION(3,0,0)
XWarpPointer(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(gui.drawarea)),
(Window)0, GDK_WINDOW_XID(gtk_widget_get_window(gui.drawarea)),
0, 0, 0U, 0U, x, y);
-#else
- XWarpPointer(GDK_WINDOW_XDISPLAY(gui.drawarea->window),
- (Window)0, GDK_WINDOW_XWINDOW(gui.drawarea->window),
- 0, 0, 0U, 0U, x, y);
-#endif
}
@@ -7298,26 +7202,16 @@
if (gui.pointer_hidden != hide)
{
gui.pointer_hidden = hide;
-#if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) && gui.blank_pointer != NULL)
-#else
- if (gui.drawarea->window && gui.blank_pointer != NULL)
-#endif
{
if (hide)
-#if GTK_CHECK_VERSION(3,0,0)
gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea),
gui.blank_pointer);
-#else
- gdk_window_set_cursor(gui.drawarea->window, gui.blank_pointer);
-#endif
else
#ifdef FEAT_MOUSESHAPE
mch_set_mouse_shape(last_shape);
-#elif GTK_CHECK_VERSION(3,0,0)
- gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea), NULL);
#else
- gdk_window_set_cursor(gui.drawarea->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea), NULL);
#endif
}
}
@@ -7354,20 +7248,12 @@
int id;
GdkCursor *c;
-# if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) == NULL)
-# else
- if (gui.drawarea->window == NULL)
-# endif
return;
if (shape == MSHAPE_HIDE || gui.pointer_hidden)
-# if GTK_CHECK_VERSION(3,0,0)
gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea),
gui.blank_pointer);
-# else
- gdk_window_set_cursor(gui.drawarea->window, gui.blank_pointer);
-# endif
else
{
if (shape >= MSHAPE_NUMBERED)
@@ -7384,11 +7270,7 @@
return;
c = gdk_cursor_new_for_display(
gtk_widget_get_display(gui.drawarea), (GdkCursorType)id);
-# if GTK_CHECK_VERSION(3,0,0)
gdk_window_set_cursor(gtk_widget_get_window(gui.drawarea), c);
-# else
- gdk_window_set_cursor(gui.drawarea->window, c);
-# endif
# if GTK_CHECK_VERSION(3,0,0)
g_object_unref(G_OBJECT(c));
# else
@@ -7420,12 +7302,8 @@
sign = (GdkPixbuf *)sign_get_image(typenr);
-# if GTK_CHECK_VERSION(3,0,0)
if (sign != NULL && gui.drawarea != NULL
&& gtk_widget_get_window(gui.drawarea) != NULL)
-# else
- if (sign != NULL && gui.drawarea != NULL && gui.drawarea->window != NULL)
-# endif
{
int width;
int height;