Changeset 274:62a03a4c21c8

Timestamp:

08/03/08 17:40:57 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

sync StyledText? with dwt-linux

Files:

• dwt/custom/DefaultContent.d (modified) (4 diffs)
• dwt/custom/StyleRange.d (modified) (4 diffs)
• dwt/custom/StyledText.d (modified) (40 diffs)
• dwt/custom/StyledTextContent.d (modified) (3 diffs)
• dwt/custom/StyledTextDropTargetEffect.d (modified) (1 diff)
• dwt/custom/StyledTextEvent.d (modified) (1 diff)
• dwt/custom/StyledTextRenderer.d (modified) (3 diffs)

dwt/custom/DefaultContent.d

@@ -22 +22 @@
-import dwt.custom.StyledTextListener;
-import dwt.custom.StyledText;
+import dwt.dwthelper.utils;
-
-static import tango.io.model.IFile;
-static import tango.text.Text;
-import dwt.dwthelper.utils;
-
-alias tango.text.Text.Text!(char) StringBuffer;
@@ -33 +33 @@
-
-    StyledTextListener[] textListeners; // stores text listeners for event sending
-String
+char[]
-    int gapStart = -1;  // the character position start of the gap
-    int gapEnd = -1;    // the character position after the end of the gap
@@ -735 +735 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when listener is null</li>
@@ -892 +892 @@
-    gapLine = getLineAtPhysicalOffset(gapStart);
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

dwt/custom/StyleRange.d

@@ -12 +12 @@
- *******************************************************************************/
-module dwt.custom.StyleRange;
+
+import dwt.dwthelper.utils;
-
-
@@ -21 +23 @@
-import dwt.custom.TextChangedEvent;
-import dwt.custom.TextChangingEvent;
-import dwt.dwthelper.utils;
-
-static import tango.text.Text;
@@ -66 +67 @@
-public this() {
-}
+/++
+ + DWT extension for clone implementation
+ +/
+protected this( StyleRange other ){
+    super( other );
+    start = other.start;
+    length = other.length;
+    fontStyle = other.fontStyle;
+}
-
-/**
@@ -74 +84 @@
- * @since 3.4
- */
-public this(StyleRange style) {
-    this( cast(TextStyle)style);
-    this.start = style.start;
-    this.length = style.length;
-    this.fontStyle = style.fontStyle;
-}
-public this(TextStyle style) {
-    super(style);

dwt/custom/StyledText.d

@@ -150 +150 @@
- */
-public class StyledText : Canvas {
-
-    alias Canvas.computeSize computeSize;
-
@@ -627 +626 @@
-        int lastSegmentIndex = 0;
-        for (int i = 0; i < 3; i++) {
-ango.text.Util.locatePattern( text,
+ext.indexOf(
-            String segment;
-text.length
-[ lastSegmentIndex .. $ ].dup
+-1
+.substring(lastSegmentIndex)
-                printDecorationSegment(segment, i, page, header, layout);
-                break;
-            } else {
-[ lastSegmentIndex .. segmentIndex ].dup
+.substring(lastSegmentIndex, segmentIndex)
-                printDecorationSegment(segment, i, page, header, layout);
-                lastSegmentIndex = segmentIndex + StyledTextPrintOptions.SEPARATOR.length;
@@ -651 +650 @@
-     */
-    void printDecorationSegment(String segment, int alignment, int page, bool header, TextLayout layout) {
-tango.text.Util.locatePattern( segment, StyledTextPrintOptions.PAGE_TAG 
-segment.length
+segment.indexOf(StyledTextPrintOptions.PAGE_TAG
+-1
-            int pageTagLength = StyledTextPrintOptions.PAGE_TAG.length;
-[ 0 .. pageIndex ]
+.substring (0, pageIndex)
-            buffer.append (page);
-[ pageIndex + pageTagLength .. $ ]
+.substring(pageIndex + pageTagLength)
-            segment = buffer.toString().dup;
-        }
@@ -706 +705 @@
-                }
-            } else {
- to!(String)(index) 
+to!(String)(index)
-            }
-            int paintX = x - printMargin - printLayout.getBounds().width;
@@ -871 +870 @@
-     */
-    void write(String string, int start, int end) {
-        wchar[] wstring = tango.text.convert.Utf.toString16( string[ start .. end ] );
-        start = 0;
-
-
-
+
+
+
+
-            if (ch > 0xFF && WriteUnicode) {
-                // write the sub string from the last escaped character
-                // to the current one. Fixes bug 21698.
-                if (index > start) {
-tango.text.convert.Utf.toString(wstring[start .. index ])
+ string[start .. index ] 
-                }
-                write("\\u");
-                write( to!(String)( cast(short)ch ));
-                write(' ');                     // control word delimiter
-1
+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) {
-tango.text.convert.Utf.toString(wstring[start .. index])
+string[start .. index]
-                }
-                write('\\');
@@ -900 +899 @@
-        // Fixes bug 21698.
-        if (start < end) {
-tango.text.convert.Utf.toString(wstring[ start .. end])
+string[ start .. end]
-        }
-    }
@@ -1270 +1269 @@
-        int copyEnd = Math.min(lineLength, endOffset - lineOffset);
-        if (lineIndex < copyEnd) {
-[lineIndex .. copyEnd]
+.substring(lineIndex, copyEnd)
-        }
-    }
@@ -1604 +1603 @@
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when listener is null</li>
- * </ul>
- */
-public void append(String string) {
-    checkWidget();
-
-    //
-    //
-    //
+for zero length 
+//     
+//     
+//     
-    int lastChar = Math.max(getCharCount(), 0);
-    replaceTextRange(lastChar, 0, string);
@@ -1938 +1934 @@
-    while (i < length) {
-        if (crIndex !is -1) {
-
-
+
-        }
-        if (lfIndex !is -1) {
-
-
+
-        }
-        if (lfIndex is -1 && crIndex is -1) {   // no more line breaks?
-            break;
-        } else if ((crIndex < lfIndex && crIndex !is -1) || lfIndex is -1) {
-[i .. crIndex]
+.substring(i, crIndex)
-            if (lfIndex is crIndex + 1) {       // CR/LF combination?
-                i = lfIndex + 1;
@@ -1955 +1949 @@
-            }
-        } else {                                    // LF occurs before CR!
-[i .. lfIndex]
+.substring(i, lfIndex)
-            i = lfIndex + 1;
-        }
@@ -1966 +1960 @@
-    // text copied thus far (because there only is one line)
-    if (i < length && (!isSingleLine() || convertedText.length() is 0)) {
-[i .. $]
+.substring(i)
-    }
-    return convertedText.toString();
@@ -2078 +2072 @@
-    Display display = getDisplay();
-    if (leftCaretBitmap !is null) {
-
+/*eq*/
-            defaultCaret.setImage(null);
-        }
@@ -2095 +2089 @@
-
-    if (rightCaretBitmap !is null) {
-
+/*eq*/
-            defaultCaret.setImage(null);
-        }
@@ -2270 +2264 @@
- * @param key the character typed by the user
- */
-
+d
-    Event event = new Event();
-    event.start = selection.x;
@@ -2290 +2284 @@
-        // end of the line
-        if (event.end < lineOffset + line.length) {
-+
-
-[key]
+=dcharToString( key ).length
+
+dcharToString( key )
-    } else {
-[key]
+dcharToString( key )
-    }
-    if (event.text !is null) {
@@ -2601 +2595 @@
-/**
- * Returns the offset of the word at the specified offset.
-:
+extends
- * (i.e., right to left, or caret is at left border of selection on
- * non-bidi platforms) the start offset of the word preceding the
-:
+extends
- * low index to high index the end offset of the word following
- * the selection is returned.
@@ -3010 +3004 @@
-    int offsetInLine = caretOffset - lineOffset;
-    caretAlignment = OFFSET_LEADING;
+
-    if (offsetInLine > 0) {
-        caretOffset = getClusterPrevious(caretOffset, caretLine);
@@ -3365 +3360 @@
-}
-/**
-:
+implements
- *
- * @return true if double clicking a word selects the word, false if double clicks
@@ -3830 +3825 @@
- *
- * @return the top pixel of a given line index
- 
+
- * @since 3.2
- */
@@ -3857 +3852 @@
- * Returns the line index for a y, relative to the client area.
- * The line index returned is always in the range 0..lineCount - 1.
- 
+
- * @param y the y-coordinate pixel
- 
+
- * @return the line index for a given y-coordinate pixel
- *
@@ -4951 +4946 @@
-public void insert(String string) {
-    checkWidget();
-
-    //
-    //
-    //
+for zero length 
+//     
+//     
+//     
-    Point sel = getSelectionRange();
-    replaceTextRange(sel.x, sel.y, string);
@@ -5008 +5003 @@
-    addListener(DWT.Resize, listener);
-    addListener(DWT.Traverse, listener);
- 
+
-        public void handleEvent(Event event) {
-            switch (event.detail) {
@@ -5728 +5723 @@
-        if (++index >= length_) return string;
-        if (string[index] !is '&') {
-[0 .. index-1] ~ string[index .. length_]
+.substring(0, index-1) ~ string.substring(index, length_)
-        }
-        index++;
@@ -5746 +5741 @@
-        while (index < length_ && string[index] !is '&') index++;
-        if (++index >= length_) return '\0';
-ToLower(firstCodePoint( string[index .. $ ] )
+FirstToLower(string[index .. $ ] 
-        index++;
-    } while (index < length_);
@@ -6272 +6267 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6280 +6275 @@
- *    <li>ERROR_NULL_ARGUMENT when listener is null</li>
- * </ul>
- 
+
- * @since 2.0
- */
@@ -6310 +6305 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6328 +6323 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6346 +6341 @@
- *
- * @param modifyListener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6364 +6359 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6405 +6400 @@
- *
- * @param verifyListener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6423 +6418 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6440 +6435 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -6498 +6493 @@
-    checkWidget();
-    if (isListening(LineGetStyle)) return;
-array
+for zero length string
-    //if (ranges is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    setStyleRanges(start, length, null, ranges, false);
@@ -6536 +6531 @@
-public void replaceTextRange(int start, int length, String text) {
-    checkWidget();
-
-    //
-    //
-    //
+for zero length 
+//     
+//     
+//     
-    int contentLength = getCharCount();
-    int end = start + length;
@@ -7829 +7824 @@
-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;
@@ -7952 +7949 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT when an element in the styles array is null</li>
- *    <li>ERROR_INVALID_RANGE when the number of ranges and style do not match (ranges.length * 2 is styles.length)</li>
- *    <li>ERROR_INVALID_RANGE when a range is outside the valid range (> getCharCount() or less than zero)</li>
@@ -7993 +7991 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT when an element in the styles array is null</li>
- *    <li>ERROR_INVALID_RANGE when the number of ranges and style do not match (ranges.length * 2 is styles.length)</li>
- *    <li>ERROR_INVALID_RANGE when a range is outside the valid range (> getCharCount() or less than zero)</li>
@@ -8128 +8127 @@
-    checkWidget();
-    if (isListening(LineGetStyle)) return;
-array
+for zero length string
-    //if (ranges is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    setStyleRanges(0, 0, null, ranges, true);
@@ -8170 +8169 @@
-public void setText(String text) {
-    checkWidget();
-
-    //
-    //
-    //
+for zero length 
+//     
+//     
+//     
-    Event event = new Event();
-    event.start = 0;

dwt/custom/StyledTextContent.d

@@ -13 +13 @@
-module dwt.custom.StyledTextContent;
-
+import dwt.dwthelper.utils;
+
-import dwt.custom.TextChangeListener;
-import dwt.dwthelper.utils;
-
-/**
- * Clients may implement the StyledTextContent interface to provide a
@@ -144 +144 @@
- *
- * @param listener the listener which should no longer be notified
- 
+
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when listener is null</li>
@@ -209 +209 @@
- */
-public void setText(String text);
+
+/++
+ + DWT Extension
+ +/
+int utf8AdjustOffset( int offset );
+
-}

dwt/custom/StyledTextDropTargetEffect.d

@@ -29 +29 @@
-
-static import tango.core.Exception;
-import Math = tango.math.Math;
-import dwt.dwthelper.utils;
-

dwt/custom/StyledTextEvent.d

@@ -19 +19 @@
-import dwt.custom.Bullet;
-import dwt.custom.StyledTextContent;
-import dwt.dwthelper.utils;
-
-/**

dwt/custom/StyledTextRenderer.d

@@ -40 +40 @@
-
-import dwt.dwthelper.Runnable;
+import dwt.dwthelper.utils;
-
-static import tango.text.Text;
@@ -45 +46 @@
-static import tango.text.convert.Utf;
-import tango.util.Convert;
-import dwt.dwthelper.utils;
-
-/**
@@ -395 +395 @@
-    StyledTextEvent event = styledText.getLineBackgroundData(lineOffset, line);
-    if (event !is null && event.lineBackground !is null) lineBackground = event.lineBackground;
+
-    int height = layout.getBounds().height;
-    if (lineBackground !is null) {