[Antiright-devel] antiright gtkshell/button.c gtkshell/gtkshell.c...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/16 01:19:51

Modified files:
        gtkshell       : button.c gtkshell.c guidl.y guidl_dialog.c 
                         guidl_util.c options.c row.c terminal.c 
        libantiright   : Makefile library.h util.c 

Log message:
        Added a Tuple and a TupleVector class, which is used for storing
        definitions within GUIDL's dictionaries. 
        Set COLUMNS and LINES in terminal command script.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_dialog.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.10&r2=1.11

Patches:
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gtkshell/button.c   13 Apr 2007 14:23:51 -0000      1.22
+++ gtkshell/button.c   16 Apr 2007 01:19:51 -0000      1.23
@@ -106,20 +106,11 @@
 void
 gsh_command_button(struct GSH * gsh, char *command)
 {
-#ifdef DEBUG
-       ARBUG("gsh_command_button");
-#endif                         /* DEBUG */
-
        ARPASSERT(gsh);
 
        create_button(gsh);
        setup_command_button(gsh, command);
        gsh_manage_unexpanded(gsh, gsh->button);
-       
-#ifdef DEBUG
-       g_debug("==> row: %d out of %d rows\n",
-               gsh->rows.row, gsh->rows.rows);
-#endif                         /* DEBUG */
 }
 
 

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gtkshell/gtkshell.c 6 Apr 2007 15:32:22 -0000       1.24
+++ gtkshell/gtkshell.c 16 Apr 2007 01:19:51 -0000      1.25
@@ -72,6 +72,7 @@
        gsh_GSH_Updater(&(gsh->update));
        gsh_GSH_Terminal(&(gsh->terminal));
 }
+
 struct GSH *
 gsh_new_GSH()
 {

Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/guidl.y    13 Apr 2007 22:48:25 -0000      1.14
+++ gtkshell/guidl.y    16 Apr 2007 01:19:51 -0000      1.15
@@ -109,7 +109,6 @@
 {
        gchar * num_string;
        ar_asprintf(&num_string, "%d", $3);
-       g_free($3);
        gsh_guidl_option($2, num_string);
        /* num_string is freed in above call.  */
 }

Index: gtkshell/guidl_dialog.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/guidl_dialog.c     13 Apr 2007 22:48:25 -0000      1.3
+++ gtkshell/guidl_dialog.c     16 Apr 2007 01:19:51 -0000      1.4
@@ -24,12 +24,11 @@
 
 extern struct GDLEnvironment * gsh_guidl_env;
 
-#define DEF(a, b) GSH_GUIDL_DEFINE(gsh_guidl_env->dictionaries.dialogs, a, b)
+#define DEF(a, b) GSH_GUIDL_DEFINE(dialogs, a, b)
 
 static void
-setup_dictionary()
+setup_definitions(struct ARTupleVector * dialogs)
 {
-       gsh_guidl_env->dictionaries.dialogs=g_tree_new(strcmp);
        DEF("file", "-df");
        DEF("font", "-dF");
        DEF("about", "-da");
@@ -42,20 +41,25 @@
        DEF("error", "-de");
 }
 
+static void
+setup_dictionary()
+{
+       setup_definitions(gsh_guidl_env->dictionaries.dialogs
+                         =ar_new_ARTupleVector());
+}
+
 void
 gsh_guidl_dialog(gchar * dialog_type, gchar * argument)
 {
        GSH_GUIDL_CHECK_DICTIONARY(dialogs);
+
        {
-               gpointer result;
+               const gchar * result;
 
                result=gsh_guidl_lookup(gsh_guidl_env->dictionaries.dialogs,
                                        (gpointer)dialog_type);
                if(result != NULL)
-               {
                        gsh_guidl_add(result, argument);
-                       g_free(result);
-               }
        }
 }
 

Index: gtkshell/guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/guidl_util.c       13 Apr 2007 22:48:25 -0000      1.7
+++ gtkshell/guidl_util.c       16 Apr 2007 01:19:51 -0000      1.8
@@ -28,6 +28,7 @@
 gsh_setup_GDLEnvironment(struct GDLEnvironment * env)
 {
        ar_setup_ARArguments(&(env->args));
+       gsh_setup_GDLDictionaries(&(env->dictionaries));
 }
 
 void

Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/options.c  13 Apr 2007 22:48:25 -0000      1.14
+++ gtkshell/options.c  16 Apr 2007 01:19:51 -0000      1.15
@@ -35,15 +35,28 @@
        g_assert((*counter) <= argc);
 }
 
+#ifdef DEBUG
+static void
+print_arguments(gint argc, gchar ** argv)
+{
+       gint i;
+       for(i=0; i<argc; i++)
+               printf("'%s' ", argv[i]);
+       putchar('\n');
+}
+#endif /* DEBUG */
+
 static void
 common_guidl_handler(struct GSH * gsh)
 {
+       gsh_guidl_env=gsh_new_GDLEnvironment();
        gsh_append_arg((char*)"guidl");
        yyparse();
-       {
-               struct ARArguments * args = &(gsh_guidl_env->args);
-               gsh_parse_arguments(gsh, args->argc, args->argv);
-       }
+#ifdef DEBUG
+       print_arguments(gsh_guidl_env->args.argc, gsh_guidl_env->args.argv);
+#endif /* DEBUG */
+       gsh_parse_arguments(gsh, gsh_guidl_env->args.argc, 
+                           gsh_guidl_env->args.argv);
        gsh_delete_GDLEnvironment(gsh_guidl_env);
        gsh_guidl_env=NULL;
        /* Free parse memory in main.  */

Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/row.c      5 Mar 2007 01:05:42 -0000       1.14
+++ gtkshell/row.c      16 Apr 2007 01:19:51 -0000      1.15
@@ -25,19 +25,9 @@
 static void
 gsh_manage_generic(struct GSH * gsh, GtkWidget *widget)
 {
-
-#ifdef DEBUG
-       ARBUG("gsh_manage()");
-#endif                         /* DEBUG */
-
        gtk_widget_show(widget);
        gsh->rows.row++;
 
-#ifdef DEBUG
-       g_debug("==> gsh_row: %d, gsh_rows: %d",
-               gsh->rows.row, gsh->rows.rows);
-#endif                         /* DEBUG */
-
 }
 void
 gsh_manage(struct GSH * gsh, GtkWidget *widget)
@@ -85,20 +75,6 @@
 void
 gsh_check_row(struct GSH * gsh)
 {
-
-#ifdef DEBUG
-       ARBUG("gsh_check_row()");
-       g_debug("==> gsh_row: %d, gsh_rows: %d",
-               gsh->rows.row, gsh->rows.rows);
-#endif
-
        if (gsh->rows.row > gsh->rows.rows)
-       {
-
-#ifdef DEBUG
-               ARBUG("new row");
-#endif
-
                gsh_new_row(gsh);
-       }
 }

Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/terminal.c 26 Mar 2007 14:09:20 -0000      1.6
+++ gtkshell/terminal.c 16 Apr 2007 01:19:51 -0000      1.7
@@ -88,7 +88,7 @@
 /* This is a workaround for vte's fscking up of option arrays.  */
 /* Returned value must be freed.  */
 static gchar *
-gsh_terminal_command_script(const gchar *command)
+gsh_terminal_command_script(struct GSH * gsh, const gchar *command)
 {
        gchar *script_name;
        FILE *script;
@@ -119,7 +119,9 @@
        if(fsync(fd) == -1)
                ARERR("cannot write script file");
        
-       ARASSERT(fprintf(script, "#!/bin/sh\n%s\n", command) != -1);
+       ARASSERT(fprintf(script, "#!/bin/sh\nexport LINES=%d\n"
+                "export COLUMNS=%d\n%s\n", 
+                gsh->terminal.height, gsh->terminal.width, command) != -1);
        fclose(script); /* Close and flush buffers.  */
 
 #ifdef DEBUG
@@ -136,7 +138,7 @@
 gsh_terminal_run(struct GSH * gsh, const gchar * command)
 {
        /* Get command to run.  */
-       gsh->terminal.script=gsh_terminal_command_script(command);
+       gsh->terminal.script=gsh_terminal_command_script(gsh, command);
 
        /* Run the script in the terminal widget.  */
        vte_terminal_fork_command(VTE_TERMINAL(gsh->terminal.widget),

Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libantiright/Makefile       13 Apr 2007 15:06:17 -0000      1.6
+++ libantiright/Makefile       16 Apr 2007 01:19:51 -0000      1.7
@@ -1,10 +1,11 @@
 include ../config.mk
 
-CFLAGS=$(DEFS) `pkg-config --cflags glib-2.0`
+CFLAGS+=`pkg-config --cflags glib-2.0`
+CFLAGS+=$(DEFS)
 
 all: libantiright.a
 
-objects=pipe.o string.o system.o util.o 
+objects=pipe.o string.o system.o util.o tuple.o
 
 libantiright.a: ${objects}
        ar rcs libantiright.a ${objects}

Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libantiright/library.h      13 Apr 2007 15:06:17 -0000      1.14
+++ libantiright/library.h      16 Apr 2007 01:19:51 -0000      1.15
@@ -34,6 +34,7 @@
 #include "string.h"
 #include "system.h"
 #include "util.h"
+#include "tuple.h"
 
 #include "macros.h"
 

Index: libantiright/util.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libantiright/util.c 13 Apr 2007 22:49:32 -0000      1.10
+++ libantiright/util.c 16 Apr 2007 01:19:51 -0000      1.11
@@ -85,3 +85,4 @@
 {
        return random() % (finish - start) + start;
 }
+