Dark Mode & Stream Overlay [macOS] (#315)

* dark mode & stream overlay

* removed all redundant imports

* update for the new xcode version with fixes for the new 'implicitly retains self warning'

* reworked the overlay view

* cleaning up unused variables

* small corrections

Moonlight macOS/Input/StreamView.m

@@ -11,26 +11,27 @@
 #import "DataManager.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include "keyboardTranslation.h"
+#import "OverlayView.h"
 
 @implementation StreamView {
-    BOOL isDragging;
-    NSTrackingArea *trackingArea;
+    bool isDragging;
+    NSTrackingArea* _trackingArea;
+    OverlayView* _overlay;
+    NSTextField* _stageLabel;
 }
 
 - (void) updateTrackingAreas {
-    
-    // This will be the area used to track the mouse movement
-    if (trackingArea != nil) {
-        [self removeTrackingArea:trackingArea];
+    if (_trackingArea != nil) {
+        [self removeTrackingArea:_trackingArea];
     }
     NSTrackingAreaOptions options = (NSTrackingActiveAlways | NSTrackingInVisibleRect |
                                      NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved);
     
-    trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
+    _trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
                                                         options:options
                                                           owner:self
                                                        userInfo:nil];
-    [self addTrackingArea:trackingArea];
+    [self addTrackingArea:_trackingArea];
 }
 
 -(void)mouseDragged:(NSEvent *)event {
@@ -59,24 +60,20 @@
 
 - (void)mouseDown:(NSEvent *)mouseEvent {
     LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-    [self setNeedsDisplay:YES];
 }
 
 - (void)mouseUp:(NSEvent *)mouseEvent {
     isDragging = false;
     LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
-    [self setNeedsDisplay:YES];
 }
 
 - (void)rightMouseUp:(NSEvent *)mouseEvent {
     isDragging = false;
     LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
-    [self setNeedsDisplay:YES];
 }
 
 - (void)rightMouseDown:(NSEvent *)mouseEvent {
     LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
-    [self setNeedsDisplay:YES];
 }
 
 - (void)mouseMoved:(NSEvent *)mouseEvent {
@@ -85,22 +82,24 @@
 
 -(void)keyDown:(NSEvent *)event {
     unsigned char keyChar = keyCharFromKeyCode(event.keyCode);
-    printf("DOWN: KeyCode: %hu, keyChar: %d, keyModifier: %lu \n", event.keyCode, keyChar, event.modifierFlags);
+    NSLog(@"DOWN: KeyCode: %hu, keyChar: %d, keyModifier: %lu \n", event.keyCode, keyChar, event.modifierFlags);
     
     LiSendKeyboardEvent(keyChar, KEY_ACTION_DOWN, modifierFlagForKeyModifier(event.modifierFlags));
+    if (event.modifierFlags & kCGEventFlagMaskCommand && event.keyCode == kVK_ANSI_I) {
+        [self toggleStats];
+    }
 }
 
 -(void)keyUp:(NSEvent *)event {
     unsigned char keyChar = keyCharFromKeyCode(event.keyCode);
-    printf("UP: KeyChar: %d \n‚", keyChar);
+    NSLog(@"UP: KeyChar: %d \n‚", keyChar);
     LiSendKeyboardEvent(keyChar, KEY_ACTION_UP, modifierFlagForKeyModifier(event.modifierFlags));
 }
 
-- (void)flagsChanged:(NSEvent *)event
-{
+- (void)flagsChanged:(NSEvent *)event {
     unsigned char keyChar = keyCodeFromModifierKey(event.modifierFlags);
     if(keyChar) {
-        printf("DOWN: FlagChanged: %hhu \n", keyChar);
+        NSLog(@"DOWN: FlagChanged: %hhu \n", keyChar);
         LiSendKeyboardEvent(keyChar, KEY_ACTION_DOWN, 0x00);
     }
     else {
@@ -108,6 +107,33 @@
     }
 }
 
+- (void)initStageLabel {
+    _stageLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(NSScreen.mainScreen.frame.size.width/2 - 100, NSScreen.mainScreen.frame.size.height/2 - 8, 200, 17)];
+    _stageLabel.drawsBackground = false;
+    _stageLabel.bordered = false;
+    _stageLabel.alignment = NSTextAlignmentCenter;
+    _stageLabel.textColor = [NSColor blackColor];
+    
+    [self addSubview:_stageLabel];
+}
+
+- (void)toggleStats {
+    if (_overlay == nil) {
+        _overlay = [[OverlayView alloc] initWithFrame:self.frame sender:self];
+        [self addSubview:_overlay];
+    }
+    [_overlay toggleOverlay:_codec];
+}
+
+- (void)drawMessage:(NSString*)message {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self->_stageLabel == nil) {
+            [self initStageLabel];
+        }
+        self->_stageLabel.stringValue = message;
+    });
+}
+
 - (BOOL)acceptsFirstResponder {
     return YES;
 }