From 4df75765634fd01d87da14eb646736c840fd549e Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Tue, 22 Dec 2015 09:18:18 +0400
Subject: [PATCH] spacebar moves selection to the next file in directory view.

also, space is considered now when performing dynamic filename lookups
(PreviewTextInput event isn't fired for space key).
---
 MainWindow.xaml    |  4 ++++
 MainWindow.xaml.cs | 31 +++++++++++++++++++++++++++++++
 README.md          |  1 +
 3 files changed, 36 insertions(+)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index b59af88b..ebf8345e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -265,6 +265,7 @@
                     SelectionMode="Extended" Foreground="Black" AlternationCount="2"
                     ContextMenu="{StaticResource lvDirContextMenu}"
                     PreviewTextInput="lv_TextInput" IsSynchronizedWithCurrentItem="True"
+                    PreviewKeyDown="lv_KeyDown"
                     SelectionChanged="lv_SelectionChanged"
                     GridViewColumnHeader.Click="lv_ColumnHeaderClicked">
                 <ListView.Resources>
@@ -274,6 +275,7 @@
                     <KeyBinding Key="Enter" Command="{x:Static local:Commands.OpenItem}"/>
                     <KeyBinding Gesture="Ctrl+E" Command="{x:Static local:Commands.ExploreItem}"/>
                     <KeyBinding Gesture="F2" Command="{x:Static local:Commands.RenameItem}"/>
+                    <KeyBinding Gesture="Space" Command="{x:Static local:Commands.NextItem}"/>
                     <MouseBinding Gesture="LeftDoubleClick" Command="{x:Static local:Commands.OpenItem}" />
                 </ListView.InputBindings>
                 <ListView.ItemContainerStyle>
@@ -368,6 +370,7 @@
         <KeyBinding Gesture="F6" Command="{x:Static local:Commands.ConvertMedia}"/>
         <KeyBinding Gesture="Delete" Command="{x:Static local:Commands.DeleteItem}"/>
         <KeyBinding Gesture="Add" Command="{x:Static local:Commands.AddSelection}"/>
+        <KeyBinding Gesture="Space" Command="{x:Static local:Commands.NextItem}"/>
     </Window.InputBindings>
     <Window.CommandBindings>
         <CommandBinding Command="{x:Static local:Commands.OpenItem}"   Executed="OpenItemExec"   CanExecute="CanExecuteOnSelected"/>
@@ -375,6 +378,7 @@
         <CommandBinding Command="{x:Static local:Commands.OpenRecent}" Executed="OpenRecentExec" CanExecute="CanExecuteAlways"/>
         <CommandBinding Command="{x:Static local:Commands.AddSelection}" Executed="AddSelectionExec" CanExecute="CanExecuteAlways"/>
         <CommandBinding Command="{x:Static local:Commands.SelectAll}"  Executed="SelectAllExec" CanExecute="CanExecuteAlways"/>
+        <CommandBinding Command="{x:Static local:Commands.NextItem}"  Executed="NextItemExec" CanExecute="CanExecuteAlways"/>
         <CommandBinding Command="{x:Static local:Commands.ExtractItem}" Executed="ExtractItemExec"   CanExecute="CanExecuteExtract"/>
         <CommandBinding Command="{x:Static local:Commands.CreateArchive}" Executed="CreateArchiveExec" CanExecute="CanExecuteCreateArchive"/>
         <CommandBinding Command="{x:Static local:Commands.DeleteItem}" Executed="DeleteItemExec" CanExecute="CanExecuteOnPhysicalFile" />
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 04886355..218900eb 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -588,12 +588,26 @@ namespace GARbro.GUI
             e.Handled = true;
         }
 
+        private void lv_KeyDown (object sender, KeyEventArgs e)
+        {
+            if (e.IsDown && Key.Space == e.Key && LookupActive)
+            {
+                LookupItem (" ", e.Timestamp);
+                e.Handled = true;
+            }
+        }
+
         class InputData
         {
             public int              LastTime = 0;
             public StringBuilder    Phrase = new StringBuilder();
             public bool             Mismatch = false;
 
+            public bool LookupActive
+            {
+                get { return Phrase.Length > 0 && Environment.TickCount - LastTime < TextLookupTimeout; }
+            }
+
             public void Reset ()
             {
                 Phrase.Clear ();
@@ -605,6 +619,8 @@ namespace GARbro.GUI
 
         InputData m_current_input = new InputData();
 
+        public bool LookupActive { get { return m_current_input.LookupActive; } }
+
         /// <summary>
         /// Lookup item in listview pane by first letters of name.
         /// </summary>
@@ -1147,6 +1163,20 @@ namespace GARbro.GUI
             CurrentDirectory.SelectAll();
         }
 
+        void NextItemExec (object sender, ExecutedRoutedEventArgs e)
+        {
+            if (LookupActive)
+                return;
+
+            var index = CurrentDirectory.SelectedIndex;
+            if (-1 == index)
+                index = 0;
+            else
+                ++index;
+            if (index < CurrentDirectory.Items.Count)
+                CurrentDirectory.SelectedIndex = index;
+        }
+
         /// <summary>
         /// Handle "Exit" command.
         /// </summary>
@@ -1351,5 +1381,6 @@ namespace GARbro.GUI
         public static readonly RoutedCommand AddSelection = new RoutedCommand();
         public static readonly RoutedCommand SelectAll = new RoutedCommand();
         public static readonly RoutedCommand SetFileType = new RoutedCommand();
+        public static readonly RoutedCommand NextItem = new RoutedCommand();
     }
 }
diff --git a/README.md b/README.md
index 33e6580e..ad8affe4 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ GUI Hotkeys
 <tr><td><kbd>Alt</kbd>+<kbd>&rarr;</kbd></td><td>   Go forward</td></tr>
 <tr><td><kbd>Ctrl</kbd>+<kbd>O</kbd></td><td>       Open file as archive</td></tr>
 <tr><td><kbd>Ctrl</kbd>+<kbd>A</kbd></td><td>       Select all files</td></tr>
+<tr><td><kbd>Space</kbd></td><td>                   Select next file</td></tr>
 <tr><td><kbd>Numpad +</kbd></td><td>                Select files matching specified mask</td></tr>
 <tr><td><kbd>F3</kbd></td><td>                      Create archive</td></tr>
 <tr><td><kbd>F4</kbd></td><td>                      Extract selected files</td></tr>