From 99e520410ce2f5d75006d2818d67b7946c4c4df6 Mon Sep 17 00:00:00 2001 From: KUSUMOTO Norio Date: Sat, 27 Jul 2019 09:56:37 +0900 Subject: [PATCH] Improved background rendering when selecting text, including emojis --- basis/core-text/core-text.factor | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/basis/core-text/core-text.factor b/basis/core-text/core-text.factor index 98b6c4a189..ee3e7a1f8e 100644 --- a/basis/core-text/core-text.factor +++ b/basis/core-text/core-text.factor @@ -5,7 +5,8 @@ assocs cache colors combinators core-foundation core-foundation.attributed-strings core-foundation.strings core-graphics core-graphics.types core-text.fonts destructors fonts init kernel locals make math math.functions math.order -math.vectors memoize namespaces sequences strings ; +math.vectors memoize namespaces sequences strings +io.encodings.utf16n io.encodings.string ; IN: core-text TYPEDEF: void* CTLineRef @@ -62,7 +63,7 @@ render-loc render-dim ; { [ >>width ] [ >>ascent ] - [ >>descent ] + [ dup 0 < [ -1 * ] when >>descent ] [ >>leading ] } spread ; inline @@ -88,7 +89,9 @@ render-loc render-dim ; bi-curry* bi ; : selection-rect ( dim line selection -- rect ) - [ start>> ] [ end>> ] bi + [let [ start>> ] [ end>> ] [ string>> ] tri :> ( start end string ) + start end [ 0 swap string subseq utf16n encode length 2 / >integer ] bi@ + ] [ f CTLineGetOffsetForStringIndex round ] bi-curry@ bi [ drop nip 0 ] [ swap - swap second ] 3bi ;