ui.backend.cocoa.views: some formatting cleanup.
John Benediktsson
parent
c8f82ecf2c
commit
42b6fbec70
|
|
@ -238,7 +238,7 @@ IMPORT: NSAttributedString
|
||||||
] [ underlines ] if ;
|
] [ underlines ] if ;
|
||||||
|
|
||||||
:: update-marked-text ( gadget str selectedRange replacementRange -- )
|
:: update-marked-text ( gadget str selectedRange replacementRange -- )
|
||||||
replacementRange location>> NSNotFound = not [
|
replacementRange location>> NSNotFound = [
|
||||||
gadget editor-caret first
|
gadget editor-caret first
|
||||||
dup gadget editor-line
|
dup gadget editor-line
|
||||||
[
|
[
|
||||||
|
|
@ -253,7 +253,7 @@ IMPORT: NSAttributedString
|
||||||
gadget earlier-caret/mark dup
|
gadget earlier-caret/mark dup
|
||||||
gadget preedit-start<<
|
gadget preedit-start<<
|
||||||
0 1 2array v+ gadget preedit-end<<
|
0 1 2array v+ gadget preedit-end<<
|
||||||
] when
|
] unless
|
||||||
|
|
||||||
gadget preedit? [
|
gadget preedit? [
|
||||||
gadget remove-preedit-text
|
gadget remove-preedit-text
|
||||||
|
|
@ -459,148 +459,147 @@ PRIVATE>
|
||||||
|
|
||||||
! Text input
|
! Text input
|
||||||
METHOD: void insertText: id text replacementRange: NSRange replacementRange [
|
METHOD: void insertText: id text replacementRange: NSRange replacementRange [
|
||||||
self window :> window
|
self window :> window
|
||||||
window [
|
window [
|
||||||
|
"" clone :> str!
|
||||||
|
text NSString -> class -> isKindOfClass: 0 = not [
|
||||||
|
text CF>string str!
|
||||||
|
] [
|
||||||
|
text -> string CF>string str!
|
||||||
|
] if
|
||||||
|
window world-focus :> gadget
|
||||||
|
gadget [
|
||||||
|
gadget support-input-methods? [
|
||||||
|
replacementRange location>> NSNotFound = [
|
||||||
|
gadget editor-caret first
|
||||||
|
dup gadget editor-line
|
||||||
|
[
|
||||||
|
replacementRange location>> >codepoint-index
|
||||||
|
2array gadget set-caret
|
||||||
|
] [
|
||||||
|
replacementRange [ location>> ] [ length>> ] bi +
|
||||||
|
>codepoint-index
|
||||||
|
2array gadget set-mark
|
||||||
|
] 2bi
|
||||||
|
] unless
|
||||||
|
gadget preedit? [
|
||||||
|
gadget remove-preedit-text
|
||||||
|
gadget remove-preedit-info
|
||||||
|
str gadget user-input* drop
|
||||||
|
f gadget preedit-selection-mode?<<
|
||||||
|
] [
|
||||||
|
str window user-input
|
||||||
|
] if
|
||||||
|
] [
|
||||||
|
str window user-input
|
||||||
|
] if
|
||||||
|
] when
|
||||||
|
] when
|
||||||
|
] ;
|
||||||
|
|
||||||
|
METHOD: char hasMarkedText [
|
||||||
|
self window :> window
|
||||||
|
window [
|
||||||
|
window world-focus :> gadget
|
||||||
|
gadget [
|
||||||
|
gadget preedit? 1 0 ?
|
||||||
|
] [ 0 ] if
|
||||||
|
] [ 0 ] if
|
||||||
|
] ;
|
||||||
|
|
||||||
|
METHOD: NSRange markedRange [
|
||||||
|
self window :> window
|
||||||
|
window [
|
||||||
|
window world-focus :> gadget
|
||||||
|
gadget [
|
||||||
|
gadget preedit? [
|
||||||
|
gadget preedit-start>> second
|
||||||
|
gadget preedit-end>> second < [
|
||||||
|
gadget preedit-start>> first gadget editor-line :> str
|
||||||
|
gadget preedit-start>> second ! location
|
||||||
|
gadget preedit-end>> second
|
||||||
|
[ str swap >utf16-index ] bi@ over - ! length
|
||||||
|
] [ NSNotFound 0 ] if
|
||||||
|
] [ NSNotFound 0 ] if
|
||||||
|
] [ NSNotFound 0 ] if
|
||||||
|
] [ NSNotFound 0 ] if
|
||||||
|
<NSRange>
|
||||||
|
] ;
|
||||||
|
|
||||||
|
METHOD: NSRange selectedRange [
|
||||||
|
self window :> window
|
||||||
|
window [
|
||||||
|
window world-focus :> gadget
|
||||||
|
gadget [
|
||||||
|
gadget support-input-methods? [
|
||||||
|
gadget editor-caret first gadget editor-line :> str
|
||||||
|
gadget preedit? [
|
||||||
|
str
|
||||||
|
gadget preedit-selected-start>> second
|
||||||
|
gadget preedit-start>> second
|
||||||
|
- >utf16-index ! location
|
||||||
|
gadget preedit-selected-end>> second
|
||||||
|
gadget preedit-selected-start>> second
|
||||||
|
[ str swap >utf16-index ] bi@ - ! length
|
||||||
|
] [
|
||||||
|
str gadget editor-caret second >utf16-index 0
|
||||||
|
] if
|
||||||
|
] [ 0 0 ] if
|
||||||
|
] [ 0 0 ] if
|
||||||
|
] [ 0 0 ] if
|
||||||
|
<NSRange>
|
||||||
|
] ;
|
||||||
|
|
||||||
|
METHOD: void setMarkedText: id text selectedRange: NSRange selectedRange
|
||||||
|
replacementRange: NSRange replacementRange [
|
||||||
|
self window :> window
|
||||||
|
window [
|
||||||
|
window world-focus :> gadget
|
||||||
|
gadget [
|
||||||
|
{ } clone :> underlines!
|
||||||
"" clone :> str!
|
"" clone :> str!
|
||||||
text NSString -> class -> isKindOfClass: 0 = not [
|
text NSString -> class -> isKindOfClass: 0 = not [
|
||||||
text CF>string str!
|
text CF>string str!
|
||||||
] [
|
] [
|
||||||
text -> string CF>string str!
|
text -> string CF>string str!
|
||||||
] if
|
|
||||||
window world-focus :> gadget
|
|
||||||
gadget [
|
|
||||||
gadget support-input-methods? [
|
gadget support-input-methods? [
|
||||||
replacementRange location>> NSNotFound = [
|
gadget text selectedRange make-preedit-underlines underlines!
|
||||||
gadget editor-caret first
|
|
||||||
dup gadget editor-line
|
|
||||||
[
|
|
||||||
replacementRange location>> >codepoint-index
|
|
||||||
2array gadget set-caret
|
|
||||||
] [
|
|
||||||
replacementRange [ location>> ] [ length>> ] bi +
|
|
||||||
>codepoint-index
|
|
||||||
2array gadget set-mark
|
|
||||||
] 2bi
|
|
||||||
] unless
|
|
||||||
gadget preedit? [
|
|
||||||
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi
|
|
||||||
str gadget user-input* drop
|
|
||||||
f gadget preedit-selection-mode?<<
|
|
||||||
] [
|
|
||||||
str window user-input
|
|
||||||
] if
|
|
||||||
] [
|
|
||||||
str window user-input
|
|
||||||
] if
|
|
||||||
] when
|
|
||||||
] when
|
|
||||||
] ;
|
|
||||||
|
|
||||||
METHOD: char hasMarkedText [
|
|
||||||
self window :> window
|
|
||||||
window [
|
|
||||||
window world-focus :> gadget
|
|
||||||
gadget [
|
|
||||||
gadget preedit? [ 1 ] [ 0 ] if
|
|
||||||
] [ 0 ] if
|
|
||||||
] [ 0 ] if
|
|
||||||
] ;
|
|
||||||
|
|
||||||
METHOD: NSRange markedRange [
|
|
||||||
self window :> window
|
|
||||||
window [
|
|
||||||
window world-focus :> gadget
|
|
||||||
gadget [
|
|
||||||
gadget preedit? [
|
|
||||||
gadget [ preedit-start>> second ] [ preedit-end>> second ] bi >= [
|
|
||||||
NSNotFound 0
|
|
||||||
] [
|
|
||||||
gadget preedit-start>> first gadget editor-line :> str
|
|
||||||
gadget
|
|
||||||
[ 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
|
|
||||||
<NSRange>
|
|
||||||
] ;
|
|
||||||
|
|
||||||
METHOD: NSRange selectedRange [
|
|
||||||
self window :> window
|
|
||||||
window [
|
|
||||||
window world-focus :> gadget
|
|
||||||
gadget [
|
|
||||||
gadget support-input-methods? [
|
|
||||||
gadget editor-caret first gadget editor-line :> str
|
|
||||||
gadget preedit? [
|
|
||||||
str
|
|
||||||
gadget
|
|
||||||
[ preedit-selected-start>> second ]
|
|
||||||
[ preedit-start>> second ]
|
|
||||||
bi - >utf16-index ! location
|
|
||||||
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
|
|
||||||
<NSRange>
|
|
||||||
] ;
|
|
||||||
|
|
||||||
METHOD: void setMarkedText: id text selectedRange: NSRange selectedRange
|
|
||||||
replacementRange: NSRange replacementRange [
|
|
||||||
self window :> window
|
|
||||||
window [
|
|
||||||
window world-focus :> gadget
|
|
||||||
gadget [
|
|
||||||
{ } clone :> underlines!
|
|
||||||
"" clone :> str!
|
|
||||||
text NSString -> class -> isKindOfClass: 0 = not [
|
|
||||||
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 str selectedRange replacementRange update-marked-text
|
|
||||||
underlines gadget preedit-underlines<<
|
|
||||||
] when
|
] when
|
||||||
|
] if
|
||||||
|
gadget support-input-methods? [
|
||||||
|
gadget str selectedRange replacementRange update-marked-text
|
||||||
|
underlines gadget preedit-underlines<<
|
||||||
] when
|
] when
|
||||||
] when
|
] when
|
||||||
] ;
|
] when
|
||||||
|
] ;
|
||||||
|
|
||||||
METHOD: void unmarkText [
|
METHOD: void unmarkText [
|
||||||
self window :> window
|
self window :> window
|
||||||
window [
|
window [
|
||||||
window world-focus :> gadget
|
window world-focus :> gadget
|
||||||
gadget [
|
gadget [
|
||||||
gadget support-input-methods? [
|
gadget support-input-methods? [
|
||||||
gadget preedit? [
|
gadget preedit? [
|
||||||
gadget {
|
gadget {
|
||||||
[ preedit-start>> second ]
|
[ preedit-start>> second ]
|
||||||
[ preedit-end>> second ]
|
[ preedit-end>> second ]
|
||||||
[ preedit-start>> first ] [ editor-line ]
|
[ preedit-start>> first ]
|
||||||
} cleave subseq
|
[ editor-line ]
|
||||||
gadget [ remove-preedit-text ] [ remove-preedit-info ] bi
|
} cleave subseq
|
||||||
gadget user-input* drop
|
gadget remove-preedit-text
|
||||||
] when
|
gadget remove-preedit-info
|
||||||
f gadget preedit-selection-mode?<<
|
gadget user-input* drop
|
||||||
] when
|
] when
|
||||||
|
f gadget preedit-selection-mode?<<
|
||||||
] when
|
] when
|
||||||
] when
|
] when
|
||||||
] ;
|
] when
|
||||||
|
] ;
|
||||||
|
|
||||||
METHOD: id validAttributesForMarkedText [
|
METHOD: id validAttributesForMarkedText [
|
||||||
NSArray "NSMarkedClauseSegment" <NSString> -> arrayWithObject:
|
NSArray "NSMarkedClauseSegment" <NSString> -> arrayWithObject:
|
||||||
] ;
|
] ;
|
||||||
|
|
||||||
METHOD: id attributedSubstringForProposedRange: NSRange aRange
|
METHOD: id attributedSubstringForProposedRange: NSRange aRange
|
||||||
actualRange: id actualRange [ f ] ;
|
actualRange: id actualRange [ f ] ;
|
||||||
|
|
@ -609,26 +608,26 @@ PRIVATE>
|
||||||
|
|
||||||
METHOD: NSRect firstRectForCharacterRange: NSRange aRange
|
METHOD: NSRect firstRectForCharacterRange: NSRange aRange
|
||||||
actualRange: NSRange actualRange [
|
actualRange: NSRange actualRange [
|
||||||
self window :> window
|
self window :> window
|
||||||
window [
|
window [
|
||||||
window world-focus :> gadget
|
window world-focus :> gadget
|
||||||
gadget [
|
gadget [
|
||||||
gadget support-input-methods? [
|
gadget support-input-methods? [
|
||||||
gadget editor-caret first gadget editor-line :> str
|
gadget editor-caret first gadget editor-line :> str
|
||||||
str aRange location>> >codepoint-index :> start-pos
|
str aRange location>> >codepoint-index :> start-pos
|
||||||
gadget editor-caret first start-pos 2array gadget loc>x
|
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 +
|
||||||
2array ! character pos
|
2array ! character pos
|
||||||
gadget screen-loc v+ ! + gadget pos
|
gadget screen-loc v+ ! + gadget pos
|
||||||
{ 1 -1 } v*
|
{ 1 -1 } v*
|
||||||
window handle>> window>> dup -> frame -> contentRectForFrameRect:
|
window handle>> window>> dup -> frame -> contentRectForFrameRect:
|
||||||
CGRect-top-left 2array v+ ! + window pos
|
CGRect-top-left 2array v+ ! + window pos
|
||||||
first2 [ >fixnum ] bi@ 0 gadget line-height >fixnum
|
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>
|
] [ 0 0 0 0 ] if
|
||||||
] ;
|
<CGRect>
|
||||||
|
] ;
|
||||||
|
|
||||||
METHOD: void doCommandBySelector: SEL selector [ ] ;
|
METHOD: void doCommandBySelector: SEL selector [ ] ;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue