Move ncurses related files to curses directory

src/Makefile.am

@@ -1,5 +1,7 @@
 bin_PROGRAMS = ncmpcpp
 ncmpcpp_SOURCES = \
+	curses/scrollpad.cpp \
+	curses/window.cpp \
 	utility/comparators.cpp \
 	utility/html.cpp \
 	utility/option_parser.cpp \
@@ -33,7 +35,6 @@ ncmpcpp_SOURCES = \
 	playlist_editor.cpp \
 	screen.cpp \
 	screen_type.cpp \
-	scrollpad.cpp \
 	search_engine.cpp \
 	sel_items_adder.cpp \
 	server_info.cpp \
@@ -48,8 +49,7 @@ ncmpcpp_SOURCES = \
 	tags.cpp \
 	tiny_tag_editor.cpp \
 	title.cpp \
-	visualizer.cpp \
+	visualizer.cpp
-	window.cpp
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
@@ -57,6 +57,11 @@ INCLUDES= $(all_includes)
 # the library search path.
 ncmpcpp_LDFLAGS = $(all_libraries)
 noinst_HEADERS = \
+	curses/menu.h \
+	curses/menu_impl.h \
+	curses/scrollpad.h \
+	curses/strbuffer.h \
+	curses/window.h \
 	helpers/song_iterator_maker.h \
 	utility/comparators.h \
 	utility/const.h \
@@ -89,8 +94,6 @@ noinst_HEADERS = \
 	lyrics_fetcher.h \
 	macro_utilities.h \
 	media_library.h \
-	menu.h \
-	menu_impl.h \
 	mpdpp.h \
 	mutable_song.h \
 	outputs.h \
@@ -100,7 +103,6 @@ noinst_HEADERS = \
 	screen.h \
 	screen_switcher.h \
 	screen_type.h \
-	scrollpad.h \
 	search_engine.h \
 	sel_items_adder.h \
 	server_info.h \
@@ -115,5 +117,4 @@ noinst_HEADERS = \
 	tags.h \
 	tiny_tag_editor.h \
 	title.h \
-	visualizer.h \
+	visualizer.h
-	window.h

src/actions.cpp

@@ -40,12 +40,12 @@
 #include "utility/comparators.h"
 #include "utility/conversion.h"
 
+#include "curses/menu_impl.h"
 #include "bindings.h"
 #include "browser.h"
 #include "clock.h"
 #include "help.h"
 #include "media_library.h"
-#include "menu_impl.h"
 #include "lastfm.h"
 #include "lyrics.h"
 #include "playlist.h"

src/actions.h

@@ -25,8 +25,8 @@
 #include <boost/format.hpp>
 #include <map>
 #include <string>
+#include "curses/window.h"
 #include "interfaces.h"
-#include "window.h"
 
 // forward declarations
 struct SongList;

src/browser.cpp

@@ -30,7 +30,7 @@
 #include "global.h"
 #include "helpers.h"
 #include "playlist.h"
-#include "menu_impl.h"
+#include "curses/menu_impl.h"
 #include "screen_switcher.h"
 #include "settings.h"
 #include "status.h"

src/clock.h

@@ -25,9 +25,9 @@
 
 #ifdef ENABLE_CLOCK
 
+#include "curses/window.h"
 #include "interfaces.h"
 #include "screen.h"
-#include "window.h"
 
 struct Clock: Screen<NC::Window>, Tabbable
 {

src/display.cpp

@@ -20,12 +20,12 @@
 
 #include <cassert>
 
+#include "curses/menu_impl.h"
 #include "browser.h"
 #include "charset.h"
 #include "display.h"
 #include "format_impl.h"
 #include "helpers.h"
-#include "menu_impl.h"
 #include "song_info.h"
 #include "playlist.h"
 #include "global.h"

src/format.h

@@ -23,7 +23,7 @@
 
 #include <boost/variant.hpp>
 
-#include "menu.h"
+#include "curses/menu.h"
 #include "song.h"
 
 namespace Format {

src/format_impl.h

@@ -23,10 +23,10 @@
 
 #include <boost/variant.hpp>
 
+#include "curses/menu.h"
+#include "curses/strbuffer.h"
 #include "format.h"
-#include "menu.h"
 #include "song.h"
-#include "strbuffer.h"
 #include "utility/functional.h"
 #include "utility/wide_string.h"
 

src/helpers/song_iterator_maker.h

@@ -22,7 +22,7 @@
 #define NCMPCPP_HELPERS_SONG_ITERATOR_MAKER_H
 
 #include <boost/iterator/transform_iterator.hpp>
-#include "menu.h"
+#include "curses/menu.h"
 #include "song_list.h"
 
 template <typename SongT>

src/lastfm_service.h

@@ -26,7 +26,7 @@
 #include <map>
 #include <string>
 
-#include "scrollpad.h"
+#include "curses/scrollpad.h"
 
 namespace LastFm {
 

src/lyrics.cpp

@@ -27,6 +27,7 @@
 #include <fstream>
 #include <thread>
 
+#include "curses/scrollpad.h"
 #include "browser.h"
 #include "charset.h"
 #include "curl_handle.h"
@@ -35,7 +36,6 @@
 #include "helpers.h"
 #include "lyrics.h"
 #include "playlist.h"
-#include "scrollpad.h"
 #include "settings.h"
 #include "song.h"
 #include "statusbar.h"

src/media_library.cpp

@@ -28,7 +28,7 @@
 #include "display.h"
 #include "helpers.h"
 #include "global.h"
-#include "menu_impl.h"
+#include "curses/menu_impl.h"
 #include "mpdpp.h"
 #include "playlist.h"
 #include "media_library.h"

src/outputs.cpp

@@ -22,10 +22,10 @@
 
 #ifdef ENABLE_OUTPUTS
 
+#include "curses/menu_impl.h"
 #include "charset.h"
 #include "display.h"
 #include "global.h"
-#include "menu_impl.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"

src/playlist.cpp

@@ -22,10 +22,10 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <sstream>
 
+#include "curses/menu_impl.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "menu_impl.h"
 #include "playlist.h"
 #include "screen_switcher.h"
 #include "song.h"

src/playlist_editor.cpp

@@ -23,13 +23,13 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <cassert>
 
+#include "curses/menu_impl.h"
 #include "charset.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
 #include "playlist.h"
 #include "playlist_editor.h"
-#include "menu_impl.h"
 #include "mpdpp.h"
 #include "status.h"
 #include "statusbar.h"

src/screen.h

@@ -21,8 +21,8 @@
 #ifndef NCMPCPP_SCREEN_H
 #define NCMPCPP_SCREEN_H
 
-#include "menu.h"
+#include "curses/menu.h"
-#include "scrollpad.h"
+#include "curses/scrollpad.h"
 #include "screen_type.h"
 
 void drawSeparator(int x);

src/search_engine.cpp

@@ -22,10 +22,10 @@
 #include <boost/range/detail/any_iterator.hpp>
 #include <iomanip>
 
+#include "curses/menu_impl.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "menu_impl.h"
 #include "playlist.h"
 #include "search_engine.h"
 #include "settings.h"

src/sel_items_adder.cpp

@@ -20,10 +20,10 @@
 
 #include <algorithm>
 
+#include "curses/menu_impl.h"
 #include "browser.h"
 #include "global.h"
 #include "helpers.h"
-#include "menu_impl.h"
 #include "mpdpp.h"
 #include "playlist.h"
 #include "sel_items_adder.h"

src/settings.h

@@ -28,11 +28,11 @@
 #include <vector>
 #include <mpd/client.h>
 
+#include "curses/strbuffer.h"
 #include "enums.h"
 #include "format.h"
 #include "lyrics_fetcher.h"
 #include "screen_type.h"
-#include "strbuffer.h"
 
 struct Column
 {

src/song.cpp

@@ -26,10 +26,10 @@
 #include <iostream>
 #include <memory>
 
+#include "curses/window.h"
 #include "song.h"
 #include "utility/type_conversions.h"
 #include "utility/wide_string.h"
-#include "window.h"
 
 namespace {
 

src/song_list.h

@@ -22,7 +22,7 @@
 #define NCMPCPP_SONG_LIST_H
 
 #include <boost/range/detail/any_iterator.hpp>
-#include "menu.h"
+#include "curses/menu.h"
 #include "song.h"
 #include "utility/const.h"
 

src/sort_playlist.cpp

@@ -18,12 +18,12 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
+#include "curses/menu_impl.h"
 #include "charset.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
 #include "playlist.h"
-#include "menu_impl.h"
 #include "settings.h"
 #include "sort_playlist.h"
 #include "statusbar.h"

src/status.cpp

@@ -22,6 +22,7 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
 
+#include "curses/menu_impl.h"
 #include "browser.h"
 #include "charset.h"
 #include "format_impl.h"
@@ -29,7 +30,6 @@
 #include "helpers.h"
 #include "lyrics.h"
 #include "media_library.h"
-#include "menu_impl.h"
 #include "outputs.h"
 #include "playlist.h"
 #include "playlist_editor.h"

src/statusbar.h

@@ -22,10 +22,10 @@
 #define NCMPCPP_STATUSBAR_H
 
 #include <boost/format.hpp>
+#include "curses/window.h"
 #include "settings.h"
 #include "gcc.h"
 #include "interfaces.h"
-#include "window.h"
 
 namespace Progressbar {
 

src/tag_editor.cpp

@@ -32,7 +32,7 @@
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "menu_impl.h"
+#include "curses/menu_impl.h"
 #include "playlist.h"
 #include "song_info.h"
 #include "statusbar.h"

src/tiny_tag_editor.cpp

@@ -28,12 +28,12 @@
 #include <fileref.h>
 #include <tag.h>
 
+#include "curses/menu_impl.h"
 #include "browser.h"
 #include "charset.h"
 #include "display.h"
 #include "helpers.h"
 #include "global.h"
-#include "menu_impl.h"
 #include "song_info.h"
 #include "playlist.h"
 #include "search_engine.h"

src/title.h

@@ -21,7 +21,7 @@
 #ifndef NCMPCPP_TITLE_H
 #define NCMPCPP_TITLE_H
 
-#include "window.h"
+#include "curses/window.h"
 
 void windowTitle(const std::string &title);
 

src/utility/type_conversions.h

@@ -21,9 +21,9 @@
 #ifndef NCMPCPP_UTILITY_TYPE_CONVERSIONS_H
 #define NCMPCPP_UTILITY_TYPE_CONVERSIONS_H
 
+#include "curses/window.h"
 #include "mpdpp.h"
 #include "mutable_song.h"
-#include "window.h"
 #include "enums.h"
 
 NC::Color charToColor(char c);

src/visualizer.h

@@ -26,9 +26,9 @@
 #ifdef ENABLE_VISUALIZER
 
 #include <boost/date_time/posix_time/posix_time_types.hpp>
+#include "curses/window.h"
 #include "interfaces.h"
 #include "screen.h"
-#include "window.h"
 
 #ifdef HAVE_FFTW3_H
 # include <fftw3.h>