From 451f2e112e946cb363d023302b2bd384b9374f68 Mon Sep 17 00:00:00 2001
From: unK <electricityispower@gmail.com>
Date: Tue, 2 Sep 2008 06:00:00 +0200
Subject: [PATCH] 'start searching immediately' function added

---
 doc/ncmpcpp_keys |  2 ++
 src/ncmpcpp.cpp  | 11 +++++++++++
 src/settings.cpp |  4 ++++
 src/settings.h   |  1 +
 4 files changed, 18 insertions(+)

diff --git a/doc/ncmpcpp_keys b/doc/ncmpcpp_keys
index a886a80d..c06b800e 100644
--- a/doc/ncmpcpp_keys
+++ b/doc/ncmpcpp_keys
@@ -117,6 +117,8 @@
 #
 #key_go_to_containing_directory = 'G'
 #
+#key_start_searching = 'y'
+#
 #key_go_to_parent_dir = 263 127
 #
 #key_quit = 'q' 'Q'
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index fcceb99c..5244d2e1 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -296,6 +296,7 @@ int main(int argc, char *argv[])
 	sHelp->Add("   [b]Keys - Search engine\n -----------------------------------------[/b]\n");
 	sHelp->Add(DisplayKeys(Key.Enter) + "Add item to playlist and play/change option\n");
 	sHelp->Add(DisplayKeys(Key.Space) + "Add item to playlist\n");
+	sHelp->Add(DisplayKeys(Key.StartSearching) + "Start searching immediately\n");
 	sHelp->Add(DisplayKeys(Key.GoToContainingDir) + "Go to directory containing found item\n\n\n");
 	
 	sHelp->Add("   [b]Keys - Media library\n -----------------------------------------[/b]\n");
@@ -1012,6 +1013,8 @@ int main(int argc, char *argv[])
 				}
 				case csSearcher:
 				{
+					ENTER_SEARCH_ENGINE_SCREEN:
+					
 					int id = mSearcher->GetChoice();
 					int option = mSearcher->GetChoice();
 					LOCK_STATUSBAR;
@@ -1853,6 +1856,14 @@ int main(int argc, char *argv[])
 				goto SWITCHER_BROWSER_REDIRECT;
 			}
 		}
+		else if (Keypressed(input, Key.StartSearching))
+		{
+			if (wCurrent == mSearcher)
+			{
+				mSearcher->Highlight(13);
+				goto ENTER_SEARCH_ENGINE_SCREEN;
+			}
+		}
 		else if (Keypressed(input, Key.GoToPosition))
 		{
 			if (now_playing < 0)
diff --git a/src/settings.cpp b/src/settings.cpp
index d6bd4a25..3b595fa3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -78,6 +78,7 @@ void DefaultKeys(ncmpcpp_keys &keys)
 	keys.SavePlaylist[0] = 'S';
 	keys.GoToNowPlaying[0] = 'o';
 	keys.GoToContainingDir[0] = 'G';
+	keys.StartSearching[0] = 'y';
 	keys.ToggleAutoCenter[0] = 'U';
 	keys.GoToParentDir[0] = 263;
 	keys.Quit[0] = 'q';
@@ -133,6 +134,7 @@ void DefaultKeys(ncmpcpp_keys &keys)
 	keys.SavePlaylist[1] = null_key;
 	keys.GoToNowPlaying[1] = null_key;
 	keys.GoToContainingDir[1] = null_key;
+	keys.StartSearching[1] = null_key;
 	keys.ToggleAutoCenter[1] = null_key;
 	keys.GoToParentDir[1] = 127;
 	keys.Quit[1] = 'Q';
@@ -384,6 +386,8 @@ void ReadKeys(ncmpcpp_keys &keys)
 				GetKeys(*it, keys.ToggleAutoCenter);
 			else if (it->find("key_go_to_containing_directory ") != string::npos)
 				GetKeys(*it, keys.GoToContainingDir);
+			else if (it->find("key_start_searching ") != string::npos)
+				GetKeys(*it, keys.StartSearching);
 			else if (it->find("key_go_to_parent_dir ") != string::npos)
 				GetKeys(*it, keys.GoToParentDir);
 			else if (it->find("key_quit ") != string::npos)
diff --git a/src/settings.h b/src/settings.h
index 477bf2c2..4e774668 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -80,6 +80,7 @@ struct ncmpcpp_keys
 	int SavePlaylist[2];
 	int GoToNowPlaying[2];
 	int GoToContainingDir[2];
+	int StartSearching[2];
 	int ToggleAutoCenter[2];
 	int GoToParentDir[2];
 	int Quit[2];