Changeset 227:b74b74ce5c7d

Timestamp:

05/19/08 16:30:33 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

reworked TextLayout?

Files:

• dwt/graphics/TextLayout.d (modified) (21 diffs)

dwt/graphics/TextLayout.d

@@ -37 +37 @@
-import dwt.dwthelper.System;
-
+
-/**
- * <code>TextLayout</code> is a graphic object that represents
@@ -53 +54 @@
- */
-public final class TextLayout : Resource {
+
-    alias Resource.init_ init_;
+
+/++
+  DWT doku
+  The styles has at minimum 2 member, each with a start. The last element is the end marker.
+++/
+
+    invariant{
+        assert( stylesCount >= 2 );
+        assert( stylesCount <= styles.length );
+        assert( styles[stylesCount-1] );
+        assert( styles[stylesCount-1].start is text.length );
+    }
-
-    Font font;
@@ -1384 +1398 @@
-    checkLayout();
-    computeRuns(null);
-_
-_
+
+
-    if (start > end) return new Rectangle(0, 0, 0, 0);
-_
-_
+
+
-    start = translateOffset(start);
-    end = translateOffset(end);
@@ -1541 +1555 @@
-    checkLayout();
-    computeRuns(null);
-_
-_
+
+
-    offset = translateOffset(offset);
-    for (int i=1; i<allRuns.length; i++) {
@@ -1640 +1654 @@
-    checkLayout();
-    computeRuns(null);
-_
-_
+
+
-    offset = translateOffset(offset);
-    for (int line=0; line<runs.length; line++) {
@@ -1738 +1752 @@
-    checkLayout();
-    computeRuns(null);
-_
-_
-_
+
+
+
-    offset = translateOffset(offset);
-    int line;
@@ -1747 +1761 @@
-    }
-    line = Math.min(line, runs.length - 1);
-_
+
-        return new Point(getLineIndent(line) + lineWidth[line], lineY[line]);
-    }
@@ -1765 +1779 @@
-                width = metrics.width * (offset - run.start + (trailing ? 1 : 0));
-            } else if (run.tab) {
-_
+
-            } else {
-                int runOffset = offset - run.start;
@@ -1807 +1821 @@
-int _getOffset(int offset, int movement, bool forward) {
-    computeRuns(null);
-_
-_
-_) return length_
+
+
+) return length
-    if (!forward && offset is 0) return 0;
-    int step = forward ? 1 : -1;
-    if ((movement & DWT.MOVEMENT_CHAR) !is 0) return offset + step;
-_
+
-    offset = translateOffset(offset);
-
-
+ = new SCRIPT_LOGATTR()
+ = new SCRIPT_PROPERTIES()
-    int i = forward ? 0 : allRuns.length - 1;
-    offset = validadeOffset(offset, step);
@@ -1824 +1838 @@
-            if (run.lineBreak && !run.softBreak) return untranslateOffset(run.start);
-            if (run.tab) return untranslateOffset(run.start);
-properties = device.scripts[run.analysis.eScript]
+OS.MoveMemory(properties, device.scripts[run.analysis.eScript], SCRIPT_PROPERTIES.sizeof)
-            bool isComplex = properties.fNeedsCaretInfo || properties.fNeedsWordBreaking;
-            if (isComplex) breakRun(run);
-            while (run.start <= offset && offset < run.start + run.length) {
-                if (isComplex) {
-logAttr = run.psla + (offset - run.start
+OS.MoveMemory(logAttr, run.psla + (offset - run.start), SCRIPT_LOGATTR.sizeof
-                }
-                switch (movement) {
@@ -1873 +1887 @@
-        }
-        i += step;
-_
+
-    return forward ? text.length : 0;
-}
@@ -2126 +2140 @@
-public TextStyle getStyle (int offset) {
-    checkLayout();
-_
-_
+
+
-    for (int i=1; i<stylesCount; i++) {
-        if (styles[i].start > offset) {
@@ -2229 +2243 @@
-StyleItem[] itemize () {
-    segmentsText = getSegmentsText();
-_
+
-    SCRIPT_CONTROL scriptControl;
-    SCRIPT_STATE scriptState;
-_
+
-
-    if ((orientation & DWT.RIGHT_TO_LEFT) !is 0) {
@@ -2273 +2287 @@
-        item.style = styles[styleIndex].style;
-        runs[count++] = item;
-*scriptItem = items[itemIndex]
+OS.MoveMemory(scriptItem, (cast(void*)items) + itemIndex * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof)
-        item.analysis = scriptItem.a;
-        if (linkBefore) {
@@ -2280 +2294 @@
-        }
-        //scriptItem.a = new SCRIPT_ANALYSIS();
-*scriptItem = items[ itemIndex + 1]
+OS.MoveMemory(scriptItem, (cast(void*)items) + (itemIndex + 1) * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof)
-        int itemLimit = scriptItem.iCharPos;
-        int styleLimit = translateOffset(styles[styleIndex + 1].start);
@@ -2303 +2317 @@
-    StyleItem item = new StyleItem();
-    item.start = end;
-*scriptItem = items[ itemCount ]
+OS.MoveMemory(scriptItem, (cast(void*)items) + itemCount * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof)
-    item.analysis = scriptItem.a;
-    runs[count++] = item;
@@ -2589 +2603 @@
-public void setStyle (TextStyle style, int start, int end) {
-    checkLayout();
-_
-_
+
+
-    if (start > end) return;
-_
-_
+
+
-    int low = -1;
-    int high = stylesCount;
@@ -2610 +2624 @@
-                if (item.style is null) return;
-            } else {
- ==/*eq*/ item.style
+.opEquals(item.style)
-            }
-        }
@@ -2710 +2724 @@
-    //PORTING_CHANGE: allow null argument
-    //if (text is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-==/*eq*/this.text
+.equals(this.text)
-    freeRuns();
-    this.text = text;
@@ -3001 +3015 @@
-    int nSegments = segments.length;
-    if (nSegments <= 1) return offset;
-_
-_
+
+
-    if (nSegments is 2) {
-_
+
-    }
-    for (int i = 0; i < nSegments && offset - i >= segments[i]; i++) {
@@ -3016 +3030 @@
-    int nSegments = segments.length;
-    if (nSegments <= 1) return offset;
-_
-_
+
+
-    if (nSegments is 2) {
-_
+
-    }
-    for (int i = 0; i < nSegments && offset > segments[i]; i++) {