From 0c4c27ac6cec33c650e5f46de47e75703b8a5054 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Thu, 7 Jul 2011 21:35:33 +0200
Subject: [PATCH] adjust indentation of code from previous patches and make
 shift-tab customizable

---
 doc/keys         |  2 ++
 src/help.cpp     |  7 ++++++-
 src/ncmpcpp.cpp  | 24 ++++++++++--------------
 src/settings.cpp |  4 ++++
 src/settings.h   |  1 +
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/doc/keys b/doc/keys
index 08b7d365..549636d6 100644
--- a/doc/keys
+++ b/doc/keys
@@ -56,6 +56,8 @@
 #
 #key_screen_switcher = 9
 #
+#key_backward_screen_switcher = 353
+#
 #key_help = '1' 265
 #
 #key_playlist = '2' 266
diff --git a/src/help.cpp b/src/help.cpp
index aab03922..9d35c448 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -101,6 +101,8 @@ std::string Help::DisplayKeys(int *key, int size)
 			result += "Left";
 		else if (key[i] == 9)
 			result += "Tab";
+		else if (key[i] == 353)
+			result += "Shift-Tab";
 		else if (key[i] >= 1 && key[i] <= 26)
 		{
 			result += "Ctrl-";
@@ -145,7 +147,10 @@ void Help::GetKeybindings()
 	if (Config.screen_switcher_previous)
 		*w << DisplayKeys(Key.ScreenSwitcher)   << "Switch between current and last screen\n";
 	else
-		*w << DisplayKeys(Key.ScreenSwitcher)   << "Switch between given sequence of screens\n";
+	{
+		*w << DisplayKeys(Key.ScreenSwitcher)   << "Switch to next screen in sequence\n";
+		*w << DisplayKeys(Key.BackwardScreenSwitcher) << "Switch to previous screen in sequence\n";
+	}
 	*w << DisplayKeys(Key.Help)			<< "Help screen\n";
 	*w << DisplayKeys(Key.Playlist)			<< "Playlist screen\n";
 	*w << DisplayKeys(Key.Browser)			<< "Browse screen\n";
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 3dc1740b..8de17d76 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -147,7 +147,7 @@ namespace
 		myPlaylistEditor->hasToBeResized = 1;
 		myLyrics->hasToBeResized = 1;
 		mySelectedItemsAdder->hasToBeResized = 1;
-                mySongInfo->hasToBeResized = 1;
+		mySongInfo->hasToBeResized = 1;
 		
 #		ifdef HAVE_CURL_CURL_H
 		myLastfm->hasToBeResized = 1;
@@ -2231,9 +2231,9 @@ int main(int argc, char *argv[])
 					(*screen)->SwitchTo();
 			}
 		}
-                else if (input == 353)
-                {
-                        if (Config.screen_switcher_previous)
+		else if (!Config.screen_switcher_previous && Keypressed(input, Key.BackwardScreenSwitcher))
+		{
+			if (Config.screen_switcher_previous)
 			{
 				if (myScreen->isTabbable())
 					myPrevScreen->SwitchTo();
@@ -2243,16 +2243,12 @@ int main(int argc, char *argv[])
 			else if (!Config.screens_seq.empty())
 			{
 				std::list<BasicScreen *>::const_iterator screen = std::find(Config.screens_seq.begin(), Config.screens_seq.end(), myScreen);
-				if (screen == Config.screens_seq.begin()) {
-                                        screen = --(Config.screens_seq.end());
-                                        (*screen)->SwitchTo();
-                                }
-				else {
-                                        --screen;
-					(*screen)->SwitchTo();
-                                }
-                        }
-                }
+				if (screen == Config.screens_seq.begin())
+					(*Config.screens_seq.rbegin())->SwitchTo();
+				else
+					(*--screen)->SwitchTo();
+			}
+		}
 		else if (Keypressed(input, Key.Playlist))
 		{
 			myPlaylist->SwitchTo();
diff --git a/src/settings.cpp b/src/settings.cpp
index 5cd09024..69f83b0b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -185,6 +185,7 @@ void NcmpcppKeys::SetDefaults()
 	PrevColumn[0] = KEY_LEFT;
 	NextColumn[0] = KEY_RIGHT;
 	ScreenSwitcher[0] = 9;
+	BackwardScreenSwitcher[0] = 353;
 	Help[0] = '1';
 	Playlist[0] = '2';
 	Browser[0] = '3';
@@ -272,6 +273,7 @@ void NcmpcppKeys::SetDefaults()
 	PrevColumn[1] = NullKey;
 	NextColumn[1] = NullKey;
 	ScreenSwitcher[1] = NullKey;
+	BackwardScreenSwitcher[1] = NullKey;
 	Help[1] = 265;
 	Playlist[1] = 266;
 	Browser[1] = 267;
@@ -502,6 +504,8 @@ void NcmpcppKeys::Read()
 				GetKeys(key, NextColumn);
 			else if (key.find("key_screen_switcher ") != std::string::npos)
 				GetKeys(key, ScreenSwitcher);
+			else if (key.find("key_backward_screen_switcher ") != std::string::npos)
+				GetKeys(key, BackwardScreenSwitcher);
 			else if (key.find("key_help ") != std::string::npos)
 				GetKeys(key, Help);
 			else if (key.find("key_playlist ") != std::string::npos)
diff --git a/src/settings.h b/src/settings.h
index 698efa0e..24d51d16 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -76,6 +76,7 @@ struct NcmpcppKeys
 	int PrevColumn[2];
 	int NextColumn[2];
 	int ScreenSwitcher[2];
+	int BackwardScreenSwitcher[2];
 	int Help[2];
 	int Playlist[2];
 	int Browser[2];