io.encodings.utf16: add a utf16n word for native utf16 type.

[factor.git] / basis / ui / text / core-text / core-text.factor

diff --git a/basis/ui/text/core-text/core-text.factor b/basis/ui/text/core-text/core-text.factor
index 606990a9412cfd85a05206eb63111fb4de830ddb..7b328e787b7e2325d846b3cce6e9eaf1c3f75f32 100644 (file)
--- a/basis/ui/text/core-text/core-text.factor
+++ b/basis/ui/text/core-text/core-text.factor
@@ -1,49 +1,70 @@
-! Copyright (C) 2009 Slava Pestov.
+! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs accessors alien core-graphics.types core-text
-core-text.fonts kernel hashtables namespaces sequences
-ui.gadgets.worlds ui.text ui.text.private opengl opengl.gl
-opengl.textures destructors combinators core-foundation
-core-foundation.strings math math.vectors init colors colors.constants
-cache arrays ;
+USING: accessors cache core-graphics.types core-text
+core-text.fonts io.encodings.string io.encodings.utf16 kernel
+locals math math.vectors namespaces sequences ui.text
+ui.text.private ;
 IN: ui.text.core-text
 
 SINGLETON: core-text-renderer
 
-M: core-text-renderer init-text-rendering
-    <cache-assoc> >>text-handle drop ;
+<PRIVATE
+
+: unscale ( m -- n )
+    retina? get-global [ 2.0 / ] when ; inline
+
+: scale ( m -- n )
+    retina? get-global [ 2.0 * ] when ; inline
+
+: scale-dim ( dim -- dim' )
+    retina? get-global [ [ 2.0 / ] map ] when ; inline
+
+: scale-metrics ( metrics -- metrics' )
+    retina? get-global [
+        clone
+            [ 2.0 / ] change-width
+            [ 2.0 / ] change-ascent
+            [ 2.0 / ] change-descent
+            [ 2.0 / ] change-height
+            [ 2.0 / ] change-leading
+            [ 2.0 / ] change-cap-height
+            [ 2.0 / ] change-x-height
+    ] when ; inline
+
+PRIVATE>
 
 M: core-text-renderer string-dim
     [ " " string-dim { 0 1 } v* ]
-    [ cached-line image>> dim>> ]
+    [ cached-line dim>> scale-dim ]
     if-empty ;
 
-M: core-text-renderer finish-text-rendering
-    text-handle>> purge-cache
-    cached-lines get purge-cache ;
-
-: rendered-line ( font string -- texture )
-    world get text-handle>> [ cached-line image>> <texture> ] 2cache ;
+M: core-text-renderer flush-layout-cache
+    cached-lines get-global purge-cache ;
 
-M: core-text-renderer draw-string ( font string -- )
-    rendered-line display-list>> glCallList ;
+M: core-text-renderer string>image ( font string -- image loc )
+    cached-line [ line>image ] [ loc>> scale-dim ] bi ;
 
-M: core-text-renderer x>offset ( x font string -- n )
+M:: core-text-renderer x>offset ( x font string -- n )
+    x font string
     [ 2drop 0 ] [
         cached-line line>>
-        swap 0 <CGPoint> CTLineGetStringIndexForPosition
-    ] if-empty ;
+        swap scale 0 <CGPoint> CTLineGetStringIndexForPosition
+    ] if-empty
+    2 * 0 swap string utf16n encode subseq
+    utf16n decode length ;
 
-M: core-text-renderer offset>x ( n font string -- x )
-    cached-line line>> swap f
-    CTLineGetOffsetForStringIndex ;
+M:: core-text-renderer offset>x ( n font string -- x )
+    font string cached-line line>> 
+    0 n string subseq utf16n encode length 2 / >integer
+    f
+    CTLineGetOffsetForStringIndex unscale ;
 
 M: core-text-renderer font-metrics ( font -- metrics )
     cache-font-metrics ;
 
 M: core-text-renderer line-metrics ( font string -- metrics )
     [ " " line-metrics clone 0 >>width ]
-    [ cached-line metrics>> ]
+    [ cached-line metrics>> scale-metrics ]
     if-empty ;
 
-core-text-renderer font-renderer set-global
\ No newline at end of file
+core-text-renderer font-renderer set-global