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

Fix stylecodes insertion. Patch from Ianos Gnatiuc

Browse Source
This commit is contained in:
Stas Degteff 2005-09-29 15:44:25 +00:00
parent b47bb3f0cd
commit f50fdd69c9
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
golded3/geedit.cpp
View File

@ -2040,17 +2040,20 @@ void IEclass::SCodeChange(gkey key)
case KK_EditSCodeReverse: _ch = '#'; break; case KK_EditSCodeReverse: _ch = '#'; break;
} }
if (strchr(CFG->stylecodepunct, currline->txt[col])) const char *cltxt = currline->txt.c_str();
const char *punct = CFG->stylecodepunct;
if (isspace(cltxt[col]) || strchr(punct, cltxt[col]))
{ {
if (col && !strchr(CFG->stylecodepunct, currline->txt[col-1])) if (col && !isspace(cltxt[col-1]) && !strchr(punct, cltxt[col-1]))
GoLeft(); GoLeft();
else if (!strchr(CFG->stylecodepunct, currline->txt[col+1])) else if (!isspace(cltxt[col+1]) && !strchr(punct, cltxt[col+1]))
GoRight(); GoRight();
else else
{ {
if (isspace(currline->txt[col]) && (key != KK_EditSCodeNormal)) if (isspace(cltxt[col]) && (key != KK_EditSCodeNormal))
{ {
if ((col > 0) && !isspace(currline->txt[col-1])) if (col && !isspace(cltxt[col-1]))
insertchar(' '); insertchar(' ');
insertchar(_ch); insertchar(_ch);
@ -2066,14 +2069,14 @@ void IEclass::SCodeChange(gkey key)
uint beg = col; uint beg = col;
uint end = col; uint end = col;
while ((beg > 0) && !strchr(CFG->stylecodepunct, currline->txt[beg-1])) while (beg && !isspace(cltxt[beg-1]) && !strchr(punct, cltxt[beg-1]))
beg--; beg--;
while (!strchr(CFG->stylecodepunct, currline->txt[end+1])) while (!isspace(cltxt[end+1]) && !strchr(punct, cltxt[end+1]))
end++; end++;
bool replace = false; bool replace = false;
char c1 = currline->txt[beg]; char c1 = cltxt[beg];
char c2 = currline->txt[end]; char c2 = cltxt[end];
if ((_ch == c1) && (c1 == c2)) if ((_ch == c1) && (c1 == c2))
{ {
@ -2086,13 +2089,14 @@ void IEclass::SCodeChange(gkey key)
replace = true; replace = true;
while ((col > 0) && !strchr(CFG->stylecodepunct, currline->txt[col-1])) while (col && !isspace(cltxt[col-1]) && !strchr(punct, cltxt[col-1]))
GoLeft(); GoLeft();
if (replace) DelChar(); if (replace) DelChar();
if (_ch != ' ') insertchar(_ch); if (_ch != ' ') insertchar(_ch);
while (!strchr(CFG->stylecodepunct, currline->txt[col+1])) cltxt = currline->txt.c_str();
while (!isspace(cltxt[col+1]) && !strchr(punct, cltxt[col+1]))
GoRight(); GoRight();
if (replace) DelChar(); if (replace) DelChar();