[Antiright-devel] antiright/gtkshell guidl.lex guidl.y guidl_util...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/13 03:00:07

Modified files:
        gtkshell       : guidl.lex guidl.y guidl_util.c guidl_util.h 

Log message:
        Added support for command-initialized labels and buttons to guidl.
        This will allow for more flexible interface definitions.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.h?cvsroot=antiright&r1=1.2&r2=1.3

Patches:
Index: guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- guidl.lex   9 Apr 2007 15:27:47 -0000       1.7
+++ guidl.lex   13 Apr 2007 03:00:07 -0000      1.8
@@ -30,6 +30,7 @@
 text           return TEXT;
 separator      return SEPARATOR;
 dialog         return DIALOG;
+system         return SYSTEM;
 
 [ \t\n]                /* ignore */;
 "//".*$                /* comment */;

Index: guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- guidl.y     9 Apr 2007 20:25:15 -0000       1.11
+++ guidl.y     13 Apr 2007 03:00:07 -0000      1.12
@@ -59,7 +59,7 @@
 %token IFS SC COMMA OPTION PROMPT VIEWER LABEL
 %token BUTTON END ADD UPDATING PROGRESS BUTTONS
 %token TERMINAL WINDOW TOKEN_ECHO TEXT SEPARATOR
-%token ROW DIALOG
+%token ROW DIALOG SYSTEM
 %token <string> STRING
 %token <number> NUM
 %%
@@ -140,6 +140,16 @@
 |
 ADD BUTTON button
 |
+ADD SYSTEM BUTTON STRING
+{
+       gsh_add_system_button($4);
+}
+|
+ADD SYSTEM LABEL STRING
+{
+       gsh_add_system_label($4);
+}
+|
 ADD UPDATING PROGRESS STRING
 {
        gsh_guidl_add("-aup", $4);

Index: guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- guidl_util.c        9 Apr 2007 20:25:15 -0000       1.4
+++ guidl_util.c        13 Apr 2007 03:00:07 -0000      1.5
@@ -26,6 +26,33 @@
 int gsh_parsed_argc=0;
 
 void
+gsh_add_system_button(gchar * command)
+{
+       /* Adds a button containing the output of
+        * a command specified by STRING.  */
+       gchar * output;
+
+       output=antiright_pipe_read(command);
+       g_free(command);
+       gsh_append_arg(output);
+       g_free(output);
+}
+
+void
+gsh_add_system_label(gchar * command)
+{
+       /* Adds a label containing the output of 
+        * a command specified by STRING.  */
+
+       gchar * output;
+
+       output=antiright_pipe_read(command);
+       g_free(command);
+       gsh_guidl_add("-al", output);
+       /* OUTPUT is freed in gsh_guidl_add().  */
+}
+
+void
 gsh_append_arg(gchar * arg)
 {
        gsh_parsed_argc++;

Index: guidl_util.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- guidl_util.h        9 Apr 2007 20:25:15 -0000       1.2
+++ guidl_util.h        13 Apr 2007 03:00:07 -0000      1.3
@@ -23,6 +23,12 @@
 #ifndef GSH_GUIDL_UTIL_H
 #define GSH_GUIDL_UTIL_H
 
+void
+gsh_add_system_button(gchar * command);
+
+void
+gsh_add_system_label(gchar * command);
+
 int
 yylex();