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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/03/19 10:18:25

Modified files:
        ACE-desktop    : ACE 
        ACE-desktop/guidl: IDE.gdl 
        gtkshell       : Makefile guidl.lex guidl.y guidl_util.c label.c 
                         macros.h option_options.c terminal.c 

Log message:
        Added option for nonexpanding labels.  Added TODO list to IDE.
        Added text area to guidl.  Added IDE launch function to ACE.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/IDE.gdl?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/terminal.c?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ACE-desktop/ACE     19 Mar 2007 07:09:30 -0000      1.27
+++ ACE-desktop/ACE     19 Mar 2007 10:18:25 -0000      1.28
@@ -44,6 +44,11 @@
        echo $TMPDIR/ACE.$1.$$
 }
 
+IDE()
+{
+       GUIDL IDE
+}
+
 Prepare_Temp()
 {
        rm -f $1

Index: ACE-desktop/guidl/IDE.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/IDE.gdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/guidl/IDE.gdl   19 Mar 2007 09:33:07 -0000      1.1
+++ ACE-desktop/guidl/IDE.gdl   19 Mar 2007 10:18:25 -0000      1.2
@@ -16,6 +16,10 @@
        "make", 
        "make clean", 
        "make install", 
-       "make run",
        "make test";
 
+option "no label fill";
+add label "     TODO:     ";
+
+add text;
+

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/Makefile   19 Mar 2007 09:33:07 -0000      1.16
+++ gtkshell/Makefile   19 Mar 2007 10:18:25 -0000      1.17
@@ -64,3 +64,9 @@
        install gtkshell $(PREFIX)/bin
        install gshterm $(PREFIX)/bin
 
+test:
+       ./gtkshell -oh -or 4 test_button\
+               test_menubutton::item::item,gtk-execute\
+               -at echo -aT -aul date -aup 'echo 0.5' -al test_label\
+               -otf 'Mono 8' -otw 48 -oth 16 -as ksh
+

Index: gtkshell/guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/guidl.lex  19 Mar 2007 09:33:07 -0000      1.3
+++ gtkshell/guidl.lex  19 Mar 2007 10:18:25 -0000      1.4
@@ -26,6 +26,7 @@
 terminal       return TERMINAL;
 window         return WINDOW;
 echo           return TOKEN_ECHO;
+text           return TEXT;
 
 [ \t\n]                /* ignore */;
 "//".*$                /* comment */;

Index: gtkshell/guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gtkshell/guidl.y    19 Mar 2007 09:33:07 -0000      1.4
+++ gtkshell/guidl.y    19 Mar 2007 10:18:25 -0000      1.5
@@ -58,7 +58,7 @@
 }
 %token IFS SC COMMA OPTION PROMPT VIEWER LABEL
 %token BUTTON END ADD UPDATING PROGRESS BUTTONS
-%token TERMINAL WINDOW TOKEN_ECHO
+%token TERMINAL WINDOW TOKEN_ECHO TEXT
 %token <string> STRING
 %token <number> NUM
 %%
@@ -108,6 +108,11 @@
        gsh_guidl_add("-ae", $3);
 }
 |
+ADD TEXT
+{
+       gsh_append_arg((gchar *)"-aT");
+}
+|
 ADD LABEL STRING
 {
        gsh_guidl_add("-al", $3);

Index: gtkshell/guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/guidl_util.c       19 Mar 2007 09:33:07 -0000      1.1
+++ gtkshell/guidl_util.c       19 Mar 2007 10:18:25 -0000      1.2
@@ -56,6 +56,10 @@
                option='h';
        else if(!strcmp(string, "scrolled"))
                option='s';
+       else if(!strcmp(string, "no label fill"))
+               option='l';
+       else if(!strcmp(string, "label fill")) /* default */
+               option='L';
        else
        {
                ARWARN("invalid option");

Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/label.c    2 Mar 2007 03:56:07 -0000       1.13
+++ gtkshell/label.c    19 Mar 2007 10:18:25 -0000      1.14
@@ -63,9 +63,13 @@
                to_be_managed = label;
 
        /*
-        * This uses expanded management, as the label may be
-        * displaying a large text area.
+        * This uses expanded management by default , as the label may be
+        * displaying a large text area.  Behavior is unexpanded if
+        * corresponding option is set.
         */
+       if(GSH_FLAG(GSH_NO_LABEL_EXPAND))
+               gsh_manage_unexpanded(gsh, to_be_managed);
+       else /* default */
        gsh_manage(gsh, to_be_managed);
 
        return label;

Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/macros.h   19 Mar 2007 07:09:30 -0000      1.1
+++ gtkshell/macros.h   19 Mar 2007 10:18:25 -0000      1.2
@@ -32,6 +32,7 @@
 #define GSH_FRAMED_LABELS      32
 #define GSH_MENU_BUTTON                64
 #define GSH_NO_BASE_FRAME      128
+#define GSH_NO_LABEL_EXPAND    256
 
 typedef guint Bitmask;
 

Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/option_options.c   19 Mar 2007 07:09:30 -0000      1.15
+++ gtkshell/option_options.c   19 Mar 2007 10:18:25 -0000      1.16
@@ -60,6 +60,14 @@
                GSH_SET(GSH_HORIZONTAL_LABELS);
                break;
                
+       case 'l':
+               GSH_SET(GSH_NO_LABEL_EXPAND);
+               break;
+
+       case 'L':
+               GSH_UNSET(GSH_NO_LABEL_EXPAND);
+               break;
+
        case 'n':
                gtk_window_set_decorated(GTK_WINDOW(gsh->window),
                                         FALSE);

Index: gtkshell/terminal.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/terminal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/terminal.c 19 Mar 2007 09:33:07 -0000      1.3
+++ gtkshell/terminal.c 19 Mar 2007 10:18:25 -0000      1.4
@@ -55,7 +55,7 @@
        term=gsh->terminal.widget;
 
        set_size(gsh);
-       /*vte_terminal_set_allow_bold(VTE_TERMINAL(term), TRUE);*/
+       vte_terminal_set_allow_bold(VTE_TERMINAL(term), TRUE);
        vte_terminal_set_backspace_binding(VTE_TERMINAL(term),
                                           VTE_ERASE_ASCII_BACKSPACE);
        set_font(gsh);