From 39bc8df77c1b440c138d064d1141af54b293493b Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Wed, 26 Sep 2018 20:30:02 -0700
Subject: [PATCH] Implement spacebar for play/pause and enter for restart
 current track for the mini window, and implement left/right arrows for
 seeking forward and backward for both the mini window and the main window
 playlist view.

---
 Base.lproj/MainMenu.xib |  5 +++--
 Playlist/PlaylistView.m |  8 ++++++++
 Window/MiniWindow.h     |  3 ++-
 Window/MiniWindow.m     | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 3cbc06bae..201c51973 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -298,11 +298,11 @@
                                     </subviews>
                                     <nil key="backgroundColor"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1516">
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="1516">
                                     <rect key="frame" x="-100" y="-100" width="683" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
-                                <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="1515">
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="1515">
                                     <rect key="frame" x="85" y="17" width="15" height="68"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -773,6 +773,7 @@
                         <string key="NSNullPlaceholder">Cog</string>
                     </dictionary>
                 </binding>
+                <outlet property="playbackController" destination="705" id="vo7-mK-yQe"/>
             </connections>
         </window>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
index 1751d7017..ebd2c0dbd 100644
--- a/Playlist/PlaylistView.m
+++ b/Playlist/PlaylistView.m
@@ -198,6 +198,14 @@
 	{
 		[playbackController play:self];
 	}
+    else if (modifiers == 0 && c == NSLeftArrowFunctionKey)
+    {
+        [playbackController eventSeekBackward:self];
+    }
+    else if (modifiers == 0 && c == NSRightArrowFunctionKey)
+    {
+        [playbackController eventSeekForward:self];
+    }
 	// Escape
 	else if (modifiers == 0 && c == 0x1b) 
 	{ 
diff --git a/Window/MiniWindow.h b/Window/MiniWindow.h
index 49f58caf8..1b2ee588c 100644
--- a/Window/MiniWindow.h
+++ b/Window/MiniWindow.h
@@ -7,9 +7,10 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "PlaybackController.h"
 
 @interface MiniWindow : NSWindow {
-
+    IBOutlet PlaybackController *playbackController;
 }
 
 @end
diff --git a/Window/MiniWindow.m b/Window/MiniWindow.m
index 439be85ff..c66c426f1 100644
--- a/Window/MiniWindow.m
+++ b/Window/MiniWindow.m
@@ -36,5 +36,41 @@
     // Do nothing!
 }
 
+- (void)keyDown:(NSEvent *)e {
+    unsigned int   modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask);
+    NSString       *characters = [e characters];
+    unichar        c;
+    
+    if ([characters length] != 1)
+    {
+        [super keyDown:e];
+        
+        return;
+    }
+    
+    c = [characters characterAtIndex:0];
+    if (modifiers == 0 && c == ' ')
+    {
+        [playbackController playPauseResume:self];
+    }
+    else if (modifiers == 0 && (c == NSEnterCharacter || c == NSCarriageReturnCharacter))
+    {
+        [playbackController play:self];
+    }
+    else if (modifiers == 0 && c == NSLeftArrowFunctionKey)
+    {
+        [playbackController eventSeekBackward:self];
+    }
+    else if (modifiers == 0 && c == NSRightArrowFunctionKey)
+    {
+        [playbackController eventSeekForward:self];
+    }
+    else
+    {
+        [super keyDown:e];
+    }
+
+}
+
 
 @end