diff --git a/3rdparty/X11/xcb/image.d b/3rdparty/X11/xcb/image.d index 995a348e..85710ebb 100644 --- a/3rdparty/X11/xcb/image.d +++ b/3rdparty/X11/xcb/image.d @@ -159,6 +159,7 @@ xcb_image_create_native (xcb_connection_t * c, if (depth != 1) return null; /* fall through */ + goto case; case XCB_IMAGE_FORMAT_XY_PIXMAP: if (depth > 1) { fmt = find_format_by_depth(setup, depth); diff --git a/dub.json b/dub.json index efcb2e50..25496c9b 100644 --- a/dub.json +++ b/dub.json @@ -21,6 +21,35 @@ "targetPath": "lib", "targetType": "staticLibrary", + "sourceFiles-posix": [ + "3rdparty/X11/xcb/bigreq.d", + "3rdparty/X11/xcb/composite.d", + "3rdparty/X11/xcb/damage.d", + "3rdparty/X11/xcb/dpms.d", + "3rdparty/X11/xcb/glx.d", + "3rdparty/X11/xcb/randr.d", + "3rdparty/X11/xcb/record.d", + "3rdparty/X11/xcb/render.d", + "3rdparty/X11/xcb/res.d", + "3rdparty/X11/xcb/screensaver.d", + "3rdparty/X11/xcb/shape.d", + "3rdparty/X11/xcb/shm.d", + "3rdparty/X11/xcb/xcb.d", + "3rdparty/X11/xcb/xc_misc.d", + "3rdparty/X11/xcb/xevie.d", + "3rdparty/X11/xcb/xf86dri.d", + "3rdparty/X11/xcb/xfixes.d", + "3rdparty/X11/xcb/xinerama.d", + "3rdparty/X11/xcb/xprint.d", + "3rdparty/X11/xcb/xproto.d", + "3rdparty/X11/xcb/xtest.d", + "3rdparty/X11/xcb/xv.d", + "3rdparty/X11/xcb/xvmc.d", + "3rdparty/X11/xcb/image.d", + "3rdparty/X11/keysymdef.d", + "3rdparty/X11/X.d", + "3rdparty/X11/Xlib.d" + ], "sourceFiles-windows": [ "3rdparty/win32/basetsd.d", "3rdparty/win32/basetyps.d", diff --git a/examples/example1/dub.json b/examples/example1/dub.json index 36d88392..c9a742bd 100644 --- a/examples/example1/dub.json +++ b/examples/example1/dub.json @@ -11,6 +11,36 @@ "sourcePaths": ["../../src"], + "sourceFiles-posix": [ + "../../3rdparty/X11/xcb/bigreq.d", + "../../3rdparty/X11/xcb/composite.d", + "../../3rdparty/X11/xcb/damage.d", + "../../3rdparty/X11/xcb/dpms.d", + "../../3rdparty/X11/xcb/glx.d", + "../../3rdparty/X11/xcb/randr.d", + "../../3rdparty/X11/xcb/record.d", + "../../3rdparty/X11/xcb/render.d", + "../../3rdparty/X11/xcb/res.d", + "../../3rdparty/X11/xcb/screensaver.d", + "../../3rdparty/X11/xcb/shape.d", + "../../3rdparty/X11/xcb/shm.d", + "../../3rdparty/X11/xcb/xcb.d", + "../../3rdparty/X11/xcb/xc_misc.d", + "../../3rdparty/X11/xcb/xevie.d", + "../../3rdparty/X11/xcb/xf86dri.d", + "../../3rdparty/X11/xcb/xfixes.d", + "../../3rdparty/X11/xcb/xinerama.d", + "../../3rdparty/X11/xcb/xprint.d", + "../../3rdparty/X11/xcb/xproto.d", + "../../3rdparty/X11/xcb/xtest.d", + "../../3rdparty/X11/xcb/xv.d", + "../../3rdparty/X11/xcb/xvmc.d", + "../../3rdparty/X11/xcb/image.d", + "../../3rdparty/X11/keysymdef.d", + "../../3rdparty/X11/X.d", + "../../3rdparty/X11/Xlib.d" + ], + "sourceFiles-windows": [ "../../3rdparty/win32/basetsd.d", "../../3rdparty/win32/basetyps.d", @@ -81,6 +111,8 @@ "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], + "libs-posix": ["xcb", "xcb-util", "xcb-shm", "xcb-image", "xcb-keysyms", "X11-xcb", "X11"], + "versions-windows": ["USE_OPENGL", "Unicode"], diff --git a/src/dlangui/platforms/x11/x11app.d b/src/dlangui/platforms/x11/x11app.d index ecc23771..a18662c0 100644 --- a/src/dlangui/platforms/x11/x11app.d +++ b/src/dlangui/platforms/x11/x11app.d @@ -70,14 +70,16 @@ version(linux) { xcb_gcontext_t _g; xcb_image_t * _image; xcb_shm_segment_info_t shminfo; - /* Create GLX Window */ - GLXDrawable _drawable; - GLXWindow _glxwindow; - - private GLXContext _context; + version(USE_OPENGL) { + /* Create GLX Window */ + private GLXDrawable _drawable; + private GLXWindow _glxwindow; + private GLXContext _context; + private GLXFBConfig _fb_config; + } private int _visualID = 0; private xcb_colormap_t _colormap; - private GLXFBConfig _fb_config; + @property xcb_window_t windowId() { return _w; } this(string caption, Window parent) { @@ -112,46 +114,47 @@ version(linux) { _w = xcb_generate_id(_xcbconnection); Log.d("window=", _w, " gc=", _g); - - if (_enableOpengl) { - int visual_attribs[] = [ - GLX_RENDER_TYPE, GLX_RGBA_BIT, - GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, - GLX_DOUBLEBUFFER, 1, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - std.c.linux.X11.Xlib.None]; + version (USE_OPENGL) { + if (_enableOpengl) { + int visual_attribs[] = [ + GLX_RENDER_TYPE, GLX_RGBA_BIT, + GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, + GLX_DOUBLEBUFFER, 1, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + std.c.linux.X11.Xlib.None]; - Log.d("Getting framebuffer config"); - int fbcount; - GLXFBConfig *fbc = glXChooseFBConfig(_display, DefaultScreen(_display), visual_attribs.ptr, &fbcount); - if (!fbc) - { - Log.d("Failed to retrieve a framebuffer config"); - //return 1; - } - - Log.d("Getting XVisualInfo"); - _fb_config = fbc[0]; - auto vi = glXGetVisualFromFBConfig(_display, _fb_config); + Log.d("Getting framebuffer config"); + int fbcount; + GLXFBConfig *fbc = glXChooseFBConfig(_display, DefaultScreen(_display), visual_attribs.ptr, &fbcount); + if (!fbc) + { + Log.d("Failed to retrieve a framebuffer config"); + //return 1; + } + + Log.d("Getting XVisualInfo"); + _fb_config = fbc[0]; + auto vi = glXGetVisualFromFBConfig(_display, _fb_config); - //auto vi = glXChooseVisual(_display, std.c.linux.X11.Xlib.DefaultScreen(_display), attributeList.ptr); - _visualID = vi.visualid; - //swa.colormap = std.c.linux.X11.Xlib.XCreateColormap(_display, std.c.linux.X11.Xlib.RootWindow(_display, vi.screen), vi.visual, 0); // AllocNone + //auto vi = glXChooseVisual(_display, std.c.linux.X11.Xlib.DefaultScreen(_display), attributeList.ptr); + _visualID = vi.visualid; + //swa.colormap = std.c.linux.X11.Xlib.XCreateColormap(_display, std.c.linux.X11.Xlib.RootWindow(_display, vi.screen), vi.visual, 0); // AllocNone - Log.d("Creating color map"); - _colormap = xcb_generate_id(_xcbconnection); - /* Create colormap */ - xcb_create_colormap( - _xcbconnection, - XCB_COLORMAP_ALLOC_NONE, - _colormap, - _xcbscreen.root, - _visualID - ); - depth = cast(ubyte)vi.depth; - } + Log.d("Creating color map"); + _colormap = xcb_generate_id(_xcbconnection); + /* Create colormap */ + xcb_create_colormap( + _xcbconnection, + XCB_COLORMAP_ALLOC_NONE, + _colormap, + _xcbscreen.root, + _visualID + ); + depth = cast(ubyte)vi.depth; + } + } //mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; //values[0] = _xcbscreen.white_pixel; @@ -181,7 +184,7 @@ version(linux) { //XCB_COPY_FROM_PARENT,//_xcbscreen.root_depth, _w, _xcbscreen.root, - 50, 50, 500, 400, + 30, 30, 800, 650, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, visualId, @@ -288,112 +291,117 @@ version(linux) { xcb_map_window(_xcbconnection, _w); xcb_flush(_xcbconnection); //_enableOpengl = false; // test - if (_enableOpengl && !_glxwindow) { - Log.d("Calling glXCreateWindow display=", _display, " fbconfig=", _fb_config, " window=", _w); - _glxwindow = glXCreateWindow( - _display, - _fb_config, - _w, - null); - if (!_glxwindow) { - Log.e("Failed to create GLX window: disabling OpenGL"); - _enableOpengl = false; - } else { - import derelict.opengl3.glxext; - import std.c.linux.X11.Xlib; + version (USE_OPENGL) { + if (_enableOpengl && !_glxwindow) { + Log.d("Calling glXCreateWindow display=", _display, " fbconfig=", _fb_config, " window=", _w); + _glxwindow = glXCreateWindow( + _display, + _fb_config, + _w, + null); + if (!_glxwindow) { + Log.e("Failed to create GLX window: disabling OpenGL"); + _enableOpengl = false; + } else { + import derelict.opengl3.glxext; + import std.c.linux.X11.Xlib; - _drawable = _glxwindow; + _drawable = _glxwindow; - if (!_derelictgl3Reloaded) { + if (!_derelictgl3Reloaded) { - int count; - glGetIntegerv( GL_NUM_EXTENSIONS, &count ); - Log.d("Number of extensions: ", count); - for( int i=0; i= start) { - dchar prevchar = i > 1 && i > start + 1 ? source[i - 1] : 0; - int end = i; - if (delimiter == EOL && prevchar == '\r') // windows CR/LF - end--; - dstring line = i > start ? cast(dstring)(source[start .. end].dup) : ""d; - res ~= line; - } - start = i + 1; - } - } - return res; -} - -version (Windows) { - immutable dstring SYSTEM_DEFAULT_EOL = "\r\n"; -} else { - immutable dstring SYSTEM_DEFAULT_EOL = "\n"; -} - -/// concat strings from array using delimiter -dstring concatDStrings(dstring[] lines, dstring delimiter = SYSTEM_DEFAULT_EOL) { - dchar[] buf; - foreach(line; lines) { - if (buf.length) - buf ~= delimiter; - buf ~= line; - } - return cast(dstring)buf; -} - -/// replace end of lines with spaces -dstring replaceEolsWithSpaces(dstring source) { - dchar[] buf; - dchar lastch; - foreach(ch; source) { - if (ch == '\r') { - buf ~= ' '; - } else if (ch == '\n') { - if (lastch != '\r') - buf ~= ' '; - } else { - buf ~= ch; - } - lastch = ch; - } - return cast(dstring)buf; -} - -/// text content position -struct TextPosition { - /// line number, zero based - int line; - /// character position in line (0 == before first character) - int pos; - /// compares two positions - int opCmp(ref const TextPosition v) const { - if (line < v.line) - return -1; - if (line > v.line) - return 1; - if (pos < v.pos) - return -1; - if (pos > v.pos) - return 1; - return 0; - } -} - -/// text content range -struct TextRange { - TextPosition start; - TextPosition end; - /// returns true if range is empty - @property bool empty() const { - return end <= start; - } - /// returns true if start and end located at the same line - @property bool singleLine() const { - return end.line == start.line; - } - /// returns count of lines in range - @property int lines() const { - return end.line - start.line + 1; - } -} - -/// action performed with editable contents -enum EditAction { - /// insert content into specified position (range.start) - //Insert, - /// delete content in range - //Delete, - /// replace range content with new content - Replace -} - -/// edit operation details for EditableContent -class EditOperation { - protected EditAction _action; - /// action performed - @property EditAction action() { return _action; } - protected TextRange _range; - - /// source range to replace with new content - @property ref TextRange range() { return _range; } - protected TextRange _newRange; - - /// new range after operation applied - @property ref TextRange newRange() { return _newRange; } - @property void newRange(TextRange range) { _newRange = range; } - - /// new content for range (if required for this action) - protected dstring[] _content; - @property ref dstring[] content() { return _content; } - - /// old content for range - protected dstring[] _oldContent; - @property ref dstring[] oldContent() { return _oldContent; } - @property void oldContent(dstring[] content) { _oldContent = content; } - - this(EditAction action) { - _action = action; - } - this(EditAction action, TextPosition pos, dstring text) { - this(action, TextRange(pos, pos), text); - } - this(EditAction action, TextRange range, dstring text) { - _action = action; - _range = range; - _content.length = 1; - _content[0] = text; - } - this(EditAction action, TextRange range, dstring[] text) { - _action = action; - _range = range; - _content = text; - } - /// try to merge two operations (simple entering of characters in the same line), return true if succeded - bool merge(EditOperation op) { - if (_range.start.line != op._range.start.line) // both ops whould be on the same line - return false; - if (_content.length != 1 || op._content.length != 1) // both ops should operate the same line - return false; - // appending of single character - if (_range.empty && op._range.empty && op._content[0].length == 1 && _newRange.end.pos == op._range.start.pos) { - _content[0] ~= op._content[0]; - _newRange.end.pos++; - return true; - } - // removing single character - if (_newRange.empty && op._newRange.empty && op._oldContent[0].length == 1) { - if (_newRange.end.pos == op.range.end.pos) { - // removed char before - _range.start.pos--; - _newRange.start.pos--; - _newRange.end.pos--; - _oldContent[0] = (op._oldContent[0] ~ _oldContent[0]).dup; - return true; - } else if (_newRange.end.pos == op._range.start.pos) { - // removed char after - _range.end.pos++; - _oldContent[0] = (_oldContent[0] ~ op._oldContent[0]).dup; - return true; - } - } - return false; - } -} - -/// Undo/Redo buffer -class UndoBuffer { - protected Collection!EditOperation _undoList; - protected Collection!EditOperation _redoList; - - /// returns true if buffer contains any undo items - @property bool hasUndo() { - return !_undoList.empty; - } - - /// returns true if buffer contains any redo items - @property bool hasRedo() { - return !_redoList.empty; - } - - /// adds undo operation - void saveForUndo(EditOperation op) { - _redoList.clear(); - if (!_undoList.empty) { - if (_undoList.back.merge(op)) { - return; // merged - no need to add new operation - } - } - _undoList.pushBack(op); - } - - /// returns operation to be undone (put it to redo), null if no undo ops available - EditOperation undo() { - if (!hasUndo) - return null; // no undo operations - EditOperation res = _undoList.popBack(); - _redoList.pushBack(res); - return res; - } - - /// returns operation to be redone (put it to undo), null if no undo ops available - EditOperation redo() { - if (!hasRedo) - return null; // no undo operations - EditOperation res = _redoList.popBack(); - _undoList.pushBack(res); - return res; - } - - /// clears both undo and redo buffers - void clear() { - _undoList.clear(); - _redoList.clear(); - } -} - -/// Editable Content change listener -interface EditableContentListener { - void onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source); -} - -/// editable plain text (singleline/multiline) -class EditableContent { - - this(bool multiline) { - _multiline = multiline; - _lines.length = 1; // initial state: single empty line - _undoBuffer = new UndoBuffer(); - } - - protected UndoBuffer _undoBuffer; - - protected bool _readOnly; - - @property bool readOnly() { - return _readOnly; - } - - @property void readOnly(bool readOnly) { - _readOnly = readOnly; - } - - /// listeners for edit operations - Signal!EditableContentListener contentChangeListeners; - - protected bool _multiline; - /// returns true if miltyline content is supported - @property bool multiline() { return _multiline; } - - protected dstring[] _lines; - /// returns all lines concatenated delimited by '\n' - @property dstring text() { - if (_lines.length == 0) - return ""; - if (_lines.length == 1) - return _lines[0]; - // concat lines - dchar[] buf; - foreach(item;_lines) { - if (buf.length) - buf ~= EOL; - buf ~= item; - } - return cast(dstring)buf; - } - /// replace whole text with another content - @property EditableContent text(dstring newContent) { - clearUndo(); - _lines.length = 0; - if (_multiline) - _lines = splitDString(newContent); - else { - _lines.length = 1; - _lines[0] = replaceEolsWithSpaces(newContent); - } - return this; - } - /// returns line text - @property int length() { return cast(int)_lines.length; } - dstring opIndex(int index) { - return line(index); - } - /// returns line text by index, "" if index is out of bounds - dstring line(int index) { - return index >= 0 && index < _lines.length ? _lines[index] : ""d; - } - - /// returns text position for end of line lineIndex - TextPosition lineEnd(int lineIndex) { - return TextPosition(lineIndex, lineLength(lineIndex)); - } - - /// returns position before first non-space character of line, returns 0 position if no non-space chars - TextPosition firstNonSpace(int lineIndex) { - dstring s = line(lineIndex); - for (int i = 0; i < s.length; i++) - if (s[i] != ' ' && s[i] != '\t') - return TextPosition(lineIndex, i); - return TextPosition(lineIndex, 0); - } - - /// returns position after last non-space character of line, returns 0 position if no non-space chars on line - TextPosition lastNonSpace(int lineIndex) { - dstring s = line(lineIndex); - for (int i = cast(int)s.length - 1; i >= 0; i--) - if (s[i] != ' ' && s[i] != '\t') - return TextPosition(lineIndex, i + 1); - return TextPosition(lineIndex, 0); - } - - /// returns text position for end of line lineIndex - int lineLength(int lineIndex) { - return lineIndex >= 0 && lineIndex < _lines.length ? cast(int)_lines[lineIndex].length : 0; - } - - /// returns maximum length of line - int maxLineLength() { - int m = 0; - foreach(s; _lines) - if (m < s.length) - m = cast(int)s.length; - return m; - } - - void handleContentChange(EditOperation op, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source) { - // call listeners - contentChangeListeners(this, op, rangeBefore, rangeAfter, source); - } - - /// return text for specified range - dstring[] rangeText(TextRange range) { - dstring[] res; - if (range.empty) { - res ~= ""d; - return res; - } - for (int lineIndex = range.start.line; lineIndex <= range.end.line; lineIndex++) { - dstring lineText = line(lineIndex); - dstring lineFragment = lineText; - int startchar = 0; - int endchar = cast(int)lineText.length; - if (lineIndex == range.start.line) - startchar = range.start.pos; - if (lineIndex == range.end.line) - endchar = range.end.pos; - if (endchar > lineText.length) - endchar = cast(int)lineText.length; - if (endchar <= startchar) - lineFragment = ""d; - else if (startchar != 0 || endchar != lineText.length) - lineFragment = lineText[startchar .. endchar].dup; - res ~= lineFragment; - } - return res; - } - +module dlangui.widgets.editors; + +import dlangui.widgets.widget; +import dlangui.widgets.controls; +import dlangui.core.signals; +import dlangui.core.collections; +import dlangui.platforms.common.platform; + +import std.algorithm; + +immutable dchar EOL = '\n'; + +/// split dstring by delimiters +dstring[] splitDString(dstring source, dchar delimiter = EOL) { + int start = 0; + dstring[] res; + dchar lastchar; + for (int i = 0; i <= source.length; i++) { + if (i == source.length || source[i] == delimiter) { + if (i >= start) { + dchar prevchar = i > 1 && i > start + 1 ? source[i - 1] : 0; + int end = i; + if (delimiter == EOL && prevchar == '\r') // windows CR/LF + end--; + dstring line = i > start ? cast(dstring)(source[start .. end].dup) : ""d; + res ~= line; + } + start = i + 1; + } + } + return res; +} + +version (Windows) { + immutable dstring SYSTEM_DEFAULT_EOL = "\r\n"; +} else { + immutable dstring SYSTEM_DEFAULT_EOL = "\n"; +} + +/// concat strings from array using delimiter +dstring concatDStrings(dstring[] lines, dstring delimiter = SYSTEM_DEFAULT_EOL) { + dchar[] buf; + foreach(line; lines) { + if (buf.length) + buf ~= delimiter; + buf ~= line; + } + return cast(dstring)buf; +} + +/// replace end of lines with spaces +dstring replaceEolsWithSpaces(dstring source) { + dchar[] buf; + dchar lastch; + foreach(ch; source) { + if (ch == '\r') { + buf ~= ' '; + } else if (ch == '\n') { + if (lastch != '\r') + buf ~= ' '; + } else { + buf ~= ch; + } + lastch = ch; + } + return cast(dstring)buf; +} + +/// text content position +struct TextPosition { + /// line number, zero based + int line; + /// character position in line (0 == before first character) + int pos; + /// compares two positions + int opCmp(ref const TextPosition v) const { + if (line < v.line) + return -1; + if (line > v.line) + return 1; + if (pos < v.pos) + return -1; + if (pos > v.pos) + return 1; + return 0; + } +} + +/// text content range +struct TextRange { + TextPosition start; + TextPosition end; + /// returns true if range is empty + @property bool empty() const { + return end <= start; + } + /// returns true if start and end located at the same line + @property bool singleLine() const { + return end.line == start.line; + } + /// returns count of lines in range + @property int lines() const { + return end.line - start.line + 1; + } +} + +/// action performed with editable contents +enum EditAction { + /// insert content into specified position (range.start) + //Insert, + /// delete content in range + //Delete, + /// replace range content with new content + Replace +} + +/// edit operation details for EditableContent +class EditOperation { + protected EditAction _action; + /// action performed + @property EditAction action() { return _action; } + protected TextRange _range; + + /// source range to replace with new content + @property ref TextRange range() { return _range; } + protected TextRange _newRange; + + /// new range after operation applied + @property ref TextRange newRange() { return _newRange; } + @property void newRange(TextRange range) { _newRange = range; } + + /// new content for range (if required for this action) + protected dstring[] _content; + @property ref dstring[] content() { return _content; } + + /// old content for range + protected dstring[] _oldContent; + @property ref dstring[] oldContent() { return _oldContent; } + @property void oldContent(dstring[] content) { _oldContent = content; } + + this(EditAction action) { + _action = action; + } + this(EditAction action, TextPosition pos, dstring text) { + this(action, TextRange(pos, pos), text); + } + this(EditAction action, TextRange range, dstring text) { + _action = action; + _range = range; + _content.length = 1; + _content[0] = text; + } + this(EditAction action, TextRange range, dstring[] text) { + _action = action; + _range = range; + _content = text; + } + /// try to merge two operations (simple entering of characters in the same line), return true if succeded + bool merge(EditOperation op) { + if (_range.start.line != op._range.start.line) // both ops whould be on the same line + return false; + if (_content.length != 1 || op._content.length != 1) // both ops should operate the same line + return false; + // appending of single character + if (_range.empty && op._range.empty && op._content[0].length == 1 && _newRange.end.pos == op._range.start.pos) { + _content[0] ~= op._content[0]; + _newRange.end.pos++; + return true; + } + // removing single character + if (_newRange.empty && op._newRange.empty && op._oldContent[0].length == 1) { + if (_newRange.end.pos == op.range.end.pos) { + // removed char before + _range.start.pos--; + _newRange.start.pos--; + _newRange.end.pos--; + _oldContent[0] = (op._oldContent[0] ~ _oldContent[0]).dup; + return true; + } else if (_newRange.end.pos == op._range.start.pos) { + // removed char after + _range.end.pos++; + _oldContent[0] = (_oldContent[0] ~ op._oldContent[0]).dup; + return true; + } + } + return false; + } +} + +/// Undo/Redo buffer +class UndoBuffer { + protected Collection!EditOperation _undoList; + protected Collection!EditOperation _redoList; + + /// returns true if buffer contains any undo items + @property bool hasUndo() { + return !_undoList.empty; + } + + /// returns true if buffer contains any redo items + @property bool hasRedo() { + return !_redoList.empty; + } + + /// adds undo operation + void saveForUndo(EditOperation op) { + _redoList.clear(); + if (!_undoList.empty) { + if (_undoList.back.merge(op)) { + return; // merged - no need to add new operation + } + } + _undoList.pushBack(op); + } + + /// returns operation to be undone (put it to redo), null if no undo ops available + EditOperation undo() { + if (!hasUndo) + return null; // no undo operations + EditOperation res = _undoList.popBack(); + _redoList.pushBack(res); + return res; + } + + /// returns operation to be redone (put it to undo), null if no undo ops available + EditOperation redo() { + if (!hasRedo) + return null; // no undo operations + EditOperation res = _redoList.popBack(); + _undoList.pushBack(res); + return res; + } + + /// clears both undo and redo buffers + void clear() { + _undoList.clear(); + _redoList.clear(); + } +} + +/// Editable Content change listener +interface EditableContentListener { + void onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source); +} + +/// editable plain text (singleline/multiline) +class EditableContent { + + this(bool multiline) { + _multiline = multiline; + _lines.length = 1; // initial state: single empty line + _undoBuffer = new UndoBuffer(); + } + + protected UndoBuffer _undoBuffer; + + protected bool _readOnly; + + @property bool readOnly() { + return _readOnly; + } + + @property void readOnly(bool readOnly) { + _readOnly = readOnly; + } + + /// listeners for edit operations + Signal!EditableContentListener contentChangeListeners; + + protected bool _multiline; + /// returns true if miltyline content is supported + @property bool multiline() { return _multiline; } + + protected dstring[] _lines; + /// returns all lines concatenated delimited by '\n' + @property dstring text() { + if (_lines.length == 0) + return ""; + if (_lines.length == 1) + return _lines[0]; + // concat lines + dchar[] buf; + foreach(item;_lines) { + if (buf.length) + buf ~= EOL; + buf ~= item; + } + return cast(dstring)buf; + } + /// replace whole text with another content + @property EditableContent text(dstring newContent) { + clearUndo(); + _lines.length = 0; + if (_multiline) + _lines = splitDString(newContent); + else { + _lines.length = 1; + _lines[0] = replaceEolsWithSpaces(newContent); + } + return this; + } + /// returns line text + @property int length() { return cast(int)_lines.length; } + dstring opIndex(int index) { + return line(index); + } + /// returns line text by index, "" if index is out of bounds + dstring line(int index) { + return index >= 0 && index < _lines.length ? _lines[index] : ""d; + } + + /// returns text position for end of line lineIndex + TextPosition lineEnd(int lineIndex) { + return TextPosition(lineIndex, lineLength(lineIndex)); + } + + /// returns position before first non-space character of line, returns 0 position if no non-space chars + TextPosition firstNonSpace(int lineIndex) { + dstring s = line(lineIndex); + for (int i = 0; i < s.length; i++) + if (s[i] != ' ' && s[i] != '\t') + return TextPosition(lineIndex, i); + return TextPosition(lineIndex, 0); + } + + /// returns position after last non-space character of line, returns 0 position if no non-space chars on line + TextPosition lastNonSpace(int lineIndex) { + dstring s = line(lineIndex); + for (int i = cast(int)s.length - 1; i >= 0; i--) + if (s[i] != ' ' && s[i] != '\t') + return TextPosition(lineIndex, i + 1); + return TextPosition(lineIndex, 0); + } + + /// returns text position for end of line lineIndex + int lineLength(int lineIndex) { + return lineIndex >= 0 && lineIndex < _lines.length ? cast(int)_lines[lineIndex].length : 0; + } + + /// returns maximum length of line + int maxLineLength() { + int m = 0; + foreach(s; _lines) + if (m < s.length) + m = cast(int)s.length; + return m; + } + + void handleContentChange(EditOperation op, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source) { + // call listeners + contentChangeListeners(this, op, rangeBefore, rangeAfter, source); + } + + /// return text for specified range + dstring[] rangeText(TextRange range) { + dstring[] res; + if (range.empty) { + res ~= ""d; + return res; + } + for (int lineIndex = range.start.line; lineIndex <= range.end.line; lineIndex++) { + dstring lineText = line(lineIndex); + dstring lineFragment = lineText; + int startchar = 0; + int endchar = cast(int)lineText.length; + if (lineIndex == range.start.line) + startchar = range.start.pos; + if (lineIndex == range.end.line) + endchar = range.end.pos; + if (endchar > lineText.length) + endchar = cast(int)lineText.length; + if (endchar <= startchar) + lineFragment = ""d; + else if (startchar != 0 || endchar != lineText.length) + lineFragment = lineText[startchar .. endchar].dup; + res ~= lineFragment; + } + return res; + } + /// when position is out of content bounds, fix it to nearest valid position void correctPosition(ref TextPosition position) { if (position.line >= length) { @@ -421,594 +421,594 @@ class EditableContent { correctPosition(range.end); } - /// removes removedCount lines starting from start - protected void removeLines(int start, int removedCount) { - int end = start + removedCount; - assert(removedCount > 0 && start >= 0 && end > 0 && start < _lines.length && end <= _lines.length); - for (int i = start; i < _lines.length - removedCount; i++) - _lines[i] = _lines[i + removedCount]; - for (int i = cast(int)_lines.length - removedCount; i < _lines.length; i++) - _lines[i] = null; // free unused line references - _lines.length -= removedCount; - } - - /// inserts count empty lines at specified position - protected void insertLines(int start, int count) { - assert(count > 0); - _lines.length += count; - for (int i = cast(int)_lines.length - 1; i >= start + count; i--) - _lines[i] = _lines[i - count]; - for (int i = start; i < start + count; i++) - _lines[i] = ""d; - } - - /// inserts or removes lines, removes text in range - protected void replaceRange(TextRange before, TextRange after, dstring[] newContent) { - dstring firstLineBefore = line(before.start.line); - dstring lastLineBefore = before.singleLine ? firstLineBefore : line(before.end.line); - dstring firstLineHead = before.start.pos > 0 && before.start.pos <= firstLineBefore.length ? firstLineBefore[0..before.start.pos] : ""d; - dstring lastLineTail = before.end.pos >= 0 && before.end.pos < lastLineBefore.length ? lastLineBefore[before.end.pos .. $] : ""d; - - int linesBefore = before.lines; - int linesAfter = after.lines; - if (linesBefore < linesAfter) { - // add more lines - insertLines(before.start.line + 1, linesAfter - linesBefore); - } else if (linesBefore > linesAfter) { - // remove extra lines - removeLines(before.start.line + 1, linesBefore - linesAfter); - } - for (int i = after.start.line; i <= after.end.line; i++) { - dstring newline = newContent[i - after.start.line]; - if (i == after.start.line && i == after.end.line) { - dchar[] buf; - buf ~= firstLineHead; - buf ~= newline; - buf ~= lastLineTail; - //Log.d("merging lines ", firstLineHead, " ", newline, " ", lastLineTail); - _lines[i] = cast(dstring)buf; - //Log.d("merge result: ", _lines[i]); - } else if (i == after.start.line) { - dchar[] buf; - buf ~= firstLineHead; - buf ~= newline; - _lines[i] = cast(dstring)buf; - } else if (i == after.end.line) { - dchar[] buf; - buf ~= newline; - buf ~= lastLineTail; - _lines[i] = cast(dstring)buf; - } else - _lines[i] = newline; // no dup needed - } - } - - static bool isDigit(dchar ch) pure nothrow { - return ch >= '0' && ch <= '9'; - } - static bool isAlpha(dchar ch) pure nothrow { - return isLowerAlpha(ch) || isUpperAlpha(ch); - } - static bool isAlNum(dchar ch) pure nothrow { - return isDigit(ch) || isAlpha(ch); - } - static bool isLowerAlpha(dchar ch) pure nothrow { - return (ch >= 'a' && ch <= 'z') || (ch == '_'); - } - static bool isUpperAlpha(dchar ch) pure nothrow { - return (ch >= 'A' && ch <= 'Z'); - } - static bool isPunct(dchar ch) pure nothrow { - switch(ch) { - case '.': - case ',': - case ';': - case '?': - case '!': - return true; - default: - return false; - } - } - static bool isBracket(dchar ch) pure nothrow { - switch(ch) { - case '(': - case ')': - case '[': - case ']': - case '{': - case '}': - return true; - default: - return false; - } - } - static bool isWordBound(dchar thischar, dchar nextchar) { - return (isAlNum(thischar) && !isAlNum(nextchar)) - || (isPunct(thischar) && !isPunct(nextchar)) - || (isBracket(thischar) && !isBracket(nextchar)) - || (thischar != ' ' && nextchar == ' '); - } - - /// change text position to nearest word bound (direction < 0 - back, > 0 - forward) - TextPosition moveByWord(TextPosition p, int direction, bool camelCasePartsAsWords) { - correctPosition(p); - TextPosition firstns = firstNonSpace(p.line); // before first non space - TextPosition lastns = lastNonSpace(p.line); // after last non space - int linelen = lineLength(p.line); // line length - if (direction < 0) { - // back - if (p.pos <= 0) { - // beginning of line - move to prev line - if (p.line > 0) - p = lastNonSpace(p.line - 1); - } else if (p.pos <= firstns.pos) { // before first nonspace - // to beginning of line - p.pos = 0; - } else { - dstring txt = line(p.line); - int found = -1; - for (int i = p.pos - 1; i > 0; i--) { - // check if position i + 1 is after word end - dchar thischar = i >= 0 && i < linelen ? txt[i] : ' '; - if (thischar == '\t') - thischar = ' '; - dchar nextchar = i - 1 >= 0 && i - 1 < linelen ? txt[i - 1] : ' '; - if (nextchar == '\t') - nextchar = ' '; - if (isWordBound(thischar, nextchar) - || (camelCasePartsAsWords && isUpperAlpha(thischar) && isLowerAlpha(nextchar))) { - found = i; - break; - } - } - if (found >= 0) - p.pos = found; - else - p.pos = 0; - } - } else if (direction > 0) { - // forward - if (p.pos >= linelen) { - // last position of line - if (p.line < length - 1) - p = firstNonSpace(p.line + 1); - } else if (p.pos >= lastns.pos) { // before first nonspace - // to beginning of line - p.pos = linelen; - } else { - dstring txt = line(p.line); - int found = -1; - for (int i = p.pos; i < linelen; i++) { - // check if position i + 1 is after word end - dchar thischar = txt[i]; - if (thischar == '\t') - thischar = ' '; - dchar nextchar = i < linelen - 1 ? txt[i + 1] : ' '; - if (nextchar == '\t') - nextchar = ' '; - if (isWordBound(thischar, nextchar) - || (camelCasePartsAsWords && isLowerAlpha(thischar) && isUpperAlpha(nextchar))) { - found = i + 1; - break; - } - } - if (found >= 0) - p.pos = found; - else - p.pos = linelen; - } - } - return p; - } - - /// edit content - bool performOperation(EditOperation op, Object source) { - if (_readOnly) - throw new Exception("content is readonly"); - if (op.action == EditAction.Replace) { - TextRange rangeBefore = op.range; - assert(rangeBefore.start <= rangeBefore.end); - //correctRange(rangeBefore); - dstring[] oldcontent = rangeText(rangeBefore); - dstring[] newcontent = op.content; - if (newcontent.length == 0) - newcontent ~= ""d; - TextRange rangeAfter = op.range; - rangeAfter.end = rangeAfter.start; - if (newcontent.length > 1) { - // different lines - rangeAfter.end.line = rangeAfter.start.line + cast(int)newcontent.length - 1; - rangeAfter.end.pos = cast(int)newcontent[$ - 1].length; - } else { - // same line - rangeAfter.end.pos = rangeAfter.start.pos + cast(int)newcontent[0].length; - } - assert(rangeAfter.start <= rangeAfter.end); - op.newRange = rangeAfter; - op.oldContent = oldcontent; - replaceRange(rangeBefore, rangeAfter, newcontent); - handleContentChange(op, rangeBefore, rangeAfter, source); - _undoBuffer.saveForUndo(op); - return true; - } - return false; - } - - /// return true if there is at least one operation in undo buffer - @property bool hasUndo() { - return _undoBuffer.hasUndo; - } - /// return true if there is at least one operation in redo buffer - @property bool hasRedo() { - return _undoBuffer.hasRedo; - } - /// undoes last change - bool undo() { - if (!hasUndo) - return false; - if (_readOnly) - throw new Exception("content is readonly"); - EditOperation op = _undoBuffer.undo(); - TextRange rangeBefore = op.newRange; - dstring[] oldcontent = op.content; - dstring[] newcontent = op.oldContent; - TextRange rangeAfter = op.range; - //Log.d("Undoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); - replaceRange(rangeBefore, rangeAfter, newcontent); - handleContentChange(op, rangeBefore, rangeAfter, this); - return true; - } - /// redoes last undone change - bool redo() { - if (!hasUndo) - return false; - if (_readOnly) - throw new Exception("content is readonly"); - EditOperation op = _undoBuffer.redo(); - TextRange rangeBefore = op.range; - dstring[] oldcontent = op.oldContent; - dstring[] newcontent = op.content; - TextRange rangeAfter = op.newRange; - //Log.d("Redoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); - replaceRange(rangeBefore, rangeAfter, newcontent); - handleContentChange(op, rangeBefore, rangeAfter, this); - return true; - } - /// clear undo/redp history - void clearUndo() { - _undoBuffer.clear(); - } -} - -/// Editor action codes -enum EditorActions { - None = 0, - /// move cursor one char left - Left = 1000, - /// move cursor one char left with selection - SelectLeft, - /// move cursor one char right - Right, - /// move cursor one char right with selection - SelectRight, - /// move cursor one line up - Up, - /// move cursor one line up with selection - SelectUp, - /// move cursor one line down - Down, - /// move cursor one line down with selection - SelectDown, - /// move cursor one word left - WordLeft, - /// move cursor one word left with selection - SelectWordLeft, - /// move cursor one word right - WordRight, - /// move cursor one word right with selection - SelectWordRight, - /// move cursor one page up - PageUp, - /// move cursor one page up with selection - SelectPageUp, - /// move cursor one page down - PageDown, - /// move cursor one page down with selection - SelectPageDown, - /// move cursor to the beginning of page - PageBegin, - /// move cursor to the beginning of page with selection - SelectPageBegin, - /// move cursor to the end of page - PageEnd, - /// move cursor to the end of page with selection - SelectPageEnd, - /// move cursor to the beginning of line - LineBegin, - /// move cursor to the beginning of line with selection - SelectLineBegin, - /// move cursor to the end of line - LineEnd, - /// move cursor to the end of line with selection - SelectLineEnd, - /// move cursor to the beginning of document - DocumentBegin, - /// move cursor to the beginning of document with selection - SelectDocumentBegin, - /// move cursor to the end of document - DocumentEnd, - /// move cursor to the end of document with selection - SelectDocumentEnd, - /// delete char before cursor (backspace) - DelPrevChar, - /// delete char after cursor (del key) - DelNextChar, - /// delete word before cursor (ctrl + backspace) - DelPrevWord, - /// delete char after cursor (ctrl + del key) - DelNextWord, - - /// insert new line (Enter) - InsertNewLine, - /// insert new line after current position (Ctrl+Enter) - PrependNewLine, - - /// Turn On/Off replace mode - ToggleReplaceMode, - - /// Copy selection to clipboard - Copy, - /// Cut selection to clipboard - Cut, - /// Paste selection from clipboard - Paste, - /// Undo last change - Undo, - /// Redo last undoed change - Redo, - - /// Tab (e.g., Tab key to insert tab character or indent text) - Tab, - /// Tab (unindent text, or remove whitespace before cursor, usually Shift+Tab) - BackTab, - - /// Select whole content (usually, Ctrl+A) - SelectAll, - - // Scroll operations - - /// Scroll one line up (not changing cursor) - ScrollLineUp, - /// Scroll one line down (not changing cursor) - ScrollLineDown, - /// Scroll one page up (not changing cursor) - ScrollPageUp, - /// Scroll one page down (not changing cursor) - ScrollPageDown, - /// Scroll window left - ScrollLeft, - /// Scroll window right - ScrollRight, - - /// Zoom in editor font - ZoomIn, - /// Zoom out editor font - ZoomOut, - -} - -/// base for all editor widgets -class EditWidgetBase : WidgetGroup, EditableContentListener { - protected EditableContent _content; - protected Rect _clientRc; - - protected int _lineHeight; - protected Point _scrollPos; - protected bool _fixedFont; - protected int _spaceWidth; - protected int _tabSize = 4; - - protected int _minFontSize = -1; // disable zooming - protected int _maxFontSize = -1; // disable zooming - - protected bool _wantTabs = true; - protected bool _useSpacesForTabs = false; - - protected bool _replaceMode; - - // TODO: move to styles + /// removes removedCount lines starting from start + protected void removeLines(int start, int removedCount) { + int end = start + removedCount; + assert(removedCount > 0 && start >= 0 && end > 0 && start < _lines.length && end <= _lines.length); + for (int i = start; i < _lines.length - removedCount; i++) + _lines[i] = _lines[i + removedCount]; + for (int i = cast(int)_lines.length - removedCount; i < _lines.length; i++) + _lines[i] = null; // free unused line references + _lines.length -= removedCount; + } + + /// inserts count empty lines at specified position + protected void insertLines(int start, int count) { + assert(count > 0); + _lines.length += count; + for (int i = cast(int)_lines.length - 1; i >= start + count; i--) + _lines[i] = _lines[i - count]; + for (int i = start; i < start + count; i++) + _lines[i] = ""d; + } + + /// inserts or removes lines, removes text in range + protected void replaceRange(TextRange before, TextRange after, dstring[] newContent) { + dstring firstLineBefore = line(before.start.line); + dstring lastLineBefore = before.singleLine ? firstLineBefore : line(before.end.line); + dstring firstLineHead = before.start.pos > 0 && before.start.pos <= firstLineBefore.length ? firstLineBefore[0..before.start.pos] : ""d; + dstring lastLineTail = before.end.pos >= 0 && before.end.pos < lastLineBefore.length ? lastLineBefore[before.end.pos .. $] : ""d; + + int linesBefore = before.lines; + int linesAfter = after.lines; + if (linesBefore < linesAfter) { + // add more lines + insertLines(before.start.line + 1, linesAfter - linesBefore); + } else if (linesBefore > linesAfter) { + // remove extra lines + removeLines(before.start.line + 1, linesBefore - linesAfter); + } + for (int i = after.start.line; i <= after.end.line; i++) { + dstring newline = newContent[i - after.start.line]; + if (i == after.start.line && i == after.end.line) { + dchar[] buf; + buf ~= firstLineHead; + buf ~= newline; + buf ~= lastLineTail; + //Log.d("merging lines ", firstLineHead, " ", newline, " ", lastLineTail); + _lines[i] = cast(dstring)buf; + //Log.d("merge result: ", _lines[i]); + } else if (i == after.start.line) { + dchar[] buf; + buf ~= firstLineHead; + buf ~= newline; + _lines[i] = cast(dstring)buf; + } else if (i == after.end.line) { + dchar[] buf; + buf ~= newline; + buf ~= lastLineTail; + _lines[i] = cast(dstring)buf; + } else + _lines[i] = newline; // no dup needed + } + } + + static bool isDigit(dchar ch) pure nothrow { + return ch >= '0' && ch <= '9'; + } + static bool isAlpha(dchar ch) pure nothrow { + return isLowerAlpha(ch) || isUpperAlpha(ch); + } + static bool isAlNum(dchar ch) pure nothrow { + return isDigit(ch) || isAlpha(ch); + } + static bool isLowerAlpha(dchar ch) pure nothrow { + return (ch >= 'a' && ch <= 'z') || (ch == '_'); + } + static bool isUpperAlpha(dchar ch) pure nothrow { + return (ch >= 'A' && ch <= 'Z'); + } + static bool isPunct(dchar ch) pure nothrow { + switch(ch) { + case '.': + case ',': + case ';': + case '?': + case '!': + return true; + default: + return false; + } + } + static bool isBracket(dchar ch) pure nothrow { + switch(ch) { + case '(': + case ')': + case '[': + case ']': + case '{': + case '}': + return true; + default: + return false; + } + } + static bool isWordBound(dchar thischar, dchar nextchar) { + return (isAlNum(thischar) && !isAlNum(nextchar)) + || (isPunct(thischar) && !isPunct(nextchar)) + || (isBracket(thischar) && !isBracket(nextchar)) + || (thischar != ' ' && nextchar == ' '); + } + + /// change text position to nearest word bound (direction < 0 - back, > 0 - forward) + TextPosition moveByWord(TextPosition p, int direction, bool camelCasePartsAsWords) { + correctPosition(p); + TextPosition firstns = firstNonSpace(p.line); // before first non space + TextPosition lastns = lastNonSpace(p.line); // after last non space + int linelen = lineLength(p.line); // line length + if (direction < 0) { + // back + if (p.pos <= 0) { + // beginning of line - move to prev line + if (p.line > 0) + p = lastNonSpace(p.line - 1); + } else if (p.pos <= firstns.pos) { // before first nonspace + // to beginning of line + p.pos = 0; + } else { + dstring txt = line(p.line); + int found = -1; + for (int i = p.pos - 1; i > 0; i--) { + // check if position i + 1 is after word end + dchar thischar = i >= 0 && i < linelen ? txt[i] : ' '; + if (thischar == '\t') + thischar = ' '; + dchar nextchar = i - 1 >= 0 && i - 1 < linelen ? txt[i - 1] : ' '; + if (nextchar == '\t') + nextchar = ' '; + if (isWordBound(thischar, nextchar) + || (camelCasePartsAsWords && isUpperAlpha(thischar) && isLowerAlpha(nextchar))) { + found = i; + break; + } + } + if (found >= 0) + p.pos = found; + else + p.pos = 0; + } + } else if (direction > 0) { + // forward + if (p.pos >= linelen) { + // last position of line + if (p.line < length - 1) + p = firstNonSpace(p.line + 1); + } else if (p.pos >= lastns.pos) { // before first nonspace + // to beginning of line + p.pos = linelen; + } else { + dstring txt = line(p.line); + int found = -1; + for (int i = p.pos; i < linelen; i++) { + // check if position i + 1 is after word end + dchar thischar = txt[i]; + if (thischar == '\t') + thischar = ' '; + dchar nextchar = i < linelen - 1 ? txt[i + 1] : ' '; + if (nextchar == '\t') + nextchar = ' '; + if (isWordBound(thischar, nextchar) + || (camelCasePartsAsWords && isLowerAlpha(thischar) && isUpperAlpha(nextchar))) { + found = i + 1; + break; + } + } + if (found >= 0) + p.pos = found; + else + p.pos = linelen; + } + } + return p; + } + + /// edit content + bool performOperation(EditOperation op, Object source) { + if (_readOnly) + throw new Exception("content is readonly"); + if (op.action == EditAction.Replace) { + TextRange rangeBefore = op.range; + assert(rangeBefore.start <= rangeBefore.end); + //correctRange(rangeBefore); + dstring[] oldcontent = rangeText(rangeBefore); + dstring[] newcontent = op.content; + if (newcontent.length == 0) + newcontent ~= ""d; + TextRange rangeAfter = op.range; + rangeAfter.end = rangeAfter.start; + if (newcontent.length > 1) { + // different lines + rangeAfter.end.line = rangeAfter.start.line + cast(int)newcontent.length - 1; + rangeAfter.end.pos = cast(int)newcontent[$ - 1].length; + } else { + // same line + rangeAfter.end.pos = rangeAfter.start.pos + cast(int)newcontent[0].length; + } + assert(rangeAfter.start <= rangeAfter.end); + op.newRange = rangeAfter; + op.oldContent = oldcontent; + replaceRange(rangeBefore, rangeAfter, newcontent); + handleContentChange(op, rangeBefore, rangeAfter, source); + _undoBuffer.saveForUndo(op); + return true; + } + return false; + } + + /// return true if there is at least one operation in undo buffer + @property bool hasUndo() { + return _undoBuffer.hasUndo; + } + /// return true if there is at least one operation in redo buffer + @property bool hasRedo() { + return _undoBuffer.hasRedo; + } + /// undoes last change + bool undo() { + if (!hasUndo) + return false; + if (_readOnly) + throw new Exception("content is readonly"); + EditOperation op = _undoBuffer.undo(); + TextRange rangeBefore = op.newRange; + dstring[] oldcontent = op.content; + dstring[] newcontent = op.oldContent; + TextRange rangeAfter = op.range; + //Log.d("Undoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); + replaceRange(rangeBefore, rangeAfter, newcontent); + handleContentChange(op, rangeBefore, rangeAfter, this); + return true; + } + /// redoes last undone change + bool redo() { + if (!hasUndo) + return false; + if (_readOnly) + throw new Exception("content is readonly"); + EditOperation op = _undoBuffer.redo(); + TextRange rangeBefore = op.range; + dstring[] oldcontent = op.oldContent; + dstring[] newcontent = op.content; + TextRange rangeAfter = op.newRange; + //Log.d("Redoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); + replaceRange(rangeBefore, rangeAfter, newcontent); + handleContentChange(op, rangeBefore, rangeAfter, this); + return true; + } + /// clear undo/redp history + void clearUndo() { + _undoBuffer.clear(); + } +} + +/// Editor action codes +enum EditorActions { + None = 0, + /// move cursor one char left + Left = 1000, + /// move cursor one char left with selection + SelectLeft, + /// move cursor one char right + Right, + /// move cursor one char right with selection + SelectRight, + /// move cursor one line up + Up, + /// move cursor one line up with selection + SelectUp, + /// move cursor one line down + Down, + /// move cursor one line down with selection + SelectDown, + /// move cursor one word left + WordLeft, + /// move cursor one word left with selection + SelectWordLeft, + /// move cursor one word right + WordRight, + /// move cursor one word right with selection + SelectWordRight, + /// move cursor one page up + PageUp, + /// move cursor one page up with selection + SelectPageUp, + /// move cursor one page down + PageDown, + /// move cursor one page down with selection + SelectPageDown, + /// move cursor to the beginning of page + PageBegin, + /// move cursor to the beginning of page with selection + SelectPageBegin, + /// move cursor to the end of page + PageEnd, + /// move cursor to the end of page with selection + SelectPageEnd, + /// move cursor to the beginning of line + LineBegin, + /// move cursor to the beginning of line with selection + SelectLineBegin, + /// move cursor to the end of line + LineEnd, + /// move cursor to the end of line with selection + SelectLineEnd, + /// move cursor to the beginning of document + DocumentBegin, + /// move cursor to the beginning of document with selection + SelectDocumentBegin, + /// move cursor to the end of document + DocumentEnd, + /// move cursor to the end of document with selection + SelectDocumentEnd, + /// delete char before cursor (backspace) + DelPrevChar, + /// delete char after cursor (del key) + DelNextChar, + /// delete word before cursor (ctrl + backspace) + DelPrevWord, + /// delete char after cursor (ctrl + del key) + DelNextWord, + + /// insert new line (Enter) + InsertNewLine, + /// insert new line after current position (Ctrl+Enter) + PrependNewLine, + + /// Turn On/Off replace mode + ToggleReplaceMode, + + /// Copy selection to clipboard + Copy, + /// Cut selection to clipboard + Cut, + /// Paste selection from clipboard + Paste, + /// Undo last change + Undo, + /// Redo last undoed change + Redo, + + /// Tab (e.g., Tab key to insert tab character or indent text) + Tab, + /// Tab (unindent text, or remove whitespace before cursor, usually Shift+Tab) + BackTab, + + /// Select whole content (usually, Ctrl+A) + SelectAll, + + // Scroll operations + + /// Scroll one line up (not changing cursor) + ScrollLineUp, + /// Scroll one line down (not changing cursor) + ScrollLineDown, + /// Scroll one page up (not changing cursor) + ScrollPageUp, + /// Scroll one page down (not changing cursor) + ScrollPageDown, + /// Scroll window left + ScrollLeft, + /// Scroll window right + ScrollRight, + + /// Zoom in editor font + ZoomIn, + /// Zoom out editor font + ZoomOut, + +} + +/// base for all editor widgets +class EditWidgetBase : WidgetGroup, EditableContentListener { + protected EditableContent _content; + protected Rect _clientRc; + + protected int _lineHeight; + protected Point _scrollPos; + protected bool _fixedFont; + protected int _spaceWidth; + protected int _tabSize = 4; + + protected int _minFontSize = -1; // disable zooming + protected int _maxFontSize = -1; // disable zooming + + protected bool _wantTabs = true; + protected bool _useSpacesForTabs = false; + + protected bool _replaceMode; + + // TODO: move to styles protected uint _selectionColorFocused = 0xB060A0FF; protected uint _selectionColorNormal = 0xD060A0FF; - - - this(string ID) { - super(ID); - focusable = true; - acceleratorMap.add( [ - new Action(EditorActions.Up, KeyCode.UP, 0), - new Action(EditorActions.SelectUp, KeyCode.UP, KeyFlag.Shift), - new Action(EditorActions.Down, KeyCode.DOWN, 0), - new Action(EditorActions.SelectDown, KeyCode.DOWN, KeyFlag.Shift), - new Action(EditorActions.Left, KeyCode.LEFT, 0), - new Action(EditorActions.SelectLeft, KeyCode.LEFT, KeyFlag.Shift), - new Action(EditorActions.Right, KeyCode.RIGHT, 0), - new Action(EditorActions.SelectRight, KeyCode.RIGHT, KeyFlag.Shift), - new Action(EditorActions.WordLeft, KeyCode.LEFT, KeyFlag.Control), - new Action(EditorActions.SelectWordLeft, KeyCode.LEFT, KeyFlag.Control | KeyFlag.Shift), - new Action(EditorActions.WordRight, KeyCode.RIGHT, KeyFlag.Control), - new Action(EditorActions.SelectWordRight, KeyCode.RIGHT, KeyFlag.Control | KeyFlag.Shift), - new Action(EditorActions.PageUp, KeyCode.PAGEUP, 0), - new Action(EditorActions.SelectPageUp, KeyCode.PAGEUP, KeyFlag.Shift), - new Action(EditorActions.PageDown, KeyCode.PAGEDOWN, 0), - new Action(EditorActions.SelectPageDown, KeyCode.PAGEDOWN, KeyFlag.Shift), - new Action(EditorActions.PageBegin, KeyCode.PAGEUP, KeyFlag.Control), - new Action(EditorActions.SelectPageBegin, KeyCode.PAGEUP, KeyFlag.Control | KeyFlag.Shift), - new Action(EditorActions.PageEnd, KeyCode.PAGEDOWN, KeyFlag.Control), - new Action(EditorActions.SelectPageEnd, KeyCode.PAGEDOWN, KeyFlag.Control | KeyFlag.Shift), - new Action(EditorActions.LineBegin, KeyCode.HOME, 0), - new Action(EditorActions.SelectLineBegin, KeyCode.HOME, KeyFlag.Shift), - new Action(EditorActions.LineEnd, KeyCode.END, 0), - new Action(EditorActions.SelectLineEnd, KeyCode.END, KeyFlag.Shift), - new Action(EditorActions.DocumentBegin, KeyCode.HOME, KeyFlag.Control), - new Action(EditorActions.SelectDocumentBegin, KeyCode.HOME, KeyFlag.Control | KeyFlag.Shift), - new Action(EditorActions.DocumentEnd, KeyCode.END, KeyFlag.Control), - new Action(EditorActions.SelectDocumentEnd, KeyCode.END, KeyFlag.Control | KeyFlag.Shift), - - new Action(EditorActions.InsertNewLine, KeyCode.RETURN, 0), - new Action(EditorActions.InsertNewLine, KeyCode.RETURN, KeyFlag.Shift), - new Action(EditorActions.PrependNewLine, KeyCode.RETURN, KeyFlag.Control), - - // Backspace/Del - new Action(EditorActions.DelPrevChar, KeyCode.BACK, 0), - new Action(EditorActions.DelNextChar, KeyCode.DEL, 0), - new Action(EditorActions.DelPrevWord, KeyCode.BACK, KeyFlag.Control), - new Action(EditorActions.DelNextWord, KeyCode.DEL, KeyFlag.Control), - - // Copy/Paste - new Action(EditorActions.Copy, KeyCode.KEY_C, KeyFlag.Control), - new Action(EditorActions.Copy, KeyCode.KEY_C, KeyFlag.Control|KeyFlag.Shift), - new Action(EditorActions.Copy, KeyCode.INS, KeyFlag.Control), - new Action(EditorActions.Cut, KeyCode.KEY_X, KeyFlag.Control), - new Action(EditorActions.Cut, KeyCode.KEY_X, KeyFlag.Control|KeyFlag.Shift), - new Action(EditorActions.Cut, KeyCode.DEL, KeyFlag.Shift), - new Action(EditorActions.Paste, KeyCode.KEY_V, KeyFlag.Control), - new Action(EditorActions.Paste, KeyCode.KEY_V, KeyFlag.Control|KeyFlag.Shift), - new Action(EditorActions.Paste, KeyCode.INS, KeyFlag.Shift), - - // Undo/Redo - new Action(EditorActions.Undo, KeyCode.KEY_Z, KeyFlag.Control), - new Action(EditorActions.Redo, KeyCode.KEY_Y, KeyFlag.Control), - new Action(EditorActions.Redo, KeyCode.KEY_Z, KeyFlag.Control|KeyFlag.Shift), - - new Action(EditorActions.Tab, KeyCode.TAB, 0), - new Action(EditorActions.BackTab, KeyCode.TAB, KeyFlag.Shift), - - new Action(EditorActions.ToggleReplaceMode, KeyCode.INS, 0), - new Action(EditorActions.SelectAll, KeyCode.KEY_A, KeyFlag.Control), - - ]); - } - /// when true, Tab / Shift+Tab presses are processed internally in widget (e.g. insert tab character) instead of focus change navigation. - @property bool wantTabs() { - return _wantTabs; - } - - /// sets tab size (in number of spaces) - @property EditWidgetBase wantTabs(bool wantTabs) { - _wantTabs = wantTabs; - return this; - } - - /// readonly flag (when true, user cannot change content of editor) - @property bool readOnly() { - return !enabled || _content.readOnly; - } - - /// sets readonly flag - @property EditWidgetBase readOnly(bool readOnly) { - enabled = !readOnly; - invalidate(); - return this; - } - - /// replace mode flag (when true, entered character replaces character under cursor) - @property bool replaceMode() { - return _replaceMode; - } - - /// sets replace mode flag - @property EditWidgetBase replaceMode(bool replaceMode) { - _replaceMode = replaceMode; - invalidate(); - return this; - } - - /// when true, spaces will be inserted instead of tabs - @property bool useSpacesForTabs() { - return _useSpacesForTabs; - } - - /// set new Tab key behavior flag: when true, spaces will be inserted instead of tabs - @property EditWidgetBase useSpacesForTabs(bool useSpacesForTabs) { - _useSpacesForTabs = useSpacesForTabs; - return this; - } - - /// returns tab size (in number of spaces) - @property int tabSize() { - return _tabSize; - } - - /// sets tab size (in number of spaces) - @property EditWidgetBase tabSize(int newTabSize) { - if (newTabSize < 1) - newTabSize = 1; - else if (newTabSize > 16) - newTabSize = 16; - if (newTabSize != _tabSize) { - _tabSize = newTabSize; - requestLayout(); - } - return this; - } - - /// editor content object - @property EditableContent content() { - return _content; - } - - /// when _ownContent is false, _content should not be destroyed in editor destructor - protected bool _ownContent = true; - /// set content object - @property EditWidgetBase content(EditableContent content) { - if (_content is content) - return this; // not changed - if (_content !is null) { - // disconnect old content - _content.contentChangeListeners.disconnect(this); - if (_ownContent) { - destroy(_content); - } - } - _content = content; - _ownContent = false; - _content.contentChangeListeners.connect(this); - if (_content.readOnly) - enabled = false; - return this; - } - - /// free resources - ~this() { - if (_ownContent) { - destroy(_content); - _content = null; - } - } - - protected void updateMaxLineWidth() { - } - - override void onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source) { - Log.d("onContentChange rangeBefore=", rangeBefore, " rangeAfter=", rangeAfter, " text=", operation.content); + + this(string ID) { + super(ID); + focusable = true; + acceleratorMap.add( [ + new Action(EditorActions.Up, KeyCode.UP, 0), + new Action(EditorActions.SelectUp, KeyCode.UP, KeyFlag.Shift), + new Action(EditorActions.Down, KeyCode.DOWN, 0), + new Action(EditorActions.SelectDown, KeyCode.DOWN, KeyFlag.Shift), + new Action(EditorActions.Left, KeyCode.LEFT, 0), + new Action(EditorActions.SelectLeft, KeyCode.LEFT, KeyFlag.Shift), + new Action(EditorActions.Right, KeyCode.RIGHT, 0), + new Action(EditorActions.SelectRight, KeyCode.RIGHT, KeyFlag.Shift), + new Action(EditorActions.WordLeft, KeyCode.LEFT, KeyFlag.Control), + new Action(EditorActions.SelectWordLeft, KeyCode.LEFT, KeyFlag.Control | KeyFlag.Shift), + new Action(EditorActions.WordRight, KeyCode.RIGHT, KeyFlag.Control), + new Action(EditorActions.SelectWordRight, KeyCode.RIGHT, KeyFlag.Control | KeyFlag.Shift), + new Action(EditorActions.PageUp, KeyCode.PAGEUP, 0), + new Action(EditorActions.SelectPageUp, KeyCode.PAGEUP, KeyFlag.Shift), + new Action(EditorActions.PageDown, KeyCode.PAGEDOWN, 0), + new Action(EditorActions.SelectPageDown, KeyCode.PAGEDOWN, KeyFlag.Shift), + new Action(EditorActions.PageBegin, KeyCode.PAGEUP, KeyFlag.Control), + new Action(EditorActions.SelectPageBegin, KeyCode.PAGEUP, KeyFlag.Control | KeyFlag.Shift), + new Action(EditorActions.PageEnd, KeyCode.PAGEDOWN, KeyFlag.Control), + new Action(EditorActions.SelectPageEnd, KeyCode.PAGEDOWN, KeyFlag.Control | KeyFlag.Shift), + new Action(EditorActions.LineBegin, KeyCode.HOME, 0), + new Action(EditorActions.SelectLineBegin, KeyCode.HOME, KeyFlag.Shift), + new Action(EditorActions.LineEnd, KeyCode.END, 0), + new Action(EditorActions.SelectLineEnd, KeyCode.END, KeyFlag.Shift), + new Action(EditorActions.DocumentBegin, KeyCode.HOME, KeyFlag.Control), + new Action(EditorActions.SelectDocumentBegin, KeyCode.HOME, KeyFlag.Control | KeyFlag.Shift), + new Action(EditorActions.DocumentEnd, KeyCode.END, KeyFlag.Control), + new Action(EditorActions.SelectDocumentEnd, KeyCode.END, KeyFlag.Control | KeyFlag.Shift), + + new Action(EditorActions.InsertNewLine, KeyCode.RETURN, 0), + new Action(EditorActions.InsertNewLine, KeyCode.RETURN, KeyFlag.Shift), + new Action(EditorActions.PrependNewLine, KeyCode.RETURN, KeyFlag.Control), + + // Backspace/Del + new Action(EditorActions.DelPrevChar, KeyCode.BACK, 0), + new Action(EditorActions.DelNextChar, KeyCode.DEL, 0), + new Action(EditorActions.DelPrevWord, KeyCode.BACK, KeyFlag.Control), + new Action(EditorActions.DelNextWord, KeyCode.DEL, KeyFlag.Control), + + // Copy/Paste + new Action(EditorActions.Copy, KeyCode.KEY_C, KeyFlag.Control), + new Action(EditorActions.Copy, KeyCode.KEY_C, KeyFlag.Control|KeyFlag.Shift), + new Action(EditorActions.Copy, KeyCode.INS, KeyFlag.Control), + new Action(EditorActions.Cut, KeyCode.KEY_X, KeyFlag.Control), + new Action(EditorActions.Cut, KeyCode.KEY_X, KeyFlag.Control|KeyFlag.Shift), + new Action(EditorActions.Cut, KeyCode.DEL, KeyFlag.Shift), + new Action(EditorActions.Paste, KeyCode.KEY_V, KeyFlag.Control), + new Action(EditorActions.Paste, KeyCode.KEY_V, KeyFlag.Control|KeyFlag.Shift), + new Action(EditorActions.Paste, KeyCode.INS, KeyFlag.Shift), + + // Undo/Redo + new Action(EditorActions.Undo, KeyCode.KEY_Z, KeyFlag.Control), + new Action(EditorActions.Redo, KeyCode.KEY_Y, KeyFlag.Control), + new Action(EditorActions.Redo, KeyCode.KEY_Z, KeyFlag.Control|KeyFlag.Shift), + + new Action(EditorActions.Tab, KeyCode.TAB, 0), + new Action(EditorActions.BackTab, KeyCode.TAB, KeyFlag.Shift), + + new Action(EditorActions.ToggleReplaceMode, KeyCode.INS, 0), + new Action(EditorActions.SelectAll, KeyCode.KEY_A, KeyFlag.Control), + + ]); + } + + /// when true, Tab / Shift+Tab presses are processed internally in widget (e.g. insert tab character) instead of focus change navigation. + @property bool wantTabs() { + return _wantTabs; + } + + /// sets tab size (in number of spaces) + @property EditWidgetBase wantTabs(bool wantTabs) { + _wantTabs = wantTabs; + return this; + } + + /// readonly flag (when true, user cannot change content of editor) + @property bool readOnly() { + return !enabled || _content.readOnly; + } + + /// sets readonly flag + @property EditWidgetBase readOnly(bool readOnly) { + enabled = !readOnly; + invalidate(); + return this; + } + + /// replace mode flag (when true, entered character replaces character under cursor) + @property bool replaceMode() { + return _replaceMode; + } + + /// sets replace mode flag + @property EditWidgetBase replaceMode(bool replaceMode) { + _replaceMode = replaceMode; + invalidate(); + return this; + } + + /// when true, spaces will be inserted instead of tabs + @property bool useSpacesForTabs() { + return _useSpacesForTabs; + } + + /// set new Tab key behavior flag: when true, spaces will be inserted instead of tabs + @property EditWidgetBase useSpacesForTabs(bool useSpacesForTabs) { + _useSpacesForTabs = useSpacesForTabs; + return this; + } + + /// returns tab size (in number of spaces) + @property int tabSize() { + return _tabSize; + } + + /// sets tab size (in number of spaces) + @property EditWidgetBase tabSize(int newTabSize) { + if (newTabSize < 1) + newTabSize = 1; + else if (newTabSize > 16) + newTabSize = 16; + if (newTabSize != _tabSize) { + _tabSize = newTabSize; + requestLayout(); + } + return this; + } + + /// editor content object + @property EditableContent content() { + return _content; + } + + /// when _ownContent is false, _content should not be destroyed in editor destructor + protected bool _ownContent = true; + /// set content object + @property EditWidgetBase content(EditableContent content) { + if (_content is content) + return this; // not changed + if (_content !is null) { + // disconnect old content + _content.contentChangeListeners.disconnect(this); + if (_ownContent) { + destroy(_content); + } + } + _content = content; + _ownContent = false; + _content.contentChangeListeners.connect(this); + if (_content.readOnly) + enabled = false; + return this; + } + + /// free resources + ~this() { + if (_ownContent) { + destroy(_content); + _content = null; + } + } + + protected void updateMaxLineWidth() { + } + + override void onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter, Object source) { + Log.d("onContentChange rangeBefore=", rangeBefore, " rangeAfter=", rangeAfter, " text=", operation.content); updateMaxLineWidth(); - measureVisibleText(); - if (source is this) { - _caretPos = rangeAfter.end; - _selectionRange.start = _caretPos; - _selectionRange.end = _caretPos; + measureVisibleText(); + if (source is this) { + _caretPos = rangeAfter.end; + _selectionRange.start = _caretPos; + _selectionRange.end = _caretPos; ensureCaretVisible(); - } else { - correctCaretPos(); - // TODO: do something better (e.g. take into account ranges when correcting) - } - invalidate(); - return; - } - - + } else { + correctCaretPos(); + // TODO: do something better (e.g. take into account ranges when correcting) + } + invalidate(); + return; + } + + /// get widget text override @property dstring text() { return _content.text; } @@ -1035,7 +1035,7 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { abstract protected void ensureCaretVisible(); - abstract protected Point measureVisibleText(); + abstract protected Point measureVisibleText(); /// returns cursor rectangle protected Rect caretRect() { @@ -1071,12 +1071,12 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { } } - protected void updateFontProps() { + protected void updateFontProps() { FontRef font = font(); _fixedFont = font.isFixed; _spaceWidth = font.spaceWidth; _lineHeight = font.height; - } + } /// override to update scrollbars - if necessary protected void updateScrollbars() { @@ -1093,7 +1093,7 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { private int[] _lineWidthBuf; - protected int calcLineWidth(dstring s) { + protected int calcLineWidth(dstring s) { int w = 0; if (_fixedFont) { int tabw = _tabSize * _spaceWidth; @@ -1115,7 +1115,7 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { w = _lineWidthBuf[charsMeasured - 1]; } return w; - } + } protected void updateSelectionAfterCursorMovement(TextPosition oldCaretPos, bool selecting) { if (selecting) { @@ -1209,8 +1209,8 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { ensureCaretVisible(); } return true; - case EditorActions.Right: - case EditorActions.SelectRight: + case EditorActions.Right: + case EditorActions.SelectRight: correctCaretPos(); if (_caretPos.pos < currentLine.length) { _caretPos.pos++; @@ -1223,30 +1223,30 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { ensureCaretVisible(); } return true; - case EditorActions.WordLeft: - case EditorActions.SelectWordLeft: - { - TextPosition newpos = _content.moveByWord(_caretPos, -1, _camelCasePartsAsWords); - if (newpos != _caretPos) { - _caretPos = newpos; + case EditorActions.WordLeft: + case EditorActions.SelectWordLeft: + { + TextPosition newpos = _content.moveByWord(_caretPos, -1, _camelCasePartsAsWords); + if (newpos != _caretPos) { + _caretPos = newpos; updateSelectionAfterCursorMovement(oldCaretPos, a.id == EditorActions.SelectWordLeft); ensureCaretVisible(); - } - } + } + } return true; - case EditorActions.WordRight: - case EditorActions.SelectWordRight: - { - TextPosition newpos = _content.moveByWord(_caretPos, 1, _camelCasePartsAsWords); - if (newpos != _caretPos) { - _caretPos = newpos; + case EditorActions.WordRight: + case EditorActions.SelectWordRight: + { + TextPosition newpos = _content.moveByWord(_caretPos, 1, _camelCasePartsAsWords); + if (newpos != _caretPos) { + _caretPos = newpos; updateSelectionAfterCursorMovement(oldCaretPos, a.id == EditorActions.SelectWordRight); ensureCaretVisible(); - } - } + } + } return true; - case EditorActions.DocumentBegin: - case EditorActions.SelectDocumentBegin: + case EditorActions.DocumentBegin: + case EditorActions.SelectDocumentBegin: if (_caretPos.pos > 0 || _caretPos.line > 0) { _caretPos.line = 0; _caretPos.pos = 0; @@ -1254,16 +1254,16 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); } return true; - case EditorActions.LineBegin: - case EditorActions.SelectLineBegin: + case EditorActions.LineBegin: + case EditorActions.SelectLineBegin: if (_caretPos.pos > 0) { _caretPos.pos = 0; ensureCaretVisible(); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); } return true; - case EditorActions.DocumentEnd: - case EditorActions.SelectDocumentEnd: + case EditorActions.DocumentEnd: + case EditorActions.SelectDocumentEnd: if (_caretPos.line < _content.length - 1 || _caretPos.pos < _content[_content.length - 1].length) { _caretPos.line = _content.length - 1; _caretPos.pos = cast(int)_content[_content.length - 1].length; @@ -1271,8 +1271,8 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); } return true; - case EditorActions.LineEnd: - case EditorActions.SelectLineEnd: + case EditorActions.LineEnd: + case EditorActions.SelectLineEnd: if (_caretPos.pos < currentLine.length) { _caretPos.pos = cast(int)currentLine.length; ensureCaretVisible(); @@ -1285,9 +1285,9 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { correctCaretPos(); if (removeSelectionTextIfSelected()) // clear selection return true; - TextPosition newpos = _content.moveByWord(_caretPos, -1, _camelCasePartsAsWords); - if (newpos < _caretPos) - removeRangeText(TextRange(newpos, _caretPos)); + TextPosition newpos = _content.moveByWord(_caretPos, -1, _camelCasePartsAsWords); + if (newpos < _caretPos) + removeRangeText(TextRange(newpos, _caretPos)); return true; case EditorActions.DelNextWord: if (readOnly) @@ -1295,9 +1295,9 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { correctCaretPos(); if (removeSelectionTextIfSelected()) // clear selection return true; - TextPosition newpos = _content.moveByWord(_caretPos, 1, _camelCasePartsAsWords); - if (newpos > _caretPos) - removeRangeText(TextRange(_caretPos, newpos)); + TextPosition newpos = _content.moveByWord(_caretPos, 1, _camelCasePartsAsWords); + if (newpos > _caretPos) + removeRangeText(TextRange(_caretPos, newpos)); return true; case EditorActions.DelPrevChar: if (readOnly) @@ -1529,7 +1529,6 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { return "\t"d ~ src; } } - return src; } /// indent / unindent range @@ -1628,20 +1627,20 @@ class EditWidgetBase : WidgetGroup, EditableContentListener { } -} - - -/// single line editor -class EditLine : EditWidgetBase { - - this(string ID, dstring initialContent = null) { - super(ID); - _content = new EditableContent(false); - _content.contentChangeListeners = this; - wantTabs = false; - styleId = "EDIT_LINE"; - text = initialContent; - } +} + + +/// single line editor +class EditLine : EditWidgetBase { + + this(string ID, dstring initialContent = null) { + super(ID); + _content = new EditableContent(false); + _content.contentChangeListeners = this; + wantTabs = false; + styleId = "EDIT_LINE"; + text = initialContent; + } protected dstring _measuredText; protected int[] _measuredTextWidths; @@ -1677,23 +1676,23 @@ class EditLine : EditWidgetBase { return res; } - override protected void ensureCaretVisible() { - //_scrollPos - Rect rc = textPosToClient(_caretPos); - if (rc.left < 0) { - // scroll left - _scrollPos.x -= -rc.left + _clientRc.width / 10; - if (_scrollPos.x < 0) - _scrollPos.x = 0; - invalidate(); - } else if (rc.left >= _clientRc.width - 10) { - // scroll right - _scrollPos.x += (rc.left - _clientRc.width) + _spaceWidth * 4; - invalidate(); - } - updateScrollbars(); - } - + override protected void ensureCaretVisible() { + //_scrollPos + Rect rc = textPosToClient(_caretPos); + if (rc.left < 0) { + // scroll left + _scrollPos.x -= -rc.left + _clientRc.width / 10; + if (_scrollPos.x < 0) + _scrollPos.x = 0; + invalidate(); + } else if (rc.left >= _clientRc.width - 10) { + // scroll right + _scrollPos.x += (rc.left - _clientRc.width) + _spaceWidth * 4; + invalidate(); + } + updateScrollbars(); + } + override protected Point measureVisibleText() { FontRef font = font(); //Point sz = font.textSize(text); @@ -1714,13 +1713,13 @@ class EditLine : EditWidgetBase { override protected bool handleAction(Action a) { switch (a.id) { - case EditorActions.Up: + case EditorActions.Up: break; - case EditorActions.Down: + case EditorActions.Down: break; - case EditorActions.PageUp: + case EditorActions.PageUp: break; - case EditorActions.PageDown: + case EditorActions.PageDown: break; default: break; @@ -1796,38 +1795,38 @@ class EditLine : EditWidgetBase { drawCaret(buf); } -} - - - -/// single line editor -class EditBox : EditWidgetBase, OnScrollHandler { - protected ScrollBar _hscrollbar; - protected ScrollBar _vscrollbar; - - this(string ID, dstring initialContent = null) { - super(ID); - _content = new EditableContent(true); // multiline - _content.contentChangeListeners = this; - styleId = "EDIT_BOX"; - text = initialContent; - _hscrollbar = new ScrollBar("hscrollbar", Orientation.Horizontal); - _vscrollbar = new ScrollBar("vscrollbar", Orientation.Vertical); - _hscrollbar.onScrollEventListener = this; - _vscrollbar.onScrollEventListener = this; - addChild(_hscrollbar); - addChild(_vscrollbar); - } - - protected int _firstVisibleLine; - - protected int _maxLineWidth; - protected int _numVisibleLines; // number of lines visible in client area - protected dstring[] _visibleLines; // text for visible lines - protected int[][] _visibleLinesMeasurement; // char positions for visible lines - protected int[] _visibleLinesWidths; // width (in pixels) of visible lines - - override protected void updateMaxLineWidth() { +} + + + +/// single line editor +class EditBox : EditWidgetBase, OnScrollHandler { + protected ScrollBar _hscrollbar; + protected ScrollBar _vscrollbar; + + this(string ID, dstring initialContent = null) { + super(ID); + _content = new EditableContent(true); // multiline + _content.contentChangeListeners = this; + styleId = "EDIT_BOX"; + text = initialContent; + _hscrollbar = new ScrollBar("hscrollbar", Orientation.Horizontal); + _vscrollbar = new ScrollBar("vscrollbar", Orientation.Vertical); + _hscrollbar.onScrollEventListener = this; + _vscrollbar.onScrollEventListener = this; + addChild(_hscrollbar); + addChild(_vscrollbar); + } + + protected int _firstVisibleLine; + + protected int _maxLineWidth; + protected int _numVisibleLines; // number of lines visible in client area + protected dstring[] _visibleLines; // text for visible lines + protected int[][] _visibleLinesMeasurement; // char positions for visible lines + protected int[] _visibleLinesWidths; // width (in pixels) of visible lines + + override protected void updateMaxLineWidth() { // find max line width. TODO: optimize!!! int maxw; int[] buf; @@ -1838,25 +1837,25 @@ class EditBox : EditWidgetBase, OnScrollHandler { maxw = w; } _maxLineWidth = maxw; - } - - @property int minFontSize() { - return _minFontSize; - } - @property EditBox minFontSize(int size) { - _minFontSize = size; - return this; - } - @property int maxFontSize() { - return _maxFontSize; - } - @property EditBox maxFontSize(int size) { - _maxFontSize = size; - return this; - } - - override protected Point measureVisibleText() { - Point sz; + } + + @property int minFontSize() { + return _minFontSize; + } + @property EditBox minFontSize(int size) { + _minFontSize = size; + return this; + } + @property int maxFontSize() { + return _maxFontSize; + } + @property EditBox maxFontSize(int size) { + _maxFontSize = size; + return this; + } + + override protected Point measureVisibleText() { + Point sz; FontRef font = font(); _lineHeight = font.height; _numVisibleLines = (_clientRc.height + _lineHeight - 1) / _lineHeight; @@ -1875,21 +1874,21 @@ class EditBox : EditWidgetBase, OnScrollHandler { } sz.x = _maxLineWidth; sz.y = _lineHeight * _content.length; // height - for all lines - return sz; - } - - override protected void updateScrollbars() { + return sz; + } + + override protected void updateScrollbars() { int visibleLines = _clientRc.height / _lineHeight; // fully visible lines if (visibleLines < 1) visibleLines = 1; - _vscrollbar.setRange(0, _content.length - 1); - _vscrollbar.pageSize = visibleLines; - _vscrollbar.position = _firstVisibleLine; - _hscrollbar.setRange(0, _maxLineWidth + _clientRc.width / 4); - _hscrollbar.pageSize = _clientRc.width; - _hscrollbar.position = _scrollPos.x; - } - + _vscrollbar.setRange(0, _content.length - 1); + _vscrollbar.pageSize = visibleLines; + _vscrollbar.position = _firstVisibleLine; + _hscrollbar.setRange(0, _maxLineWidth + _clientRc.width / 4); + _hscrollbar.pageSize = _clientRc.width; + _hscrollbar.position = _scrollPos.x; + } + /// handle scroll event override bool onScrollEvent(AbstractSlider source, ScrollEvent event) { if (source.id.equal("hscrollbar")) { @@ -1929,8 +1928,8 @@ class EditBox : EditWidgetBase, OnScrollHandler { return false; } - - override protected void ensureCaretVisible() { + + override protected void ensureCaretVisible() { if (_caretPos.line >= _content.length) _caretPos.line = _content.length - 1; if (_caretPos.line < 0) @@ -1938,33 +1937,33 @@ class EditBox : EditWidgetBase, OnScrollHandler { int visibleLines = _clientRc.height / _lineHeight; // fully visible lines if (visibleLines < 1) visibleLines = 1; - if (_caretPos.line < _firstVisibleLine) { - _firstVisibleLine = _caretPos.line; - measureVisibleText(); - invalidate(); - } else if (_caretPos.line >= _firstVisibleLine + visibleLines) { - _firstVisibleLine = _caretPos.line - visibleLines + 1; - if (_firstVisibleLine < 0) - _firstVisibleLine = 0; - measureVisibleText(); - invalidate(); - } - //_scrollPos - Rect rc = textPosToClient(_caretPos); - if (rc.left < 0) { - // scroll left - _scrollPos.x -= -rc.left + _clientRc.width / 4; - if (_scrollPos.x < 0) - _scrollPos.x = 0; - invalidate(); - } else if (rc.left >= _clientRc.width - 10) { - // scroll right - _scrollPos.x += (rc.left - _clientRc.width) + _clientRc.width / 4; - invalidate(); - } - updateScrollbars(); - } - + if (_caretPos.line < _firstVisibleLine) { + _firstVisibleLine = _caretPos.line; + measureVisibleText(); + invalidate(); + } else if (_caretPos.line >= _firstVisibleLine + visibleLines) { + _firstVisibleLine = _caretPos.line - visibleLines + 1; + if (_firstVisibleLine < 0) + _firstVisibleLine = 0; + measureVisibleText(); + invalidate(); + } + //_scrollPos + Rect rc = textPosToClient(_caretPos); + if (rc.left < 0) { + // scroll left + _scrollPos.x -= -rc.left + _clientRc.width / 4; + if (_scrollPos.x < 0) + _scrollPos.x = 0; + invalidate(); + } else if (rc.left >= _clientRc.width - 10) { + // scroll right + _scrollPos.x += (rc.left - _clientRc.width) + _clientRc.width / 4; + invalidate(); + } + updateScrollbars(); + } + override protected Rect textPosToClient(TextPosition p) { Rect res; int lineIndex = p.line - _firstVisibleLine; @@ -2027,192 +2026,188 @@ class EditBox : EditWidgetBase, OnScrollHandler { _content.performOperation(op, this); } return true; - case EditorActions.Up: - case EditorActions.SelectUp: - if (_caretPos.line > 0) { - _caretPos.line--; + case EditorActions.Up: + case EditorActions.SelectUp: + if (_caretPos.line > 0) { + _caretPos.line--; updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); ensureCaretVisible(); - } + } return true; - case EditorActions.Down: - case EditorActions.SelectDown: - if (_caretPos.line < _content.length - 1) { - _caretPos.line++; + case EditorActions.Down: + case EditorActions.SelectDown: + if (_caretPos.line < _content.length - 1) { + _caretPos.line++; updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); ensureCaretVisible(); - } + } return true; - case EditorActions.PageBegin: - case EditorActions.SelectPageBegin: - { + case EditorActions.PageBegin: + case EditorActions.SelectPageBegin: + { ensureCaretVisible(); - _caretPos.line = _firstVisibleLine; + _caretPos.line = _firstVisibleLine; updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); - return true; - } - break; - case EditorActions.PageEnd: - case EditorActions.SelectPageEnd: - { + } + return true; + case EditorActions.PageEnd: + case EditorActions.SelectPageEnd: + { ensureCaretVisible(); - int fullLines = _clientRc.height / _lineHeight; + int fullLines = _clientRc.height / _lineHeight; int newpos = _firstVisibleLine + fullLines - 1; if (newpos >= _content.length) newpos = _content.length - 1; - _caretPos.line = newpos; + _caretPos.line = newpos; updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); - return true; - } - break; - case EditorActions.PageUp: - case EditorActions.SelectPageUp: - { + } + return true; + case EditorActions.PageUp: + case EditorActions.SelectPageUp: + { ensureCaretVisible(); - int fullLines = _clientRc.height / _lineHeight; - int newpos = _firstVisibleLine - fullLines; - if (newpos < 0) { - _firstVisibleLine = 0; - _caretPos.line = 0; - } else { - int delta = _firstVisibleLine - newpos; - _firstVisibleLine = newpos; - _caretPos.line -= delta; - } - measureVisibleText(); - updateScrollbars(); + int fullLines = _clientRc.height / _lineHeight; + int newpos = _firstVisibleLine - fullLines; + if (newpos < 0) { + _firstVisibleLine = 0; + _caretPos.line = 0; + } else { + int delta = _firstVisibleLine - newpos; + _firstVisibleLine = newpos; + _caretPos.line -= delta; + } + measureVisibleText(); + updateScrollbars(); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); - return true; - } - break; - case EditorActions.PageDown: - case EditorActions.SelectPageDown: - { + } + return true; + case EditorActions.PageDown: + case EditorActions.SelectPageDown: + { ensureCaretVisible(); - int fullLines = _clientRc.height / _lineHeight; - int newpos = _firstVisibleLine + fullLines; - if (newpos >= _content.length) { - _caretPos.line = _content.length - 1; - } else { - int delta = newpos - _firstVisibleLine; - _firstVisibleLine = newpos; - _caretPos.line += delta; - } - measureVisibleText(); - updateScrollbars(); + int fullLines = _clientRc.height / _lineHeight; + int newpos = _firstVisibleLine + fullLines; + if (newpos >= _content.length) { + _caretPos.line = _content.length - 1; + } else { + int delta = newpos - _firstVisibleLine; + _firstVisibleLine = newpos; + _caretPos.line += delta; + } + measureVisibleText(); + updateScrollbars(); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); - return true; - } - break; - case EditorActions.ScrollLeft: - { - if (_scrollPos.x > 0) { - int newpos = _scrollPos.x - _spaceWidth * 4; - if (newpos < 0) - newpos = 0; - _scrollPos.x = newpos; - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ScrollRight: - { - if (_scrollPos.x < _maxLineWidth - _clientRc.width) { - int newpos = _scrollPos.x + _spaceWidth * 4; - if (newpos > _maxLineWidth - _clientRc.width) - newpos = _maxLineWidth - _clientRc.width; - _scrollPos.x = newpos; - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ScrollLineUp: - { - if (_firstVisibleLine > 0) { - _firstVisibleLine -= 3; - if (_firstVisibleLine < 0) - _firstVisibleLine = 0; - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ScrollPageUp: - { - int fullLines = _clientRc.height / _lineHeight; - if (_firstVisibleLine > 0) { - _firstVisibleLine -= fullLines * 3 / 4; - if (_firstVisibleLine < 0) - _firstVisibleLine = 0; - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ScrollLineDown: - { - int fullLines = _clientRc.height / _lineHeight; - if (_firstVisibleLine + fullLines < _content.length) { - _firstVisibleLine += 3; - if (_firstVisibleLine > _content.length - fullLines) - _firstVisibleLine = _content.length - fullLines; - if (_firstVisibleLine < 0) - _firstVisibleLine = 0; - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ScrollPageDown: - { - int fullLines = _clientRc.height / _lineHeight; - if (_firstVisibleLine + fullLines < _content.length) { - _firstVisibleLine += fullLines * 3 / 4; - if (_firstVisibleLine > _content.length - fullLines) - _firstVisibleLine = _content.length - fullLines; - if (_firstVisibleLine < 0) - _firstVisibleLine = 0; - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - return true; - case EditorActions.ZoomIn: - { - if (_minFontSize < _maxFontSize && _minFontSize > 10 && _maxFontSize > 10) { - int currentFontSize = fontSize; - int newFontSize = currentFontSize * 110 / 100; - if (currentFontSize != newFontSize && newFontSize <= _maxFontSize) { - fontSize = cast(ushort)newFontSize; - updateFontProps(); - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - } - return true; - case EditorActions.ZoomOut: - { - if (_minFontSize < _maxFontSize && _minFontSize > 10 && _maxFontSize > 10) { - int currentFontSize = fontSize; - int newFontSize = currentFontSize * 100 / 110; - if (currentFontSize != newFontSize && newFontSize >= _minFontSize) { - fontSize = cast(ushort)newFontSize; - updateFontProps(); - measureVisibleText(); - updateScrollbars(); - invalidate(); - } - } - } - return true; + } + return true; + case EditorActions.ScrollLeft: + { + if (_scrollPos.x > 0) { + int newpos = _scrollPos.x - _spaceWidth * 4; + if (newpos < 0) + newpos = 0; + _scrollPos.x = newpos; + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ScrollRight: + { + if (_scrollPos.x < _maxLineWidth - _clientRc.width) { + int newpos = _scrollPos.x + _spaceWidth * 4; + if (newpos > _maxLineWidth - _clientRc.width) + newpos = _maxLineWidth - _clientRc.width; + _scrollPos.x = newpos; + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ScrollLineUp: + { + if (_firstVisibleLine > 0) { + _firstVisibleLine -= 3; + if (_firstVisibleLine < 0) + _firstVisibleLine = 0; + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ScrollPageUp: + { + int fullLines = _clientRc.height / _lineHeight; + if (_firstVisibleLine > 0) { + _firstVisibleLine -= fullLines * 3 / 4; + if (_firstVisibleLine < 0) + _firstVisibleLine = 0; + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ScrollLineDown: + { + int fullLines = _clientRc.height / _lineHeight; + if (_firstVisibleLine + fullLines < _content.length) { + _firstVisibleLine += 3; + if (_firstVisibleLine > _content.length - fullLines) + _firstVisibleLine = _content.length - fullLines; + if (_firstVisibleLine < 0) + _firstVisibleLine = 0; + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ScrollPageDown: + { + int fullLines = _clientRc.height / _lineHeight; + if (_firstVisibleLine + fullLines < _content.length) { + _firstVisibleLine += fullLines * 3 / 4; + if (_firstVisibleLine > _content.length - fullLines) + _firstVisibleLine = _content.length - fullLines; + if (_firstVisibleLine < 0) + _firstVisibleLine = 0; + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + return true; + case EditorActions.ZoomIn: + { + if (_minFontSize < _maxFontSize && _minFontSize > 10 && _maxFontSize > 10) { + int currentFontSize = fontSize; + int newFontSize = currentFontSize * 110 / 100; + if (currentFontSize != newFontSize && newFontSize <= _maxFontSize) { + fontSize = cast(ushort)newFontSize; + updateFontProps(); + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + } + return true; + case EditorActions.ZoomOut: + { + if (_minFontSize < _maxFontSize && _minFontSize > 10 && _maxFontSize > 10) { + int currentFontSize = fontSize; + int newFontSize = currentFontSize * 100 / 110; + if (currentFontSize != newFontSize && newFontSize >= _minFontSize) { + fontSize = cast(ushort)newFontSize; + updateFontProps(); + measureVisibleText(); + updateScrollbars(); + invalidate(); + } + } + } + return true; default: break; } @@ -2331,4 +2326,4 @@ class EditBox : EditWidgetBase, OnScrollHandler { drawCaret(buf); } -} +}