Make GTK code in xscreensaver build when -DGSEAL_ENABLE is set in CFLAGS,
though gtk+ 2.20 or later is required to actually build that way, due to
requirements for accessor functions not introduced until then.
Checks GTK version number and enables the appropriate flags for that version
so this can be incorporated upstream or backported to older releases.
Version number checks are based on versions listed as introducing the
functions in the GTK docs at http://library.gnome.org/devel/gtk/ and have
not been manually verified.
[Submitted upstream 06/11/10]
diff --git xscreensaver-5.11/driver/demo-Gtk-conf.c xscreensaver-5.11/driver/demo-Gtk-conf.c
--- xscreensaver-5.11/driver/demo-Gtk-conf.c
+++ xscreensaver-5.11/driver/demo-Gtk-conf.c
@@ -63,7 +63,22 @@
#include "demo-Gtk-conf.h"
-
+/* Deal with deprecation of direct access to struct fields on the way to GTK3
+ See http://live.gnome.org/GnomeGoals/UseGseal
+ */
+#if GTK_CHECK_VERSION(2,14,0)
+# define GET_PARENT(w) gtk_widget_get_parent (w)
+# define GET_ADJ_VALUE(a) gtk_adjustment_get_value (a)
+# define GET_ADJ_UPPER(a) gtk_adjustment_get_upper (a)
+# define GET_ADJ_LOWER(a) gtk_adjustment_get_lower (a)
+#else
+# define GET_PARENT(w) ((w)->parent)
+# define GET_ADJ_VALUE(a) ((a)->value)
+# define GET_ADJ_UPPER(a) ((a)->upper)
+# define GET_ADJ_LOWER(a) ((a)->lower)
+#endif
+
+
extern const char *blurb (void);
@@ -930,7 +945,7 @@ make_parameter_widget (const char *filename, parameter *p, GtkWidget *parent)
GtkWidget *spin = gtk_spin_button_new (adj, 15, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (spin), TRUE);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), adj->value);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), GET_ADJ_VALUE(adj));
set_widget_min_width (GTK_WIDGET (spin), MIN_SPINBUTTON_WIDTH);
if (label)
@@ -1008,8 +1023,8 @@ static void
file_sel_cancel (GtkWidget *button, gpointer user_data)
{
GtkWidget *dialog = button;
- while (dialog->parent)
- dialog = dialog->parent;
+ while (GET_PARENT (dialog))
+ dialog = GET_PARENT (dialog);
gtk_widget_destroy (dialog);
}
@@ -1020,8 +1035,9 @@ file_sel_ok (GtkWidget *button, gpointer user_data)
GtkWidget *entry = GTK_WIDGET (user_data);
GtkWidget *dialog = button;
const char *path;
- while (dialog->parent)
- dialog = dialog->parent;
+
+ while (GET_PARENT (dialog))
+ dialog = GET_PARENT (dialog);
gtk_widget_hide (dialog);
path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (dialog));
@@ -1213,8 +1229,9 @@ parameter_to_switch (parameter *p)
char buf[255];
char *s1;
float value = (p->invert_p
- ? invert_range (adj->lower, adj->upper, adj->value) - 1
- : adj->value);
+ ? invert_range (GET_ADJ_LOWER(adj), GET_ADJ_UPPER(adj),
+ GET_ADJ_VALUE(adj)) - 1
+ : GET_ADJ_VALUE(adj));
if (value == p->value) /* same as default */
return 0;
@@ -1575,7 +1592,7 @@ parameter_set_switch (parameter *p, gpointer value)
if (1 == sscanf ((char *) value, "%f %c", &f, &c))
{
if (p->invert_p)
- f = invert_range (adj->lower, adj->upper, f) - 1;
+ f = invert_range (GET_ADJ_LOWER(adj), GET_ADJ_UPPER(adj), f) - 1;
gtk_adjustment_set_value (adj, f);
}
break;
diff --git xscreensaver-5.11/driver/demo-Gtk.c xscreensaver-5.11/driver/demo-Gtk.c
--- xscreensaver-5.11/driver/demo-Gtk.c
+++ xscreensaver-5.11/driver/demo-Gtk.c
@@ -152,6 +152,41 @@ enum {
};
#endif /* HAVE_GTK2 */
+/* Deal with deprecation of direct access to struct fields on the way to GTK3
+ See http://live.gnome.org/GnomeGoals/UseGseal
+ */
+#if GTK_CHECK_VERSION(2,14,0)
+# define GET_PARENT(w) gtk_widget_get_parent (w)
+# define GET_WINDOW(w) gtk_widget_get_window (w)
+# define GET_ACTION_AREA(d) gtk_dialog_get_action_area (d)
+# define GET_CONTENT_AREA(d) gtk_dialog_get_content_area (d)
+# define GET_ADJ_VALUE(a) gtk_adjustment_get_value (a)
+# define SET_ADJ_VALUE(a,v) gtk_adjustment_set_value (a, v)
+# define SET_ADJ_UPPER(a,v) gtk_adjustment_set_upper (a, v)
+#else
+# define GET_PARENT(w) ((w)->parent)
+# define GET_WINDOW(w) ((w)->window)
+# define GET_ACTION_AREA(d) ((d)->action_area)
+# define GET_CONTENT_AREA(d) ((d)->vbox)
+# define GET_ADJ_VALUE(a) ((a)->value)
+# define SET_ADJ_VALUE(a,v) (a)->value = v
+# define SET_ADJ_UPPER(a,v) (a)->upper = v
+#endif
+
+#if GTK_CHECK_VERSION(2,18,0)
+# define SET_CAN_DEFAULT(w) gtk_widget_set_can_default ((w), TRUE)
+# define GET_SENSITIVE(w) gtk_widget_get_sensitive (w)
+#else
+# define SET_CAN_DEFAULT(w) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT)
+# define GET_SENSITIVE(w) GTK_WIDGET_IS_SENSITIVE (w)
+#endif
+
+#if GTK_CHECK_VERSION(2,20,0)
+# define GET_REALIZED(w) gtk_widget_get_realized (w)
+#else
+# define GET_REALIZED(w) GTK_WIDGET_REALIZED (w)
+#endif
+
/* from exec.c */
extern void exec_command (const char *shell, const char *command, int nice);
extern int on_path_p (const char *program);
@@ -437,9 +472,9 @@ ensure_selected_item_visible (GtkWidget *widget)
adj = gtk_scrolled_window_get_vadjustment (scroller);
- gdk_window_get_geometry (GTK_WIDGET(vp)->window,
+ gdk_window_get_geometry (GET_WINDOW (GTK_WIDGET (vp)),
&ignore, &ignore, &ignore, &parent_h, &ignore);
- gdk_window_get_geometry (GTK_WIDGET(selected)->window,
+ gdk_window_get_geometry (GET_WINDOW (GTK_WIDGET (selected)),
&ignore, &child_y, &ignore, &child_h, &ignore);
children_h = nkids * child_h;
@@ -482,8 +517,8 @@ static void
warning_dialog_dismiss_cb (GtkWidget *widget, gpointer user_data)
{
GtkWidget *shell = GTK_WIDGET (user_data);
- while (shell->parent)
- shell = shell->parent;
+ while (GET_PARENT (shell))
+ shell = GET_PARENT (shell);
gtk_widget_destroy (GTK_WIDGET (shell));
}
@@ -523,11 +558,11 @@ warning_dialog (GtkWidget *parent, const char *message,
GtkWidget *cancel = 0;
int i = 0;
- while (parent && !parent->window)
- parent = parent->parent;
+ while (parent && !GET_WINDOW (parent))
+ parent = GET_PARENT (parent);
if (!parent ||
- !GTK_WIDGET (parent)->window) /* too early to pop up transient dialogs */
+ !GET_WINDOW (parent)) /* too early to pop up transient dialogs */
{
fprintf (stderr, "%s: too early for dialog?\n", progname);
return;
@@ -562,7 +597,7 @@ warning_dialog (GtkWidget *parent, const char *message,
#endif /* !HAVE_GTK2 */
if (center <= 0)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (GET_CONTENT_AREA (GTK_DIALOG (dialog))),
label, TRUE, TRUE, 0);
gtk_widget_show (label);
}
@@ -576,12 +611,12 @@ warning_dialog (GtkWidget *parent, const char *message,
}
label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (GET_CONTENT_AREA (GTK_DIALOG (dialog))),
label, TRUE, TRUE, 0);
gtk_widget_show (label);
label = gtk_hbutton_box_new ();
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
+ gtk_box_pack_start (GTK_BOX (GET_ACTION_AREA (GTK_DIALOG (dialog))),
label, TRUE, TRUE, 0);
#ifdef HAVE_GTK2
@@ -610,13 +645,13 @@ warning_dialog (GtkWidget *parent, const char *message,
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
gtk_window_set_title (GTK_WINDOW (dialog), progclass);
- GTK_WIDGET_SET_FLAGS (ok, GTK_CAN_DEFAULT);
+ SET_CAN_DEFAULT (ok);
gtk_widget_show (ok);
gtk_widget_grab_focus (ok);
if (cancel)
{
- GTK_WIDGET_SET_FLAGS (cancel, GTK_CAN_DEFAULT);
+ SET_CAN_DEFAULT (cancel);
gtk_widget_show (cancel);
}
gtk_widget_show (label);
@@ -644,8 +679,8 @@ warning_dialog (GtkWidget *parent, const char *message,
(gpointer) dialog);
}
- gdk_window_set_transient_for (GTK_WIDGET (dialog)->window,
- GTK_WIDGET (parent)->window);
+ gdk_window_set_transient_for (GET_WINDOW (GTK_WIDGET (dialog)),
+ GET_WINDOW (GTK_WIDGET (parent)));
#ifdef HAVE_GTK2
gtk_window_present (GTK_WINDOW (dialog));
@@ -835,11 +870,11 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
GtkWidget *dialog = gtk_dialog_new ();
GtkWidget *hbox, *icon, *vbox, *label1, *label2, *hb, *ok;
GtkWidget *parent = GTK_WIDGET (menuitem);
- while (parent->parent)
- parent = parent->parent;
+ while (GET_PARENT (parent))
+ parent = GET_PARENT (parent);
hbox = gtk_hbox_new (FALSE, 20);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (GET_CONTENT_AREA (GTK_DIALOG (dialog))),
hbox, TRUE, TRUE, 0);
colormap = gtk_widget_get_colormap (parent);
@@ -880,7 +915,7 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
hb = gtk_hbutton_box_new ();
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
+ gtk_box_pack_start (GTK_BOX (GET_ACTION_AREA (GTK_DIALOG (dialog))),
hb, TRUE, TRUE, 0);
#ifdef HAVE_GTK2
@@ -906,10 +941,10 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data)
gtk_signal_connect_object (GTK_OBJECT (ok), "clicked",
GTK_SIGNAL_FUNC (warning_dialog_dismiss_cb),
(gpointer) dialog);
- gdk_window_set_transient_for (GTK_WIDGET (dialog)->window,
- GTK_WIDGET (parent)->window);
- gdk_window_show (GTK_WIDGET (dialog)->window);
- gdk_window_raise (GTK_WIDGET (dialog)->window);
+ gdk_window_set_transient_for (GET_WINDOW (GTK_WIDGET (dialog)),
+ GET_WINDOW (GTK_WIDGET (parent)));
+ gdk_window_show (GET_WINDOW (GTK_WIDGET (dialog)));
+ gdk_window_raise (GET_WINDOW (GTK_WIDGET (dialog)));
}
}
@@ -1158,7 +1193,7 @@ static void
force_list_select_item (state *s, GtkWidget *list, int list_elt, Bool scroll_p)
{
GtkWidget *parent = name_to_widget (s, "scroller");
- Bool was = GTK_WIDGET_IS_SENSITIVE (parent);
+ gboolean was = GET_SENSITIVE (parent);
#ifdef HAVE_GTK2
GtkTreeIter iter;
GtkTreeModel *model;
@@ -1792,7 +1827,8 @@ mode_menu_item_cb (GtkWidget *widget, gpointer user_data)
GtkWidget *list = name_to_widget (s, "list");
int list_elt;
- GList *menu_items = gtk_container_children (GTK_CONTAINER (widget->parent));
+ GList *menu_items =
+ gtk_container_children (GTK_CONTAINER (GET_PARENT (widget)));
int menu_index = 0;
saver_mode new_mode;
@@ -2005,7 +2041,7 @@ list_checkbox_cb (
/* remember previous scroll position of the top of the list */
adj = gtk_scrolled_window_get_vadjustment (scroller);
- scroll_top = adj->value;
+ scroll_top = GET_ADJ_VALUE (adj);
flush_dialog_changes_and_save (s);
force_list_select_item (s, GTK_WIDGET (list), list_elt, False);
@@ -2530,7 +2566,7 @@ populate_hack_list (state *s)
(but don't actually make it be insensitive, since we still
want to be able to click on it.)
*/
- GtkStyle *style = GTK_WIDGET (list)->style;
+ GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (list));
GdkColor *fg = &style->fg[GTK_STATE_INSENSITIVE];
/* GdkColor *bg = &style->bg[GTK_STATE_INSENSITIVE]; */
char *buf = (char *) malloc (strlen (pretty_name) + 100);
@@ -2942,9 +2978,9 @@ populate_prefs_page (state *s)
if (idletime)
{
adj = gtk_spin_button_get_adjustment((GtkSpinButton *)timeout_spinbutton);
- adj->upper = (gdouble)idletime;
- if (adj->value > adj->upper)
- adj->value = adj->upper;
+ SET_ADJ_UPPER (adj, (gdouble)idletime);
+ if (GET_ADJ_VALUE (adj) > (gdouble)idletime)
+ SET_ADJ_VALUE (adj, (gdouble)idletime);
gtk_spin_button_set_adjustment((GtkSpinButton *)timeout_spinbutton, adj);
}
}
@@ -3076,7 +3112,7 @@ force_dialog_repaint (state *s)
#if 1
/* Tell GDK to invalidate and repaint the whole window.
*/
- GdkWindow *w = s->toplevel_widget->window;
+ GdkWindow *w = GET_WINDOW (s->toplevel_widget);
GdkRegion *region = gdk_region_new ();
GdkRectangle rect;
rect.x = rect.y = 0;
@@ -3165,7 +3201,7 @@ fix_text_entry_sizes (state *s)
#ifdef HAVE_GTK2
PangoFontMetrics *pain =
pango_context_get_metrics (gtk_widget_get_pango_context (w),
- w->style->font_desc,
+ gtk_widget_get_style (w)->font_desc,
gtk_get_default_language ());
height = PANGO_PIXELS (pango_font_metrics_get_ascent (pain) +
pango_font_metrics_get_descent (pain));
@@ -3602,16 +3638,18 @@ clear_preview_window (state *s)
{
GtkWidget *p;
GdkWindow *window;
+ GtkStyle *style;
if (!s->toplevel_widget) return; /* very early */
p = name_to_widget (s, "preview");
- window = p->window;
+ window = GET_WINDOW (p);
if (!window) return;
/* Flush the widget background down into the window, in case a subproc
has changed it. */
- gdk_window_set_background (window, &p->style->bg[GTK_STATE_NORMAL]);
+ style = gtk_widget_get_style (p);
+ gdk_window_set_background (window, &style->bg[GTK_STATE_NORMAL]);
gdk_window_clear (window);
{
@@ -3672,15 +3710,16 @@ reset_preview_window (state *s)
when changing hacks, instead of always trying to reuse the same one?
*/
GtkWidget *pr = name_to_widget (s, "preview");
- if (GTK_WIDGET_REALIZED (pr))
+ if (GET_REALIZED (pr))
{
- Window oid = (pr->window ? GDK_WINDOW_XWINDOW (pr->window) : 0);
+ GdkWindow *window = GET_WINDOW (pr);
+ Window oid = (window ? GDK_WINDOW_XWINDOW (window) : 0);
Window id;
gtk_widget_hide (pr);
gtk_widget_unrealize (pr);
gtk_widget_realize (pr);
gtk_widget_show (pr);
- id = (pr->window ? GDK_WINDOW_XWINDOW (pr->window) : 0);
+ id = (window ? GDK_WINDOW_XWINDOW (window) : 0);
if (s->debug_p)
fprintf (stderr, "%s: window id 0x%X -> 0x%X\n", blurb(),
(unsigned int) oid,
@@ -3705,7 +3744,7 @@ fix_preview_visual (state *s)
(visual == dvisual ? "default" : "non-default"),
(xvisual ? (unsigned long) xvisual->visualid : 0L));
- if (!GTK_WIDGET_REALIZED (widget) ||
+ if (GET_REALIZED (widget) ||
gtk_widget_get_visual (widget) != visual)
{
gtk_widget_unrealize (widget);
@@ -3716,8 +3755,8 @@ fix_preview_visual (state *s)
/* Set the Widget colors to be white-on-black. */
{
- GdkWindow *window = widget->window;
- GtkStyle *style = gtk_style_copy (widget->style);
+ GdkWindow *window = GET_WINDOW (widget);
+ GtkStyle *style = gtk_style_copy (gtk_widget_get_style (widget));
GdkColormap *cmap = gtk_widget_get_colormap (widget);
GdkColor *fg = &style->fg[GTK_STATE_NORMAL];
GdkColor *bg = &style->bg[GTK_STATE_NORMAL];
@@ -3980,7 +4019,7 @@ launch_preview_subproc (state *s)
reset_preview_window (s);
- window = pr->window;
+ window = GET_WINDOW (pr);
s->running_preview_error_p = False;
@@ -5281,7 +5320,7 @@ main (int argc, char **argv)
{
GtkWidget *window = capplet;
while (window && !GTK_IS_WINDOW (window))
- window = window->parent;
+ window = GET_PARENT (window);
if (window)
{
gtk_window_set_title (GTK_WINDOW (window), window_title);
@@ -5316,7 +5355,7 @@ main (int argc, char **argv)
#endif
gtk_widget_show (s->toplevel_widget);
- init_icon (GTK_WIDGET (s->toplevel_widget)->window); /* after `show' */
+ init_icon (GET_WINDOW (GTK_WIDGET (s->toplevel_widget))); /* after `show' */
fix_preview_visual (s);
/* Realize page zero, so that we can diddle the scrollbar when the