fte-cvs — CVS Updates

[Fte-cvs] fte/src h_c.cpp,1.41,1.42

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19443

Modified Files:
	h_c.cpp 
Log Message:
Fix broken indent after ?: in C mode
https://sourceforge.net/p/fte/patches/72/

Thanks, Krzysztof Nikiel


Index: h_c.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/h_c.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- h_c.cpp	14 Feb 2010 21:30:20 -0000	1.41
+++ h_c.cpp	13 Dec 2014 04:14:29 -0000	1.42
@@ -165,6 +165,10 @@
                     Color = CLR_Punctuation;
                     PRINTF(("----FOUND TRIPPLET\n"));
                     goto hilit;
+		} else if (State == hsC_Tripplet && *p == ';') {
+		    State = hsC_Normal;
+		    Color = CLR_Punctuation;
+                    goto hilit;
                 } else if (ispunct(*p) && *p != '_') {
                     Color = CLR_Punctuation;
                     PRINTF(("----FOUND PUNKT\n"));

[Fte-cvs] fte/src c_config.cpp,1.46,1.47

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13772/src

Modified Files:
	c_config.cpp 
Log Message:
fix version test 

Previous patch missed change to unsigned char buffer.
Simplify version test as well.


Index: c_config.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/c_config.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- c_config.cpp	23 Nov 2013 19:36:33 -0000	1.46
+++ c_config.cpp	23 Nov 2013 22:04:43 -0000	1.47
@@ -1238,8 +1238,8 @@
     LOG << "Config file: " << CfgFileName << ENDLINE;
 
     int fd, rc;
-    char *buffer;
-    int ln;
+    unsigned char *buffer;
+    int ln, ver;
     struct stat statbuf;
     CurPos cp;
 
@@ -1257,7 +1257,7 @@
         ENDFUNCRC(-1);
     }
 
-    buffer = (char *) malloc((size_t)statbuf.st_size);
+    buffer = (unsigned char *) malloc((size_t)statbuf.st_size);
     if (!buffer) {
         close(fd);
         ENDFUNCRC(-1);
@@ -1270,25 +1270,18 @@
     close(fd);
 
     ln = (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
+    ver = (buffer[7] << 24) | (buffer[6] << 16) | (buffer[5] << 8) | buffer[4];
 
-    if (ln != CONFIG_ID) {
+    if (ln != CONFIG_ID || ver != VERNUM) {
         free(buffer);
+        LOG << std::hex << "Config " << ln << ":" << ver << " expecting " << CONFIG_ID << VERNUM << ENDLINE;
         DieError(0, "Bad .CNF signature");
         ENDFUNCRC(-1);
     }
 
-    ln = (buffer[7] << 24) + (buffer[6] << 16) + (buffer[5] << 8) + buffer[4];
-
-    if (ln != VERNUM) {
-        LOG << std::hex << ln << " != " << VERNUM << ENDLINE;
-        free(buffer);
-        DieError(0, "Bad .CNF version.");
-        ENDFUNCRC(-1);
-    }
-
     cp.name = CfgFileName;
     cp.sz = statbuf.st_size;
-    cp.a = buffer;
+    cp.a = (char *) buffer;
     cp.c = cp.a + 2 * 4;
     cp.z = cp.a + cp.sz;
     cp.line = 1;
@@ -1307,7 +1300,6 @@
 
 int UseDefaultConfig() {
     CurPos cp;
-    int rc;
 
     cp.name = "Internal Configuration";
     cp.sz = sizeof(DefaultConfig);
@@ -1316,7 +1308,7 @@
     cp.z = cp.a + cp.sz;
     cp.line = 1;
 
-    rc = ReadConfigFile(cp);
+    int rc = ReadConfigFile(cp);
 
     if (rc == -1)
         DieError(1, "Error %s offset %d\n", cp.name, cp.c - cp.a);

[Fte-cvs] fte/src c_hilit.h, 1.24, 1.25 e_buffer.cpp, 1.22, 1.23 o_messages.cpp, 1.30, 1.31 s_util.cpp, 1.15, 1.16

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4872/src

Modified Files:
	c_hilit.h e_buffer.cpp o_messages.cpp s_util.cpp 
Log Message:
Cleanup some conversion warnings


Index: s_util.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/s_util.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- s_util.cpp	23 Nov 2013 19:31:34 -0000	1.15
+++ s_util.cpp	23 Nov 2013 19:37:05 -0000	1.16
@@ -26,7 +26,7 @@
 static int copyfile(char const* f1, char const* f2) { // from F1 to F2
     void *buffer;
     int fd1, fd2;
-    int rd;
+    ssize_t rd;
 
     buffer = FileBuffer;
 

Index: c_hilit.h
===================================================================
RCS file: /cvsroot/fte/fte/src/c_hilit.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- c_hilit.h	22 Feb 2011 00:11:56 -0000	1.24
+++ c_hilit.h	23 Nov 2013 19:37:05 -0000	1.25
@@ -173,7 +173,7 @@
 
 struct HTrans {
     char *match;
-    int matchLen;
+    size_t matchLen;
     long matchFlags;
     int nextState;
     int color;

Index: e_buffer.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/e_buffer.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- e_buffer.cpp	19 Feb 2011 19:59:36 -0000	1.22
+++ e_buffer.cpp	23 Nov 2013 19:37:05 -0000	1.23
@@ -932,8 +932,8 @@
     
     L = ScreenPos(Line, Line->Count);
     if (LCol >= L) return 1;
-    if (ACount == -1) ACount = L - LCol;
-    if (ACount + LCol > L) ACount = L - LCol;
+    if ((int)ACount == -1) ACount = L - LCol;
+    if ((int)ACount + LCol > L) ACount = L - LCol;
     if (ACount == 0) return 1;
     assert(ACount > 0);
 

Index: o_messages.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/o_messages.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- o_messages.cpp	19 Feb 2011 20:20:58 -0000	1.30
+++ o_messages.cpp	23 Nov 2013 19:37:05 -0000	1.31
@@ -427,7 +427,7 @@
                     getWord(fn, pin);                   // Get dirname,
                     //dbg("leaving %s", fn);
 		    int found = 0;
-		    for (unsigned i = DirLevel.size(); i-- > 0;) {
+		    for (size_t i = DirLevel.size(); i-- > 0;) {
 			/*
 			 * remove leaved director from our list of Dirs
 			 * as many users runs make in parallel mode

[Fte-cvs] fte/src c_config.cpp,1.45,1.46

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4844/src

Modified Files:
	c_config.cpp 
Log Message:
Convert long to int

Do not used longs when ints are perfectly ok.


Index: c_config.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/c_config.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- c_config.cpp	23 Nov 2013 19:30:28 -0000	1.45
+++ c_config.cpp	23 Nov 2013 19:36:33 -0000	1.46
@@ -406,7 +406,7 @@
         unsigned char l[2];
         c = *cp.c++;
         memcpy(l, cp.c, 2);
-        len = (l[1] << 8) + l[0];
+        len = (unsigned short)((l[1] << 8) | l[0]);
         cp.c += 2;
         return c;
     }
@@ -427,18 +427,12 @@
     ENDFUNCRC(p);
 }
 
-static int GetNum(CurPos &cp, long &num) {
+static int GetNum(CurPos &cp, int &num) {
     unsigned char n[4];
     if (cp.c + 4 > cp.z) return 0;
     memcpy(n, cp.c, 4);
-    num =
-        (n[3] << 24) +
-        (n[2] << 16) +
-        (n[1] << 8) +
-        n[0];
+    num = (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
 
-    if ((n[3] > 127) && sizeof(long) > 4)
-        num = num | (~0xFFFFFFFFUL);
     cp.c += 4;
     return 1;
 }
@@ -449,13 +443,13 @@
 
     unsigned char obj;
     unsigned short len;
-    long Cmd = NewCommand(Name);
-    long cmdno;
+    int Cmd = NewCommand(Name);
+    int cmdno;
 
     if (GetObj(cp, len) != CF_INT) ENDFUNCRC(-1);
     if (GetNum(cp, cmdno) == 0) ENDFUNCRC(-1);
     if (cmdno != (Cmd | CMD_EXT)) {
-        fprintf(stderr, "Bad Command map %s -> %ld != %ld\n", Name, Cmd, cmdno);
+        fprintf(stderr, "Bad Command map %s -> %d != %d\n", Name, Cmd, cmdno);
         ENDFUNCRC(-1);
     }
 
@@ -464,9 +458,9 @@
         case CF_COMMAND:
             {
                 //              char *s;
-                long cnt;
-                long ign;
-                long cmd;
+                int cnt;
+                int ign;
+                int cmd;
 
                 //                if ((s = GetCharStr(cp, len)) == 0) return -1;
                 if (GetNum(cp, cmd) == 0) ENDFUNCRC(-1);
@@ -482,7 +476,7 @@
 
                 if (AddCommand(Cmd, cmd, cnt, ign) == 0) {
                     if (Name == 0 || strcmp(Name, "xx") != 0) {
-                        fprintf(stderr, "Bad Command Id: %ld\n", cmd);
+                        fprintf(stderr, "Bad Command Id: %d\n", cmd);
                         ENDFUNCRC(-1);
                     }
                 }
@@ -498,7 +492,7 @@
             break;
         case CF_INT:
             {
-                long num;
+                int num;
 
                 if (GetNum(cp, num) == 0) ENDFUNCRC(-1);
                 if (AddNumber(Cmd, num) == 0) ENDFUNCRC(-1);
@@ -506,7 +500,7 @@
             break;
         case CF_VARIABLE:
             {
-                long num;
+                int num;
 
                 if (GetNum(cp, num) == 0) ENDFUNCRC(-1);
                 if (AddVariable(Cmd, num) == 0) ENDFUNCRC(-1);
@@ -621,7 +615,7 @@
         switch (obj) {
         case CF_INT:
             {
-                long cidx;
+                int cidx;
                 const char *svalue;
 
                 if (GetNum(cp, cidx) == 0) return -1;
@@ -712,7 +706,7 @@
 
         case CF_SETVAR:
             {
-                long what;
+                int what;
 
                 if (GetNum(cp, what) == 0) return -1;
                 switch (GetObj(cp, len)) {
@@ -779,8 +773,8 @@
 
         case CF_HSTATE:
             {
-                long stateno;
-                long color;
+                int stateno;
+                int color;
 
                 if (Colorize->hm == 0)
                     Colorize->hm = new HMachine();
@@ -812,10 +806,10 @@
         case CF_HTRANS:
             {
                 HTrans newTrans;
-                long nextState;
-                long matchFlags;
+                int nextState;
+                int matchFlags;
+                int color;
                 const char *match;
-                long color;
 
                 if (GetNum(cp, nextState) == 0)
                     return -1;
@@ -859,10 +853,10 @@
 
         case CF_HWTYPE:
             {
-                long nextKwdMatchedState;
-                long nextKwdNotMatchedState;
-                long nextKwdNoCharState;
-                long options;
+                int nextKwdMatchedState;
+                int nextKwdNotMatchedState;
+                int nextKwdNoCharState;
+                int options;
                 const char *wordChars;
 
                 obj = GetObj(cp, len);
@@ -940,7 +934,7 @@
 
         case CF_SETVAR:
             {
-                long what;
+                int what;
 
                 if (GetNum(cp, what) == 0) return -1;
                 switch (GetObj(cp, len)) {
@@ -982,7 +976,7 @@
         switch (obj) {
         case CF_SETVAR:
             {
-                long what;
+                int what;
 
                 if (GetNum(cp, what) == 0) return -1;
                 switch (GetObj(cp, len)) {
@@ -995,7 +989,7 @@
                     break;
                 case CF_INT:
                     {
-                        long num;
+                        int num;
 
                         if (GetNum(cp, num) == 0) return -1;
                         if (SetModeNumber(Mode, what, num) != 0) return -1;
@@ -1027,7 +1021,7 @@
 #ifdef CONFIG_OBJ_MESSAGES
         case CF_COMPRX:
             {
-                long file, line, msg;
+                int file, line, msg;
                 const char *regexp;
 
                 if (GetObj(cp, len) != CF_INT) return -1;
@@ -1070,7 +1064,7 @@
 #endif
         case CF_SETVAR:
             {
-                long what;
+                int what;
                 if (GetNum(cp, what) == 0) return -1;
 
                 switch (GetObj(cp, len)) {
@@ -1083,7 +1077,7 @@
                     break;
                 case CF_INT:
                     {
-                        long num;
+                        int num;
 
                         if (GetNum(cp, num) == 0) return -1;
                         if (SetGlobalNumber(what, num) != 0) return -1;
@@ -1244,7 +1238,8 @@
     LOG << "Config file: " << CfgFileName << ENDLINE;
 
     int fd, rc;
-    char *buffer = 0;
+    char *buffer;
+    int ln;
     struct stat statbuf;
     CurPos cp;
 
@@ -1263,7 +1258,7 @@
     }
 
     buffer = (char *) malloc((size_t)statbuf.st_size);
-    if (buffer == 0) {
+    if (!buffer) {
         close(fd);
         ENDFUNCRC(-1);
     }
@@ -1274,11 +1269,7 @@
     }
     close(fd);
 
-    unsigned char l[4];
-    unsigned long ln;
-
-    memcpy(l, buffer, 4);
-    ln = (l[3] << 24) + (l[2] << 16) + (l[1] << 8) + l[0];
+    ln = (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0];
 
     if (ln != CONFIG_ID) {
         free(buffer);
@@ -1286,8 +1277,7 @@
         ENDFUNCRC(-1);
     }
 
-    memcpy(l, buffer + 4, 4);
-    ln = (l[3] << 24) + (l[2] << 16) + (l[1] << 8) + l[0];
+    ln = (buffer[7] << 24) + (buffer[6] << 16) + (buffer[5] << 8) + buffer[4];
 
     if (ln != VERNUM) {
         LOG << std::hex << ln << " != " << VERNUM << ENDLINE;

[Fte-cvs] fte/src con_linux.cpp,1.37,1.38

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4782/src

Modified Files:
	con_linux.cpp 
Log Message:
Buffer for console is created from TCell components


Index: con_linux.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_linux.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- con_linux.cpp	23 Nov 2013 19:31:33 -0000	1.37
+++ con_linux.cpp	23 Nov 2013 19:35:36 -0000	1.38
@@ -983,7 +983,7 @@
     free(SavedScreen);
     ConQuerySize(&SavedX, &SavedY);
 
-    SavedScreen = (PCell) malloc(SavedX * SavedY * sizeof(PCell));
+    SavedScreen = (PCell) malloc(SavedX * SavedY * sizeof(TCell));
 
     if (SavedScreen)
         ConGetBox(0, 0, SavedX, SavedY, SavedScreen);

[Fte-cvs] fte/src g_qt_dlg.cpp,1.5,1.6

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4652/src

Modified Files:
	g_qt_dlg.cpp 
Log Message:
Fix code to access data from already delete object

Retrieve return value before destroing object.


Index: g_qt_dlg.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_qt_dlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- g_qt_dlg.cpp	7 Feb 2010 15:16:32 -0000	1.5
+++ g_qt_dlg.cpp	23 Nov 2013 19:34:47 -0000	1.6
@@ -199,12 +199,11 @@
     
     cb->setText(msg);
     
-    int retcode = cb->exec();
-    
+    int retcode = (cb->exec() == QDialog::Accepted) ? cb->getChoice()  : -1;
+
     delete cb;
-    if (retcode == QDialog::Accepted)
-        return cb->getChoice();
-    return -1;
+
+    return retcode;
 }
 
 int DLGGetFind(GView *View, SearchReplaceOptions &sr) {

[Fte-cvs] fte/src g_text.cpp,1.27,1.28

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4596/src

Modified Files:
	g_text.cpp 
Log Message:
Comment-out some unused code.

Maybe this code should be doing something else,
think about it....


Index: g_text.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_text.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- g_text.cpp	22 Feb 2011 00:15:17 -0000	1.27
+++ g_text.cpp	23 Nov 2013 19:33:44 -0000	1.28
@@ -800,8 +800,8 @@
     if (!Top)
         return 0;
 
-    if (FocusCapture != 0)
-        view = view;
+    //if (FocusCapture != 0)
+    //    view = view;
 
     if (Active)
         Active->Activate(0);

[Fte-cvs] fte/src g_motif.cpp,1.26,1.27

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4537/src

Modified Files:
	g_motif.cpp 
Log Message:
Avoid testing array for existence.

'gc' is not a pointer but array class member.


Index: g_motif.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_motif.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- g_motif.cpp	23 Nov 2013 19:31:33 -0000	1.26
+++ g_motif.cpp	23 Nov 2013 19:33:02 -0000	1.27
@@ -818,7 +818,7 @@
     char *p, *ps, *c, *ops;
     int len, x, l, ox, olen, skip;
 
-    if (!(View && View->Parent && gc))
+    if (!(View && View->Parent))
         return 1;
 
     if (Visibility == VisibilityFullyObscured)

[Fte-cvs] fte/src i_input.cpp, 1.9, 1.10 i_search.cpp, 1.7, 1.8 menu_text.cpp, 1.14, 1.15

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4443/src

Modified Files:
	i_input.cpp i_search.cpp menu_text.cpp 
Log Message:
Add  Fall through  comments 


Index: i_input.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/i_input.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- i_input.cpp	19 Feb 2011 12:24:06 -0000	1.9
+++ i_input.cpp	23 Nov 2013 19:32:07 -0000	1.10
@@ -212,6 +212,7 @@
         case 'Q' | kfCtrl:
             Event.What = evKeyDown;
             Event.Key.Code = Win->GetChar(0);
+            /* Fall through */
         default:
             {
                 char Ch;

Index: menu_text.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/menu_text.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- menu_text.cpp	14 Feb 2010 17:55:30 -0000	1.14
+++ menu_text.cpp	23 Nov 2013 19:32:07 -0000	1.15
@@ -284,7 +284,9 @@
         case evKeyDown:
             switch (kbCode(E.Key.Code)) {
             case kbPgDn:
-            case kbEnd: cur = Menus[id].Count;
+            case kbEnd:
+                cur = Menus[id].Count;
+                /* Fall through */
             case kbUp: 
                 {
                     int xcur = cur;
@@ -296,7 +298,9 @@
                 }
                 break;
             case kbPgUp:
-            case kbHome: cur = -1;
+            case kbHome:
+                cur = -1;
+                /* Fall through */
             case kbDown: 
                 {
                     int xcur = cur;
@@ -537,7 +541,9 @@
             break;
         case evKeyDown:
             switch (kbCode(E.Key.Code)) {
-            case kbEnd: cur = Menus[id].Count;
+            case kbEnd:
+                cur = Menus[id].Count;
+                /* Fall through */
             case kbLeft:
                 dovert = 1;
                 {
@@ -548,7 +554,9 @@
                     } while (cur != x && Menus[id].Items[cur].Name == 0);
                 }
                 break;
-            case kbHome: cur = -1;
+            case kbHome:
+                cur = -1;
+                /* Fall through */
             case kbRight:
                 dovert = 1;
                 {

Index: i_search.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/i_search.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- i_search.cpp	23 Nov 2013 19:31:34 -0000	1.7
+++ i_search.cpp	23 Nov 2013 19:32:07 -0000	1.8
@@ -120,6 +120,7 @@
         case 'Q' | kfCtrl:
             Event.What = evKeyDown;
             Event.Key.Code = Win->GetChar(0);
+            /* Fall through */
         default:
             if (isAscii(Event.Key.Code) && (len < (int)MAXISEARCH)) {
                 char Ch = (char) Event.Key.Code;

[Fte-cvs] fte/src con_linux.cpp, 1.36, 1.37 con_ncurses.cpp, 1.34, 1.35 con_slang.cpp, 1.44, 1.45 g_motif.cpp, 1.25, 1.26 g_qt.cpp, 1.26, 1.27 i_choice.cpp, 1.5, 1.6 i_search.cpp, 1.6, 1.7 log.cpp, 1.12, 1.13 s_files.cpp, 1.19, 1.20 s_util.cpp, 1.14, 1.15

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4402/src

Modified Files:
	con_linux.cpp con_ncurses.cpp con_slang.cpp g_motif.cpp 
	g_qt.cpp i_choice.cpp i_search.cpp log.cpp s_files.cpp 
	s_util.cpp 
Log Message:
Remove some unused headers


Index: g_qt.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_qt.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- g_qt.cpp	22 Feb 2011 00:15:17 -0000	1.26
+++ g_qt.cpp	23 Nov 2013 19:31:33 -0000	1.27
@@ -16,7 +16,6 @@
 #include <qapp.h>
 #include <qclipbrd.h>
 #include <qframe.h>
-#include <qkeycode.h>
 #include <qmenubar.h>
 #include <qpainter.h>
 #include <qscrbar.h>

Index: con_slang.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_slang.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- con_slang.cpp	22 Feb 2011 00:19:43 -0000	1.44
+++ con_slang.cpp	23 Nov 2013 19:31:33 -0000	1.45
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 #include <unistd.h>
 
 extern TEvent NextEvent; // g_text.cpp

Index: log.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/log.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- log.cpp	18 Mar 2009 22:02:38 -0000	1.12
+++ log.cpp	23 Nov 2013 19:31:34 -0000	1.13
@@ -22,9 +22,6 @@
 #include <stdlib.h>
 #else
 #include <iomanip>
-#include <iostream>
-#include <cstring>
-#include <cstdlib>
 
 using namespace std;
 #endif

Index: s_util.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/s_util.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- s_util.cpp	19 Feb 2011 12:24:06 -0000	1.14
+++ s_util.cpp	23 Nov 2013 19:31:34 -0000	1.15
@@ -13,7 +13,6 @@
 #include "o_buflist.h"
 #include "s_direct.h"
 #include "s_files.h"
-#include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

Index: g_motif.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_motif.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- g_motif.cpp	22 Feb 2011 00:15:17 -0000	1.25
+++ g_motif.cpp	23 Nov 2013 19:31:33 -0000	1.26
@@ -29,7 +29,6 @@
 #include <Xm/CascadeB.h>
 #include <Xm/DrawingA.h>
 #include <Xm/Form.h>
-#include <Xm/Label.h>
 #include <Xm/MainW.h>
 #include <Xm/MainW.h>
 #include <Xm/PanedW.h>
@@ -38,7 +37,6 @@
 #include <Xm/ScrollBar.h>
 #include <Xm/ScrolledW.h>
 #include <Xm/Separator.h>
-#include <Xm/Text.h>
 
 #include <fcntl.h>
 #include <stdarg.h>

Index: con_ncurses.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_ncurses.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- con_ncurses.cpp	22 Feb 2011 00:19:43 -0000	1.34
+++ con_ncurses.cpp	23 Nov 2013 19:31:33 -0000	1.35
@@ -12,15 +12,12 @@
 #include "gui.h"
 #include "o_model.h"  // Msg
 #include "s_string.h"
-#include "s_util.h"  // S_ERROR
 #include "sysdep.h"
 
 #include <ncurses.h>
 
 #include <signal.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/wait.h>
 #include <termios.h>
 
 /* Escape sequence delay in milliseconds */

Index: i_choice.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/i_choice.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- i_choice.cpp	14 Feb 2010 11:26:10 -0000	1.5
+++ i_choice.cpp	23 Nov 2013 19:31:33 -0000	1.6
@@ -11,7 +11,6 @@
 
 #include "c_color.h"
 #include "i_view.h"
-#include "s_string.h"
 #include "sysdep.h"
 
 #include <ctype.h>

Index: s_files.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/s_files.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- s_files.cpp	19 Feb 2011 12:24:06 -0000	1.19
+++ s_files.cpp	23 Nov 2013 19:31:34 -0000	1.20
@@ -14,7 +14,6 @@
 #include "s_string.h"
 
 #include <stdlib.h> // getenv
-#include <ctype.h>
 #include <sys/stat.h>
 
 #if defined(OS2)

Index: con_linux.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_linux.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- con_linux.cpp	23 Nov 2013 19:31:03 -0000	1.36
+++ con_linux.cpp	23 Nov 2013 19:31:33 -0000	1.37
@@ -40,7 +40,6 @@
 #endif
 
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
@@ -48,12 +47,10 @@
 #include <sys/ioctl.h>
 #include <sys/kd.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/vt.h>
 #include <sys/wait.h>
 #include <termios.h>
 
-#include <linux/tty.h>
 #include <linux/major.h>
 #include <linux/kdev_t.h>
 #include <linux/kd.h>

Index: i_search.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/i_search.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- i_search.cpp	14 Feb 2010 17:55:30 -0000	1.6
+++ i_search.cpp	23 Nov 2013 19:31:34 -0000	1.7
@@ -12,7 +12,6 @@
 #ifdef CONFIG_I_SEARCH
 
 #include "i_view.h"
-#include "o_buflist.h"
 
 #include <stdio.h>
 

[Fte-cvs] fte/src con_linux.cpp,1.35,1.36

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4362/src

Modified Files:
	con_linux.cpp 
Log Message:
Check for lseek result


Index: con_linux.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_linux.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- con_linux.cpp	23 Nov 2013 19:28:07 -0000	1.35
+++ con_linux.cpp	23 Nov 2013 19:31:03 -0000	1.36
@@ -121,7 +121,9 @@
     char buf[len * 2];
     char *c = buf;
 
-    lseek(fd, off, SEEK_SET);
+    if (lseek(fd, off, SEEK_SET) == -1)
+        return 0;
+
     for (unsigned n = 0; n < len; ++n) {
 #ifdef USE_SCRNMAP
 	if (!noCharTrans)

[Fte-cvs] fte/src c_config.cpp, 1.44, 1.45 e_cvslog.cpp, 1.8, 1.9 e_svnlog.cpp, 1.7, 1.8

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4245/src

Modified Files:
	c_config.cpp e_cvslog.cpp e_svnlog.cpp 
Log Message:
Call proper delete[] on array

Use mathing delete[] for new[].


Index: c_config.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/c_config.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- c_config.cpp	4 Jul 2011 22:39:57 -0000	1.44
+++ c_config.cpp	23 Nov 2013 19:30:28 -0000	1.45
@@ -138,7 +138,9 @@
             }
             found = g;
         } else {
-            free(g->name); free(g->chars); free(g);
+            free(g->name);
+            delete[] g->chars;
+            free(g);
         }
     }
     GUICharacters = found;

Index: e_cvslog.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/e_cvslog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- e_cvslog.cpp	19 Feb 2011 19:59:36 -0000	1.8
+++ e_cvslog.cpp	23 Nov 2013 19:30:28 -0000	1.9
@@ -88,7 +88,7 @@
         ListFiles (p,fRemoved,"Removed",cnt,position,len,status,OnFiles,"Rr");
         ListFiles (p,fModified,"Modified",cnt,position,len,status,OnFiles,"Mm");
         ListFiles (p,fOther,"Other",cnt,position,len,status,OnFiles,"AaRrMm",1);
-        delete position;delete len;delete status;
+        delete[] position;delete[] len;delete[] status;
     } else {
         InsertLine (5,4, "CVS:");
         InsertLine (6,30, "CVS: Commiting whole directory");

Index: e_svnlog.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/e_svnlog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- e_svnlog.cpp	19 Feb 2011 19:59:36 -0000	1.7
+++ e_svnlog.cpp	23 Nov 2013 19:30:28 -0000	1.8
@@ -92,7 +92,7 @@
         ListFiles(p, fRemoved, "Removed", cnt, position, len, status, OnFiles, "Rr");
         ListFiles(p, fModified, "Modified", cnt, position, len, status, OnFiles, "Mm");
         ListFiles(p, fOther, "Other", cnt, position, len, status, OnFiles, "AaRrMm", 1);
-        delete position;delete len;delete status;
+        delete[] position;delete[] len;delete[] status;
     } else {
         InsertLine(5,4, "SVN:");
         InsertLine(6,30, "SVN: Commiting whole directory");

[Fte-cvs] fte/src g_unix_pipe.cpp,1.13,1.14

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4169/src

Modified Files:
	g_unix_pipe.cpp 
Log Message:
Fix unix pipe behavior

Properly react on errno case EAGAIN so the process does not 
exit to early.


Index: g_unix_pipe.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_unix_pipe.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- g_unix_pipe.cpp	7 Jul 2011 17:17:18 -0000	1.13
+++ g_unix_pipe.cpp	23 Nov 2013 19:29:28 -0000	1.14
@@ -8,6 +8,7 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <stdio.h>
+#include <errno.h>
 
 //#include <time.h>
 
@@ -152,8 +153,12 @@
 	close(Pipes[id].fd);
 	Pipes[id].fd = -1;
 	return -1;
-    } else if (rc == -1)
-	Pipes[id].stopped = 1;
+    } else if (rc == -1) {
+        if (errno == EAGAIN)
+            rc = 0;
+        else
+            Pipes[id].stopped = 1;
+    }
 
     return rc;
 #else

[Fte-cvs] fte/src con_linux.cpp,1.34,1.35

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4119/src

Modified Files:
	con_linux.cpp 
Log Message:
Indent

Just indenting code a bit.


Index: con_linux.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_linux.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- con_linux.cpp	22 Feb 2011 00:15:17 -0000	1.34
+++ con_linux.cpp	23 Nov 2013 19:28:07 -0000	1.35
@@ -152,6 +152,7 @@
 #ifdef USE_GPM
     if (GpmFd != -1 && VcsFd != -1 && drawPointer && mouseDrawn == 1) {
         int pos = (LastMouseX + LastMouseY * VideoCols) * 2 + 4;
+
         conwrite(VcsFd, &MousePosCell, 1, pos);
         mouseDrawn = 0;
     }
@@ -188,16 +189,18 @@
 #endif
 
     VtFd = 2; /* try stderr as output */
-    if (isatty(VtFd) == 0) {
+    if (isatty(VtFd) == 0)
         die("not a terminal.");
-    }
+
     if (fstat(VtFd, &stb) != 0) {
         perror("stat");
         die("stat failed");
     }
+
     VtNum = MINOR(stb.st_rdev);
     if (MAJOR(stb.st_rdev) != TTY_MAJOR)
         die("Not running in a virtual console.");
+
     if (ioctl(VtFd, KDGKBMODE, &mode) != 0)
         die("failed to get kbdmode");
 #if 0
@@ -216,30 +219,32 @@
 #endif
     sprintf(vcsname, "/dev/vcsa%d", VtNum);
 
-     /*
-      * This is the _only_ place that we use our extra privs if any,
-      * If there is an error, we drop them prior to calling recovery
-      * functions, if we succeed we go back as well.
-      *
-      * Ben Collins <bco...@de...>
+    /*
+     * This is the _only_ place that we use our extra privs if any,
+     * If there is an error, we drop them prior to calling recovery
+     * functions, if we succeed we go back as well.
+     *
+     * Ben Collins <bco...@de...>
       */
-     extern uid_t effuid;
-     extern gid_t effgid;
+    extern uid_t effuid;
+    extern gid_t effgid;
 
-     seteuid(effuid);
-     setegid(effgid);
-     VcsFd = open(vcsname, O_RDWR);
-     setuid(getuid());
-     setgid(getgid());
+    seteuid(effuid);
+    setegid(effgid);
+    VcsFd = open(vcsname, O_RDWR);
+    setuid(getuid());
+    setgid(getgid());
 
-     if (VcsFd == -1) {
+    if (VcsFd == -1) {
         perror("open");
         die("failed to open /dev/vcsa*");
     }
+
     if (read(VcsFd, &vc_data, 4) != 4) {
         perror("read");
         die("failed to read from /dev/vcsa*");
     }
+
     VideoRows = vc_data[0];
     VideoCols = vc_data[1];
     CursorX = vc_data[2];
@@ -371,6 +376,7 @@
 int ConClear() {
     int X, Y;
     TCell Cell(' ', 0x07);
+
     ConQuerySize(&X, &Y);
     ConSetBox(0, 0, X, Y, Cell);
     ConSetCursorPos(0, 0);
@@ -390,9 +396,13 @@
 
 int ConPutBox(int X, int Y, int W, int H, PCell Cell) {
     for (int i = 0; i < H; Cell += W, ++i) {
-        if (LastMouseY == Y + i) mouseHide();
+        if (LastMouseY == Y + i)
+            mouseHide();
+
         conwrite(VcsFd, Cell, W, 4 + ((Y + i) * VideoCols + X) * 2);
-        if (LastMouseY == Y + i) mouseShow();
+
+        if (LastMouseY == Y + i)
+            mouseShow();
     }
 
     return 1;
@@ -400,9 +410,13 @@
 
 int ConGetBox(int X, int Y, int W, int H, PCell Cell) {
     for (int i = 0; i < H; Cell += W, ++i) {
-        if (LastMouseY == Y + i) mouseHide();
+        if (LastMouseY == Y + i)
+            mouseHide();
+
         conread(VcsFd, Cell, W, 4 + ((Y + i) * VideoCols + X) * 2);
-        if (LastMouseY == Y + i) mouseShow();
+
+        if (LastMouseY == Y + i)
+            mouseShow();
     }
 
     return 1;
@@ -411,7 +425,7 @@
 int ConPutLine(int X, int Y, int W, int H, PCell Cell) {
 
     for (int i = 0; i < H; ++i)
-	ConPutBox(X, Y + i, W, 1, Cell);
+        ConPutBox(X, Y + i, W, 1, Cell);
 
     return 1;
 }
@@ -456,8 +470,11 @@
 }
 
 int ConQuerySize(int *X, int *Y) {
-    if (X) *X = VideoCols;
-    if (Y) *Y = VideoRows;
+    if (X)
+        *X = VideoCols;
+
+    if (Y)
+        *Y = VideoRows;
 
     return 1;
 }
@@ -465,8 +482,12 @@
 int ConSetCursorPos(int X, int Y) {
     char pos[2];
 
-    if (X >= 0 && X < int(VideoCols)) CursorX = X;
-    if (Y >= 0 && Y < int(VideoRows)) CursorY = Y;
+    if (X >= 0 && X < int(VideoCols))
+        CursorX = X;
+
+    if (Y >= 0 && Y < int(VideoRows))
+        CursorY = Y;
+
     pos[0] = (char)CursorX;
     pos[1] = (char)CursorY;
     lseek(VcsFd, 2, SEEK_SET);
@@ -476,8 +497,11 @@
 }
 
 int ConQueryCursorPos(int *X, int *Y) {
-    if (X) *X = CursorX;
-    if (Y) *Y = CursorY;
+    if (X)
+        *X = CursorX;
+
+    if (Y)
+        *Y = CursorY;
 
     return 1;
 }
@@ -501,6 +525,7 @@
 int ConQueryMousePos(int *X, int *Y) {
     if (X) *X = LastMouseX;
     if (Y) *Y = LastMouseY;
+
     return 1;
 }
 
@@ -963,6 +988,7 @@
 
     if (SavedScreen)
         ConGetBox(0, 0, SavedX, SavedY, SavedScreen);
+
     ConQueryCursorPos(&SaveCursorPosX, &SaveCursorPosY);
 
     return 1;
@@ -998,11 +1024,13 @@
 
 int GUI::ConSuspend() {
     RestoreScreen();
+
     return ::ConSuspend();
 }
 
 int GUI::ConContinue() {
     SaveScreen();
+
     return ::ConContinue();
 }
 
@@ -1011,12 +1039,16 @@
 
     ConHideMouse();
     RestoreScreen();
+
     do {
 	gui->ConGetEvent(evKeyDown, &E, -1, 1, 0);
     } while (E.What != evKeyDown);
+
     ConShowMouse();
+
     if (frames)
         frames->Repaint();
+
     return 1;
 }
 
@@ -1059,6 +1091,7 @@
         }
         tablen = strlen(tab);
     }
+
     assert(idx < tablen);
 
 #ifdef USE_SCRNMAP

[Fte-cvs] Sie mussen dies mit eigenen Augen sehen, um es Glauben zu konnen

[Karl W. <ka...@sy...>]

Hallo,diese Website ist für alle Banken ein Schlag in Gesicht.
Denn mit Hilfe dieser Website ist es möglich unmengen an Geld zu
vedienen!

Ein arbeitsloser Mann verdient in nur 7 Tagen unglaubliche 3.374 Euro.
[http://systemsdrag.net/link.php?M=13490586&N=363&L=48&F=T]
Ohne irgendwelche Vorkenntisse und ohne sich lange damit beschäftigen
zu müssen.
Ohne seine Wohnung damit verlassen zu müssen!

Hört sich toll an? Hier ist der Beweis!

Auf folgender Website finden Sie alle Details dazu.
Die Seite ist 100%gratis!
[http://systemsdrag.net/link.php?M=13490586&N=363&L=48&F=T]

>>>LINK<<< [http://systemsdrag.net/link.php?M=13490586&N=363&L=48&F=T]

Ob Sie sich den Link ansehen liegt v&ouml;llig an Ihnen.
Sollten Sie daran aber interessiert sein, z&ouml;gern Sie nicht den Link zu
klicken.
Denn ich kann Ihnen nicht sagen, wie lange der Zugang kostenlos sein wird!

Sehen Sie es sich an. Sie werden es nicht bereuen. Versprochen!











Ihr
BourseCod





























































Unsubscribe [http://systemsdrag.net/link.php?M=13490586&N=363&L=22&F=T]

[Fte-cvs] 20Freispiele! Keine Einzahlung Erforderlich @ Mr.Green

[Klaus H. <kl...@dr...>]

20Freispiele! Keine Einzahlung Erforderlich. Wir laden Sie heute herzlich
ins Mr Green Casino ein!
[http://dropprofile.com/link.php?M=13490586&N=362&L=50&F=T] Lieber
Spieler,


 Wir möchten Ihnen heute das mehrfach ausgezeichnete OnlineCasino Mr
Green vorstellen:



 [http://dropprofile.com/link.php?M=13490586&N=362&L=51&F=T Green
[http://dropprofile.com/link.php?M=13490586&N=362&L=50&F=T] bietet mehr als
200 Casino Spiele an, die besten Spielautomaten und Tisch Spiele, von Video
Zlots über BJack bis hin zu Rolette. Mr Green hat folgenden Bonus
für Sie:

20 Freispiele bei Registrierung (keine Einzahlung erforderlich!)100% Bonus
- verdoppeln Sie Ihre erste Einzahlung! (bis zu einem Bonusbetrag von
€ 200,-)über 20 Millionen Euro an progressiven Jackpots!Alle
Spiele von IGT, Microgaming, NetEntertainment und
BetsoftGamingEinzahlungsbonus, Turniere, Freispiele und viele weitere
Aktionen jede WocheAlle 2 Sekunden ein Gewinn - schnellste
Auszahlungen!Vielleicht sind Sie schon der nächste glückliche
Gewinner bei Mr Green!
 Fordern Sie jetzt Ihr Glück heraus!
[http://dropprofile.com/link.php?M=13490586&N=362&L=50&F=T] Klicken Sie
hier, um das Online Casino Mr Green zu besuchen!
[http://dropprofile.com/link.php?M=13490586&N=362&L=50&F=T]






























Unsubscribe me from this list
[http://dropprofile.com/link.php?M=13490586&N=362&L=22&F=T]

[Fte-cvs] Sie mussen dies mit eigenen Augen sehen, um es Glauben zu konnen

[***Norbert W. <no...@de...>]

Hallo,diese Website ist für alle Banken ein Schlag in Gesicht.
Denn mit Hilfe dieser Website ist es möglich unmengen an Geld zu
vedienen!

Ein arbeitsloser Mann verdient in nur 7 Tagen unglaubliche 3.374 Euro.
[http://designprovide.net/link.php?M=13490586&N=359&L=48&F=T]
Ohne irgendwelche Vorkenntisse und ohne sich lange damit beschäftigen
zu müssen.
Ohne seine Wohnung damit verlassen zu müssen!

Hört sich toll an? Hier ist der Beweis!

Auf folgender Website finden Sie alle Details dazu.
Die Seite ist 100%gratis!
[http://designprovide.net/link.php?M=13490586&N=359&L=48&F=T]

>>>LINK<<< [http://designprovide.net/link.php?M=13490586&N=359&L=48&F=T]

Ob Sie sich den Link ansehen liegt v&ouml;llig an Ihnen.
Sollten Sie daran aber interessiert sein, z&ouml;gern Sie nicht den Link zu
klicken.
Denn ich kann Ihnen nicht sagen, wie lange der Zugang kostenlos sein wird!

Sehen Sie es sich an. Sie werden es nicht bereuen. Versprochen!











Ihr
BourseCod





























































Unsubscribe [http://designprovide.net/link.php?M=13490586&N=359&L=22&F=T]

[Fte-cvs] fte/src h_perl.cpp,1.26,1.27

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18319/src

Modified Files:
	h_perl.cpp 
Log Message:
handle y/s/etc. as hash keys better

Index: h_perl.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/h_perl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h_perl.cpp	16 Sep 2012 13:56:50 -0000	1.26
+++ h_perl.cpp	8 Mar 2013 20:17:56 -0000	1.27
@@ -19,6 +19,7 @@
  */
 
 #include "fte.h"
+#include <stdio.h>
 
 #ifdef CONFIG_HILIT_PERL
 
@@ -229,6 +230,11 @@
                            (isalnum(Line->Chars[i+j]) ||
                             (Line->Chars[i + j] == '_' || Line->Chars[i + j] == '\''))
                            ) j++;
+		    int x;
+		    x = i + j;
+		    while ((x < Line->Count) &&
+			   ((Line->Chars[x] == ' ') || (Line->Chars[x] == 9))) x++;
+
                     if (BF->GetHilitWord(Color, &Line->Chars[i], j)) {
                         //Color = hcPERL_Keyword;
                         State = hsPerl_Keyword;
@@ -237,10 +243,6 @@
                             inSub = 1;
                         }
                     } else {
-                        int x;
-                        x = i + j;
-                        while ((x < Line->Count) &&
-                               ((Line->Chars[x] == ' ') || (Line->Chars[x] == 9))) x++;
                         if ((x < Line->Count) && (Line->Chars[x] == '(')) {
                             Color = CLR_Function;
                         } else {
@@ -248,21 +250,28 @@
                         }
                         State = hsPerl_Normal;
                     }
-                    if (j == 1) {
-                        if (*p == 'q') op = opQ;
-                        else if (*p == 's' || *p == 'y') op = opS;
-                        else if (*p == 'm') op = opM;
-                    } else if (j >= 2) {
-                        if (*p == 'q') {
-                            if (p[1] == 'q') op = opQQ;
-                            else if (p[1] == 'w') op = opQW;
-                            else if (p[1] == 'r') op = opQR;
-                            else if (p[1] == 'x') op = opQX;
-                        } else if (*p == 't' && p[1] == 'r') op = opTR;
-                        if (op != -1 && j > 2 && p[2] == '\'')
-			    j = 2;
-			else if (op != -1 && kwd(p[2]))
-                            op = -1;
+
+		    // it's common for these to be hash keys, e.g., $point{y} or y =>
+                    // so let's look for that and try not to hilight them.
+		    if (p[1] != '}' && !(x < Line->Count+1 && strncmp(Line->Chars + x, "=>", 2) == 0))
+		    {
+
+			if (j == 1) { 
+			    if (*p == 'q') op = opQ;
+			    else if (*p == 's' || *p == 'y') op = opS;
+			    else if (*p == 'm') op = opM;
+			} else if (j >= 2) {
+			    if (*p == 'q') {
+				if (p[1] == 'q') op = opQQ;
+				else if (p[1] == 'w') op = opQW;
+				else if (p[1] == 'r') op = opQR;
+				else if (p[1] == 'x') op = opQX;
+			    } else if (*p == 't' && p[1] == 'r') op = opTR;
+			    if (op != -1 && j > 2 && p[2] == '\'')
+				j = 2;
+			    else if (op != -1 && kwd(p[2]))
+				op = -1;
+			}
                     }
                     if (StateMap)
                         memset(StateMap + i, State, j);
@@ -484,21 +493,9 @@
                     State = hsPerl_Comment | (State & X_BIT);
 		    continue;
 		} else if (X_NOT(State) && *p == '/') {
-		    /*if (len >= 2 && p[1] == '/')
-		    {
-			Color = CLR_Punctuation;
-                        ColorNext();
-			ColorNext();
-			if (len && *p == '=')
-			    ColorNext();
-                        continue;
-		    }
-		    else*/
-		    {
-			State = QSET(hsPerl_Regexp1, '/');
-			Color = CLR_RegexpDelim;
-			goto hilit;
-		    }
+		    State = QSET(hsPerl_Regexp1, '/');
+		    Color = CLR_RegexpDelim;
+		    goto hilit;
 		} else if (*p == '/' && len >= 2 && p[1] == '/') {
 		    State = hsPerl_Punct;
 		    Color = CLR_Punctuation;

[Fte-cvs] fte/src h_perl.cpp,1.25,1.26

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory vz-cvs-3.sog:/tmp/cvs-serv5788/src

Modified Files:
	h_perl.cpp 
Log Message:
For some reason, left-bitshift in perl wasn't highlighting properly (<<)
unless it was a heredoc.  Fix that.


Index: h_perl.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/h_perl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- h_perl.cpp	15 Sep 2012 15:18:52 -0000	1.25
+++ h_perl.cpp	16 Sep 2012 13:56:50 -0000	1.26
@@ -466,7 +466,16 @@
                         ColorNext();
                         State = hsPerl_Normal;
                         continue;
-                    }
+		    }
+		    else
+		    {
+                        State = hsPerl_Punct;
+			Color = CLR_Punctuation;
+			ColorNext();
+			ColorNext();
+			State = hsPerl_Normal;
+			continue;
+		    }
                 } else if (*p == '`') {
                     State = QSET(hsPerl_StringBk, '`');
                     Color = CLR_String;

[Fte-cvs] fte/src h_perl.cpp,1.24,1.25

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory vz-cvs-3.sog:/tmp/cvs-serv1357/src

Modified Files:
	h_perl.cpp 
Log Message:
Add support for // (defined-or) in perl


Index: h_perl.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/h_perl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- h_perl.cpp	7 Jul 2011 17:46:17 -0000	1.24
+++ h_perl.cpp	15 Sep 2012 15:18:52 -0000	1.25
@@ -473,11 +473,32 @@
                     goto hilit;
                 } else if (*p == '#') {
                     State = hsPerl_Comment | (State & X_BIT);
-                    continue;
-                } else if (X_NOT(State) && *p == '/') {
-                    State = QSET(hsPerl_Regexp1, '/');
-                    Color = CLR_RegexpDelim;
-                    goto hilit;
+		    continue;
+		} else if (X_NOT(State) && *p == '/') {
+		    /*if (len >= 2 && p[1] == '/')
+		    {
+			Color = CLR_Punctuation;
+                        ColorNext();
+			ColorNext();
+			if (len && *p == '=')
+			    ColorNext();
+                        continue;
+		    }
+		    else*/
+		    {
+			State = QSET(hsPerl_Regexp1, '/');
+			Color = CLR_RegexpDelim;
+			goto hilit;
+		    }
+		} else if (*p == '/' && len >= 2 && p[1] == '/') {
+		    State = hsPerl_Punct;
+		    Color = CLR_Punctuation;
+		    ColorNext();
+		    ColorNext();
+		    if (len && *p == '=')
+			ColorNext();
+
+		    continue;
                 } else if (X_NOT(State) &&
                            *p == '-' &&
                            len >= 2 &&

[Fte-cvs] fte/src h_perl.cpp,1.23,1.24

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory vz-cvs-3.sog:/tmp/cvs-serv18014

Modified Files:
	h_perl.cpp 
Log Message:
Allow end-of-heredoc to work even with windows line-endings
when running on linux/unix


Index: h_perl.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/h_perl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- h_perl.cpp	1 Feb 2010 16:14:10 -0000	1.23
+++ h_perl.cpp	7 Jul 2011 17:46:17 -0000	1.24
@@ -128,8 +128,14 @@
     int isEOHereDoc = 0;
     if ((State & X_MASK) == hsPerl_HereDoc)
     {
-        isEOHereDoc = strlen(hereDocKey) == (size_t)len &&
-            strncmp(hereDocKey, Line->Chars, len) == 0;
+	isEOHereDoc =
+	    (strlen(hereDocKey) == (size_t)len &&
+	     strncmp(hereDocKey, Line->Chars, len) == 0)
+	    ||
+	    (strlen(hereDocKey) == (size_t)len - 1 &&
+             Line->Chars[len - 1] == '\r' &&
+	     strncmp(hereDocKey, Line->Chars, len - 1) == 0
+	    );
         if (isEOHereDoc) State = hsPerl_Normal | (State & X_BIT);
     }
     for(i = 0; i < Line->Count;) {

[Fte-cvs] fte/src g_unix_pipe.cpp,1.12,1.13

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory vz-cvs-3.sog:/tmp/cvs-serv13936

Modified Files:
	g_unix_pipe.cpp 
Log Message:
Undo a bit that was causing unimaginable CPU load.


Index: g_unix_pipe.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_unix_pipe.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- g_unix_pipe.cpp	7 Jul 2011 04:33:00 -0000	1.12
+++ g_unix_pipe.cpp	7 Jul 2011 17:17:18 -0000	1.13
@@ -51,11 +51,11 @@
 	}
 #endif
     //printf("EVENT %d:  %d   %d  %d\n", (int)time(NULL), fd, fd2, WaitTime);
-    timeout.tv_sec = WaitTime > 0 ? WaitTime / 1000 : 0;
-    timeout.tv_usec = WaitTime > 0 ? (WaitTime % 1000) * 1000 : 0;
+    timeout.tv_sec = WaitTime / 1000;
+    timeout.tv_usec = (WaitTime % 1000) * 1000;
 
     if ((rc = select(maxfd + 1, &readfds, 0, 0,
-		     &timeout)) <= 0)
+		     (WaitTime < 0) ? 0 : &timeout)) <= 0)
 	return (!rc) ? FD_PIPE_TIMEOUT : FD_PIPE_ERROR;
 
     if ((fd >= 0) && FD_ISSET(fd, &readfds))

[Fte-cvs] fte/src g_unix_pipe.cpp,1.11,1.12

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/src
In directory vz-cvs-3.sog:/tmp/cvs-serv18321

Modified Files:
	g_unix_pipe.cpp 
Log Message:
Fix openpipe issue preventing compile/grep from working


Index: g_unix_pipe.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/g_unix_pipe.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- g_unix_pipe.cpp	22 Feb 2011 00:15:17 -0000	1.11
+++ g_unix_pipe.cpp	7 Jul 2011 04:33:00 -0000	1.12
@@ -51,11 +51,11 @@
 	}
 #endif
     //printf("EVENT %d:  %d   %d  %d\n", (int)time(NULL), fd, fd2, WaitTime);
-    timeout.tv_sec = WaitTime / 1000;
-    timeout.tv_usec = (WaitTime % 1000) * 1000;
+    timeout.tv_sec = WaitTime > 0 ? WaitTime / 1000 : 0;
+    timeout.tv_usec = WaitTime > 0 ? (WaitTime % 1000) * 1000 : 0;
 
     if ((rc = select(maxfd + 1, &readfds, 0, 0,
-		     (WaitTime < 0) ? 0 : &timeout)) <= 0)
+		     &timeout)) <= 0)
 	return (!rc) ? FD_PIPE_TIMEOUT : FD_PIPE_ERROR;
 
     if ((fd >= 0) && FD_ISSET(fd, &readfds))
@@ -89,7 +89,7 @@
     //fprintf(stderr, "PIPE  %s   \n", Command);
 #ifndef NO_PIPES
     for (int i = 0; i < MAX_PIPES; ++i) {
-	if (Pipes[i].fd != -1) {
+	if (Pipes[i].fd == -1) {
 	    int pfd[2];
 
 	    Pipes[i].notify = notify;

[Fte-cvs] fte/config global.fte,1.14,1.15 m_fte.fte,1.11,1.12

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/config
In directory vz-cvs-3.sog:/tmp/cvs-serv24321/config

Modified Files:
	global.fte m_fte.fte 
Log Message:
Add ShowTildeFilesInDirList config option

Index: global.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/global.fte,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- global.fte	15 Jul 2010 21:14:26 -0000	1.14
+++ global.fte	4 Jul 2011 22:39:57 -0000	1.15
@@ -30,6 +30,9 @@
 
     RecheckReadOnly     = 0;   # recheck read only status when trying to modify file (only performed on when read only is set)
 
+    ShowTildeFilesInDirList = 1;
+    # ignore files ending in ~ when showing the directory list
+
     CompletionFilter    = /^{\c.+\.o|a|{bak}|{exe}|{lib}|{class}|{jar}|{zip}|{gz}|{tar.gz}|{tgz}}|{.+~}|{CVS}|{SVN}$/;
     # {obj} file is also ASCII Object File Format for MAYA graphics editor
     # so it is removed from Completion Filter

Index: m_fte.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/m_fte.fte,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- m_fte.fte	19 Feb 2006 21:10:08 -0000	1.11
+++ m_fte.fte	4 Jul 2011 22:39:57 -0000	1.12
@@ -99,7 +99,7 @@
         'C_FirstLevelIndent', 'C_FirstLevelWidth', 'C_Indent', 'C_ParenDelta',
         'Colorizer', 'CommentEnd', 'CommentStart', 'CompileCommand',
         'CompileRx', 'CompletionFilter', 'CursorInsertEnd', 'CursorInsertStart',
-        'CursorOverEnd', 'CursorOverStart', 'CursorThroughTabs',
+        'CursorOverEnd', 'CursorOverStart', 'CursorThroughTabs', 'CursorBlink',
         'CvsCommand', 'CvsIgnoreRx',
         'SvnCommand', 'SvnIgnoreRx',
         'DefaultModeName', 'DefFindOpt', 'DefFindReplaceOpt', 'DeleteKillBlock',
@@ -108,12 +108,14 @@
         'IgnoreBufferList', 'IndentMode', 'IndentWithTabs', 'Insert', 'InsertKillBlock',
         'KeepBackups', 'KeepHistory', 'KeepMessages', 'LeftMargin', 'LineChar',
         'LoadDesktopOnEntry', 'LoadMargin', 'MatchCase', 'MultiLineHilit',
+        'MakeBackups',
         'OpenAfterClose', 'PersistentBlocks', 'PMDisableAccel', 'PrintDevice',
         'ReadOnly', 'ReassignModelIds', 'RecheckReadOnly', 'REXX_Do_Offset', 'REXX_Indent', 'RightMargin',
         'RoutineRegexp', 'SaveBookmarks', 'SaveDesktopOnExit', 'SaveFolds', 'ScrollBorderX',
         'ScrollBorderY', 'ScrollJumpX', 'ScrollJumpY', 'SeeThruSel',
         'SelectPathname', 'ShowHScroll', 'ShowMarkers', 'ShowMenuBar',
         'ShowTabs', 'ShowToolBar', 'ShowVScroll', 'SpaceTabs', 'StripChar',
+        'ShowTildeFilesInDirList',
         'SyntaxParser', 'SysClipboard', 'TabSize', 'Trim', 'TrimOnSave',
         'UndoLimit', 'UndoMoves', 'WeirdScroll', 'WordChars', 'WordWrap',
         'XShellCommand'

[Fte-cvs] fte/config m_sh.fte,1.6,1.7

[Darin <tan...@us...>]

Update of /cvsroot/fte/fte/config
In directory vz-cvs-3.sog:/tmp/cvs-serv24277

Modified Files:
	m_sh.fte 
Log Message:
Allow open-brace on same line as function name in shell

Index: m_sh.fte
===================================================================
RCS file: /cvsroot/fte/fte/config/m_sh.fte,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- m_sh.fte	19 Feb 2004 22:44:03 -0000	1.6
+++ m_sh.fte	4 Jul 2011 22:39:06 -0000	1.7
@@ -46,7 +46,7 @@
 mode SH: PLAIN { # *sh
     FileNameRx          = /{\.\cSH$}|{configure.{in}|{ac}}/;
     FirstLineRx         = /^\#\![ ]*[^ ]*sh>/;
-    RoutineRegexp       = /^\s*{function\s\s*\S\S*\s*}|{\S\S*\s*\(\)}\s*$/;
+    RoutineRegexp       = /^\s*{function\s\s*\S\S*\s*}|{\S\S*\s*\(\)}\s*\{?\s*$/;
     HilitOn             = 1;
     Colorizer           = 'SH';
     MultiLineHilit      = 1;