projects/dwt2: org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d comparison

comparison org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d @ 120:536e43f63c81

Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers

author	Denis Shelomovskij <verylonglogin.reg@gmail.com>
date	Sat, 09 Jul 2011 15:50:20 +0300
parents	fb3aa8075988
children

comparison

equal deleted inserted replaced

-:d00e8db0a568
+:536e43f63c81
 import org.eclipse.swt.custom.DefaultContent;
 import org.eclipse.swt.custom.StyledTextDropTargetEffect;
 import org.eclipse.swt.custom.StyledTextListener;
 import org.eclipse.swt.custom.ST;
+import java.lang.all;
+import java.nonstandard.UnsafeUtf;
 version(Tango){
 static import tango.io.model.IFile;
-import tango.util.Convert;
 } else { // Phobos
-import std.conv;
 static import std.string;
 }
-import java.lang.all;
 /**
 * A StyledText is an editable user interface object that displays lines
 * of text.  The following style attributes can be defined for the text:
 * @see <a href="http://www.eclipse.org/swt/examples.php">SWT Examples: CustomControlExample, TextEditor</a>
 * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public class StyledText : Canvas {
 alias Canvas.computeSize computeSize;
+package:
 static const char TAB = '\t';
 version(Tango){
 static const String PlatformLineDelimiter = tango.io.model.IFile.FileConst.NewlineString;
 } else { // Phobos
 int leftMargin;
 int topMargin;
 int rightMargin;
 int bottomMargin;
 int columnX;                        // keep track of the horizontal caret position when changing lines/pages. Fixes bug 5935
-int caretOffset = 0;
+int/*UTF8index*/ caretOffset = 0;
 int caretAlignment;
 Point selection;                    // x and y are start and end caret offsets of selection
 Point clipboardSelection;           // x and y are start and end caret offsets of previous selection
-int selectionAnchor;                // position of selection anchor. 0 based offset from beginning of text
+bool selectedTextValid = true;      // DWT: false if we just changed a text witch was selected
+int/*UTF8index*/ selectionAnchor;   // position of selection anchor. 0 based offset from beginning of text
 Point doubleClickSelection;         // selection after last mouse double click
 bool editable = true;
 bool wordWrap = false;
-bool doubleClickEnabled = true;  // see getDoubleClickEnabled
+bool doubleClickEnabled = true;     // see getDoubleClickEnabled
-bool overwrite = false;          // insert/overwrite edit mode
+bool overwrite = false;             // insert/overwrite edit mode
-int textLimit = -1;                 // limits the number of characters the user can type in the widget. Unlimited by default.
+int/*UTF8index*/ textLimit = -1;           // limits the number of characters the user can type in the widget. Unlimited by default.
 int[int] keyActionMap;
 Color background = null;            // workaround for bug 4791
 Color foreground = null;            //
 Clipboard clipboard;
 int clickCount;
 bool justify;
 int indent;
 int lineSpacing;
 const static bool IS_CARBON, IS_GTK, IS_MOTIF;
-static this(){
+mixin(sharedStaticThis!(`{
 String platform = SWT.getPlatform();
 IS_CARBON = ("carbon" == platform);
 IS_GTK    = ("gtk"    == platform);
 IS_MOTIF  = ("motif"  == platform);
-}
+}`));
 /**
 * The Printing class : printing of a range of text.
 * An instance of <code>Printing</code> is returned in the
 * StyledText#print(Printer) API. The run() method may be
 int pageSize = clientArea.height / lineHeight;//WRONG
 startLine = (startPage - 1) * pageSize;
 } else if (data.scope_ is PrinterData.SELECTION) {
 startLine = content.getLineAtOffset(selection.x);
 if (selection.y > 0) {
+// DWT: index isn't a valid UTF-8 index
 endLine = content.getLineAtOffset(selection.x + selection.y - 1);
 } else {
 endLine = startLine - 1;
 }
 }
 printLayout.setText(lineLabels[index]);
 } else {
 printLayout.setText("");
 }
 } else {
-printLayout.setText(to!(String)(index));
+printLayout.setText(String_valueOf(index));
 }
 int paintX = x - printMargin - printLayout.getBounds().width;
 printLayout.draw(gc, paintX, y);
 printLayout.setAscent(-1);
 printLayout.setDescent(-1);
 }
 /**
 * Determines if Unicode RTF should be written.
 * Don't write Unicode RTF on Windows 95/98/ME or NT.
 */
-void setUnicode() {
+void setUnicode() {/*!!!*/
 //         const String Win95 = "windows 95";
 //         const String Win98 = "windows 98";
 //         const String WinME = "windows me";
 //         const String WinNT = "windows nt";
 //         String osName = System.getProperty("os.name").toLowerCase();
 *  line breaks. Line breaks should be written using writeLineDelimiter()
 * @param start start offset of segment. 0 based.
 * @param end end offset of segment
 */
 void write(String string, int start, int end) {
-start = 0;
+int incr;
-end = string.length;
+for (int index = start; index < end; index += incr) {
-int incr = 1;
+dchar ch = string.dcharAt(index, incr);
-for (int index = start; index < end; index+=incr) {
-dchar ch = firstCodePoint( string[index .. $], incr );
 if (ch > 0xFF && WriteUnicode) {
 // write the sub string from the last escaped character
 // to the current one. Fixes bug 21698.
 if (index > start) {
 write( string[start .. index ] );
 }
 write("\\u");
-write( to!(String)( cast(short)ch ));
+write( String_valueOf( cast(short)ch ));
 write(' ');                     // control word delimiter
 start = index + incr;
 } else if (ch is '}' || ch is '{' || ch is '\\') {
 // write the sub string from the last escaped character
 // to the current one. Fixes bug 21698.
 if (index > start) {
 write(string[start .. index]);
 }
 write('\\');
 write(cast(char)ch); // ok because one of {}\
+assert(incr == 1);
 start = index + 1;
 }
 }
 // write from the last escaped character to the end.
 // Fixes bug 21698.
 FontData fontData = getFont().getFontData()[0];
 header.append("{\\rtf1\\ansi");
 // specify code page, necessary for copy to work in bidi
 // systems that don't support Unicode RTF.
 // PORTING_TODO: String cpg = System.getProperty("file.encoding").toLowerCase();
-String cpg = "UTF16";
+//String cpg = "UTF16";
 /+
 if (cpg.startsWith("cp") || cpg.startsWith("ms")) {
 cpg = cpg.substring(2, cpg.length());
 header.append("\\ansicpg");
 header.append(cpg);
 int length = content.getCharCount();
 // called internally to remove selection after text is removed
 // therefore make sure redraw range is valid.
 int redrawStart = Math.min(selectionStart, length);
 int redrawEnd = Math.min(selectionEnd, length);
-if (redrawEnd - redrawStart > 0) {
+if (redrawEnd - redrawStart > 0 && selectedTextValid) {
 internalRedrawRange(redrawStart, redrawEnd - redrawStart);
 }
 if (sendEvent) {
 sendSelectionEvent();
 }
 }
+selectedTextValid = true;
 }
 public override Point computeSize (int wHint, int hHint, bool changed) {
 checkWidget();
 int lineCount = (getStyle() & SWT.SINGLE) !is 0 ? 1 : content.getLineCount();
 int width = 0;
 sendKeyEvent(event);
 } else if (caretOffset > 0) {
 int lineIndex = content.getLineAtOffset(caretOffset);
 int lineOffset = content.getOffsetAtLine(lineIndex);
 if (caretOffset is lineOffset) {
-// SWT: on line start, delete line break
+// DWT: on line start, delete line break
 lineOffset = content.getOffsetAtLine(lineIndex - 1);
 event.start = lineOffset + content.getLine(lineIndex - 1).length;
 event.end = caretOffset;
 } else {
 TextLayout layout = renderer.getTextLayout(lineIndex);
-int start = layout.getPreviousOffset(caretOffset - lineOffset, SWT.MOVEMENT_CLUSTER);
+int start = layout.getPreviousOffset(caretOffset - lineOffset, SWT.MOVEMENT_CHAR);
 renderer.disposeTextLayout(layout);
 event.start = start + lineOffset;
 event.end = caretOffset;
 }
 sendKeyEvent(event);
 int lineOffset = content.getOffsetAtLine(lineIndex);
 String line = content.getLine(lineIndex);
 // replace character at caret offset if the caret is not at the
 // end of the line
 if (event.end < lineOffset + line.length) {
-event.end+=dcharToString( key ).length;
+event.end += line.UTF8strideAt(event.end - lineOffset);
 }
 event.text = dcharToString( key );
 } else {
 event.text = dcharToString( key );
 }
 index--;
 }
 if (index is -1 && lineIndex > 0) {
 bottomOffset = content.getOffsetAtLine(lineIndex - 1) + content.getLine(lineIndex - 1).length;
 } else {
-bottomOffset = content.getOffsetAtLine(lineIndex) + Math.max(0, layout.getLineOffsets()[index + 1] - 1);
+bottomOffset = content.getOffsetAtLine(lineIndex) + Math.max(0, getPreviousCharOffset(lineIndex, layout.getLineOffsets()[index + 1]));
 }
 renderer.disposeTextLayout(layout);
 } else {
 int lineIndex = getBottomIndex();
 bottomOffset = content.getOffsetAtLine(lineIndex) + content.getLine(lineIndex).length;
 public int getOffsetAtLocation(Point point) {
 checkWidget();
 if (point is null) {
 SWT.error(SWT.ERROR_NULL_ARGUMENT);
 }
-int[] trailing = new int[1];
+int[1] trailing;
 int offset = getOffsetAtPoint(point.x, point.y, trailing, true);
 if (offset is -1) {
 SWT.error(SWT.ERROR_INVALID_ARGUMENT);
 }
 return offset + trailing[0];
 caretAlignment = PREVIOUS_OFFSET_TRAILING;
 } else {
 String line = content.getLine(lineIndex);
 int level;
 int offset = offsetInLine;
-while (offset > 0 && Character.isDigit(line.dcharAt(offset))) offset--;
+while (offset > 0 && Character.isDigit(line.dcharAt(offset)))
+offset = line.offsetBefore(offset);
 if (offset is 0 && Character.isDigit(line.dcharAt(offset))) {
 level = isMirrored() ? 1 : 0;
 } else {
 level = layout.getLevel(offset) & 0x1;
 }
 checkWidget();
 int contentLength = getCharCount();
 if (start < 0 || start >= contentLength || end < 0 || end >= contentLength || start > end) {
 SWT.error(SWT.ERROR_INVALID_RANGE);
 }
-return content.getTextRange(start, end - start + 1);
+auto res = content.getTextRange(start, content.getCharCount() - start);
+return res[0 .. res.offsetAfter(end - start)];
 }
 /**
 * Returns the smallest bounding rectangle that includes the characters between two offsets.
 *
 * @param start offset of the first character included in the bounding box
 int lineOffset = content.getOffsetAtLine(caretLine);
 String line = content.getLine(caretLine);
 int offset = caretOffset - lineOffset;
 int lineLength = line.length;
 if (lineLength is 0) return isMirrored() ? SWT.RIGHT : SWT.LEFT;
-if (caretAlignment is PREVIOUS_OFFSET_TRAILING && offset > 0) offset--;
+if (caretAlignment is PREVIOUS_OFFSET_TRAILING && offset > 0)
-if (offset is lineLength && offset > 0) offset--;
+offset = line.offsetBefore(offset);
-while (offset > 0 && Character.isDigit(line.dcharAt(offset))) offset--;
+if (offset is lineLength && offset > 0)
+offset = line.offsetBefore(offset);
+while (offset > 0 && Character.isDigit(line.dcharAt(offset)))
+offset = line.offsetBefore(offset);
 if (offset is 0 && Character.isDigit(line.dcharAt(offset))) {
 return isMirrored() ? SWT.RIGHT : SWT.LEFT;
 }
 TextLayout layout = renderer.getTextLayout(caretLine);
 int level = layout.getLevel(offset);
 String line = content.getLine(lineIndex);
 int lineOffset = content.getOffsetAtLine(lineIndex);
 int offsetInLine = offset - lineOffset;
 int lineLength = line.length;
 if (lineIndex < content.getLineCount() - 1) {
-int endLineOffset = content.getOffsetAtLine(lineIndex + 1) - 1;
+int afterEndLineOffset = content.getOffsetAtLine(lineIndex + 1);
-if (lineLength < offsetInLine && offsetInLine <= endLineOffset) {
+if (lineLength < offsetInLine && offsetInLine < afterEndLineOffset) {
 offsetInLine = lineLength;
 }
 }
 Point point;
 TextLayout layout = renderer.getTextLayout(lineIndex);
 if (lineLength !is 0  && offsetInLine <= lineLength) {
 if (offsetInLine is lineLength) {
-// SWT: Instead of go back one byte, go back one codepoint
+point = layout.getLocation(getPreviousCharOffset(lineIndex, offsetInLine), true);
-int offsetInLine_m1 = layout.getPreviousOffset(offsetInLine, SWT.MOVEMENT_CLUSTER);
-point = layout.getLocation(offsetInLine_m1, true);
 } else {
 switch (caretAlignment) {
 case OFFSET_LEADING:
 point = layout.getLocation(offsetInLine, false);
 break;
 case PREVIOUS_OFFSET_TRAILING:
 default:
 if (offsetInLine is 0) {
 point = layout.getLocation(offsetInLine, false);
 } else {
-// SWT: Instead of go back one byte, go back one codepoint
+point = layout.getLocation(getPreviousCharOffset(lineIndex, offsetInLine), true);
-int offsetInLine_m1 = layout.getPreviousOffset(offsetInLine, SWT.MOVEMENT_CLUSTER);
-point = layout.getLocation(offsetInLine_m1, true);
 }
 break;
 }
 }
 } else {
 if (startLine is endLine) {
 int endIndex = layout.getLineIndex(Math.min(end, layout.getText().length));
 if (startIndex is endIndex) {
 /* Redraw rect between start and end offset if start and end offsets are in same wrapped line */
-Rectangle rect = layout.getBounds(start, end - 1);
+Rectangle rect = layout.getBounds( start, getPreviousCharOffset(startLine, end) );
 rect.x += lineX;
 rect.y += startLineY;
 super.redraw(rect.x, rect.y, rect.width, rect.height, false);
 renderer.disposeTextLayout(layout);
 return;
 }
 }
 /* Redraw start line from the start offset to the end of client area */
-Rectangle startRect = layout.getBounds(start, offsets[startIndex + 1] - 1);
+Rectangle startRect = layout.getBounds( start, getPreviousCharOffset(startLine, offsets[startIndex + 1]) );
 if (startRect.height is 0) {
 Rectangle bounds = layout.getLineBounds(startIndex);
 startRect.x = bounds.width;
 startRect.y = bounds.y;
 startRect.height = bounds.height;
 renderer.disposeTextLayout(layout);
 layout = renderer.getTextLayout(endLine);
 offsets = layout.getLineOffsets();
 }
 int endIndex = layout.getLineIndex(Math.min(end, layout.getText().length));
-Rectangle endRect = layout.getBounds(offsets[endIndex], end - 1);
+Rectangle endRect = layout.getBounds(offsets[endIndex], getPreviousCharOffset(endLine, end));
 if (endRect.height is 0) {
 Rectangle bounds = layout.getLineBounds(endIndex);
 endRect.y = bounds.y;
 endRect.height = bounds.height;
 }
 if (endRect.y > y) {
 super.redraw(leftMargin, y, clientAreaWidth - rightMargin - leftMargin, endRect.y - y, false);
 }
 }
 void handleCompositionOffset (Event event) {
-int[] trailing = new int [1];
+int[1] trailing;
 event.index = getOffsetAtPoint(event.x, event.y, trailing, true);
 event.count = trailing[0];
 }
 void handleCompositionSelection (Event event) {
 event.start = selection.x;
 if (ime.getWideCaret()) {
 start = ime.getCompositionOffset();
 int lineIndex = getCaretLine();
 int lineOffset = content.getOffsetAtLine(lineIndex);
 TextLayout layout = renderer.getTextLayout(lineIndex);
-caretWidth = layout.getBounds(start - lineOffset, start + length - 1 - lineOffset).width;
+caretWidth = layout.getBounds(start - lineOffset, getPreviousCharOffset(lineIndex, start + length - lineOffset)).width;
 renderer.disposeTextLayout(layout);
 }
 }
 showCaret();
 }
 if (label !is null) {
 String text = label.getText ();
 if (text !is null) {
 dchar mnemonic = _findMnemonic (text);
 if (mnemonic !is '\0') {
-shortcut = Format("Alt+{}", mnemonic ); //$NON-NLS-1$
+shortcut = "Alt+"~dcharToString(mnemonic); //$NON-NLS-1$
 }
 }
 }
 e.result = shortcut;
 }
 int index = 0;
 int length_ = string.length;
 do {
 while (index < length_ && string[index] !is '&') index++;
 if (++index >= length_) return '\0';
-if (string[index] !is '&') return CharacterFirstToLower(string[index .. $ ] );
+if (string[index] !is '&') return Character.toLowerCase (string.dcharAt (index));
 index++;
 } while (index < length_);
 return '\0';
 }
 /**
 * @param sendEvent a Selection event is sent when set to true and when
 *  the selection is reset.
 */
 void setSelection(int start, int length, bool sendEvent) {
 int end = start + length;
-start = content.utf8AdjustOffset(start);
-end = content.utf8AdjustOffset(end);
 if (start > end) {
 int temp = end;
 end = start;
 start = temp;
 }
 }
 setScrollBars(true);
 setCaretLocation();
 super.redraw();
 }
-// SWT: If necessary, scroll to show the location
+// DWT: If necessary, scroll to show the location
 bool showLocation(Rectangle rect, bool scrollPage) {
 int clientAreaWidth = this.clientAreaWidth - leftMargin - rightMargin;
 int clientAreaHeight = this.clientAreaHeight - topMargin - bottomMargin;
 bool scrolled = false;
 if (rect.y <= topMargin) {
 // change. Selection is only affected if it intersects the change (1GDY217).
 int netNewLength = newLength - replacedLength;
 int redrawStart = startOffset + newLength;
 internalRedrawRange(redrawStart, selection.y + netNewLength - redrawStart);
 }
+selectedTextValid = false;
 if (selection.y > startOffset && selection.x < startOffset + replacedLength) {
 // selection intersects replaced text. set caret behind text change
 setSelection(startOffset + newLength, 0, true);
 } else {
 // move selection to keep same text selected
 setSelection(selection.x + newLength - replacedLength, selection.y - selection.x, true);
 }
 setCaretLocation();
 }
-}
+// DWT: to use instead of "offsetInLine - 1"
+int getPreviousCharOffset(String F = __FILE__, uint L = __LINE__)(int lineIndex, int offsetInLine) {
+String line = content.getLine(lineIndex);
+if(offsetInLine < 0 || offsetInLine > line.length) {
+getDwtLogger().warn(F, L, Format("Clamped UTF-8 offset:\noffsetInLine = {}, line.length = {}, line = {}", offsetInLine, line.length, line));
+return offsetInLine - 1;
+}
+return line.offsetBefore(offsetInLine);
+}
+}

Mercurial > projects > dwt2

comparison org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d @ 120:536e43f63c81