diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-12 17:09:30 +0000 |
| commit | 44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch) | |
| tree | c1a5c851a06dd77a27cbc135e4625701e743902e /indra/llwindow/llopenglview-objc.mm | |
| parent | 4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff) | |
| parent | 915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff) | |
Merged DRTVWR-544-maint into SL-12238
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index f9b387b00b..27d36a803b 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -494,14 +494,14 @@ attributedStringInfo getSegments(NSAttributedString *str) // e.g. OS Window for upload something or Input Window... // mModifiers instance variable is for insertText: or insertText:replacementRange: (by Pell Smit) mModifiers = [theEvent modifierFlags]; + unichar ch = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; + bool acceptsText = mHasMarkedText ? false : callKeyDown(&eventData, keycode, mModifiers, ch); - bool acceptsText = mHasMarkedText ? false : callKeyDown(&eventData, keycode, mModifiers, [[theEvent characters] characterAtIndex:0]); - unichar ch; if (acceptsText && !mMarkedTextAllowed && !(mModifiers & (NSControlKeyMask | NSCommandKeyMask)) && // commands don't invoke InputWindow ![(LLAppDelegate*)[NSApp delegate] romanScript] && - (ch = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]) > ' ' && + ch > ' ' && ch != NSDeleteCharacter && (ch < 0xF700 || ch > 0xF8FF)) // 0xF700-0xF8FF: reserved for function keys on the keyboard(from NSEvent.h) { |