[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/12/13 03:31:25

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        gtkshell       : options.c 
        libantiright   : system.c 

Log message:
        Further define options for new hashtable design.  Revert
        antiright_system to 1.8.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.c?cvsroot=antiright&r1=1.10&r2=1.11

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    11 Dec 2007 22:20:32 -0000      
1.46
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    13 Dec 2007 03:31:24 -0000      
1.47
@@ -101,7 +101,7 @@
        "ACE Lock ,gtk-dialog-authentication",
        "ACE Terminal ,terminal_32.png",
        "ACE File_Manager ,gtk-open",
-       "ACE Browser # Browser ,www_32.png",
+       "ACE Browser ,www_32.png",
        "ACE Text_Editor ,gtk-edit",
        "ACE Calculator ,Calculator_32.png",
        "ACE Sticky_Note ,todo_32.png",

Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gtkshell/options.c  12 Dec 2007 00:19:26 -0000      1.36
+++ gtkshell/options.c  13 Dec 2007 03:31:25 -0000      1.37
@@ -89,6 +89,7 @@
 #define HANDLE(type)\
        gsh_handle_##type##_arguments(gsh, argc, argv, counter)
 
+/* This exists for testing new code.  */
 static void
 test_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
@@ -103,8 +104,7 @@
 static void
 add_pane_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argv, counter);
-       gsh_setup_hpaned(gsh, argv[*counter]);
+       gsh_setup_hpaned(gsh, argv[++(*counter)]);
 }
 
 static void
@@ -114,8 +114,7 @@
 
        shell=ARNEW(gsh, GSHCommandShell);
        $(gsh, manage, $(shell, get));
-       GSH_COUNT(argc, counter);
-       if(argv[*counter])
+       if(argv[++(*counter)])
                $(shell, run, argv[*counter]);
        /* The command instance is not freed here, 
           as it is accessed by callbacks.  */
@@ -124,23 +123,20 @@
 static void
 add_editor_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argc, counter);
        GSH_SET(GSH_APP_MODE);
-       gsh_text_editor(gsh, argv[*counter]);
+       gsh_text_editor(gsh, argv[++(*counter)]);
 }
 
 static void
 add_form_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argc, counter);
-       gsh_add_form(gsh, argv[*counter]);
+       gsh_add_form(gsh, argv[++(*counter)]);
 }
 
 static void
 add_list_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argc, counter);
-       $(gsh, manage, gsh_tree_view_new(gsh, argv[*counter]));
+       $(gsh, manage, gsh_tree_view_new(gsh, argv[++(*counter)]));
 }
 
 static void
@@ -230,7 +226,7 @@
        if(!gsh->terminal)
                gsh->terminal=ARNEW(gsh, GSH_Terminal, gsh);
        /* Set counter to argument containing command.  */
-       GSH_COUNT(argc, counter);
+       (*counter)++;
        /* Create a terminal widget to run the passed command.  */
        terminal=$(gsh->terminal, add, argv[*counter]);
        if(terminal) /* This is NULL if terminal is tabbed.  */
@@ -246,7 +242,7 @@
 static void
 add_entry_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argc, counter);
+       (*counter)++;
        gsh_setup_command_entry(gsh, argv[*counter]);
 }
 
@@ -254,15 +250,59 @@
 add_text_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
        gsh_text_area(gsh);
-       
 }
 
 static void
 add_updating_label_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
+       gsh_add_updated_label(gsh, argv[++(*counter)]);
+}
+
+static void
+add_updating_progress_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       gsh_add_updated_progress(gsh, argv[++(*counter)]);
+}
+
+static void
+option_terminal_width_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       gsh->terminal->dimensions.width=atoi(argv[++(*counter)]);
+}
+
+static void
+option_terminal_height_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       gsh->terminal->dimensions.height=atoi(argv[++(*counter)]);
 }
 
 static void
+option_terminal_font_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       gsh->terminal->font=(gchar *)argv[++(*counter)];
+}
+
+static void
+option_terminal_transparent_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       GSH_UNSET(GSH_TERM_TRANSPARENT);
+}
+
+static void
+option_terminal_not_transparent_cb(GSH * gsh, gint * counter, 
+       const gchar ** argv)
+{
+       GSH_UNSET(GSH_TERM_TRANSPARENT);
+}
+
+static void
+option_terminal_not_tab_cb(GSH * gsh, gint * counter, const gchar ** argv)
+{
+       gsh->terminal=NULL;
+}
+
+
+static void
 add_window_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
        /* This is duplicate functionlity, as same can be
@@ -358,8 +398,28 @@
 static void
 option_icon_size_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
-       GSH_COUNT(argc, counter);
-       /* FIXME */
+       (*counter)++;
+        /* Define some shortcuts.  */
+#define GIS gsh->icon_size
+        /* Test for gsh->icon_size equality. 
+          Note, only the first three characters are used.   */
+#define GISCMP(text) !strncmp(text, argv[*counter], 3) 
+#define IFGISCMP(str, icon_size)\
+       { if(GISCMP(str)) { GIS=icon_size; return; } }
+
+        GSH_SET(GSH_ICON_SIZE_IS_CUSTOM);
+       
+       IFGISCMP("menu", GTK_ICON_SIZE_MENU);
+       IFGISCMP("small toolbar", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       IFGISCMP("large toolbar", GTK_ICON_SIZE_LARGE_TOOLBAR);
+       IFGISCMP("toolbar", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       IFGISCMP("medium", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       IFGISCMP("button", GTK_ICON_SIZE_BUTTON);
+       IFGISCMP("dialog", GTK_ICON_SIZE_DIALOG);
+       IFGISCMP("DND", GTK_ICON_SIZE_DND);
+       IFGISCMP("dnd", GTK_ICON_SIZE_DND);
+       /* Default */
+       GIS=GTK_ICON_SIZE_BUTTON;
 }
 
 static void
@@ -453,6 +513,7 @@
        ARTDEF("-aX", add_embedded_cb);
 
        ARTDEF("-aul", add_updating_label_cb);
+       ARTDEF("-aup", add_updating_progress_cb);
 
        ARTDEF("-oa", option_app_mode_cb);
        ARTDEF("-oC", option_check_commands_cb);
@@ -475,6 +536,13 @@
        ARTDEF("-oT", option_title_cb);
        ARTDEF("-ou", option_update_cb);
 
+       ARTDEF("-otf", option_terminal_font_cb);
+       ARTDEF("-oth", option_terminal_height_cb);
+       ARTDEF("-otN", option_terminal_not_tab_cb);
+       ARTDEF("-otT", option_terminal_not_transparent_cb);
+       ARTDEF("-otT", option_terminal_transparent_cb);
+       ARTDEF("-otw", option_terminal_width_cb);
+
        ARTDEF("-t", test_cb);
        
        

Index: libantiright/system.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/system.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libantiright/system.c       10 Dec 2007 15:13:25 -0000      1.10
+++ libantiright/system.c       13 Dec 2007 03:31:25 -0000      1.11
@@ -47,34 +47,18 @@
 int
 antiright_system(char *field_string)
 {
-       /* Ensure that FIELD_STRING is not empty.  */
-       ARIFP(field_string)
-       {
                char *command;
-               GError *error=NULL;
+       int return_status;
 
                command = get_command_string(field_string);
-
-               if (g_spawn_command_line_async(command, &error))
+       if((return_status=system(command) == 0 ? EXIT_SUCCESS : EXIT_FAILURE)
+               == EXIT_FAILURE)
                {
-                       g_free(command);
-
-                       return EXIT_SUCCESS;
+               ARWARN("command could not be executed");
                }
-               else
-               {
                        g_free(command);
-                       ARWARN(error->message);
 
-                       return EXIT_FAILURE;
-               }
-       }
-       else
-       {
-               /* The user input is empty, so generate an error.  */
-               ARWARN("field_string is NULL");
-               return (EXIT_FAILURE);
-       }
+       return return_status;
 }
 
 int