bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now golded+ can draw box lines. Use keyboard configuration keyword EditDrawLines (default: ^D) to toggle draw modes.

Browse Source
This commit is contained in:
Ianos Gnatiuc
2005-12-25 10:17:00 +00:00
parent 97eba8fdeb
commit d023e34e3f
20 changed files with 564 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
golded3/gckeys.cpp
View File

@@ -148,6 +148,7 @@ CmdKey DefaultKeyset[] = {
{ Key_C_I , KK_EditSCodeItalic , KT_E },
{ Key_C_L , KK_EditSCodeUnderline , KT_E },
{ Key_C_R , KK_EditSCodeReverse , KT_E },
{ Key_C_D , KK_EditDrawLines , KT_E },
{ Key_Esc , KK_FileAbort , KT_F },
{ Key_A_X , KK_FileAskExit , KT_F },
@@ -369,6 +370,7 @@ CmdKey DefaultKeyset[] = {
tglobalkey globalkeys[] = {
{ CRC_READLOOKUPDEST , KK_ReadLookupDest , KT_R }, // 0x0023
{ CRC_FILETOGGLEMARKALL , KK_FileToggleMarkAll , KT_F }, // 0x0032
{ CRC_EDITDRAWLINES , KK_EditDrawLines , KT_E }, // 0x00E8
{ CRC_READADDRESSBOOKADD , KK_ReadAddressbookAdd , KT_R }, // 0x00FA
{ CRC_LISTDOSSHELL , KK_ListDosShell , KT_M }, // 0x0130
{ CRC_READREADALL , KK_ReadReadAll , KT_R }, // 0x0146

1
golded3/gckeys.h
View File

@@ -81,6 +81,7 @@ const word CRC_EDITDELLINE = 0xACCF;
const word CRC_EDITDELLTWORD = 0x3B67;
const word CRC_EDITDELRTWORD = 0x829A;
const word CRC_EDITDOSSHELL = 0xD6C5;
const word CRC_EDITDRAWLINES = 0x00E8;
const word CRC_EDITDUPLINE = 0x816A;
const word CRC_EDITEXITMSG = 0x1813;
const word CRC_EDITEXPORTTEXT = 0x5AED;

2
golded3/gclang.cpp
View File

@@ -400,6 +400,8 @@ static LangCrc LangCrcs[] = {
{ CRC_ST_ESCORCONTINUE , NULL , "ESC exits. Other keys: Tries to continue" },
{ CRC_MS_SPELLCHECKER , NULL , "SpellChecker: %s" },
{ CRC_WT_INS , NULL , " Ins " },
{ CRC_WT_DRAWSL , NULL , " DL1 " },
{ CRC_WT_DRAWDL , NULL , " DL2 " },
{ CRC_MI_FILELISTFROM , NULL , "Filelist from %s" },
{ CRC_ST_INITIALIZING , NULL , "Initializing ..." },
{ CRC_ST_CHECKING , NULL , "Checking" },

2
golded3/gclang.h
View File

@@ -403,6 +403,8 @@ const word CRC_IL_NOPERSONAL = 0x2813;
const word CRC_ST_ESCORCONTINUE = 0x4800;
const word CRC_MS_SPELLCHECKER = 0x69B4;
const word CRC_WT_INS = 0x2F27;
const word CRC_WT_DRAWSL = 0x264D;
const word CRC_WT_DRAWDL = 0x314D;
const word CRC_MI_FILELISTFROM = 0xB710;
const word CRC_ST_INITIALIZING = 0x4C6B;
const word CRC_ST_CHECKING = 0xE219;

24
golded3/geedit.cpp
View File

@@ -2642,7 +2642,15 @@ int IEclass::handlekey(gkey __key) {
int rc = true;
switch(__key) {
if (drawlines &&
(__key != KK_EditGoRight) && (__key != KK_EditGoLeft) &&
(__key != KK_EditGoUp) && (__key != KK_EditGoDown))
{
drawflag = true;
}
switch(__key)
{
case KK_EditBlockRight: __key = KK_EditGoRight; break;
case KK_EditBlockLeft: __key = KK_EditGoLeft; break;
case KK_EditBlockUp: __key = KK_EditGoUp; break;
@@ -2684,6 +2692,18 @@ int IEclass::handlekey(gkey __key) {
undo_ready = NO;
return rc;
case KK_EditGoRight:
case KK_EditGoLeft:
case KK_EditGoUp:
case KK_EditGoDown:
if (drawlines && !selecting)
{
DrawLines(__key);
undo_ready = NO;
return rc;
}
// fall through
default:
rc = PlayMacro(__key, KT_E);
if(rc == true)
@@ -2783,6 +2803,7 @@ noselecting:
case KK_EditSCodeItalic:
case KK_EditSCodeUnderline:
case KK_EditSCodeReverse: SCodeChange(__key); break;
case KK_EditDrawLines: ToggleDrawLines(); break;
// Block functions
case KK_EditAnchor: BlockAnchor(); break;
@@ -2969,6 +2990,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
chartyped = false;
if((_ch < KK_Commands) and (_ch & 0xFF) and not ismacro) {
drawflag = true;
chartyped = true;
_ch &= 0xFF;
insertchar((char)_ch);

5
golded3/geedit.h
View File

@@ -269,6 +269,8 @@ protected:
Line* currline;
int done;
int insert;
int drawlines;
int drawflag;
int marginquotes;
int margintext;
int msgmode;
@@ -295,6 +297,7 @@ protected:
void deleteline (bool zapquotesbelow = false);
int dispchar (vchar __ch, int attr=-1);
void dispins ();
void dispdl ();
void displine (Line* __line, uint __row);
#if defined(__GOLD_SPELL__)
void dispstringsc (char *__buf, uint __beg, uint __end, uint __row, uint __col, char endchar);
@@ -416,6 +419,8 @@ public:
void ToggleCaseBlock(gkey key);
void SCodeChange(gkey key);
void ToggleInsert ();
void ToggleDrawLines();
void DrawLines (gkey key);
void ToLower ();
void ToUpper ();
void UnDelete (bool before=true);

505
golded3/geedit2.cpp
View File

@@ -61,6 +61,8 @@ IEclass::IEclass(int __scol, int __ecol, int __srow, int __erow, int __border) {
currline = NULL;
done = NO;
insert = YES;
drawlines = 0;
drawflag = true;
marginquotes = 0;
margintext = 0;
msgmode = 0;
@@ -1383,6 +1385,29 @@ void IEclass::dispins() {
}
// ------------------------------------------------------------------
void IEclass::dispdl()
{
GFTRK("Editdispdl");
if (drawlines)
{
const char *lng = (drawlines == 1) ? LNG->DrawSL : LNG->DrawDL;
HeaderView->window.prints(5, MAXCOL-12, C_HEADT, lng);
}
else {
vchar _lbuf[6];
for(int c = 0; c < 5; c++)
_lbuf[c] = _box_table(W_BHEAD,1);
_lbuf[5] = NUL;
HeaderView->window.printvs(5, MAXCOL-12, C_HEADB|ACSET, _lbuf);
}
GFTRK(NULL);
}
// ------------------------------------------------------------------
void IEclass::ToggleInsert() {
@@ -1396,6 +1421,486 @@ void IEclass::ToggleInsert() {
}
// ------------------------------------------------------------------
void IEclass::ToggleDrawLines()
{
GFTRK("EditToggleDrawLines");
switch (drawlines)
{
case 0: drawlines = 1; break;
case 1: drawlines = 2; break;
case 2: drawlines = 0; break;
}
dispdl();
GFTRK(NULL);
}
// ------------------------------------------------------------------
static void ChrToLines(char chr, byte lines[4])
{
lines[0] = lines[1] = lines[2] = lines[3] = 0;
if (chr == _box_table(0, 1)) //hs
lines[0] = lines[1] = 1;
else if (chr == _box_table(1, 1)) //hd
lines[0] = lines[1] = 2;
else if (chr == _box_table(0, 3)) //vs
lines[2] = lines[3] = 1;
else if (chr == _box_table(1, 3)) //vd
lines[2] = lines[3] = 2;
else if (chr == _box_table(0, 0)) //lsus
lines[1] = lines[3] = 1;
else if (chr == _box_table(1, 0)) //ldud
lines[1] = lines[3] = 2;
else if (chr == _box_table(0, 11)) //vsus
lines[0] = lines[1] = lines[3] = 1;
else if (chr == _box_table(1, 11)) //vdud
lines[0] = lines[1] = lines[3] = 2;
else if (chr == _box_table(0, 2)) //rsus
lines[0] = lines[3] = 1;
else if (chr == _box_table(1, 2)) //rdud
lines[0] = lines[3] = 2;
else if (chr == _box_table(0, 9)) //lshs
lines[1] = lines[2] = lines[3] = 1;
else if (chr == _box_table(1, 9)) //ldhd
lines[1] = lines[2] = lines[3] = 2;
else if (chr == _box_table(0, 8)) //vshs
lines[0] = lines[1] = lines[2] = lines[3] = 1;
else if (chr == _box_table(1, 8)) //vdhd
lines[0] = lines[1] = lines[2] = lines[3] = 2;
else if (chr == _box_table(0, 10)) //rshs
lines[0] = lines[2] = lines[3] = 1;
else if (chr == _box_table(1, 10)) //rdhd
lines[0] = lines[2] = lines[3] = 2;
else if (chr == _box_table(0, 5)) //lsds
lines[1] = lines[2] = 1;
else if (chr == _box_table(1, 5)) //lddd
lines[1] = lines[2] = 2;
else if (chr == _box_table(0, 12)) //vsds
lines[0] = lines[1] = lines[2] = 1;
else if (chr == _box_table(1, 12)) //vddd
lines[0] = lines[1] = lines[2] = 2;
else if (chr == _box_table(0, 7)) //rsds
lines[0] = lines[2] = 1;
else if (chr == _box_table(1, 7)) //rddd
lines[0] = lines[2] = 2;
else if (chr == _box_table(2, 0)) //ldus
{ lines[1] = 1; lines[3] = 2; }
else if (chr == _box_table(3, 0)) //lsud
{ lines[1] = 2; lines[3] = 1; }
else if (chr == _box_table(2, 11)) //vdus
{ lines[0] = lines[1] = 1; lines[3] = 2; }
else if (chr == _box_table(3, 11)) //vsud
{ lines[0] = lines[1] = 2; lines[3] = 1; }
else if (chr == _box_table(2, 2)) //rdus
{ lines[0] = 1; lines[3] = 2; }
else if (chr == _box_table(3, 2)) //rsud
{ lines[0] = 2; lines[3] = 1; }
else if (chr == _box_table(2, 9)) //ldhs
{ lines[1] = 1; lines[2] = lines[3] = 2; }
else if (chr == _box_table(3, 9)) //lshd
{ lines[1] = 2; lines[2] = lines[3] = 1; }
else if (chr == _box_table(2, 8)) //vdhs
{ lines[0] = lines[1] = 1; lines[2] = lines[3] = 2; }
else if (chr == _box_table(3, 8)) //vshd
{ lines[0] = lines[1] = 2; lines[2] = lines[3] = 1; }
else if (chr == _box_table(2, 10)) //rdhs
{ lines[0] = 1; lines[2] = lines[3] = 2; }
else if (chr == _box_table(3, 10)) //rshd
{ lines[0] = 2; lines[2] = lines[3] = 1; }
else if (chr == _box_table(2, 5)) //ldds
{ lines[1] = 1; lines[2] = 2; }
else if (chr == _box_table(3, 5)) //lsdd
{ lines[1] = 2; lines[2] = 1; }
else if (chr == _box_table(2, 12)) //vdds
{ lines[0] = lines[1] = 1; lines[2] = 2; }
else if (chr == _box_table(3, 12)) //vsdd
{ lines[0] = lines[1] = 2; lines[2] = 1; }
else if (chr == _box_table(2, 7)) //rdds
{ lines[0] = 1; lines[2] = 2; }
else if (chr == _box_table(3, 7)) //rsdd
{ lines[0] = 2; lines[2] = 1; }
}
// ------------------------------------------------------------------
static char LinesToChr(byte lines[4])
{
if (lines[0] == 0)
{ if (lines[1] == 0)
{ if (lines[2] == 0)
{ if (lines[3] == 1) return _box_table(0, 3); //vs
if (lines[3] == 2) return _box_table(1, 3); //vd
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(0, 3); //vs
if (lines[3] == 1) return _box_table(0, 3); //vs
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(1, 3); //vd
if (lines[3] == 2) return _box_table(1, 3); //vd
}
} else if (lines[1] == 1)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(0, 1); //hs
if (lines[3] == 1) return _box_table(0, 0); //lsus
if (lines[3] == 2) return _box_table(2, 0); //ldus
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(0, 5); //lsds
if (lines[3] == 1) return _box_table(0, 9); //lshs
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(2, 5); //ldds
if (lines[3] == 2) return _box_table(2, 9); //ldhs
}
} else if (lines[1] == 2)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(1, 1); //hd
if (lines[3] == 1) return _box_table(3, 0); //lsud
if (lines[3] == 2) return _box_table(1, 0); //ldud
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(3, 5); //lsdd
if (lines[3] == 1) return _box_table(3, 9); //lshd
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(1, 5); //lddd
if (lines[3] == 2) return _box_table(1, 9); //ldhd
}
}
} else if (lines[0] == 1)
{ if (lines[1] == 0)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(0, 1); //hs
if (lines[3] == 1) return _box_table(0, 2); //rsus
if (lines[3] == 2) return _box_table(2, 2); //rdus
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(0, 7); //rsds
if (lines[3] == 1) return _box_table(0, 10); //rshs
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(2, 7); //rdds
if (lines[3] == 2) return _box_table(2, 10); //rdhs
}
} else if (lines[1] == 1)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(0, 1); //hs
if (lines[3] == 1) return _box_table(0, 11); //vsus
if (lines[3] == 2) return _box_table(2, 11); //vdus
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(0, 12); //vsds
if (lines[3] == 1) return _box_table(0, 8); //vshs
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(2, 12); //vdds
if (lines[3] == 2) return _box_table(2, 8); //vdhs
}
}
} else if (lines[0] == 2)
{ if (lines[1] == 0)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(1, 1); //hd
if (lines[3] == 1) return _box_table(3, 2); //rsud
if (lines[3] == 2) return _box_table(1, 2); //rdud
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(3, 7); //rsdd
if (lines[3] == 1) return _box_table(3, 10); //rshd
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(1, 7); //rddd
if (lines[3] == 2) return _box_table(1, 10); //rdhd
}
} else if (lines[1] == 2)
{ if (lines[2] == 0)
{ if (lines[3] == 0) return _box_table(1, 1); //hd
if (lines[3] == 1) return _box_table(3, 11); //vsud
if (lines[3] == 2) return _box_table(1, 11); //vdud
} else if (lines[2] == 1)
{ if (lines[3] == 0) return _box_table(3, 12); //vsdd
if (lines[3] == 1) return _box_table(3, 8); //vshd
} else if (lines[2] == 2)
{ if (lines[3] == 0) return _box_table(1, 12); //vddd
if (lines[3] == 2) return _box_table(1, 8); //vdhd
}
}
}
return 0x20;
}
// ------------------------------------------------------------------
void IEclass::DrawLines(gkey key)
{
GFTRK("EditDrawLines");
static byte lines[4];
static int drawx;
static int drawy;
byte type1 = 1;
byte type2 = 1;
(drawlines == 1) ? type2 = 2 : type1 = 2;
//-------------------------
if (drawflag || chartyped)
{
ChrToLines(currline->txt[col], lines);
switch (key)
{
case KK_EditGoRight:
drawx = -1; drawy = 0;
if ((lines[0] == type1) || (!lines[0] && (lines[2] || lines[3])))
drawx++;
else if ((lines[0] == type2) || (lines[1] == type2))
{
drawx++; lines[0] = lines[1] = 0;
}
break;
case KK_EditGoLeft:
drawx = +1; drawy = 0;
if ((lines[1] == type1) || (!lines[1] && (lines[2] || lines[3])))
drawx--;
else if ((lines[0] == type2) || (lines[1] == type2))
{
drawx--; lines[0] = lines[1] = 0;
}
break;
case KK_EditGoDown:
drawx = 0; drawy = -1;
if ((lines[2] == type1) || (!lines[2] && (lines[0] || lines[1])))
drawy++;
else if ((lines[2] == type2) || (lines[3] == type2))
{
drawy++; lines[2] = lines[3] = 0;
}
break;
case KK_EditGoUp:
drawx = 0; drawy = +1;
if ((lines[3] == type1) || (!lines[3] && (lines[0] || lines[1])))
drawy--;
else if ((lines[2] == type2) || (lines[3] == type2))
{
drawy--; lines[2] = lines[3] = 0;
}
break;
}
drawflag = false;
}
//-------------------------
bool gonext = true;
switch (key)
{
case KK_EditGoRight:
if (col >= (maxcol-1)) { lines[1] = 0; gonext = false; }
if (!drawx && gonext)
{
drawx = -1; lines[1] = type1;
if (lines[0] == type2) lines[0] = 0;
}
else if (drawx == 1) drawx = -1;
else if (drawx == -1)
{
gonext = false;
drawx++; lines[0] = type1;
if (lines[1] == type2) lines[1] = 0;
}
if (gonext && drawy)
{
if (drawy == -1)
{
drawy++; lines[2] = type1;
lines[0] = lines[3] = 0;
}
else //(drawy == 1)
{
drawy--; lines[3] = type1;
lines[0] = lines[2] = 0;
}
}
break;
case KK_EditGoLeft:
if (col <= mincol) { lines[0] = 0; gonext = false; }
if (!drawx && gonext)
{
drawx = 1; lines[0] = type1;
if (lines[1] == type2) lines[1] = 0;
}
else if (drawx == -1) drawx = 1;
else if (drawx == 1)
{
gonext = false;
drawx--; lines[1] = type1;
if (lines[0] == type2) lines[0] = 0;
}
if (gonext && drawy)
{
if (drawy == -1)
{
drawy++; lines[2] = type1;
lines[1] = lines[3] = 0;
}
else //(drawy == 1)
{
drawy--; lines[3] = type1;
lines[1] = lines[2] = 0;
}
}
break;
case KK_EditGoDown:
if (!currline->next) { lines[3] = 0; gonext = false; }
if (!drawy && gonext)
{
drawy = -1; lines[3] = type1;
if (lines[2] == type2) lines[2] = 0;
}
else if (drawy == 1) drawy = -1;
else if (drawy == -1)
{
gonext = false;
drawy++; lines[2] = type1;
if (lines[3] == type2) lines[3] = 0;
}
if (gonext && drawx)
{
if (drawx == -1)
{
drawx++; lines[0] = type1;
lines[1] = lines[2] = 0;
}
else //(drawx == 1)
{
drawx--; lines[1] = type1;
lines[0] = lines[2] = 0;
}
}
break;
case KK_EditGoUp:
if (!currline->prev) { lines[2] = 0; gonext = false; }
if (!drawy && gonext)
{
drawy = 1; lines[2] = type1;
if (lines[3] == type2) lines[3] = 0;
}
else if (drawy == -1) drawy = 1;
else if (drawy == 1)
{
gonext = false;
drawy--; lines[3] = type1;
if (lines[2] == type2) lines[2] = 0;
}
if (gonext && drawx)
{
if (drawx == -1)
{
drawx++; lines[0] = type1;
lines[1] = lines[3] = 0;
}
else //(drawx == 1)
{
drawx--; lines[1] = type1;
lines[0] = lines[3] = 0;
}
}
break;
}
//-------------------------
char new_chr = LinesToChr(lines);
if (new_chr != currline->txt[col])
{
if (col < (currline->txt.length()-1))
{
Undo->PushItem(EDIT_UNDO_OVR_CHAR);
currline->txt[col] = new_chr;
}
else if (col < maxcol)
{
Undo->PushItem(EDIT_UNDO_INS_CHAR);
currline->txt.insert(col, 1, new_chr);
}
setlinetype(currline);
displine(currline, row);
}
//-------------------------
if (gonext)
{
switch (key)
{
case KK_EditGoRight: GoRight(); break;
case KK_EditGoLeft: GoLeft(); break;
default:
(key == KK_EditGoDown) ? GoDown() : GoUp();
if (col < pcol)
{
size_t len = pcol - col;
Undo->PushItem(EDIT_UNDO_INS_TEXT|BATCH_MODE, currline, col, len);
currline->txt.insert(col, len, ' ');
GoEOL();
}
break;
}
gotorowcol(col, row);
ChrToLines(currline->txt[col], lines);
switch (key)
{
case KK_EditGoRight:
if ((drawx == -1) && (lines[0] == type1)) drawx++;
break;
case KK_EditGoLeft:
if ((drawx == +1) && (lines[1] == type1)) drawx--;
break;
case KK_EditGoDown:
if ((drawy == -1) && (lines[2] == type1)) drawy++;
break;
case KK_EditGoUp:
if ((drawy == +1) && (lines[3] == type1)) drawy--;
break;
}
}
GFTRK(NULL);
}
// ------------------------------------------------------------------
void IEclass::Header() {

1
golded3/gekeys.h
View File

@@ -184,6 +184,7 @@ const gkey KK_EditSCodeReverse = 0xFF0C;
#if defined(__GOLD_SPELL__)
const gkey KK_EditSCheckerMenu = 0xFF0D;
#endif
const gkey KK_EditDrawLines = 0xFF0E;
const gkey KK_FileAbort = 0xFF10;
const gkey KK_FileAskExit = 0xFF11;

2
golded3/gelang.h
View File

@@ -387,6 +387,8 @@ struct LangGed {
char* EscOrContinue; // ST_ESCORCONTINUE
char* SpellChecker; // MS_SPELLCHECKER
char* Ins; // WT_INS
char* DrawSL; // WT_DRAWSL
char* DrawDL; // WT_DRAWDL
char* FilelistFrom; // MI_FILELISTFROM
char* Initializing; // ST_INITIALIZING
char* Checking; // ST_CHECKING