Changeset 278:3f53ebb05b5b

Timestamp:

08/04/08 19:07:44 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

Children:

279:e4b7af6b8e7e 280:4ec36c3a04a3

branch:

default

Message:

Fix: make MARK copy work correctly mit multiple chars.
Fix: getLocation, getOffset (codepoint vs. chars)
Fix: itemize() translation of utf16 to utf8 indices

Files:

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

dwt/graphics/TextLayout.d

@@ -34 +34 @@
-
-import tango.text.convert.Format;
+import Utf = tango.text.convert.Utf;
-import dwt.dwthelper.utils;
-import dwt.dwthelper.System;
@@ -93 +94 @@
-    void* mLangFontLink2;
-
-
+
+
+
-    static const int SCRIPT_VISATTR_SIZEOF = 2;
-    static const int GOFFSET_SIZEOF = 8;
@@ -120 +123 @@
-    class StyleItem {
-        TextStyle style;
+        // DWT: start, lenght relative to segmentsText
-        int start, length;
-        bool lineBreak, softBreak, tab;
@@ -1792 +1796 @@
-                width = (trailing || (offset is length)) ? run.width : 0;
-            } else {
-
+
+
-                int cChars = run.length;
-                int gGlyphs = run.glyphCount;
@@ -1840 +1845 @@
-    length = segmentsText.length;
-    offset = translateOffset(offset);
- = new SCRIPT_LOGATTR()
- = new SCRIPT_PROPERTIES()
+
+
-    int i = forward ? 0 : allRuns.length - 1;
-    offset = validadeOffset(offset, step);
@@ -1849 +1854 @@
-            if (run.lineBreak && !run.softBreak) return untranslateOffset(run.start);
-            if (run.tab) return untranslateOffset(run.start);
-OS.MoveMemory(properties, device.scripts[run.analysis.eScript], SCRIPT_PROPERTIES.sizeof)
+properties = device.scripts[run.analysis.eScript]
-            bool isComplex = properties.fNeedsCaretInfo || properties.fNeedsWordBreaking;
-            if (isComplex) breakRun(run);
-            while (run.start <= offset && offset < run.start + run.length) {
-                if (isComplex) {
-OS.MoveMemory(logAttr, run.psla + (offset - run.start), SCRIPT_LOGATTR.sizeof
+logAttr = run.psla + (offset - run.start
-                }
-                switch (movement) {
@@ -1958 +1963 @@
-    computeRuns(null);
-    if (trailing !is null && trailing.length < 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+
-    int line;
-    int lineCount = runs.length;
@@ -2003 +2009 @@
-            OS.ScriptXtoCP(xRun, cChars, cGlyphs, run.clusters, run.visAttrs, advances, &run.analysis, &piCP, &piTrailing);
-            if (trailing !is null) trailing[0] = piTrailing;
-
+
+
+
+
-        }
-    }
@@ -2105 +2114 @@
-    char[] oldChars = new char[length_];
-    text.getChars(0, length_, oldChars, 0);
-
+
+
+
+
-    int charCount = 0, segmentCount = 0;
-    wchar separator = orientation is DWT.RIGHT_TO_LEFT ? RTL_MARK : LTR_MARK;
-    while (charCount < length_) {
-        if (segmentCount < nSegments && charCount is segments[segmentCount]) {
-
+
+
+
-        } else {
-
+
+
-        }
-    }
-    if (segmentCount < nSegments) {
-        segments[segmentCount] = charCount;
-
-
-
+
+
+
+
+
-}
-
@@ -2253 +2269 @@
- */
-StyleItem[] itemize () {
+    // DWT: itemize is the process of finding changes in direction
-    segmentsText = getSegmentsText();
-    int length = segmentsText.length;
@@ -2274 +2291 @@
-    OS.ScriptItemize(chars.ptr, chars.length, MAX_ITEM, &scriptControl, &scriptState, pItems, &pcItems);
-//  if (hr is E_OUTOFMEMORY) //TODO handle it
+    // DWT pcItems is not inclusive the trailing item
-
-    // Translate the utf16 indices to utf8 indices
-    int utf8idx = 0;
+    int utf16idx = 0;
+    int i = 0;
-    SCRIPT_ITEM* si = pItems;
-
+
+
-        if( si.iCharPos is utf16idx ){
-            si.iCharPos = utf8idx;
+            i++;
-            si++;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    StyleItem[] runs = merge(pItems, pcItems);
@@ -2302 +2337 @@
-    int count = 0, start = 0, end = segmentsText.length, itemIndex = 0, styleIndex = 0;
-    StyleItem[] runs = new StyleItem[itemCount + stylesCount];
- = new SCRIPT_ITEM()
+
-    bool linkBefore = false;
-    while (start < end) {
@@ -2309 +2344 @@
-        item.style = styles[styleIndex].style;
-        runs[count++] = item;
-OS.MoveMemory(scriptItem, (cast(void*)items) + itemIndex * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof)
+scriptItem = items + itemIndex
-        item.analysis = scriptItem.a;
-        if (linkBefore) {
@@ -2316 +2351 @@
-        }
-        //scriptItem.a = new SCRIPT_ANALYSIS();
-OS.MoveMemory(scriptItem, (cast(void*)items) + (itemIndex + 1) * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof
+scriptItem = items + (itemIndex + 1
-        int itemLimit = scriptItem.iCharPos;
-        int styleLimit = translateOffset(styles[styleIndex + 1].start);
@@ -2339 +2374 @@
-    StyleItem item = new StyleItem();
-    item.start = end;
-OS.MoveMemory(scriptItem, (cast(void*)items) + itemCount * SCRIPT_ITEM.sizeof, SCRIPT_ITEM.sizeof)
+scriptItem = items + itemCount
-    item.analysis = scriptItem.a;
-    runs[count++] = item;
@@ -2834 +2869 @@
- */
-void shape (HDC hdc, StyleItem run) {
-final int[] buffer = new int[1]
-final 
+int[1] buffer
+
-    segmentsText.getChars(run.start, run.start + run.length, chars, 0);
-    wchar[] wchars = StrToWCHARs( chars );
@@ -2994 +3029 @@
-
-int validadeOffset(int offset, int step) {
-tep
+egmentsText.getRelativeCodePointOffset( offset, step )
-    if (segments !is null && segments.length > 2) {
-        for (int i = 0; i < segments.length; i++) {
@@ -3027 +3062 @@
-    }
-    for (int i = 0; i < nSegments && offset - i >= segments[i]; i++) {
-+
+=MARK_SIZE
-    }
-    return offset;
@@ -3042 +3077 @@
-    }
-    for (int i = 0; i < nSegments && offset > segments[i]; i++) {
--
+=MARK_SIZE
-    }
-    return offset;