[Antiright-devel] antiright/gtkshell arguments.c dialog_options.c

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/02 18:42:52

Modified files:
        gtkshell       : arguments.c dialog_options.c 

Log message:
        Refactored button string parsing code and dialog selection code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dialog_options.c?cvsroot=antiright&r1=1.13&r2=1.14

Patches:
Index: arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- arguments.c 9 Mar 2007 20:00:29 -0000       1.15
+++ arguments.c 2 Apr 2007 18:42:52 -0000       1.16
@@ -89,14 +89,18 @@
 }
 
 static void
-button_parse(struct GSH * gsh, const gchar * string)
+add_menu_items(struct GSH * gsh, gchar **tokens)
 {
-       gchar **tokens;
        gint i;
 
-       tokens=g_strsplit(string, "::", SPLIT_ALL);
-       if(ARPBOOL(tokens[1]))
-       {
+       for(i=1; ARPBOOL(tokens[i]); i++)
+               menuitem_parse(gsh, tokens[i]);
+}
+
+static void
+menubutton_parse(struct GSH * gsh, gchar **tokens)
+
+{
                GtkWidget * oldrow;
 
                oldrow=gsh->rows.v;
@@ -105,17 +109,26 @@
                 * Create the menu before overwriting, then
                 * set back at end.  */
                gsh->bflags |= GSH_MENU_BUTTON;
+       /* Add menu launcher button.  */
                new_button(gsh, tokens[0]);
                gsh->rows.v=gtk_menu_new(); 
                gtk_widget_show(gsh->rows.v);
                g_signal_connect_swapped(gsh->button, "clicked",
                        G_CALLBACK(popup_handler), gsh->rows.v);
 
-               for(i=1; ARPBOOL(tokens[i]); i++)
-                       menuitem_parse(gsh, tokens[i]);
+       add_menu_items(gsh, tokens);
 
                gsh->rows.v=oldrow;
-       }
+}
+
+static void
+button_parse(struct GSH * gsh, const gchar * string)
+{
+       gchar **tokens;
+
+       tokens=g_strsplit(string, "::", SPLIT_ALL);
+       if(ARPBOOL(tokens[1]))
+               menubutton_parse(gsh, tokens);
        else
                new_button(gsh, (char *)string);
 

Index: dialog_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dialog_options.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- dialog_options.c    2 Apr 2007 18:31:41 -0000       1.13
+++ dialog_options.c    2 Apr 2007 18:42:52 -0000       1.14
@@ -50,6 +50,7 @@
                                        GTK_BUTTONS_CLOSE,
                                        (gchar *) text);
        gtk_dialog_run(GTK_DIALOG(dialog));
+
        exit(0);
 }
 
@@ -62,33 +63,31 @@
 }
 
 static void
-gsh_font_dialog()
+select_font(GtkWidget * dialog)
 {
-       GtkWidget *dialog;
-
-       dialog = gtk_font_selection_dialog_new("Font Selector");
-       if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
-       {
                gchar *font;
 
                font = gtk_font_selection_dialog_get_font_name(
                                   GTK_FONT_SELECTION_DIALOG(dialog));
                g_print("%s\n", font);
                g_free(font);
-       }
-
-       exit(0);
 }
 
 static void
-gsh_color_dialog()
+gsh_font_dialog()
 {
-       const GtkWidget *dialog;
-
-       dialog = gtk_color_selection_dialog_new("Color Selector");
+       GtkWidget *dialog;
 
+       dialog = gtk_font_selection_dialog_new("Font Selector");
        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
-       {
+               select_font(dialog);
+
+       exit(0);
+}
+
+static void
+color_select(GtkWidget * dialog)
+{
                GdkColor color;
 
                gtk_color_selection_get_current_color(
@@ -96,10 +95,18 @@
                                    GTK_COLOR_SELECTION_DIALOG(dialog)
                                                          ->colorsel),
                                                      &color);
-
                g_print("#%x%x%x\n", color.red, color.green, color.blue);
+}
 
-       }
+static void
+gsh_color_dialog()
+{
+       GtkWidget *dialog;
+
+       dialog = gtk_color_selection_dialog_new("Color Selector");
+
+       if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
+               color_select(dialog);
 
        exit(0);
 }