import "GoToDialog"
import "Array"
+char * strchrmax(const char * s, int c, int max)
+{
+ int i;
+ char ch;
+ for(i = 0; i < max && (ch = s[i]); i++)
+ if(ch == c)
+ return (char *)s + i;
+ return null;
+}
+
public class SyntaxColorScheme
{
public:
{
public:
subclass(UndoAction) type;
+ bool continued;
+
virtual void Undo(void * data) { type.Undo(this, data); }
virtual void Redo(void * data) { type.Redo(this, data); }
#ifdef _DEBUG
void * data;
int dontRecord;
bool insideRedo;
+ bool recordAsOne;
+ bool firstEvent;
dontRecord = 0;
void Undo()
{
- dontRecord++;
- if(curAction > 0)
+ bool continued = true;
+ while(curAction > 0 && continued)
{
UndoAction action = actions[--curAction];
+ dontRecord++;
+
#ifdef _DEBUG
/*Print("Undoing: ");
action.Print(data);*/
#endif
action.Undo(data);
+ dontRecord--;
+
+ continued = curAction > 0 && actions[curAction-1].continued;
}
- dontRecord--;
}
void Redo()
{
- dontRecord++;
- insideRedo = true;
- if(curAction < count)
+ bool continued = true;
+ while(curAction < count && continued)
{
UndoAction action = actions[curAction];
+ continued = action.continued;
+ dontRecord++;
+ insideRedo = true;
+
curAction++;
#ifdef _DEBUG
/*Print("Redoing: ");
action.Print(data);*/
#endif
action.Redo(data);
+
+ insideRedo = false;
+ dontRecord--;
}
- insideRedo = false;
- dontRecord--;
}
void Record(UndoAction action)
/*Print("Recording: ");
action.Print(data);*/
#endif
+ if(recordAsOne)
+ {
+ if(!firstEvent && count > 0)
+ actions[count-1].continued = true;
+ firstEvent = false;
+ }
actions[count++] = action;
curAction = count;
else
delete action;
}
+
+ void Clear()
+ {
+ actions.Free();
+ actions.size = 8;
+ count = 0;
+ curAction = 0;
+ firstEvent = true;
+ }
};
static class AddCharAction : UndoAction
{
int y, x;
unichar ch;
- int addedSpaces, addedTabs;
+ int addedSpaces, addedTabs, xAdjustment;
type = class(AddCharAction);
void Undo(EditBox editBox)
{
- editBox.GoToPosition(null, (ch == '\n') ? (y + 1) : y, (ch == '\n') ? 0 : (x + 1));
+ editBox.GoToPosition(null, (ch == '\n') ? (y + 1) : y, (ch == '\n') ? 0 : (x + 1) - xAdjustment);
editBox.BackSpace();
if(addedTabs || addedSpaces)
- editBox.DelCh(editBox.line, y, x - (addedSpaces + addedTabs), editBox.line, y, x, false);
+ {
+ editBox.DelCh(editBox.line, y, x - xAdjustment - (addedSpaces + addedTabs), editBox.line, y, x - xAdjustment, false);
+ editBox.GoToPosition(editBox.line, y, x);
+ }
editBox.UpdateDirty();
}
{
int y1, x1, y2, x2;
char * string;
- int addedSpaces, addedTabs;
+ int addedSpaces, addedTabs, xAdjustment;
type = class(AddTextAction);
#ifdef _DEBUG
{
int y1, x1, y2, x2;
char * string;
- bool placeAfter;
+ bool placeAfter, noHighlight;
int addedSpaces;
type = class(DelTextAction);
if(!placeAfter)
{
editBox.GoToPosition(null, y1, x1);
- editBox.selY = y2;
- editBox.selX = x2;
+ if(!noHighlight)
+ {
+ editBox.selY = y2;
+ editBox.selX = x2;
+ }
{ int c; editBox.selLine = editBox.lines.first; for(c = 0; c < editBox.selY && editBox.selLine; c++, editBox.selLine = editBox.selLine.next); }
//editBox.SetViewToCursor(true);
}
else
{
- editBox.selY = y1;
- editBox.selX = x1;
+ if(!noHighlight)
+ {
+ editBox.selY = y1;
+ editBox.selX = x1;
+ }
{ int c; editBox.selLine = editBox.lines.first; for(c = 0; c < editBox.selY && editBox.selLine; c++, editBox.selLine = editBox.selLine.next); }
//editBox.SetViewToCursor(true);
char * oldString;
char * newString;
bool placeAfter;
- int addedSpaces, addedTabs;
+ int addedSpaces, addedTabs, xAdjustment;
type = class(ReplaceTextAction);
int length;
EditBox editBox;
public:
- property char * text
+ property const char * text
{
set
{
public enum EditBoxFindResult { notFound, found, wrapped };
-static char * keyWords1[] =
+static const char * keyWords1[] =
{
// C
"return","break","continue","default","switch","case","if","else","for","while", "do","long","short",
- "void", "char","int","float","double","unsigned","static", "extern", "struct", "union", "typedef","enum",
+ "void", "char","int","float","double","signed","unsigned","static", "extern", "struct", "union", "typedef","enum",
"const", "sizeof",
"#include", "#define", "#pragma", "#if", "#else", "#elif", "#ifdef", "#ifndef", "#endif", "#undef", "#line",
"__attribute__", "__stdcall", "_stdcall",
"__declspec", "goto",
"inline", "__inline__", "_inline", "__inline", "__typeof","__extension__",
"asm", "__asm", "_asm", "volatile", "#cpu", "__stdcall__",
+ "__restrict__", "__restrict", "restrict",
// eC
"class", "private", "public",
null
};
-static char * keyWords2[] =
+static const char * keyWords2[] =
{
- "defined", "warning", null
+ "defined", "warning",
+ "include", "pragma", "elif", "ifdef", "ifndef", "endif", "undef", "line",
+ null
};
-static char ** keyWords[] = { keyWords1, keyWords2 };
+static const char ** keyWords[] = { keyWords1, keyWords2 };
#define NUM_KEYWORD_GROUPS (sizeof(keyWords) / sizeof(char **))
//static int * keyLen[NUM_KEYWORD_GROUPS];
static int keyLen[NUM_KEYWORD_GROUPS][sizeof(keyWords1)];
property EditLine firstLine { get { return lines.first; } }; // Change these to a List<EditLine>... (this.lines[10].text)
property EditLine lastLine { get { return lines.last; } };
property EditLine line { get { return this.line; } }; // TODO: Add Set this.line = this.lines[10]
- property char * contents
+ property const char * contents
{
property_category $"Data"
set
{
if(this)
{
+ undoBuffer.Clear();
+
undoBuffer.dontRecord++;
Deselect();
DelCh(this.lines.first, 0, 0, this.lines.last, this.lineCount-1, ((EditLine)(this.lines.last)).count, true);
return null;
}
- void SetLineText(char * text)
+ void SetLineText(const char * text)
{
if(this)
{
property Color selectionColor { set { selectionColor = value; } get { return selectionColor; } isset { return selectionColor ? true : false; } };
property Color selectionText { set { selectionText = value; } get { return selectionText; } isset { return selectionText ? true : false; } };
property SyntaxColorScheme syntaxColorScheme { set { delete colorScheme; colorScheme = value; incref colorScheme; } }
+ property bool recordUndoEvent { set { undoBuffer.recordAsOne = value; undoBuffer.firstEvent = true; } get { return undoBuffer.recordAsOne; } };
// selectionStart.line, selectionStart.column (With Set)
// selection.line1, selection.line2, selection.column1, selection.column2 (Read only)
bool modified;
- void (* FontExtent)(Display display, Font font, char * text, int len, int * width, int * height);
+ void (* FontExtent)(Display display, Font font, const char * text, int len, int * width, int * height, int prevGlyph, int * rPrevGlyph, int * overHang);
Color backColor;
bool rightButtonDown;
void NotifyDestroyed(Window window, DialogResult result)
{
ReplaceDialog dialog = (ReplaceDialog)window;
- char * replace = dialog.replaceString;
+ const char * replace = dialog.replaceString;
if(replace)
strcpy(replaceString, replace);
strcpy(searchString, dialog.searchString);
colorScheme.keywordColors = [ blue, blue ];
}
- FontExtent = Display::FontExtent;
+ FontExtent = Display::FontExtent2;
font = fontObject;
- lines.offset = (uint)&((EditLine)0).prev;
+ lines.offset = (uint)(uintptr)&((EditLine)0).prev;
style = EditBoxBits { hScroll = true };
lines.Free(EditLine::Free);
}
- void FlushBuffer(Surface surface, EditLine line, int wc, int * renderStart, int * x, int y, int numSpaces, bool drawSpaces, Box box)
+ void FlushBuffer(Surface surface, EditLine line, int wc, int * renderStart, int * x, int y, int * previousGlyph, int * oh, int numSpaces, bool drawSpaces, Box box)
{
int count = wc - *renderStart;
if(count)
if(!numSpaces)
{
+ int coh;
//FontExtent(display, font, line.buffer + *renderStart, count, &w, null);
surface.TextFont(font);
- surface.TextExtent(line.buffer + *renderStart, count, &w, null);
- if(*x + w + XOFFSET > 0)
- surface.WriteText(XOFFSET + *x,y, line.buffer + *renderStart, count);
+ surface.TextExtent2(line.buffer + *renderStart, count, &w, null, *previousGlyph, null, &coh);
+
+ if(*x + w + coh + XOFFSET > 0)
+ {
+ surface.WriteText2(XOFFSET + *x,y, line.buffer + *renderStart, count, *previousGlyph, previousGlyph);
+ *oh = coh;
+ //surface.WriteText(XOFFSET + *x,y, line.buffer + *renderStart, count);
+ }
*x += w;
}
else
{
w = numSpaces; // * space.w;
- if(*x + w + XOFFSET > 0 && (drawSpaces || surface.GetTextOpacity()))
- surface.Area(XOFFSET + *x - 1, y, XOFFSET + *x + w, y + space.h-1);
+ if(*x + w + XOFFSET > 0 && (drawSpaces))
+ surface.Area(XOFFSET + *x /*- 1*/ + *oh, y, XOFFSET + *x + w, y + space.h-1);
// WHATS UP WITH THIS... surface.Area(XOFFSET + *x, y, XOFFSET + *x + w, y + space.h-1);
*x += w;
}
}
}
- int CheckColors(EditLine line, int wc, bool selection, int selX, int editX, bool *selected,
- Color selectionForeground, Color selectionBackground, Color textColor, Color *foreground, Color *background, bool *opacity, bool *overwrite)
+ bool CheckColors(EditLine line, int wc, bool selection, int selX, int editX, bool *selected,
+ Color selectionForeground, Color selectionBackground, Color textColor, Color *foreground, Color *background, bool *opacity, int *overwrite)
{
bool flush = false;
if((style.stuckCaret && wc == line.count && !line.next) ||
(!mouseMove && line == this.line && wc == editX))
{
- *overwrite = true;
+ *overwrite = 1;
flush = true;
}
}
}
}*/
+ static inline int countTabsExtraSpaces(char * buffer, int tabSize, int start, int end)
+ {
+ // TODO: Handle tabs position properly with UTF-8 (and everywhere else)
+ int p = 0, i, extra = 0;
+ for(i = 0; i < end; i++)
+ {
+ if(buffer[i] == '\t')
+ {
+ int t = tabSize - (p % tabSize);
+ p += t;
+ if(i >= start)
+ extra += t-1;
+ }
+ else
+ p++;
+ }
+ return extra;
+ }
+
void OnRedraw(Surface surface)
{
EditLine line;
bool opacity;
// Overwrite Caret Stuff
- bool overWrite = false;
- int overWriteX, overWriteY;
- byte overWriteCh;
+ int overWrite = 0;
+ int overWriteX = 0, overWriteY = 0;
+ char overWriteCh;
// ****** SYNTAX STATES ******
bool inMultiLineComment = style.inMultiLineComment;
bool wasInMultiLine = style.wasInMultiLine;
// ****** ************* ******
+ // For drawing selection background
+ EditLine selStartLine = this.y < this.selY ? this.line : this.selLine;
+ EditLine selEndLine = this.y < this.selY ? this.selLine : this.line;
+ int selStartX = this.y < this.selY || (this.y == this.selY && this.x < this.selX) ? this.x : this.selX;
+ int selEndX = this.y > this.selY || (this.y == this.selY && this.x > this.selX) ? this.x : this.selX;
+ ///////////////////////////////////
+
if(!isEnabled)
defaultTextColor = Color { 85, 85, 85 };
textColor = defaultTextColor;
*/
surface.SetForeground(foreground);
surface.SetBackground(background);
- surface.TextOpacity(opacity);
+ surface.TextOpacity(false);
surface.GetBox(box);
int start = 0;
Color newTextColor = textColor = defaultTextColor;
bool lineComplete = false;
-
+ int overHang = 0;
// ****** SYNTAX HIGHLIGHTING ******
bool lastWasStar = false;
}
*/
+ // Draw Selection Background all at once here
+ if(selected || line == this.line || line == this.selLine)
+ {
+ int sx = XOFFSET + x, sy = y;
+ int tw, th;
+ int oh = 0;
+ char * buffer = line.buffer;
+ if(line != this.line && line != this.selLine)
+ {
+ if(style.freeCaret)
+ {
+ tw = clientSize.w - sx;
+ th = space.h;
+ }
+ else
+ {
+ surface.TextExtent2(buffer, line.count, &tw, &th, 0, null, &oh);
+ tw += countTabsExtraSpaces(buffer, tabSize, 0, line.count) * space.w;
+ }
+ }
+ else if(line == selStartLine)
+ {
+ int prevGlyph = 0;
+ int start = Min(line.count, selStartX);
+ int end = Min(line.count, selEndX);
+ surface.TextExtent2(buffer, start, &tw, &th, 0, &prevGlyph, null);
+ sx += tw;
+ sx += countTabsExtraSpaces(buffer, tabSize, 0, start) * space.w;
+ if(selStartX > start) sx += space.w * (selStartX - start);
+ if(style.freeCaret && line != selEndLine)
+ {
+ tw = clientSize.w - sx;
+ th = space.h;
+ }
+ else if(line != selEndLine)
+ {
+ surface.TextExtent2(buffer + start, line.count - start, &tw, &th, prevGlyph, null, &oh);
+ tw += countTabsExtraSpaces(buffer, tabSize, start, line.count) * space.w;
+ }
+ else
+ {
+ surface.TextExtent2(buffer + start, end - start, &tw, &th, prevGlyph, null, &oh);
+ tw += countTabsExtraSpaces(buffer, tabSize, start, end) * space.w;
+ end = Max(end, selStartX);
+ if(selEndX > end) { tw += space.w * (selEndX - end); th = space.h; }
+ }
+ }
+ else if(line == selEndLine)
+ {
+ int end = Min(line.count, selEndX);
+ surface.TextExtent2(buffer, end, &tw, &th, 0, null, &oh);
+ tw += countTabsExtraSpaces(buffer, tabSize, 0, end) * space.w;
+ if(selEndX - end) { tw += space.w * (selEndX - end); th = space.h; }
+ }
+ tw += oh;
+ surface.Area(sx, sy, sx + tw-1, sy + th-1);
+ }
+
if(line == this.selLine && line == this.line)
{
end = Max(line.count, this.x);
if(!wasEscaped)
escaped = true;
}
- else if(!inQuotes && !inString && !inMultiLineComment && !inSingleLineComment && (isdigit(word[0]) || (word[0] == '.' && isdigit(word[1]))))
+ else if(x < box.right && !inQuotes && !inString && !inMultiLineComment && !inSingleLineComment && (isdigit(word[0]) || (word[0] == '.' && isdigit(word[1]))))
{
- char * dot = strchr(word, '.');
- bool isHex = (word[0] == '0' && (word[1] == 'x' || word[1] == 'X'));
- char * exponent;
- bool isReal;
+ char * dot = word[wordLen] == '.' ? word + wordLen : (word[0] == '.' && (word == line.buffer || word[-1] == '-' || isspace(word[-1])) ? word : null);
+ bool isReal = dot != null;
char * s = null;
- if(isHex)
- {
- exponent = strchr(word, 'p');
- if(!exponent) exponent = strchr(word, 'P');
- }
+ if(dot)
+ isReal = true;
else
{
- exponent = strchr(word, 'e');
- if(!exponent) exponent = strchr(word, 'E');
+ char * exponent;
+ bool isHex = (word[0] == '0' && (word[1] == 'x' || word[1] == 'X'));
+ if(isHex)
+ {
+ exponent = strchrmax(word, 'p', wordLen);
+ if(!exponent) exponent = strchrmax(word, 'P', wordLen);
+ }
+ else
+ {
+ exponent = strchrmax(word, 'e', wordLen);
+ if(!exponent) exponent = strchrmax(word, 'E', wordLen);
+ }
+ isReal = exponent != null;
}
- if(dot && dot > word + wordLen) dot = null;
- isReal = dot || exponent;
if(isReal)
strtod(word, &s); // strtod() seems to break on hex floats (e.g. 0x23e3p12, 0x1.fp3)
else
case 'f': case 'F': gotF++; if(gotF > 1 || !isReal) valid = false; break;
case 'l': case 'L':
gotL++;
- if(gotL > 2 || isReal || (gotL == 2 && (s[i-1] != ch)))
+ if(gotL > 2 || (isReal && (gotL == 2 || gotF)) || (gotL == 2 && (s[i-1] != ch)))
valid = false;
break;
case 'u': case 'U': gotU++; if(gotU > 1 || isReal) valid = false; break;
if(firstWord)
{
inPrep = true;
- newTextColor = colorScheme.preprocessorColor;
+ newTextColor = wordLen == 1 ? colorScheme.keywordColors[1] : colorScheme.preprocessorColor;
}
}
- if(!inQuotes && !inString && !inMultiLineComment && !inSingleLineComment)
+ if(x < box.right && !inQuotes && !inString && !inMultiLineComment && !inSingleLineComment)
{
for(g = 0; g < ((inPrep && word[0] != '#') ? 2 : 1); g++)
{
- char ** keys = keyWords[g];
+ const char ** keys = keyWords[g];
int * len = keyLen[g];
for(ccc = 0; keys[ccc]; ccc++)
{
//if(!numSpaces)
{
int tw;
- FontExtent(display, font, line.buffer + start, bufferLen + wordLen, &tw, null);
+ int oh;
+ FontExtent(display, font, line.buffer + start, bufferLen + wordLen, &tw, null, 0, null, &oh);
w = tw;
}
/*else
bool flagTrailingSpace = false;
int numSpaces = 0;
int wc;
+ int previousGlyph = 0;
// Render checking if we need to split because of selection or to find where to draw insert caret
for(wc = start; wc < start + bufferLen; wc++)
{
flush = CheckColors(line, wc, selection, selX, editX, &selected, selectionForeground,
selectionBackground, textColor, &foreground, &background, &opacity, &overWrite);
- if(overWrite == true)
+ if(overWrite == 1)
{
overWriteCh = (wc < line.count) ? line.buffer[wc] : ' ';
if(overWriteCh == '\t') overWriteCh = ' ';
{
flagTrailingSpace = numSpaces && trailingSpace && style.syntax && start + bufferLen == line.count && line != this.line;
if(flagTrailingSpace) surface.SetBackground(red);
- FlushBuffer(surface, line, wc, &renderStart, &x, y, numSpaces, flagTrailingSpace, box);
- if(overWrite == true)
+ FlushBuffer(surface, line, wc, &renderStart, &x, y, &previousGlyph, &overHang, numSpaces, flagTrailingSpace, box);
+ if(flagTrailingSpace) surface.SetBackground(background);
+ if(overWrite == 1)
{
overWriteX = x;
overWriteY = y;
}
numSpaces = 0;
- surface.TextOpacity(opacity);
- surface.SetBackground(background);
surface.SetForeground(foreground);
flush = false;
}
flagTrailingSpace = numSpaces && trailingSpace && style.syntax && start + bufferLen == line.count && line != this.line;
if(flagTrailingSpace) surface.SetBackground(red);
- FlushBuffer(surface, line, wc, &renderStart, &x, y, numSpaces, flagTrailingSpace, box);
+ FlushBuffer(surface, line, wc, &renderStart, &x, y, &previousGlyph, &overHang, numSpaces, flagTrailingSpace, box);
+ if(flagTrailingSpace) surface.SetBackground(background);
start += bufferLen;
}
}
if(CheckColors(line, c, selection, selX, editX, &selected, selectionForeground,
selectionBackground, textColor, &foreground, &background, &opacity, &overWrite))
{
- if(overWrite == true)
+ if(overWrite == 1)
{
overWriteX = x;
overWriteY = y;
overWriteCh = ' ';
overWrite = 2;
}
- surface.TextOpacity(opacity);
surface.SetBackground(background);
surface.SetForeground(foreground);
}
- if(style.freeCaret && selected)
- {
- surface.SetBackground(selectionBackground);
- surface.Area(x + XOFFSET - 1,y,clientSize.w-1,y+this.space.h-1);
- // TEST: surface.Area(x + XOFFSET,y,clientSize.w-1,y+this.space.h-1);
- }
-
-
- /*
- if(style.freeCaret && selected)
- {
- surface.SetBackground(selectionBackground);
- surface.Area(x + XOFFSET - 1,y,clientSize.w-1,y+this.space.h-1);
- }
- */
if(line.count && line.text[line.count - 1] == '\\')
{
continuedSingleLineComment = inSingleLineComment;
void ComputeLength(EditLine line)
{
int c;
- int tabOccur = 0;
- int tabWidth;
int x = 0;
for(c = 0; c < line.count; )
len = 1;
}
else
- FontExtent(display, font, line.buffer + start, len, &w, null);
+ {
+ int oh;
+ FontExtent(display, font, line.buffer + start, len, &w, null, 0, null, &oh);
+ }
}
else
{
this.col = position;
}
- int DelCh(EditLine l1, int y1, int c1, EditLine l2, int y2, int c2, bool placeAfter)
+ void DelCh(EditLine l1, int y1, int c1, EditLine l2, int y2, int c2, bool placeAfter)
{
- return _DelCh(l1, y1, c1, l2, y2, c2, placeAfter, null);
+ _DelCh(l1, y1, c1, l2, y2, c2, placeAfter, true, null);
}
bool HasCommentOrEscape(EditLine line)
return hadComment;
}
- int _DelCh(EditLine l1, int y1, int c1, EditLine l2, int y2, int c2, bool placeAfter, int * addedSpacesPtr)
+ int _DelCh(EditLine l1, int y1, int c1, EditLine l2, int y2, int c2, bool placeAfter, bool highlight, int * addedSpacesPtr)
{
EditLine line = l1, next;
char * buffer;
len = GetText(null, l1, y1, start, l2, y2, c2, false, false);
string = new char[len];
- action = DelTextAction { y1 = y1, x1 = start, y2 = y2, x2 = c2, string = string, placeAfter = placeAfter };
+ action = DelTextAction { y1 = y1, x1 = start, y2 = y2, x2 = c2, string = string, placeAfter = placeAfter, noHighlight = !highlight };
GetText(string, l1, y1, start, l2, y2, c2, false, false);
Record(action);
}
buffer = new char[line.size ? line.size : 1];
*/
buffer = new char[line.size];
- if(!buffer) return;
+ // TODO: Better handling of these allocation failures
+ if(!buffer) return extras;
CopyBytes(buffer,l2.buffer,oldCount1 + 1/*line.count + 1*//*line.size*/);
}
else
buffer = l2.buffer;
+ // TODO: Better handling of these allocation failures
if(!line.AdjustBuffer(newLineCount))
- return;
+ return extras;
#ifdef _DEBUG
/*if(newLineCount > 4000 || newLineCount < 0)
{
if(this.selY < this.y)
{
- _DelCh(this.selLine, this.selY, this.selX, this.line, this.y, this.x, true, addedSpacesPtr);
+ _DelCh(this.selLine, this.selY, this.selX, this.line, this.y, this.x, true, true, addedSpacesPtr);
this.x = this.selX;
this.y = this.selY;
this.line = this.selLine;
}
else if(this.selY > this.y)
{
- _DelCh(this.line, this.y, this.x, this.selLine, this.selY, this.selX, false, addedSpacesPtr);
+ _DelCh(this.line, this.y, this.x, this.selLine, this.selY, this.selX, false, true, addedSpacesPtr);
this.selX = this.x;
this.selY = this.y;
this.selLine = this.line;
}
else if(this.selX < this.x)
{
- _DelCh(this.selLine, this.selY, this.selX, this.line, this.y, this.x, true, addedSpacesPtr);
+ _DelCh(this.selLine, this.selY, this.selX, this.line, this.y, this.x, true, true, addedSpacesPtr);
this.x = this.selX;
this.y = this.selY;
this.line = this.selLine;
}
else
{
- _DelCh(this.line, this.y, this.x, this.selLine, this.selY, this.selX, false, addedSpacesPtr);
+ _DelCh(this.line, this.y, this.x, this.selLine, this.selY, this.selX, false, true, addedSpacesPtr);
this.selX = this.x;
this.selY = this.y;
this.selLine = this.line;
return false;
}
- bool AddToLine(char * stringLine, int count, bool LFComing, int * addedSpacesPtr, int * addedTabsPtr)
+ bool AddToLine(const char * stringLine, int count, bool LFComing, int * addedSpacesPtr, int * addedTabsPtr, int * xAdjustmentPtr)
{
bool hadComment = false;
// Add the line here
{
int w;
int numBytes = 1;
- char * string;
+ const char * string;
if(c < Min(this.x, line.count))
string = line.buffer + c;
else if(c < endX)
}
else
{
+ int oh;
numBytes = UTF8_NUM_BYTES(*string);
- FontExtent(display, this.font, string, numBytes, &w, null);
+ FontExtent(display, this.font, string, numBytes, &w, null, 0, null, &oh);
}
x += w;
{
int addedSpaces = 0;
int addedTabs = 0;
+ int xAdjustment = 0;
// Add blank spaces if EES_FREECARET
if(this.x > line.count)
addedSpaces = wantedPosition - position;
else
{
+ xAdjustment = wantedPosition - position;
+
// Put a first tab
addedTabs = 1;
position += this.tabSize - (position % this.tabSize);
position += (addedTabs-1) * this.tabSize;
// Finish off with spaces
addedSpaces = wantedPosition - position;
+
+ xAdjustment -= addedSpaces + addedTabs;
}
}
else
CopyBytes(line.buffer + this.x + addedTabs + addedSpaces, stringLine, count);
if(addedTabs)
{
- *addedTabsPtr = addedTabs;
FillBytes(line.buffer+line.count,'\t',addedTabs);
#ifdef _DEBUG
if(addedTabs > 4000 || addedTabs < 0)
#endif
line.count += addedTabs;
}
- else if(addedTabs)
- *addedTabsPtr = 0;
+
if(addedSpaces)
{
FillBytes(line.buffer+line.count,' ',addedSpaces);
printf("Warning");
#endif
line.count += addedSpaces;
- if(addedSpacesPtr) *addedSpacesPtr = addedSpaces;
}
- else if(addedSpacesPtr)
- *addedSpacesPtr = 0;
+
+ if(addedTabsPtr) *addedTabsPtr = addedTabs;
+ if(addedSpacesPtr) *addedSpacesPtr = addedSpaces;
+ if(xAdjustmentPtr) *xAdjustmentPtr = xAdjustment;
#ifdef _DEBUG
if(count > 4000 || count < 0)
printf("Warning");
// Returns true if it needs scrolling
bool FindMouse(int px, int py, int * tx, int * ty, EditLine * tline, bool half)
{
- int w;
int c;
- int x, y;
+ int y;
EditLine line;
bool needHScroll = false;
{
if(line)
{
- if(mouseMove || (!overwrite && !style.noCaret))
+ if(mouseMove || !style.noCaret)
{
int max = this.mouseMove ? this.dropX : this.x;
int y = this.mouseMove ? this.dropY : this.y;
len = 1;
}
else
- FontExtent(display, this.font, line.buffer + start, len, &w, null);
+ {
+ int oh;
+ FontExtent(display, this.font, line.buffer + start, len, &w, null, 0, null, &oh);
+ }
}
else
{
if(setCaret)
caretX = x;
caretY = y * this.space.h;
- SetCaret(x + XOFFSET-2, y * space.h + YOFFSET, space.h);
+ if(!overwrite)
+ SetCaret(x + XOFFSET-2, y * space.h + YOFFSET, space.h);
+ else
+ SetCaret(0, 0, 0);
}
else
SetCaret(0, 0, 0);
+ // TOFIX: Mismatch between NotifyCaretMove() and NotifyDropped() / GoToPosition()
NotifyCaretMove(master, this, y + 1, x + 1);
SelectionEnables();
while(true)
{
int start = c;
- int numBytes = 1;
int len = 1;
int w;
if(c < Min(max, line.count))
len = 1;
}
else
- FontExtent(display, font, line.buffer + start, len, &w, null);
+ {
+ int oh;
+ FontExtent(display, font, line.buffer + start, len, &w, null, 0, null, &oh);
+ }
}
else
{
else
a--;
if(a > start)
- FontExtent(display, font, line.buffer + start, a - start, &w, null);
+ {
+ int oh;
+ FontExtent(display, font, line.buffer + start, a - start, &w, null, 0, null, &oh);
+ }
else
w = 0;
if(position > x + (half ? ((w + lastW) / 2) : lastW)) break;
}
/*
- bool SaveFile(char * fileName)
+ bool SaveFile(const char * fileName)
{
File f = eFile_Open(fileName, FO_WRITE);
if(f)
moveX = this.selX - this.x;
}
}
+
+ recordUndoEvent = true;
DelSel(null);
this.dropX -= moveX;
this.selX = this.x = this.dropX;
this.selY = this.y = this.dropY;
this.selLine = this.line = this.dropLine;
AddS(text);
+ recordUndoEvent = false;
+
SetViewToCursor(true);
delete text;
Modified();
{
if(FontExtent)
{
- FontExtent(display, font, " ", 1, (int *)&space.w, (int *)&space.h);
- FontExtent(display, font, "W", 1, (int *)&large.w, (int *)&large.h);
+ int oh;
+ FontExtent(display, font, " ", 1, (int *)&space.w, (int *)&space.h, 0, null, &oh);
+ FontExtent(display, font, "W", 1, (int *)&large.w, (int *)&large.h, 0, null, &oh);
space.w = Max(space.w, 1);
large.w = Max(large.w, 1);
bool OnLoadGraphics()
{
- FontExtent = Display::FontExtent;
+ FontExtent = Display::FontExtent2;
font = fontObject;
ComputeFont();
// UpdateCaretPosition(true);
int y;
bool done = false;
EditLine line = this.line;
- int c;
+ int c = 0;
for(y = this.y; y>= 0; y--)
{
- c = (y == this.y) ? (this.x-1) : line.count-1;
+ c = (y == this.y) ? (Min(this.x-1, line.count-1)) : line.count-1;
// Slow down when going on lines...
if(y != this.y) break;
else
break;
}
+
//if(this.x != 0)
{
- DelCh(line,y,c+1,this.line,this.y,this.x, true);
+ _DelCh(line, y, c+1, this.line, this.y, this.x, true, false, null);
this.x = this.selX = Min(c+1, line.count);
this.y = this.selY = y;
this.line = this.selLine = line;
SetViewToCursor(true);
Modified();
}
- // Delete word
- else if(key.ctrl)
- {
- if(this.x < this.line.count)
- {
- int i;
- int length;
- for(i = this.x; i < this.line.count; i++)
- {
- if(!IS_ALUNDER(this.line.buffer[i]))
- break;
- }
-
- for(; i < this.line.count; i++)
- {
- //Delete trailing whitespace
- if(IS_ALUNDER(this.line.buffer[i]))
- break;
- }
- DelCh(this.line, this.y, this.x, this.line, this.y, i, false);
- SetViewToCursor(true);
- Modified();
- }
- else if(this.line.next)
- {
- DelCh(this.line, this.y, this.x, this.line.next, this.y+1, 0, false);
- SetViewToCursor(true);
- Modified();
- }
- }
else
{
- if(!(style.freeCaret))
+ EditLine line1 = this.line, line2 = this.line;
+ int x1, y1 = this.y, x2, y2 = this.y;
+ if(!style.freeCaret)
{
this.selX = this.x = Min(this.x, this.line.count);
ComputeColumn();
}
- if(this.x < this.line.count)
+ x1 = this.x;
+
+ if(x1 < line1.count)
{
- DelCh(this.line, this.y, this.x, this.line, this.y, this.x+1, false);
+ // Delete word
+ if(key.ctrl)
+ {
+ int i;
+ char * buffer = line1.buffer;
+ for(i = x1; i < line1.count; i++)
+ {
+ if(!IS_ALUNDER(buffer[i]))
+ break;
+ }
+
+ for(; i < line1.count; i++)
+ {
+ // Delete trailing whitespace
+ if(IS_ALUNDER(buffer[i]))
+ break;
+ }
+ x2 = i;
+ }
+ else
+ x2 = x1 + 1;
}
- else if(this.line.next)
+ else
{
- DelCh(this.line, this.y, this.x, this.line.next, this.y+1, 0, false);
+ // Avoid creating trailing spaces if there is no content on next line
+ line2 = line1.next;
+ y2++;
+ if(line2 && !line2.count)
+ x1 = line1.count;
+ x2 = 0;
}
+ if(line2)
+ _DelCh(line1, y1, x1, line2, y2, x2, false, false, null);
SetViewToCursor(true);
Modified();
}
bool stuffAfter = false;
char * addString;
int len = 0;
+ /*bool resetX = false;
+ int backX;*/
if(style.stuckCaret) GoToEnd(true);
if(style.readOnly) break;
else
break;
}
+
+ // Prevent adding trailing spaces if at the head of a line
+ /*if(c && c == this.x && c < this.line.count && this.x == this.selX && this.y == this.selY)
+ {
+ position = 0;
+ backX = this.x;
+ this.x = 0;
+ this.selX = 0;
+ resetX = true;
+ }*/
+
if(!line.count)
position = x;
stuffAfter = true;
//If last character is a { indent one tab
- if(this.line.buffer[this.x - 1] == '{')
+ c = Min(x, line.count);
+ if(c > 0 && line.buffer[c - 1] == '{')
{
//Except if the next non space character is a }
bool indent = false;
int i;
- for(i = this.x; i < this.line.size; i++)
+ for(i = c; i <= this.line.count; i++) // indent will be set to true on nul terminating char
if(this.line.buffer[i] != ' ' && this.line.buffer[i] != '\t')
{
if(this.line.buffer[i] != '}')
}
addString[len] = '\0';
}
+ recordUndoEvent = true;
if(AddS(addString))
{
- if(!stuffAfter && style.freeCaret)
+ EditLine prevLine = this.line.prev;
+ if(prevLine)
+ {
+ // Nuke spaces if that is all that is left on previous line
+ int i;
+ char * buffer = prevLine.buffer;
+ for(i = 0; i < prevLine.count; i++)
+ if(buffer[i] != ' ' && buffer[i] != '\t')
+ break;
+ if(i == prevLine.count)
+ DelCh(prevLine, this.y - 1, 0, prevLine, this.y - 1, prevLine.count, false);
+ }
+ /*if(resetX)
+ {
+ this.x = this.selX = backX;
+ ComputeColumn();
+ }
+ else */if(!stuffAfter && style.freeCaret)
{
this.x = this.selX = position;
ComputeColumn();
SetViewToCursor(true);
Modified();
}
+ recordUndoEvent = false;
delete addString;
return false;
}
bool foundAlpha = false;
bool found = false;
int y = this.y;
- EditLine line, lastLine;
- int lastC, lastY;
+ EditLine line, lastLine = null;
+ int lastC = 0, lastY = 0;
for(line = this.line; (line && !found); line = line.prev, y--)
{
break;
}
}
- while(--c)
+ while(--c >= 0)
{
byte ch = line.buffer[c];
if(UTF8_IS_FIRST(ch)) break;
{
if(x <= line.count)
{
- byte * buffer = line.buffer;
+ byte * buffer = (byte *)line.buffer;
while(--x)
{
byte ch = buffer[x];
{
bool foundAlpha = false;
bool found = false;
- EditLine line, lastLine;
+ EditLine line = null, lastLine = null;
int y = this.y;
- int lastC, lastY, lastNumBytes;
+ int lastC = 0, lastY = 0, lastNumBytes = 0;
for(line = this.line; (line && !found); line = line.next, y++)
{
{
if(x < line.count)
{
- byte * buffer = line.buffer;
+ byte * buffer = (byte *)line.buffer;
while(++x)
{
byte ch = buffer[x];
{
if(style.stuckCaret) break;
{
+ /*
int th = space.h;
int textPos = 0;
int sx = 0, sy = this.y * this.space.h;
int maxW = clientSize.w - sx;
char * text = line.buffer;
+ */
if(!shift) SelDirty();
DirtyLine(this.y);
for(c=0; line.buffer[c]; c++)
if(line.buffer[c] != ' ' && line.buffer[c] != '\t')
break;
- if(shift && (c != 0 || this.x))
+ if(overwrite || (shift && (c != 0 || this.x)))
DirtyLine(this.y);
if(this.x != c)
this.x = c;
}
else
{
- if(shift && this.x != 0)
+ if(overwrite || (shift && this.x != 0))
DirtyLine(this.y);
this.x = 0;
}
else if(this.x != this.line.count)
{
this.x = this.line.count;
- if(shift)
+ if(overwrite || shift)
DirtyLine(this.y);
ComputeColumn();
}
Copy();
return false;
}
- else if(key.shift)
- {
- if(!(style.readOnly))
- Paste();
- return false;
- }
- else
+ else if(!style.readOnly)
{
- this.overwrite ^= 1;
- UpdateCaretPosition(true);
- if(this.overwrite)
- SetCaret(0,0,0);
- DirtyLine(this.y);
- UpdateDirty();
- NotifyOvrToggle(master, this, this.overwrite);
+ if(key.shift)
+ {
+ if(!(style.readOnly))
+ Paste();
+ return false;
+ }
+ else
+ {
+ this.overwrite ^= 1;
+ UpdateCaretPosition(true);
+ if(this.overwrite)
+ SetCaret(0,0,0);
+ DirtyLine(this.y);
+ UpdateDirty();
+ NotifyOvrToggle(master, this, this.overwrite);
+ }
}
break;
case hotKey:
{
//Only indent back if you are exactly at one tab.
{
- bool whitespace = true;
+ //bool whitespace = true;
int i;
char * newline;
int putsize;
- int indentwidth;
+ int indentwidth = 0;
EditLine line = this.line;
//Only remove one tab if there is nothing else on the line.
UpdateDirty();
}
- bool _AddCh(unichar ch, int * addedSpacesPtr, int * addedTabsPtr)
+ bool _AddCh(unichar ch, int * addedSpacesPtr, int * addedTabsPtr, int * xAdjustmentPtr)
{
EditLine line;
- int length, endX;
+ int length, endX = 0;
bool result;
ReplaceTextAction replaceAction = null;
AddCharAction addCharAction = null;
- int addedSpaces = 0, addedTabs = 0;
+ int addedSpaces = 0, addedTabs = 0, xAdjustment = 0;
if(ch == '\r') return true;
if(style.stuckCaret /*|EES_READONLY)*/ )
char string[5];
int count = UTF32toUTF8Len(&ch, 1, string, 5);
DelSel(&addedSpaces);
- result = AddToLine(string, count, false, addedSpaces ? null : &addedSpaces, &addedTabs);
+ result = AddToLine(string, count, false, addedSpaces ? null : &addedSpaces, &addedTabs, &xAdjustment);
if(addedSpacesPtr) *addedSpacesPtr = addedSpaces;
if(addedTabsPtr) *addedTabsPtr = addedTabs;
+ if(xAdjustmentPtr) *xAdjustmentPtr = xAdjustment;
}
this.selX = this.x;
this.selY = this.y;
bool AddCh(unichar ch)
{
- return _AddCh(ch, null, null);
+ return _AddCh(ch, null, null, null);
}
void Modified()
void Delete(EditLine line1, int y1, int x1, EditLine line2, int y2, int x2)
{
Deselect();
- DelCh(line1, y1, x1, line2, y2, x2, false);
+ _DelCh(line1, y1, x1, line2, y2, x2, false, false, null);
SetViewToCursor(true);
UpdateDirty();
Modified();
undoBuffer.Undo();
itemEditUndo.disabled = undoBuffer.curAction == 0;
itemEditRedo.disabled = undoBuffer.curAction == undoBuffer.count;
+
+ UpdateDirty();
+ SetSelectCursor();
+ SelectionEnables();
+
if(savedAction == undoBuffer.curAction)
{
modifiedDocument = false;
undoBuffer.Redo();
itemEditUndo.disabled = undoBuffer.curAction == 0;
itemEditRedo.disabled = undoBuffer.curAction == undoBuffer.count;
+
+ UpdateDirty();
+ SetSelectCursor();
+ SelectionEnables();
+
if(savedAction == undoBuffer.curAction)
{
modifiedDocument = false;
}
// BASIC OUTPUT
- bool AddS(char * string)
+ bool AddS(const char * string)
{
if(this)
{
bool ret = true;
- char * line;
+ const char * line;
int c, count;
- int addedSpaces = 0, addedTabs = 0;
+ int addedSpaces = 0, addedTabs = 0, xAdjustment = 0;
AddTextAction action = null;
ReplaceTextAction replaceAction = null;
{
if(string[c] == '\n' || string[c] == '\r')
{
- if(!AddToLine(line,count, true, addedSpaces ? null : &addedSpaces, addedTabs ? null : &addedTabs))
+ if(!AddToLine(line, count, true, addedSpaces ? null : &addedSpaces, addedTabs ? null : &addedTabs, xAdjustment ? null : &xAdjustment))
{
ret = false;
break;
// Add the line here
if(ret && count)
- if(!AddToLine(line,count,false, addedSpaces ? null : &addedSpaces, addedTabs ? null : &addedTabs))
+ if(!AddToLine(line,count,false, addedSpaces ? null : &addedSpaces, addedTabs ? null : &addedTabs, xAdjustment ? null : &xAdjustment))
{
ret = false;
}
action.x2 = x;
action.addedSpaces = addedSpaces;
action.addedTabs = addedTabs;
+ action.xAdjustment = xAdjustment;
}
else if(replaceAction)
{
replaceAction.x3 = x;
replaceAction.addedSpaces = addedSpaces;
replaceAction.addedTabs = addedTabs;
+ replaceAction.xAdjustment = xAdjustment;
}
UpdateCaretPosition(true);
{
bool result;
- if((ch >= 32 /*&& ch <=126*/) || ch == '\n')
+ if((ch >= 32 /*&& ch <=126*/) || ch == '\n' || ch == '\t')
//if((ch >= 32) || ch == '\n')
{
- int addedSpaces = 0, addedTabs = 0;
+ int addedSpaces = 0, addedTabs = 0, xAdjustment = 0;
ReplaceTextAction replaceAction = null;
AddCharAction addCharAction = null;
}
}
undoBuffer.dontRecord++;
- result = _AddCh(ch, &addedSpaces, &addedTabs);
+ result = _AddCh(ch, &addedSpaces, &addedTabs, &xAdjustment);
if(replaceAction)
{
replaceAction.x3 = x;
replaceAction.y3 = y;
replaceAction.addedSpaces = addedSpaces;
replaceAction.addedTabs = addedTabs;
+ replaceAction.addedTabs = xAdjustment;
}
if(addCharAction)
{
- addCharAction.x -= addedTabs * (tabSize-1);
addCharAction.addedSpaces = addedSpaces;
addCharAction.addedTabs = addedTabs;
+ addCharAction.xAdjustment = xAdjustment;
}
undoBuffer.dontRecord--;
if(ch == '\n')
}
}
- void PutS(char * string)
+ void PutS(const char * string)
{
if(this)
{
}
}
- void Printf(char * format, ...)
+ void Printf(const char * format, ...)
{
if(this)
{
}
}
- void SetContents(char * format, ...)
+ void SetContents(const char * format, ...)
{
if(this)
{
{
if(x > 0)
{
- x -= 1 + DelCh(line, y, x-1, line, y, x, true);
+ if(x > line.count)
+ x--;
+ else
+ x -= 1 + _DelCh(line, y, x-1, line, y, x, true, false, null);
Modified();
}
else if(this.line.prev)
int x = line.count;
int y = this.y;
- DelCh(line, this.y-1, x, this.line, this.y, this.x, true);
+ _DelCh(line, this.y-1, x, this.line, this.y, this.x, true, false, null);
this.line = line;
this.y = y-1;
this.x = x;
return false;
}
+ // NOTE: Mismatch with NotifyCaretMove() for x/y + 1
bool GoToPosition(EditLine line, int y, int x)
{
/*
{
if(created)
{
- int w;
- int c, numLines;
+ int numLines;
EditLine line;
int x;
int checkX, checkY;
}
else
{
- EditLine oldLine = this.line;
+ //EditLine oldLine = this.line;
bool lastOne = false;
EditLine oldViewLine = this.viewLine;
bool figureSyntax = false;
}
else
{
- EditLine oldLine = this.line;
-
for(c=0, line = this.line.prev; line && c<numLines; line = line.prev, c++)
{
this.line = line;
for(line = this.lines.first; line; line = line.next)
{
- if(style.syntax && line.count && isspace(line.buffer[line.count-1]))
- {
- int c = 0;
- for(c=line.count-2; c>=-1; c--)
- {
- if(c == -1 || !isspace(line.buffer[c]))
- {
- c++;
- line.buffer[c] = '\0';
- line.count -= (line.count - c);
- break;
- }
- }
- }
- f.Write(line.buffer, line.count,1);
+ f.Write(line.buffer, line.count, 1);
if(line.next)
{
if(cr) f.Putc('\r');
itemEditRedo.disabled = undoBuffer.curAction == undoBuffer.count;
}
- EditBoxFindResult Find(char * text, bool matchWord, bool matchCase, bool isSearchDown)
+ EditBoxFindResult Find(const char * text, bool matchWord, bool matchCase, bool isSearchDown)
{
EditLine line;
int num;
return notFound;
}
- EditBoxFindResult FindInSelection(char * text, bool matchWord, bool matchCase, EditLine l2, int y2, int x2)
+ EditBoxFindResult FindInSelection(const char * text, bool matchWord, bool matchCase, EditLine l2, int y2, int x2)
{
EditLine line;
int y;
return result;
}
- bool Puts(char * string)
+ bool Puts(const char * string)
{
EditBox editBox = this.editBox;
BufferLocation start { editBox.line, editBox.y, editBox.x };
{
utf8Bytes[numBytes++] = ch;
utf8Bytes[numBytes] = 0;
- if(UTF8Validate(utf8Bytes))
+ if(UTF8Validate((char *)utf8Bytes))
{
editBox.AddCh(UTF8_GET_CHAR(utf8Bytes, numBytes));
numBytes = 0;
start.AdjustDelete(pos, end);
sel.AdjustDelete(pos, end);
- editBox.DelCh(pos.line, pos.y, pos.x, end.line, end.y, end.x, true);
+ editBox._DelCh(pos.line, pos.y, pos.x, end.line, end.y, end.x, true, false, null);
}
}
};
Ecere Software / sdk / blobdiff