summaryrefslogtreecommitdiff
path: root/indra/llwindow/llopenglview-objc.mm
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
-rw-r--r--indra/llwindow/llopenglview-objc.mm31
1 files changed, 7 insertions, 24 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index d91601152b..25669b25d3 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -190,6 +190,11 @@
[_window flagsChanged:theEvent];
}
+- (void) mouseExited:(NSEvent *)theEvent
+{
+ [_window mouseExited:theEvent];
+}
+
- (BOOL) becomeFirstResponder
{
return [_window becomeFirstResponder];
@@ -217,6 +222,7 @@
- (void) keyDown:(NSEvent *)theEvent
{
callKeyDown([theEvent keyCode], mModifiers);
+ NSLog(@"Keycode: %hu", [theEvent keyCode]);
NSString *chars = [theEvent characters];
for (uint i = 0; i < [chars length]; i++)
{
@@ -254,30 +260,7 @@
}
- (void)flagsChanged:(NSEvent *)theEvent {
- uint modifiers = [theEvent modifierFlags];
-
- // Filter through our modifier keys, and only pick out the ones we care about.
-
- mModifiers = 0;
- if (modifiers & NSCommandKeyMask)
- {
- mModifiers |= 0x0001;
- }
-
- if (modifiers & NSAlternateKeyMask)
- {
- mModifiers |= 0x0002;
- }
-
- if (modifiers & NSShiftKeyMask)
- {
- mModifiers |= 0x0004;
- }
-
- if (modifiers & NSControlKeyMask)
- {
- mModifiers |= 0x0001;
- }
+ mModifiers = [theEvent modifierFlags];
}
- (void) mouseDown:(NSEvent *)theEvent