Changeset 287:35d730fb5e9f

Timestamp:

08/21/08 03:57:23 (3 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

TextLayout? with wchar[] segments text and translation tables

Files:

• dwt/dwthelper/utils.d (modified) (4 diffs)
• dwt/graphics/TextLayout.d (modified) (38 diffs)

dwt/dwthelper/utils.d

@@ -422 +422 @@
-    return res[0];
-}
+dchar firstCodePoint( wchar[] str, out int consumed ){
+    dchar[1] buf;
+    uint ate;
+    dchar[] res = str.toString32( buf, &ate );
+    consumed = ate;
+    if( ate is 0 || res.length is 0 ){
+        Trace.formatln( "dwthelper.utils {}: str.length={} str={:X2}", __LINE__, str.length, cast(ubyte[])str );
+    }
+    assert( ate > 0 );
+    assert( res.length is 1 );
+    return res[0];
+}
-
-String dcharToString( dchar key ){
@@ -441 +453 @@
-
-int getRelativeCodePointOffset( String str, int startIndex, int searchRelCp ){
+    return getAbsoluteCodePointOffset( str, startIndex, searchRelCp ) - startIndex;
+}
+int getAbsoluteCodePointOffset( String str, int startIndex, int searchRelCp ){
-    int ignore;
-    int i = startIndex;
@@ -484 +499 @@
-                i--;
-                if( i < 0 ){
-
+startIndex
-                    //Trace.formatln( "dwthelper.utils getRelativeCodePointOffset {}: str={}, startIndex={}, searchRelCp={}", __LINE__, str, startIndex, searchRelCp );
-                    //tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
@@ -492 +507 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-dchar getRelativeCodePoint( String str, int startIndex, int searchRelCp, out int relIndex ){

dwt/graphics/TextLayout.d

@@ -12 +12 @@
- *******************************************************************************/
-module dwt.graphics.TextLayout;
+
+import tango.util.log.Trace;
-
-import dwt.DWT;
@@ -76 +78 @@
-
-    Font font;
-
+
+
+
+
+
+
-    int lineSpacing;
-    int ascent, descent;
@@ -85 +92 @@
-    bool justify;
-    int[] tabs;
-
+
+
-    StyleItem[] styles;
-    int stylesCount;
@@ -95 +103 @@
-
-    static const dchar LTR_MARK = '\u200E', RTL_MARK = '\u200F';
+    static const wchar LTR_MARKw = '\u200E', RTL_MARKw = '\u200F';
-    static const String STR_LTR_MARK = "\u200E", STR_RTL_MARK = "\u200F";
+    static const wchar[] WSTR_LTR_MARK = "\u200E"w, WSTR_RTL_MARK = "\u200F"w;
-    static const int MARK_SIZE = 3;
+    static const int WMARK_SIZE = 1;
-    static const int SCRIPT_VISATTR_SIZEOF = 2;
-    static const int GOFFSET_SIZEOF = 8;
@@ -232 +243 @@
-    stylesCount = 2;
-    text = ""; //$NON-NLS-1$
+    wtext = ""w;
-    void* ppv;
-    OS.OleInitialize(null);
@@ -242 +254 @@
-void breakRun(StyleItem run) {
-    if (run.psla !is null) return;
-StrToWCHARs( 0, segmentsText[ run.start .. run.start + run.length ] )
+segmentsWText[ index8to16[ run.start ] .. index8to16[ run.start + run.length ] ]
-    auto hHeap = OS.GetProcessHeap();
-    run.psla = cast(SCRIPT_LOGATTR*)OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, SCRIPT_LOGATTR.sizeof * chars.length);
@@ -499 +511 @@
-    font = null;
-    text = null;
+    wtext = null;
-    segmentsText = null;
+    segmentsWText = null;
-    tabs = null;
-    styles = null;
@@ -614 +628 @@
-    if (selectionBackground !is null && selectionBackground.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    int length = text.length;
+    int wlength = wtext.length;
-    if (length is 0 && flags is 0) return;
-    auto hdc = gc.handle;
@@ -756 +771 @@
-            if (drawX + run.width >= clip.x) {
-                if (!run.lineBreak || run.softBreak) {
-run.start + run.length - 1
+segmentsText.getAbsoluteCodePointOffset( run.start + run.length, -1 )
-                    bool fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end;
-                    if (fullSelection) {
@@ -787 +802 @@
-                            int selStart = Math.max(selectionStart, run.start) - run.start;
-                            int selEnd = Math.min(selectionEnd, end) - run.start;
-run.length;
+index8to16[run.start+run.length] - index8to16[run.start]; // make it wchar
-                            int gGlyphs = run.glyphCount;
-                            int piX;
-                            int* advances = run.justify !is null ? run.justify : run.advances;
-selStart
+index8to16[selStart]
-                            int runX = (orientation & DWT.RIGHT_TO_LEFT) !is 0 ? run.width - piX : piX;
-                            rect.left = drawX + runX;
-                            rect.top = drawY;
-selEnd
+index8to16[selEnd]
-                            runX = (orientation & DWT.RIGHT_TO_LEFT) !is 0 ? run.width - piX : piX;
-                            rect.right = drawX + runX;
@@ -830 +845 @@
-                    int drawRunY = drawY + (baseline - run.ascent);
-                    if (partialSelection) {
-selectionStart, run.start) - run.start
-selectionEnd, end) - run.start
-run.length;
+index8to16[selectionStart], index8to16[run.start]) - index8to16[run.start]
+index8to16[selectionEnd], index8to16[end]) - index8to16[run.start]
+index8to16[run.start+run.length] - index8to16[run.start]; // make it wchar
-                        int gGlyphs = run.glyphCount;
-                        int piX;
@@ -1331 +1346 @@
-    runs = null;
-    segmentsText = null;
+    segmentsWText = null;
-}
-
@@ -1434 +1450 @@
-            if (run.style !is null && run.style.metrics !is null) {
-                GlyphMetrics metrics = run.style.metrics;
-start - run.start
+index8to16[start] - index8to16[run.start]
-            } else if (!run.tab) {
-                int piX;
-                int* advances = run.justify !is null ? run.justify : run.advances;
-
+
+
-                cx = isRTL ? run.width - piX : piX;
-            }
@@ -1451 +1468 @@
-            if (run.style !is null && run.style.metrics !is null) {
-                GlyphMetrics metrics = run.style.metrics;
-end - run.start
+index8to16[end] - index8to16[run.start]
-            } else if (!run.tab) {
-                int piX;
-                int* advances = run.justify !is null ? run.justify : run.advances;
-
+
+
-                cx = isRTL ? run.width - piX : piX;
-            }
@@ -1796 +1814 @@
-                width = (trailing || (offset is length)) ? run.width : 0;
-            } else {
-
-
-
+
+
-                int gGlyphs = run.glyphCount;
-                int piX;
@@ -1859 +1876 @@
-            while (run.start <= offset && offset < run.start + run.length) {
-                if (isComplex) {
-offset - run.start
+index8to16[offset] - index8to16[run.start]
-                }
-                switch (movement) {
@@ -1879 +1896 @@
-                                bool previousLetterOrDigit = Compatibility.isLetterOrDigit(segmentsText.charAt(offset - 1));
-                                if (letterOrDigit !is previousLetterOrDigit || !letterOrDigit) {
-.charAt(offset
+[offset..$].firstCodePoint(
-                                        return untranslateOffset(offset);
-                                    }
@@ -1890 +1907 @@
-                        if (offset > 0) {
-                            bool isLetterOrDigit = Compatibility.isLetterOrDigit(segmentsText.charAt(offset));
-.charAt(offset - 1
+[offset - 1.. $].firstCodePoint(
-                            if (!isLetterOrDigit && previousLetterOrDigit) {
-                                return untranslateOffset(offset);
@@ -1999 +2016 @@
-                return untranslateOffset(run.start);
-            }
-run.length;
+index8to16[run.start+run.length] - index8to16[run.start]; // make it wchar
-            int cGlyphs = run.glyphCount;
-            int piCP;
@@ -2103 +2120 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    int nSegments = segments.length;
-
+
+
+
+
+
+
-    int length_ = text.length;
-
+
+
+
+
+
+
+
-    if (nSegments is 2) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            int start = charCount + (segmentCount*MARK_SIZE);
-            newChars[ start .. start + MARK_SIZE ] = separator;
-            segmentCount++;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2270 +2357 @@
-StyleItem[] itemize () {
-    // DWT: itemize is the process of finding changes in direction
-segmentsText = getSegmentsText(
+getSegmentsText(segmentsText, segmentsWText 
-    int length = segmentsText.length;
-    SCRIPT_CONTROL scriptControl;
@@ -2288 +2375 @@
-    if (pItems is null) DWT.error(DWT.ERROR_NO_HANDLES);
-    int pcItems;
-StrToWCHARs( segmentsText )
+segmentsWText
-    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;
-    while( utf16idx < chars.length ){
-
-        if( si.iCharPos is utf16idx ){
-            si.iCharPos = utf8idx;
-            i++;
-            si++;
-        }
-
-        // goto next codepoint
-        uint ate16;
-        dchar[1] buf32;
-        dchar[] res32 = Utf.toString32( chars[ utf16idx .. $ ], buf32, &ate16 );
-        uint ate32;
-        char[4] buf8;
-        char[] res8 = Utf.toString( res32, buf8, &ate32 );
-        utf16idx += ate16;
-        utf8idx += res8.length;
-    }
-    assert( si.iCharPos is chars.length );
-    si.iCharPos = utf8idx;
-    assert( si.iCharPos is segmentsText.length );
-    assert( i is pcItems );
-
-    StyleItem[] runs = merge(pItems, pcItems);
@@ -2352 +2411 @@
-        //scriptItem.a = new SCRIPT_ANALYSIS();
-        scriptItem = items + (itemIndex + 1);
-scriptItem.iCharPos
+index16to8[scriptItem.iCharPos]
-        int styleLimit = translateOffset(styles[styleIndex + 1].start);
-        if (styleLimit <= itemLimit) {
@@ -2358 +2417 @@
-            start = styleLimit;
-            if (start < itemLimit && 0 < start && start < end) {
-char pChar = segmentsText.charAt(start - 1
-char tChar = segmentsText.charAt(start
+dchar pChar = segmentsText[ segmentsText.getAbsoluteCodePointOffset(start, -1) ..$].firstCodePoint(
+dchar tChar = segmentsText[start     ..$].firstCodePoint(
-                if (Compatibility.isLetter(pChar) && Compatibility.isLetter(tChar)) {
-                    item.analysis.fLinkAfter = true;
@@ -2621 +2680 @@
-    }
-    freeRuns();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2784 +2864 @@
-    if (text.equals(this.text)) return;
-    freeRuns();
-
+
+
-    styles = new StyleItem[2];
-    styles[0] = new StyleItem();
@@ -2817 +2898 @@
-
-bool shape (HDC hdc, StyleItem run, wchar[] wchars, int[] glyphCount, int maxGlyphs, SCRIPT_PROPERTIES* sp) {
-    //wchar[] wchars = StrToWCHARs( chars );
-    bool useCMAPcheck = !sp.fComplex && !run.analysis.fNoGlyphIndex;
-    if (useCMAPcheck) {
-        ushort[] glyphs = new ushort[wchars.length];
-        scope(exit) delete glyphs;
-        if (OS.ScriptGetCMap(hdc, run.psc, wchars.ptr, wchars.length, 0, glyphs.ptr) !is OS.S_OK) {
-            if (run.psc !is null) {
-                OS.ScriptFreeCache(run.psc);
-                glyphCount[0] = 0;
-
+
+
+
-            }
-            return false;
-        }
+        //delete glyphs;
-    }
-    auto hr = OS.ScriptShape(hdc, run.psc, wchars.ptr, wchars.length, maxGlyphs, &run.analysis, run.glyphs, run.clusters, run.visAttrs, glyphCount.ptr);
@@ -2850 +2932 @@
-        OS.ScriptFreeCache(run.psc);
-        glyphCount[0] = 0;
-
+
+
-    }
-    run.glyphCount = 0;
@@ -2856 +2939 @@
-}
-
-struct CallbackDataEnumFontFamExProc {
-    int delegate ( ENUMLOGFONTEX* lpelfe, NEWTEXTMETRICEX* lpntme, int FontType, int lParam) EnumFontFamExProc;
-    int lParam;
-}
-extern(Windows) private static int EnumFontFamExProcFunc( ENUMLOGFONTEX* lpelfe, NEWTEXTMETRICEX* lpntme, int FontType, int lParam) {
-    auto cb = cast(CallbackDataEnumFontFamExProc*)cast(void*)lParam;
-    return cb.EnumFontFamExProc( lpelfe, lpntme, FontType, cb.lParam );
-}
-
-/*
@@ -2870 +2945 @@
-void shape (HDC hdc, StyleItem run) {
-    int[1] buffer;
-
-
-
+
-    int maxGlyphs = (wchars.length * 3 / 2) + 16;
-    auto hHeap = OS.GetProcessHeap();
@@ -2884 +2957 @@
-    if (run.psc is null) DWT.error(DWT.ERROR_NO_HANDLES);
-    short script = run.analysis.eScript;
-
-
+
+
+
-    if (!shapeSucceed) {
-        auto hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT);
@@ -2893 +2967 @@
-        int flags = OS.SSA_METAFILE | OS.SSA_FALLBACK | OS.SSA_GLYPHS | OS.SSA_LINK;
-        if (OS.ScriptStringAnalyse(metaFileDc, wchars.ptr, wchars.length, 0, -1, flags, 0, null, null, null, null, null, ssa) is OS.S_OK) {
-
+*
-            OS.ScriptStringFree(ssa);
-        }
@@ -2899 +2973 @@
-        OS.SelectObject(metaFileDc, oldMetaFont);
-        auto metaFile = OS.CloseEnhMetaFile(metaFileDc);
-        EMREXTCREATEFONTINDIRECTW emr;
-        static extern(Windows) int metaFileEnumProc (HDC hDC, HANDLETABLE* table, ENHMETARECORD* record, int nObj, LPARAM lpData) {
-
+ = cast(EMREXTCREATEFONTINDIRECTW*)lpData
-            OS.MoveMemory(&emr_.emr, record, EMR.sizeof);
-            switch (emr_.emr.iType) {
@@ -2909 +2982 @@
-                case OS.EMR_EXTTEXTOUTW:
-                    return 0;
+                default:
-            }
-            return 1;
-        }
+
+        EMREXTCREATEFONTINDIRECTW emr;
-        OS.EnumEnhMetaFile(null, metaFile, &metaFileEnumProc, &emr, null);
-
+
+
-
-        auto newFont = OS.CreateFontIndirectW(&emr.elfw.elfLogFont);
+        assert( newFont !is null );
+
-        OS.SelectObject(hdc, newFont);
-
+&
-            run.fallbackFont = newFont;
-        }
@@ -2923 +3002 @@
-            if (!sp.fComplex) {
-                run.analysis.fNoGlyphIndex = true;
-
+&
-                    run.fallbackFont = newFont;
-                } else {
@@ -2931 +3010 @@
-        }
-        if (!shapeSucceed) {
-
-
-
+    
+    
+    
-                /* GetStrCodePages() */
-
+    
-                /* MapFont() */
-
+    
-                    LOGFONT logFont;
-                    OS.GetObject( hNewFont, LOGFONT.sizeof, &logFont );
@@ -2944 +3023 @@
-                    auto mLangFont = OS.CreateFontIndirect(&logFont);
-                    auto oldFont = OS.SelectObject(hdc, mLangFont);
-
+&
-                        run.fallbackFont = mLangFont;
-                    } else {
@@ -2963 +3042 @@
-        * Missing glyphs typically will be represent as black boxes in the text.
-        */
-
-
+
-        run.glyphCount = buffer[0];
-    }