Merge pull request #18 from lamskoy/master

Wide terminal fixes for Golded+

golded3/gearea.cpp

@@ -473,9 +473,8 @@ void GPickArealist::precursor()
 
 void GPickArealist::print_line(uint idx, uint pos, bool isbar)
 {
-
-    vchar vbuf[256];
-    char buf[256];
+    CREATEBUFFER(char, buf, MAXCOL);
+    CREATEBUFFER(vchar, vbuf, MAXCOL*2);
 
     if(AL[idx]->isseparator())
     {
@@ -508,7 +507,6 @@ void GPickArealist::print_line(uint idx, uint pos, bool isbar)
         if(AL[idx]->ismarked())
             wprintc(pos, marked_pos, isbar ? sattr : hattr, marked_char);
     }
-
 }
 
 
@@ -576,8 +574,8 @@ void GPickArealist::AreaDropMsgMarks(uint n)
     for(AL.item = AL.idx.begin(); AL.item != AL.idx.end(); AL.item++)
         nummarks += (*AL.item)->Mark.Count();
 
-    char buf[256];
-    gsprintf(PRINTF_DECLARE_BUFFER(buf), LNG->DropMarksInfo, longdotstr(nummarks));
+    CREATEBUFFER(char, buf, MAXCOL);
+    gsprintf(PRINTF_DECLARE_BUFFER_AUTO(buf, MAXCOL), LNG->DropMarksInfo, longdotstr(nummarks));
 
     w_info(buf);
     int mode = MenuAreaDropMarks.Run();
@@ -608,7 +606,9 @@ bool GPickArealist::handle_key()
     uint n;
     uint x;
     const char* adesc;
-    char buf[256], tmp[256];
+
+    CREATEBUFFER(char, buf, MAXCOL);
+    CREATEBUFFER(char, tmp, MAXCOL);
 
     int mode, changed, currno;
 
@@ -990,7 +990,6 @@ bool GPickArealist::handle_key()
         if(not PlayMacro(key, KT_A))
             SayBibi();
     }
-
     return true;
 }
 

golded3/geedit.h

@@ -71,8 +71,8 @@
 //  ------------------------------------------------------------------
 //  Defines
 
-#define EDIT_BUFLEN           256
-#define EDIT_PARABUFLEN       2048
+#define EDIT_BUFLEN           256*16
+#define EDIT_PARABUFLEN       4096*16
 
 #define EDIT_UNDO_CHAR        0x00000010U
 #define EDIT_UNDO_INS_CHAR    0x00000011U

golded3/gemlst.cpp

@@ -368,7 +368,7 @@ void GMsgList::print_line(uint idx, uint pos, bool isbar)
         mattr_ = hattr;
     }
 
-    char buf[256];
+    CREATEBUFFER(char, buf, MAXCOL);
 
     if(AA->Msglistwidesubj())
     {
@@ -406,14 +406,14 @@ void GMsgList::print_line(uint idx, uint pos, bool isbar)
         *dbuf = NUL;
 
     gsprintf(PRINTF_DECLARE_BUFFER(nbuf), "%5u", (CFG->switches.get(disprealmsgno) ? ml->msgno : AA->Msgn.ToReln(ml->msgno)));
-    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%-5.5s%s%-*.*s %-*.*s%s%-*.*s %s",
+    gsprintf(PRINTF_DECLARE_BUFFER_AUTO(buf, MAXCOL), "%-5.5s%s%-*.*s %-*.*s%s%-*.*s %s",
              nbuf, ml->marks,
              bysiz, bysiz, ml->by,
              tosiz, tosiz, ml->to,
              (tosiz ? " " : ""),
              resiz, resiz, ml->re,
              dbuf
-            );
+    );    
 
     window.prints(pos, 0, wattr_, buf);
 
@@ -950,7 +950,7 @@ void GThreadlist::GenTree(int idx)
 
 void GThreadlist::print_line(uint idx, uint pos, bool isbar)
 {
-    char buf[256];
+    CREATEBUFFER(char, buf, MAXCOL);
     ThreadEntry &t = treeEntryList[idx];
     size_t tdlen = xlen - ((AA->Msglistdate() == MSGLISTDATE_NONE) ? 8 : 18);
 
@@ -990,8 +990,7 @@ void GThreadlist::print_line(uint idx, uint pos, bool isbar)
         if(AA->Mark.Find(t.msgno))
             marks[1] = MMRK_MARK;
     }
-
-    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%6u  %*c", (CFG->switches.get(disprealmsgno) ? t.msgno : AA->Msgn.ToReln(t.msgno)), tdlen, ' ');
+    gsprintf(PRINTF_DECLARE_BUFFER_AUTO(buf, MAXCOL), "%6u  %*c", (CFG->switches.get(disprealmsgno) ? t.msgno : AA->Msgn.ToReln(t.msgno)), tdlen, ' ');
 
     if(AA->Msglistdate() != MSGLISTDATE_NONE)
     {

golded3/geusrbse.cpp

@@ -222,8 +222,8 @@ void guserbase::do_delayed()
 void guserbase::print_line(uint idx, uint pos, bool isbar)
 {
 
-    char buf[200];
-    const size_t buflen=199;
+    CREATEBUFFER(char, buf, MAXCOL);
+    const size_t buflen=MAXCOL;
     buf[buflen]='\0';
 //  char buf2[100];
 //  const size_t buf2len=199;
@@ -260,13 +260,14 @@ void guserbase::print_line(uint idx, uint pos, bool isbar)
     }
 
 //  sprintf(buf, "%c %-*.*s %-*.*s %s ",
-    gsprintf(PRINTF_DECLARE_BUFFER(buf), "%c %-*.*s %-*.*s %s ",
+    gsprintf(PRINTF_DECLARE_BUFFER_AUTO(buf, MAXCOL), "%c %-*.*s %-*.*s %s ",
              entry.is_deleted ? 'D' : ' ',
              cwidth, (int)cwidth, entry.name,
              (cwidth*2)/3, (int)(cwidth*2)/3, entry.organisation,
 //    buf2);
              useraddr.c_str() );
 
+
 //  strsetsz(buf, xlen);
     /*  strsetsz(buf, buflen>xlen?xlen:buflen); */
 //  window.prints(pos, 0, isbar ? sattr : wattr, buf);

goldlib/gall/gstrall.h

@@ -223,6 +223,12 @@ char* strcvtc(char* s);
 //  ------------------------------------------------------------------
 
 #define PRINTF_DECLARE_BUFFER(b) b, ARRAYSIZE(b), __FILE__, __LINE__
+#define PRINTF_DECLARE_BUFFER_AUTO(b,size) b, size, __FILE__, __LINE__
+#if defined(__USE_ALLOCA__)
+    #define CREATEBUFFER(type, name, size) type *name = (type*)alloca(size)
+#else
+    #define CREATEBUFFER(type, name, size) __extension__ type name[size]
+#endif
 int gsprintf(TCHAR* buffer, size_t sizeOfBuffer, const TCHAR* __file, int __line, const TCHAR* format, ...);
 
 //  ------------------------------------------------------------------

goldlib/gmb3/gmoezyc5.cpp

@@ -90,7 +90,7 @@ Line* EzycomArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     AddLineF(line, "MsgLength: %u", _hdr.messagelength);
     AddLineF(line, "UserRecno: %u (%s)", wide->userno, WideUsername[0]);
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     uint _count = 0;

goldlib/gmb3/gmofido5.cpp

@@ -181,7 +181,7 @@ Line* FidoArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     }
     AddLineF(line, "UserRecno: %u (%s)", wide->userno, WideUsername[0]);
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count;

goldlib/gmb3/gmohuds5.cpp

@@ -118,7 +118,7 @@ Line* _HudsArea<msgn_t, rec_t, attr_t, board_t, last_t, __HUDSON>::make_dump_msg
                 );
     }
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count = 0;

goldlib/gmb3/gmojamm5.cpp

@@ -182,7 +182,7 @@ Line* JamArea::make_dump_msg(Line*& lin, gmsg* __msg, char* lng_head)
     throw_free(_subfield);
 
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     AddHexdump(line, _hdr, sizeof(JamHdr));

goldlib/gmb3/gmopcbd5.cpp

@@ -158,7 +158,7 @@ Line* PcbArea::make_dump_msg(Line*& lin, gmsg* __msg, char* lng_head)
         AddLineF(line, "Board %4u : %10u / %08Xh", n, dumplr[n], dumplr[n]);
 
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     char _buf[256];

goldlib/gmb3/gmosmb1.cpp

@@ -1124,7 +1124,7 @@ Line* SMBArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     }
 
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count = 0;

goldlib/gmb3/gmosqsh5.cpp

@@ -139,7 +139,7 @@ Line* SquishArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     AddLineF(line, "TotalLength    : %u", _frm.totsize);
     AddLineF(line, "CtrlLength     : %u", _frm.ctlsize);
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count = 0;

goldlib/gmb3/gmowcat5.cpp

@@ -108,7 +108,7 @@ Line* WCatArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     line = AddLine(line, "");
     AddLineF(line, "UserRecno  : %u (%s)", wide->userno, WideUsername[0]);
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count;

goldlib/gmb3/gmoxbbs5.cpp

@@ -109,7 +109,7 @@ Line* XbbsArea::make_dump_msg(Line*& lin, gmsg* msg, char* lng_head)
     AddLineF(line, "ReplyidCrc      : %08Xh (%u)", idx->replycrc,      idx->replycrc);
     AddLineF(line, "ReplyidSerialNo : %08Xh (%u)", idx->replyserialno, idx->replyserialno);
     line = AddLine(line, "");
-    AddLineF(line, lng_head);
+    AddLine(line, lng_head);
     line = AddLine(line, "");
 
     int _count;