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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 10/08/22 20:31:54

Modified files:
        ACE-desktop    : ACE 
        ACE-desktop/guidl: Administration_Panel.gdl 
        gtkshell       : Makefile gshterm gtkshell.c module_includes.h 
                         option_options.c option_options.h terminal.c 
                         terminal_options.c updated.h updated_label.c 
Removed files:
        gtkshell       : updated_options.c updated_options.h 

Log message:
        Automated gtkshell Makefile object list.  Fixed missing GUIDL command in
        Administration_Panel.gdl.  Removed updated_options.[ch].  Fixed improper
        setting of terminal width environment in terminal.c.  Start with
        gsh->terminal and gsh->update set to NULL, initialize on the fly as
        necessary.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Administration_Panel.gdl?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gshterm?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/module_includes.h?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.h?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal_options.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.h?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.24&r2=0
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.h?cvsroot=antiright&r1=1.8&r2=0

Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- ACE-desktop/ACE     17 Aug 2010 12:57:12 -0000      1.60
+++ ACE-desktop/ACE     22 Aug 2010 20:31:53 -0000      1.61
@@ -688,8 +688,8 @@
                exit 0
                ;;
        L|+L)
-               arguments=$($ARSHELL  -al 'Launch Arguments:' -oe -at "echo")
-               shift $(($OPTIND - 1))
+               arguments=`$ARSHELL  -al 'Launch Arguments:' -oe -at "echo"`
+               shift $(( $OPTIND - 1 ))
                $@ $arguments &
                exit 0
                ;;
@@ -698,12 +698,12 @@
                exit 0
                ;;
        A|+A)
-               shift $(($OPTIND-2))
+               shift $(( $OPTIND - 2 ))
                $@
                 exit 0
                ;;
        b|+b)
-               shift $(($OPTIND-2))
+               shift $(( $OPTIND - 2 ))
                $@ &
                exit 0
                ;;
@@ -719,6 +719,7 @@
        # Set the remaining arguments to not include COMMAND.  
        shift
         # This allows parameters to be passed to a configured command.
+#      echo "$command $*"
        $command $* 
 else
        # No getopt-unrecognized parameters passed, so launch the ACE

Index: ACE-desktop/guidl/Administration_Panel.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Administration_Panel.gdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/guidl/Administration_Panel.gdl  1 Jun 2007 18:51:30 -0000       
1.2
+++ ACE-desktop/guidl/Administration_Panel.gdl  22 Aug 2010 20:31:53 -0000      
1.3
@@ -1,6 +1,6 @@
 option "rows" 4;
 add buttons    "ACE -A Secure_Permissions,gtk-dialog-authentication", 
                "ACE Root_Shell,Terminal_32.png",
-               "ACE -A Monitoring_Panel,System_Monitor_32.png", 
+               "ACE -A GUIDL Monitoring_Panel,System_Monitor_32.png", 
                "ACE -A OS_Specific,gtk-open";
 

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gtkshell/Makefile   16 Aug 2010 14:23:42 -0000      1.63
+++ gtkshell/Makefile   22 Aug 2010 20:31:53 -0000      1.64
@@ -29,18 +29,8 @@
 ARFLAGS=-L. -lgtkshell -L../libantiright -lantiright
 GTKFLAGS=$(ARFLAGS) $(LDFLAGS)
 
-#LDFLAGS+=-lefence
-
-objects=y.tab.o lex.yy.o gtkshell.o arguments.o options.o callbacks.o\
-       label.o button.o text.o updated_label.o updated_progress.o\
-       dialog_options.o row.o containers.o geometry.o font.o dragdrop.o\
-       image_button.o terminal.o terminal_options.o menu.o updated.o\
-       guidl_util.o about_dialog.o init.o guidl_dialog.o guidl_dictionary.o\
-       guidl_options.o guidl_widgets.o update_manager.o pane.o\
-       command_shell.o app_mode.o clock.o tree.o form.o dialog.o swallow.o\
-       GSHWidget.o undo.o color.o add_options.o option_options.o\
-       ptk-app-menu.o
-
+objects=$(patsubst %.c,%.o,$(wildcard *.c)) 
+objects+=y.tab.o lex.yy.o
 program=main.o 
 
 ifeq ($(OS),MINGW32)
@@ -49,8 +39,7 @@
        INSTALLPROG=install -s
 endif
 
-all: 
-       $(MAKE) y.tab.c
+all: y.tab.c
        $(MAKE) gtkshell
 
 gtkshell: $(objects) $(program)

Index: gtkshell/gshterm
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gshterm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/gshterm    31 Jul 2010 17:54:15 -0000      1.13
+++ gtkshell/gshterm    22 Aug 2010 20:31:53 -0000      1.14
@@ -71,7 +71,7 @@
 if [ "$COMMAND" = "" ]; then
        COMMAND=$SHELL
 fi
-
+#DEBUG=TRUE
 COMMAND="gtkshell $APP_MODE -oF $ARGS -oT '$COMMAND' -as '$COMMAND'"
 if [ "$DEBUG" = "TRUE" ]; then
        echo $COMMAND

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gtkshell/gtkshell.c 22 Aug 2010 18:56:32 -0000      1.55
+++ gtkshell/gtkshell.c 22 Aug 2010 20:31:53 -0000      1.56
@@ -74,13 +74,10 @@
 void
 gsh_GSH (GSH * gsh)
 {
-//  struct GSH *gsh;
-
-  // gsh = (struct GSH *) armalloc (sizeof (struct GSH));
   /* setup child classes */
-  gsh->update = ARNEW (gsh, GSHUpdateManager);
+  gsh->update=NULL;
   gsh->rows = ARNEW (gsh, GSHRows);
-  gsh->terminal = ARNEW (gsh, GSH_Terminal, gsh);
+  gsh->terminal=NULL;
   /* setup methods */
   gsh->delete = &gsh_delete_GSH;
   gsh->parse = &gsh_parse_arguments;

Index: gtkshell/module_includes.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/module_includes.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/module_includes.h  13 Aug 2010 20:22:22 -0000      1.16
+++ gtkshell/module_includes.h  22 Aug 2010 20:31:53 -0000      1.17
@@ -32,7 +32,6 @@
 #include "updated_label.h"
 #include "updated_progress.h"
 #include "option_options.h"
-#include "updated_options.h"
 #include "add_options.h"
 #include "dialog_options.h"
 #include "file_dialog.h"

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gtkshell/option_options.c   17 Aug 2010 19:17:24 -0000      1.45
+++ gtkshell/option_options.c   22 Aug 2010 20:31:53 -0000      1.46
@@ -198,5 +198,8 @@
 void
 gsh_option_update_cb (GSH * gsh, gint * counter, const gchar ** argv)
 {
+  if(!(gsh->update)) 
+    gsh->update=ARNEW(gsh, GSHUpdateManager);
   gsh->update->period = atoi (argv[++(*counter)]);
 }
+

Index: gtkshell/option_options.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/option_options.h   17 Aug 2010 19:17:24 -0000      1.14
+++ gtkshell/option_options.h   22 Aug 2010 20:31:53 -0000      1.15
@@ -23,17 +23,23 @@
 #ifndef GSH_OPTION_OPTIONS_H
 #define GSH_OPTION_OPTIONS_H
 
-void gsh_option_app_mode_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_app_mode_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_color_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_color_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_no_relief_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_no_relief_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_no_dummy_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_no_dummy_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_echoes_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_echoes_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_exits_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_exits_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
 void
 gsh_option_no_base_frame_cb (GSH * gsh, gint * counter, const gchar ** argv);
@@ -41,7 +47,8 @@
 void
 gsh_option_framed_labels_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_geometry_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_geometry_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
 void
 gsh_option_horiz_clock_cb (GSH * gsh, gint * counter, const gchar ** argv);
@@ -49,23 +56,31 @@
 void
 gsh_option_horiz_labels_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_icon_size_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_icon_size_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_expand_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_expand_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_no_expand_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_no_expand_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
 void
 gsh_option_no_decorations_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_pane_next_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_pane_next_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_rows_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_rows_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_scroll_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_scroll_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_title_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void 
+gsh_option_title_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
-void gsh_option_update_cb (GSH * gsh, gint * counter, const gchar ** argv);
+void
+gsh_option_update_cb (GSH * gsh, gint * counter, const gchar ** argv);
 
 #endif

Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gtkshell/terminal.c 22 Aug 2010 18:56:33 -0000      1.39
+++ gtkshell/terminal.c 22 Aug 2010 20:31:54 -0000      1.40
@@ -97,7 +97,7 @@
     numstr = ar_dtostr (term->dimensions.height);
     height = g_strconcat ("LINES=", numstr, NULL);
     g_free (numstr);
-    numstr = ar_dtostr (term->dimensions.height);
+    numstr = ar_dtostr (term->dimensions.width);
     width = g_strconcat ("COLUMNS=", numstr, NULL);
     g_free (numstr);
   }

Index: gtkshell/terminal_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal_options.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/terminal_options.c 16 Aug 2010 11:51:22 -0000      1.12
+++ gtkshell/terminal_options.c 22 Aug 2010 20:31:54 -0000      1.13
@@ -22,22 +22,26 @@
 */
 
 #include "gtkshell.h"
-
+#define CHECKTERM if(!(gsh->terminal))\
+  gsh->terminal = ARNEW (gsh, GSH_Terminal, gsh);
 void
 gsh_option_terminal_width_cb (GSH * gsh, gint * counter, const gchar ** argv)
 {
+  CHECKTERM;
   gsh->terminal->dimensions.width = atoi (argv[++(*counter)]);
 }
 
 void
 gsh_option_terminal_height_cb (GSH * gsh, gint * counter, const gchar ** argv)
 {
+  CHECKTERM;
   gsh->terminal->dimensions.height = atoi (argv[++(*counter)]);
 }
 
 void
 gsh_option_terminal_font_cb (GSH * gsh, gint * counter, const gchar ** argv)
 {
+  CHECKTERM;
   gsh->terminal->font = (gchar *) argv[++(*counter)];
 }
 

Index: gtkshell/updated.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/updated.h  16 Aug 2010 11:51:22 -0000      1.13
+++ gtkshell/updated.h  22 Aug 2010 20:31:54 -0000      1.14
@@ -37,9 +37,11 @@
                             const gchar * command, GtkWidget * widget);
 
 #define GSH_NEW_UPDATER_WITH_COMMAND(gsh, function, widget, command)\
+  if(!(gsh->update)) gsh->update=ARNEW(gsh, GSHUpdateManager);\
        $(gsh->update, add, ARNEW(gsh, GSHUpdatedWidget,\
                &function, command, widget))
+
 #define GSH_NEW_UPDATER(gsh, function, widget)\
        GSH_NEW_UPDATER_WITH_COMMAND(gsh, function, widget, NULL)
 
-#endif
+#endif /* !GSH_UPDATED_H */

Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gtkshell/updated_label.c    16 Aug 2010 11:51:22 -0000      1.26
+++ gtkshell/updated_label.c    22 Aug 2010 20:31:54 -0000      1.27
@@ -27,10 +27,6 @@
 {
   gchar *results;
 
-#ifdef DEBUG
-  ARPASSERT (command);
-  ARPASSERT (widget);
-#endif /* DEBUG */
   results = antiright_pipe_read (command);
   /* This ensures that the result string is not empty, avoiding
    * certain formatting problems.

Index: gtkshell/updated_options.c
===================================================================
RCS file: gtkshell/updated_options.c
diff -N gtkshell/updated_options.c
--- gtkshell/updated_options.c  16 Aug 2010 11:51:22 -0000      1.24
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-/*
-  AntiRight
-  (c) 2002-2006 Jeffrey Bedard
-  address@hidden
-
-  This file is part of AntiRight.
-
-  AntiRight is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  AntiRight is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with AntiRight; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
-*/
-
-#include "gtkshell.h"

Index: gtkshell/updated_options.h
===================================================================
RCS file: gtkshell/updated_options.h
diff -N gtkshell/updated_options.h
--- gtkshell/updated_options.h  16 Aug 2010 11:51:22 -0000      1.8
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-/*
-  AntiRight
-  (c) 2002-2007 Jeffrey Bedard
-  address@hidden
-
-  This file is part of AntiRight.
-
-  AntiRight is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  AntiRight is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with AntiRight; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
-*/
-
-#ifndef GSH_UPDATED_OPTIONS_H
-#define GSH_UPDATED_OPTIONS_H
-
-void
-gsh_handle_updated_arguments (GSH * gsh, const gint argc,
-                             const gchar ** argv, gint * counter);
-
-#endif