steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better support to NSTextInputClient

clean-linux-x86-64
KUSUMOTO Norio 2019-07-26 21:58:29 +09:00 committed by Doug Coleman
parent b83435c9a9
commit 1b790ee6b6
1 changed files with 125 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
basis/ui/backend/cocoa/views/views.factor
View File

@ -193,7 +193,7 @@ IMPORT: NSAttributedString
:: >codepoint-index ( str utf16-index -- codepoint-index ) :: >codepoint-index ( str utf16-index -- codepoint-index )
0 utf16-index 2 * str utf16n encode subseq utf16n decode length ; 0 utf16-index 2 * str utf16n encode subseq utf16n decode length ;
:: >utf16-index ( str codepoint-index -- utf16-index ) :: >utf16-index ( str codepoint-index -- utf16-index )
0 codepoint-index str subseq utf16n encode length 2 / >integer ; 0 codepoint-index str subseq utf16n encode length 2 / >integer ;
@ -237,24 +237,42 @@ IMPORT: NSAttributedString
underlines first first 2 2array 1array ! thickness: 2 underlines first first 2 2array 1array ! thickness: 2
] [ underlines ] if ; ] [ underlines ] if ;
:: update-marked-text ( gadget str range -- ) :: update-marked-text ( gadget str selectedRange replacementRange -- )
replacementRange location>> NSNotFound = not ! [
replacementRange length>> NSNotFound = not and [ ! erase this line
gadget editor-caret first
dup gadget editor-line
[
replacementRange length>> ! location>>
>codepoint-index
2array gadget set-caret
] [
replacementRange length>> 1 + ! [ location>> ] [ length>> ] bi +
>codepoint-index
2array gadget set-mark
] 2bi
gadget earlier-caret/mark dup
gadget preedit-start<<
0 1 2array v+ gadget preedit-end<<
] when
gadget preedit? [ gadget preedit? [
gadget remove-preedit-text gadget remove-preedit-text
] when ] when
gadget earlier-caret/mark dup gadget earlier-caret/mark dup
gadget preedit-start<< gadget preedit-start<<
0 str length 2array v+ gadget preedit-end<< 0 str length 2array v+ gadget preedit-end<<
str gadget temp-im-input drop str gadget temp-im-input drop
gadget preedit-start>> gadget preedit-start>>
0 str range location>> >codepoint-index 0 str selectedRange location>> >codepoint-index 2array v+
2array v+
dup gadget preedit-selected-start<< dup gadget preedit-selected-start<<
0 0
range location>> dup range length>> + [ 2 * ] bi@ selectedRange [ location>> ] [ length>> ] bi + selectedRange location>>
str utf16n encode subseq utf16n decode length [ str swap >codepoint-index ] bi@ -
2array v+ 2array v+
dup gadget preedit-selected-end<< dup gadget preedit-selected-end<<
dup gadget set-caret gadget set-mark dup gadget set-caret gadget set-mark
gadget preedit-start>> gadget preedit-end>> = [ gadget preedit-start>> gadget preedit-end>> = [
gadget remove-preedit-info gadget remove-preedit-info
] when ; ] when ;
@ -445,23 +463,39 @@ PRIVATE>
text -> string CF>string str! text -> string CF>string str!
] if ] if
window world-focus :> gadget window world-focus :> gadget
gadget support-input-methods? [ gadget [
gadget preedit? [ gadget support-input-methods? [
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi replacementRange location>> NSNotFound = [
] when gadget editor-caret first
str gadget user-input* drop dup gadget editor-line
f gadget preedit-selection-mode?<< [
] [ replacementRange location>> >codepoint-index
str window user-input 2array gadget set-caret
] if ] [
replacementRange [ location>> ] [ length>> ] bi +
>codepoint-index
2array gadget set-mark
] 2bi
] unless
gadget preedit? [
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi
] when
str gadget user-input* drop
f gadget preedit-selection-mode?<<
] [
str window user-input
] if
] when
] when ] when
] ; ] ;
METHOD: char hasMarkedText [ METHOD: char hasMarkedText [
self window :> window self window :> window
window [ window [
window world-focus :> gadget window world-focus :> gadget
gadget preedit? [ 1 ] [ 0 ] if gadget [
gadget preedit? [ 1 ] [ 0 ] if
] [ 0 ] if
] [ 0 ] if ] [ 0 ] if
] ; ] ;
@ -469,14 +503,18 @@ PRIVATE>
self window :> window self window :> window
window [ window [
window world-focus :> gadget window world-focus :> gadget
gadget preedit? [ gadget [
gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [ gadget preedit? [
NSNotFound 0 gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [
] [ NSNotFound 0
gadget preedit-start>> first gadget editor-line :> str ] [
str gadget preedit-start>> second >utf16-index dup ! location gadget preedit-start>> first gadget editor-line :> str
str gadget preedit-end>> second >utf16-index swap - ! length gadget
] if [ preedit-start>> second ] ! location
[ preedit-end>> second ]
bi [ str swap >utf16-index ] bi@ over - ! length
] if
] [ NSNotFound 0 ] if
] [ NSNotFound 0 ] if ] [ NSNotFound 0 ] if
] [ NSNotFound 0 ] if ] [ NSNotFound 0 ] if
<NSRange> <NSRange>
@ -486,39 +524,48 @@ PRIVATE>
self window :> window self window :> window
window [ window [
window world-focus :> gadget window world-focus :> gadget
gadget support-input-methods? [ gadget [
gadget preedit? [ gadget support-input-methods? [
gadget preedit-start>> first gadget editor-line :> str gadget editor-caret first gadget editor-line :> str
str gadget preedit? [
gadget str
[ preedit-selected-start>> second ] gadget
[ preedit-start>> second ] bi - >utf16-index ! location [ preedit-selected-start>> second ]
str gadget preedit-selected-end>> second >utf16-index [ preedit-start>> second ]
str gadget preedit-selected-start>> second >utf16-index - ! length bi - >utf16-index ! location
] [ gadget earlier-caret/mark second 0 ] if gadget
[ preedit-selected-end>> second ]
[ preedit-selected-start>> second ]
bi [ str swap >utf16-index ] bi@ - ! length
] [
str gadget editor-caret second >utf16-index 0
] if
] [ 0 0 ] if
] [ 0 0 ] if ] [ 0 0 ] if
] [ 0 0 ] if ] [ 0 0 ] if
<NSRange> <NSRange>
] ; ] ;
METHOD: void setMarkedText: id text selectedRange: NSRange selectedRange METHOD: void setMarkedText: id text selectedRange: NSRange selectedRange
replacementRange: NSRange replacementRange [ replacementRange: NSRange replacementRange [
self window :> window self window :> window
{ } clone :> underlines!
window [ window [
window world-focus :> gadget window world-focus :> gadget
"" clone :> str! gadget [
text NSString -> class -> isKindOfClass: 0 = not [ { } clone :> underlines!
text CF>string str! "" clone :> str!
] [ text NSString -> class -> isKindOfClass: 0 = not [
text -> string CF>string str! text CF>string str!
] [
text -> string CF>string str!
gadget support-input-methods? [
gadget text selectedRange make-preedit-underlines underlines!
] when
] if
gadget support-input-methods? [ gadget support-input-methods? [
gadget text selectedRange make-preedit-underlines underlines! gadget str selectedRange replacementRange update-marked-text
underlines gadget preedit-underlines<<
] when ] when
] if
gadget support-input-methods? [
gadget str selectedRange update-marked-text
underlines gadget preedit-underlines<<
] when ] when
] when ] when
] ; ] ;
@ -527,17 +574,19 @@ PRIVATE>
self window :> window self window :> window
window [ window [
window world-focus :> gadget window world-focus :> gadget
gadget support-input-methods? [ gadget [
gadget preedit? [ gadget support-input-methods? [
gadget { gadget preedit? [
[ preedit-start>> second ] gadget {
[ preedit-end>> second ] [ preedit-start>> second ]
[ preedit-start>> first ] [ editor-line ] [ preedit-end>> second ]
} cleave subseq [ preedit-start>> first ] [ editor-line ]
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi } cleave subseq
gadget user-input* drop gadget [ remove-preedit-text ] [ remove-preedit-info ] bi
gadget user-input* drop
] when
f gadget preedit-selection-mode?<<
] when ] when
f gadget preedit-selection-mode?<<
] when ] when
] when ] when
] ; ] ;
@ -546,36 +595,34 @@ PRIVATE>
NSArray "NSMarkedClauseSegment" <NSString> -> arrayWithObject: NSArray "NSMarkedClauseSegment" <NSString> -> arrayWithObject:
] ; ] ;
METHOD: id attributedSubstringForProposedRange: NSRange range METHOD: id attributedSubstringForProposedRange: NSRange aRange
actualRange: id actualRange [ f ] ; actualRange: id actualRange [ f ] ;
METHOD: NSUInteger characterIndexForPoint: NSPoint point [ 0 ] ; METHOD: NSUInteger characterIndexForPoint: NSPoint point [ 0 ] ;
METHOD: NSRect firstRectForCharacterRange: NSRange aRange METHOD: NSRect firstRectForCharacterRange: NSRange aRange
actualRange: id actualRange [ actualRange: NSRange actualRange [
aRange :> range!
actualRange [
actualRange NSRange memory>struct range!
] when
self window :> window self window :> window
window [ window [
window world-focus preedit? [ window world-focus :> gadget
window world-focus :> gadget gadget [
gadget editor-caret first gadget editor-line :> str gadget support-input-methods? [
str range location>> >codepoint-index :> start-pos gadget editor-caret first gadget editor-line :> str
gadget screen-loc str aRange location>> >codepoint-index :> start-pos
gadget editor-caret first start-pos 2array gadget loc>x dup :> xl gadget editor-caret first start-pos 2array gadget loc>x
gadget caret-loc second gadget caret-dim second + gadget caret-loc second gadget caret-dim second +
[ >fixnum ] bi@ 2array v+ { 1 -1 } v* 2array ! character pos
window handle>> window>> dup -> frame -> contentRectForFrameRect: gadget screen-loc v+ ! + gadget pos
CGRect-top-left 2array v+ { 1 -1 } v*
first2 0 gadget line-height >fixnum window handle>> window>> dup -> frame -> contentRectForFrameRect:
CGRect-top-left 2array v+ ! + window pos
first2 [ >fixnum ] bi@ 0 gadget line-height >fixnum
] [ 0 0 0 0 ] if
] [ 0 0 0 0 ] if ] [ 0 0 0 0 ] if
] [ 0 0 0 0 ] if ] [ 0 0 0 0 ] if
<CGRect> <CGRect>
] ; ] ;
! Initialization ! Initialization
METHOD: void updateFactorGadgetSize: id notification METHOD: void updateFactorGadgetSize: id notification
[ [