FTE Text Editor

Update of /cvsroot/fte/fte/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24110

Modified Files:
	c_config.cpp 
Log Message:
h_words color problem fix, now color information is imported correctly.


Index: c_config.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/c_config.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- c_config.cpp	10 Jan 2003 03:56:12 -0000	1.18
+++ c_config.cpp	25 May 2003 21:24:46 -0000	1.19
@@ -859,7 +859,12 @@
                         Col <<= 4;
                         Col |= (hcPlain_Background & 0x0F);
                     } else {
-                        if (sscanf(Value, "%2X", &Col) != 1) return -1;
+                        unsigned int ColBg, ColFg;
+
+                        if (sscanf(colorstr, "%1X %1X", &ColFg, &ColBg) != 2)
+                            return 0;
+
+                        Col = ColFg | (ColBg << 4);
                     }
                     color = Col;
                 }

Update of /cvsroot/fte/fte/config
In directory sc8-pr-cvs1:/tmp/cvs-serv27729/config

Modified Files:
	ab_c.fte ab_java.fte main.fte 
Added Files:
	ab_perl.fte 
Log Message:
Add perl abbreviations.  Also add choice between One True Brace Style:

   if () {
   }

using the %define 1TBS_BRACE, or BSD Style:

   if ()
   {
   }

using the %define BSD_BRACE.  1TBS_BRACE is default, to enable BSD_BRACE,
put the following line in your .fte/mymain.fte before the %include of
systemmain.fte:

   %define(BSD_BRACE)

All the config files were in 1TBS which I can't stand.  Last time I switched
them, someone switched them back.  This time, there's choice, and no one
can complain - we'll support both.



--- NEW FILE: ab_perl.fte ---
# perl language templates

eventmap PERL {
    # these work well for default indentation settings
    # changes may be necessary if you use different indentation
    
    # typical usage would be typing ifx and <space>.
    # useful command here is <A+Enter> which adds 
    # a new line after the current one, and indents it properly.
    # in cmode defined as LineAdd; LineIndent;
    abbrev 'ifx' {
        KillWordPrev;
%if(BSD_BRACE)
        InsertString 'if ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
        InsertString '{'; LineIndent; LineNew;
%endif
%if(1TBS_BRACE)
        InsertString 'if () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
%endif
        InsertString '}'; LineIndent; 
        MoveSavedPos; Fail; # do not insert typed character
    }
    abbrev 'whx' { 
        KillWordPrev;
%if(BSD_BRACE)
        InsertString 'while ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
        InsertString '{'; LineIndent; LineNew;
%endif
%if(1TBS_BRACE)
        InsertString 'while () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
%endif
        InsertString '}'; LineIndent; 
        MoveSavedPos; Fail;
    }
    abbrev 'unx' { 
        KillWordPrev;
%if(BSD_BRACE)
        InsertString 'unless ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
        InsertString '{'; LineIndent; LineNew;
%endif
%if(1TBS_BRACE)
        InsertString 'unless () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
%endif
        InsertString '}'; LineIndent; 
        MoveSavedPos; Fail;
    }
}

Index: ab_c.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/ab_c.fte,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ab_c.fte	20 Aug 2002 21:50:49 -0000	1.2
+++ ab_c.fte	15 May 2003 02:50:04 -0000	1.3
@@ -9,22 +9,40 @@
     # a new line after the current one, and indents it properly.
     # in cmode defined as LineAdd; LineIndent;
     abbrev 'ifx' {
-        KillWordPrev; InsertString 'if () {'; LineIndent; LineNew; 
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'if ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'if () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft; 
-        Fail; # do not insert typed character
+        MoveSavedPos; Fail; # do not insert typed character
     }
     abbrev 'whx' { 
-        KillWordPrev; InsertString 'while () {'; LineIndent; LineNew;
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'while ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'while () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft;
-        Fail;
+        MoveSavedPos; Fail;
     }
     abbrev 'swx' { 
-        KillWordPrev; InsertString 'switch () {'; LineIndent; LineNew;
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'switch ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'switch () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft; 
-        Fail;
+        MoveSavedPos; Fail;
     }
     abbrev 'cax' {
         KillWordPrev; InsertString 'case :'; LineIndent; LineNew;

Index: ab_java.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/ab_java.fte,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ab_java.fte	28 Aug 2001 02:32:39 -0000	1.1
+++ ab_java.fte	15 May 2003 02:50:05 -0000	1.2
@@ -9,22 +9,40 @@
     # a new line after the current one, and indents it properly.
     # in cmode defined as LineAdd; LineIndent;
     abbrev 'ifx' {
-        KillWordPrev; InsertString 'if () {'; LineIndent; LineNew; 
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'if ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'if () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft; 
-        Fail; # do not insert typed character
+        MoveSavedPos; Fail; # do not insert typed character
     }
     abbrev 'whx' { 
-        KillWordPrev; InsertString 'while () {'; LineIndent; LineNew;
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'while ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'while () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft;
-        Fail;
+        MoveSavedPos; Fail;
     }
     abbrev 'swx' { 
-        KillWordPrev; InsertString 'switch () {'; LineIndent; LineNew;
+        KillWordPrev;
+%if(BSD_BRACE)
+        InsertString 'switch ()'; MoveLeft; SavePos; MoveRight; LineIndent; LineNew;
+        InsertString '{'; LineIndent; LineNew;
+%endif
+%if(1TBS_BRACE)
+        InsertString 'switch () {'; 3:MoveLeft; SavePos; 3:MoveRight; LineIndent; LineNew; 
+%endif
         InsertString '}'; LineIndent; 
-        MoveUp; MoveLineEnd; 3:MoveLeft; 
-        Fail;
+        MoveSavedPos; Fail;
     }
     abbrev 'cax' {
         KillWordPrev; InsertString 'case :'; LineIndent; LineNew;

Index: main.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/main.fte,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.fte	10 Jan 2003 03:59:02 -0000	1.13
+++ main.fte	15 May 2003 02:50:05 -0000	1.14
@@ -13,6 +13,10 @@
 #%define(UI_BRIEF)
 # experimental
 
+%if(!BSD_BRACE)
+%define(1TBS_BRACE)
+%endif
+
 #%define(COLORS_GRAY_BG)
 #%define(COLORS_WHITE_BG)
 %define(COLORS_BLACK_BG)
@@ -233,6 +237,7 @@
 include 'ab_rexx.fte';
 include 'ab_sh.fte';
 include 'ab_java.fte';
+include 'ab_perl.fte';
 
 # some customizations

Update of /cvsroot/fte/fte/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13135

Modified Files:
	cfte.cpp c_hilit.h 
Log Message:
Added error message when trying to configure too long keyword name and extended maxium keyword name to 64 chars.


Index: cfte.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/cfte.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cfte.cpp	10 Jan 2003 03:56:12 -0000	1.15
+++ cfte.cpp	12 May 2003 14:02:10 -0000	1.16
@@ -23,6 +23,8 @@
 #include "c_fconfig.h"
 #include "s_files.h"
 #include "c_mode.h"
+#include "console.h"
+#include "c_hilit.h"
 
 #define slen(s) ((s) ? (strlen(s) + 1) : 0)
 
@@ -1226,6 +1228,9 @@
                                     if (Parse(cp) == P_CLOSEBRACE) break;
                                     if (Parse(cp) != P_STRING) Fail(cp, "String expected");
                                     kname = GetString(cp);
+
+                                    if (strlen(kname) >= CK_MAXLEN) Fail(cp, "Keyword name is too long");
+
                                     PutString(cp, CF_STRING, kname);
 
                                     if (Parse(cp) != P_COMMA)

Index: c_hilit.h
===================================================================
RCS file: /cvsroot/fte/fte/src/c_hilit.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- c_hilit.h	30 Nov 2002 17:45:15 -0000	1.7
+++ c_hilit.h	12 May 2003 14:02:10 -0000	1.8
@@ -176,7 +176,7 @@
     continue;\
     }
 
-#define CK_MAXLEN 32
+#define CK_MAXLEN 64
 
 inline bool isZeroArray(int* Count, size_t len)
 {

Update of /cvsroot/fte/fte/config
In directory sc8-pr-cvs1:/tmp/cvs-serv1123

Modified Files:
	m_unrealscript.fte 
Log Message:
UnrealScript syntax highlighter updates from ryan.


Index: m_unrealscript.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/m_unrealscript.fte,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- m_unrealscript.fte	10 Jan 2003 03:59:02 -0000	1.1
+++ m_unrealscript.fte	10 May 2003 14:11:05 -0000	1.2
@@ -22,9 +22,10 @@
         'struct', 'config', 'for', 'else', 'event', 'exec', 'state', 'while',
         'break', 'continue', 'native', 'simulated', 'abstract', 'native',
         'nativereplication', 'const', 'final', 'iterator', 'static', 'color',
-        'simulated', 'replication', 'unreliable', 'foreach', 'vector',
-        'optional', 'out', 'switch', 'transient', 'name', 'export', 'delegate',
-        'cpptext', 'globalconfig', 'self',
+        'simulated', 'replication', 'unreliable', 'foreach', 'optional',
+        'out', 'switch', 'transient', 'name', 'export', 'delegate', 'cpptext',
+        'globalconfig', 'self', 'preoperator', 'postoperator', 'operator',
+        'coerce', 'noexport', 'ignores',
     };
 }
 
@@ -43,4 +44,3 @@
     CommentStart        = ' /*';
     CommentEnd          = '*/';
 }
-

Update of /cvsroot/fte/fte/config
In directory sc8-pr-cvs1:/tmp/cvs-serv19967

Modified Files:
	m_make.fte 
Log Message:
Allow .make extentions for makefiles



Index: m_make.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/m_make.fte,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- m_make.fte	9 Jan 2003 16:52:02 -0000	1.3
+++ m_make.fte	7 May 2003 15:06:53 -0000	1.4
@@ -83,7 +83,7 @@
 }
 
 mode MAKE: PLAIN {
-    FileNameRx          = /\c{makefile}|{\.{MAK}|{MK}|{MIF}$}/;
+    FileNameRx          = /\c{makefile}|{\.{MAK}|{MAKE}|{MK}|{MIF}$}/;
     FirstLineRx         = /^\#\!.*make\s+-f/;
     HilitOn             = 1;
     Colorizer           = 'MAKE';