From 24b0af3ecb957085354642026877159b6022f800 Mon Sep 17 00:00:00 2001

From: Alan Coopersmith <[email protected]>

Date: Sat, 25 Mar 2017 23:18:43 -0700

Subject: [PATCH] Port from libglade to GtkBuilder

Need to discuss with upstream if they'll accept this, but we need it

in order to obsolete our libglade package.

---

 configure.in                       |    5 +-

 driver/Makefile.in                 |   14 +-

 driver/demo-Gtk.c                  |  123 +-

 driver/xscreensaver-demo.glade2.in | 3136 ------------------------------------

 driver/xscreensaver-demo.ui.in     | 2912 +++++++++++++++++++++++++++++++++

 5 files changed, 2981 insertions(+), 3209 deletions(-)

 delete mode 100644 driver/xscreensaver-demo.glade2.in

 create mode 100644 driver/xscreensaver-demo.ui.in

diff --git a/configure.in b/configure.in

index 4c4dee5..5ff8aea 100644

--- a/configure.in

+++ b/configure.in

@@ -2660,10 +2660,9 @@ if test "$with_gtk" = yes; then

   have_gtk=no

   ok="yes"

-  pkg_check_version            gtk+-2.0  2.0.1  ; ac_gtk_version_string="$vers"

+  pkg_check_version            gtk+-2.0  2.12.0  ; ac_gtk_version_string="$vers"

   pkg_check_version         gmodule-2.0  2.0.0

   pkg_check_version          libxml-2.0  2.4.6

-  pkg_check_version        libglade-2.0  1.99.0

   pkg_check_version      gdk-pixbuf-2.0  2.0.0

   pkg_check_version gdk-pixbuf-xlib-2.0  2.0.0

   have_gtk="$ok"

@@ -4159,7 +4158,7 @@ AC_OUTPUT(Makefile

           utils/Makefile

           driver/Makefile

           driver/xscreensaver.pam

-          driver/xscreensaver-demo.glade2

+          driver/xscreensaver-demo.ui

           hacks/Makefile

           hacks/glx/Makefile

           po/Makefile.in

diff --git a/driver/Makefile.in b/driver/Makefile.in

index c132304..b24536e 100644

--- a/driver/Makefile.in

+++ b/driver/Makefile.in

@@ -237,7 +237,7 @@ MEN		= $(MEN_1) @MEN_OSX@

 EXTRAS		= README Makefile.in \

 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \

-		  xscreensaver-demo.glade2.in xscreensaver-demo.glade2p \

+		  xscreensaver-demo.ui.in \

 		  screensaver-properties.desktop.in \

 		  .gdbinit

 VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \

@@ -537,15 +537,15 @@ install-gnome::

 	   done								     ;\

         fi

-# xscreensaver-demo.glade2

+# xscreensaver-demo.ui

 # into /usr/share/xscreensaver/glade/

-install-gnome:: xscreensaver-demo.glade2

+install-gnome:: xscreensaver-demo.ui

 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \

 	  if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then		      \

 	    echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\

 	         $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"	     ;\

 	  fi								     ;\

-	  target=xscreensaver-demo.glade2				     ;\

+	  target=xscreensaver-demo.ui					     ;\

 	  echo $(INSTALL_DATA) $$target                             \

 	    $(install_prefix)$(GTK_GLADEDIR)/$$target                        ;\

 	  if   $(INSTALL_DATA) $$target                             \

@@ -595,11 +595,11 @@ uninstall-gnome::

 	   done								     ;\

         fi

-# xscreensaver-demo.glade2

+# xscreensaver-demo.ui

 # into /usr/share/xscreensaver/glade/

-uninstall-gnome:: xscreensaver-demo.glade2

+uninstall-gnome:: xscreensaver-demo.ui

 	@if [ "$(GTK_DATADIR)" != "" ]; then				      \

-	  target=xscreensaver-demo.glade2				     ;\

+	  target=xscreensaver-demo.ui					     ;\

 	  echo rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\

 	       rm -f $(install_prefix)$(GTK_GLADEDIR)/$$target               ;\

 	 fi

diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c

index 27d2316..87ae8a5 100644

--- a/driver/demo-Gtk.c

+++ b/driver/demo-Gtk.c

@@ -92,7 +92,6 @@

 #include <gdk/gdkx.h>

 #ifdef HAVE_GTK2

-# include <glade/glade-xml.h>

 # include <gmodule.h>

 #else  /* !HAVE_GTK2 */

 # define G_MODULE_EXPORT /**/

@@ -208,7 +207,7 @@ typedef struct {

   conf_data *cdata;		/* private data for per-hack configuration */

 #ifdef HAVE_GTK2

-  GladeXML *glade_ui;           /* Glade UI file */

+  GtkBuilder *glade_ui;         /* Glade UI file */

 #endif /* HAVE_GTK2 */

   Bool debug_p;			/* whether to print diagnostics */

@@ -343,20 +342,31 @@ name_to_widget (state *s, const char *name)

       /* First try to load the Glade file from the current directory;

          if there isn't one there, check the installed directory.

        */

-# define GLADE_FILE_NAME "xscreensaver-demo.glade2"

+# define GLADE_FILE_NAME "xscreensaver-demo.ui"

       const char * const files[] = { GLADE_FILE_NAME,

                                      GLADE_DIR "/" GLADE_FILE_NAME };

       int i;

+

+      s->glade_ui = gtk_builder_new ();

+

       for (i = 0; i < countof (files); i++)

         {

           struct stat st;

           if (!stat (files[i], &st))

             {

-              s->glade_ui = glade_xml_new (files[i], NULL, NULL);

-              break;

+              GError* error = NULL;

+

+              if (gtk_builder_add_from_file (s->glade_ui, files[i], &error))

+                break;

+              else

+                {

+                  g_warning ("Couldn't load builder file %s: %s",

+			     files[i], error->message);

+                  g_error_free (error);

+                }

             }

         }

-      if (!s->glade_ui)

+      if (i >= countof (files))

 	{

 	  fprintf (stderr,

                    "%s: could not load \"" GLADE_FILE_NAME "\"\n"

@@ -366,10 +376,10 @@ name_to_widget (state *s, const char *name)

 	}

 # undef GLADE_FILE_NAME

-      glade_xml_signal_autoconnect (s->glade_ui);

+      gtk_builder_connect_signals (s->glade_ui, NULL);

     }

-  w = glade_xml_get_widget (s->glade_ui, name);

+  w = GTK_WIDGET (gtk_builder_get_object (s->glade_ui, name));

 #else /* !HAVE_GTK2 */

@@ -1633,11 +1643,8 @@ flush_dialog_changes_and_save (state *s)

   /* Map the mode menu to `saver_mode' enum values. */

   {

-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));

-    GtkMenu *menu = GTK_MENU (gtk_option_menu_get_menu (opt));

-    GtkWidget *selected = gtk_menu_get_active (menu);

-    GList *kids = gtk_container_children (GTK_CONTAINER (menu));

-    int menu_elt = g_list_index (kids, (gpointer) selected);

+    GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));

+    int menu_elt = gtk_combo_box_get_active (opt);

     if (menu_elt < 0 || menu_elt >= countof(mode_menu_order)) abort();

     p2->mode = mode_menu_order[menu_elt];

   }

@@ -1743,9 +1750,10 @@ flush_popup_changes_and_save (state *s)

   int list_elt = selected_list_element (s);

   GtkEntry *cmd = GTK_ENTRY (name_to_widget (s, "cmd_text"));

-  GtkCombo *vis = GTK_COMBO (name_to_widget (s, "visual_combo"));

+  GtkComboBoxEntry *vis = GTK_COMBO_BOX_ENTRY (name_to_widget (s, "visual_combo"));

+  GtkEntry *visent = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (vis)));

-  const char *visual = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (vis)->entry));

+  const char *visual = gtk_entry_get_text (visent);

   const char *command = gtk_entry_get_text (cmd);

   char c;

@@ -1790,7 +1798,7 @@ flush_popup_changes_and_save (state *s)

     {

       gdk_beep ();				  /* unparsable */

       visual = "";

-      gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (vis)->entry), _("Any"));

+      gtk_entry_set_text (visent, _("Any"));

     }

   changed = flush_changes (s, list_elt, -1, command, visual);

@@ -1838,21 +1846,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 (GET_PARENT (widget)));

-  int menu_index = 0;

-  saver_mode new_mode;

-

-  while (menu_items)

-    {

-      if (menu_items->data == widget)

-        break;

-      menu_index++;

-      menu_items = menu_items->next;

-    }

-  if (!menu_items) abort();

-

-  new_mode = mode_menu_order[menu_index];

+  int menu_index = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));

+  saver_mode new_mode = mode_menu_order[menu_index];

   /* Keep the same list element displayed as before; except if we're

      switching *to* "one screensaver" mode from any other mode, set

@@ -2867,13 +2862,13 @@ populate_prefs_page (state *s)

   /* Map the `saver_mode' enum to mode menu to values. */

   {

-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));

+    GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));

     int i;

     for (i = 0; i < countof(mode_menu_order); i++)

       if (mode_menu_order[i] == p->mode)

         break;

-    gtk_option_menu_set_history (opt, i);

+    gtk_combo_box_set_active (opt, i);

     update_list_sensitivity (s);

   }

@@ -3022,7 +3017,7 @@ sensitize_menu_items (state *s, Bool force_p)

   static Bool running_p = False;

   static time_t last_checked = 0;

   time_t now = time ((time_t *) 0);

-  const char *names[] = { "activate_menu", "lock_menu", "kill_menu",

+  const char *names[] = { "activate_action", "lock_action", "kill_action",

                           /* "demo" */ };

   int i;

@@ -3034,8 +3029,9 @@ sensitize_menu_items (state *s, Bool force_p)

   for (i = 0; i < countof(names); i++)

     {

-      GtkWidget *w = name_to_widget (s, names[i]);

-      gtk_widget_set_sensitive (GTK_WIDGET(w), running_p);

+      GtkAction *a = GTK_ACTION (gtk_builder_get_object (s->glade_ui,

+							 names[i]));

+      gtk_action_set_sensitive (a, running_p);

     }

 }

@@ -3107,7 +3103,7 @@ fix_text_entry_sizes (state *s)

   /* Now fix the width of the combo box.

    */

   w = GTK_WIDGET (name_to_widget (s, "visual_combo"));

-  w = GTK_COMBO (w)->entry;

+  w = GTK_COMBO_BOX_ENTRY (w)->entry;

   width = gdk_string_width (w->style->font, "PseudoColor___");

   gtk_widget_set_usize (w, width, -2);

@@ -3313,7 +3309,7 @@ populate_demo_window (state *s, int list_elt)

   GtkFrame *frame1 = GTK_FRAME (name_to_widget (s, "preview_frame"));

   GtkFrame *frame2 = GTK_FRAME (name_to_widget (s, "opt_frame"));

   GtkEntry *cmd    = GTK_ENTRY (name_to_widget (s, "cmd_text"));

-  GtkCombo *vis    = GTK_COMBO (name_to_widget (s, "visual_combo"));

+  GtkComboBoxEntry *vis = GTK_COMBO_BOX_ENTRY (name_to_widget (s, "visual_combo"));

   GtkWidget *list  = GTK_WIDGET (name_to_widget (s, "list"));

   if (p->mode == BLANK_ONLY)

@@ -3363,7 +3359,7 @@ populate_demo_window (state *s, int list_elt)

     gtk_window_set_title (GTK_WINDOW (s->popup_widget), title);

   }

-  gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (vis)->entry),

+  gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (vis))),

                       (hack

                        ? (hack->visual && *hack->visual

                           ? hack->visual

@@ -5164,31 +5160,32 @@ main (int argc, char **argv)

 #endif /* !HAVE_GTK2 */

   /* Hook up callbacks to the items on the mode menu. */

-  {

-    GtkOptionMenu *opt = GTK_OPTION_MENU (name_to_widget (s, "mode_menu"));

-    GtkMenu *menu = GTK_MENU (gtk_option_menu_get_menu (opt));

-    GList *kids = gtk_container_children (GTK_CONTAINER (menu));

-    int i;

-    for (i = 0; kids; kids = kids->next, i++)

-      {

-        gtk_signal_connect (GTK_OBJECT (kids->data), "activate",

-                            GTK_SIGNAL_FUNC (mode_menu_item_cb),

-                            (gpointer) s);

-

-        /* The "random-same" mode menu item does not appear unless

-           there are multple screens.

-         */

-        if (s->nscreens <= 1 &&

-            mode_menu_order[i] == RANDOM_HACKS_SAME)

-          gtk_widget_hide (GTK_WIDGET (kids->data));

-      }

+  gtk_signal_connect (GTK_OBJECT (name_to_widget (s, "mode_menu")),

+                      "changed", GTK_SIGNAL_FUNC (mode_menu_item_cb),

+                      (gpointer) s);

+  if (s->nscreens <= 1)

+    {

+      GtkComboBox *opt = GTK_COMBO_BOX (name_to_widget (s, "mode_menu"));

+      GtkTreeModel *list = gtk_combo_box_get_model (opt);

+      unsigned int i;

+      for (i = 0; i < countof(mode_menu_order); i++)

+        {

+          /* The "random-same" mode menu item does not appear unless

+             there are multiple screens.

+           */

+          if (mode_menu_order[i] == RANDOM_HACKS_SAME)

+            {

+              GtkTreeIter iter;

+              gtk_tree_model_iter_nth_child (list, &iter, NULL, i);

+              gtk_list_store_remove (GTK_LIST_STORE (list), &iter);

+              break;

+            }

+        }

-    if (s->nscreens <= 1)   /* recompute option-menu size */

-      {

-        gtk_widget_unrealize (GTK_WIDGET (menu));

-        gtk_widget_realize (GTK_WIDGET (menu));

-      }

-  }

+        /* recompute option-menu size */

+        gtk_widget_unrealize (GTK_WIDGET (opt));

+        gtk_widget_realize (GTK_WIDGET (opt));

+    }

   /* Handle the -prefs command-line argument. */

diff --git a/driver/xscreensaver-demo.glade2.in b/driver/xscreensaver-demo.glade2.in

deleted file mode 100644

index ad0095d..0000000

--- a/driver/xscreensaver-demo.glade2.in

+++ /dev/null

@@ -1,3136 +0,0 @@

-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->

-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">

-

-<glade-interface>

-<requires lib="gnome"/>

-

-<widget class="GtkWindow" id="xscreensaver_demo">

-  <property name="title" translatable="yes">XScreenSaver</property>

-  <property name="type">GTK_WINDOW_TOPLEVEL</property>

-  <property name="window_position">GTK_WIN_POS_NONE</property>

-  <property name="modal">False</property>

-  <property name="resizable">True</property>

-  <property name="destroy_with_parent">False</property>

-  <property name="decorated">True</property>

-  <property name="skip_taskbar_hint">False</property>

-  <property name="skip_pager_hint">False</property>

-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>

-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>

-  <property name="focus_on_map">True</property>

-  <property name="urgency_hint">False</property>

-

-  <child>

-    <widget class="GtkVBox" id="outer_vbox">

-      <property name="visible">True</property>

-      <property name="homogeneous">False</property>

-      <property name="spacing">5</property>

-

-      <child>

-	<widget class="GtkMenuBar" id="menubar">

-	  <property name="visible">True</property>

-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>

-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>

-

-	  <child>

-	    <widget class="GtkMenuItem" id="file">

-	      <property name="visible">True</property>

-	      <property name="label" translatable="yes">_File</property>

-	      <property name="use_underline">True</property>

-	      <signal name="activate" handler="file_menu_cb" last_modification_time="Sun, 06 Mar 2005 21:41:13 GMT"/>

-

-	      <child>

-		<widget class="GtkMenu" id="file_menu">

-

-		  <child>

-		    <widget class="GtkMenuItem" id="activate_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Blank Screen Now</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="activate_menu_cb"/>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="lock_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Lock Screen Now</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="lock_menu_cb"/>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="kill_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Kill Daemon</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="kill_menu_cb"/>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="restart">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Restart Daemon</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="restart_menu_cb"/>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="separator1">

-		      <property name="visible">True</property>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="exit_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Quit</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="exit_menu_cb"/>

-		    </widget>

-		  </child>

-		</widget>

-	      </child>

-	    </widget>

-	  </child>

-

-	  <child>

-	    <widget class="GtkMenuItem" id="help">

-	      <property name="visible">True</property>

-	      <property name="label" translatable="yes">_Help</property>

-	      <property name="use_underline">True</property>

-

-	      <child>

-		<widget class="GtkMenu" id="help_menu">

-

-		  <child>

-		    <widget class="GtkMenuItem" id="about_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_About...</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="about_menu_cb"/>

-		    </widget>

-		  </child>

-

-		  <child>

-		    <widget class="GtkMenuItem" id="doc_menu">

-		      <property name="visible">True</property>

-		      <property name="label" translatable="yes">_Documentation...</property>

-		      <property name="use_underline">True</property>

-		      <signal name="activate" handler="doc_menu_cb"/>

-		    </widget>

-		  </child>

-		</widget>

-	      </child>

-	    </widget>

-	  </child>

-	</widget>

-	<packing>

-	  <property name="padding">0</property>

-	  <property name="expand">False</property>

-	  <property name="fill">False</property>

-	</packing>

-      </child>

-

-      <child>

-	<widget class="GtkHBox" id="spacer_hbox">

-	  <property name="border_width">8</property>

-	  <property name="visible">True</property>

-	  <property name="homogeneous">False</property>

-	  <property name="spacing">0</property>

-

-	  <child>

-	    <widget class="GtkNotebook" id="notebook">

-	      <property name="visible">True</property>

-	      <property name="can_focus">True</property>

-	      <property name="show_tabs">True</property>

-	      <property name="show_border">True</property>

-	      <property name="tab_pos">GTK_POS_TOP</property>

-	      <property name="scrollable">False</property>

-	      <property name="enable_popup">False</property>

-	      <signal name="switch_page" handler="switch_page_cb"/>

-

-	      <child>

-		<widget class="GtkTable" id="demos_table">

-		  <property name="border_width">10</property>

-		  <property name="visible">True</property>

-		  <property name="n_rows">2</property>

-		  <property name="n_columns">2</property>

-		  <property name="homogeneous">False</property>

-		  <property name="row_spacing">0</property>

-		  <property name="column_spacing">0</property>

-

-		  <child>

-		    <widget class="GtkTable" id="blanking_table">

-		      <property name="visible">True</property>

-		      <property name="n_rows">3</property>

-		      <property name="n_columns">4</property>

-		      <property name="homogeneous">False</property>

-		      <property name="row_spacing">2</property>

-		      <property name="column_spacing">0</property>

-

-		      <child>

-			<widget class="GtkLabel" id="cycle_label">

-			  <property name="visible">True</property>

-			  <property name="label" translatable="yes">_Cycle After</property>

-			  <property name="use_underline">True</property>

-			  <property name="use_markup">False</property>

-			  <property name="justify">GTK_JUSTIFY_RIGHT</property>

-			  <property name="wrap">False</property>

-			  <property name="selectable">False</property>

-			  <property name="xalign">1</property>