Move ncurses related files to curses directory

36 files changed, 39 insertions, 38 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 397b671d..b74e4d61 100644
--- a/src/Makefile.am
+++ b/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 \
-	window.cpp
+	visualizer.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 \
-	window.h
+	visualizer.h
diff --git a/src/actions.cpp b/src/actions.cpp
index d96ff1ed..41d35ce0 100644
--- a/src/actions.cpp
+++ b/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"
diff --git a/src/actions.h b/src/actions.h
index 1254cf63..3bbffac9 100644
--- a/src/actions.h
+++ b/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;
diff --git a/src/browser.cpp b/src/browser.cpp
index dd1e733d..320597b6 100644
--- a/src/browser.cpp
+++ b/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"
diff --git a/src/clock.h b/src/clock.h
index d875d3d8..50264dc6 100644
--- a/src/clock.h
+++ b/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
 {
diff --git a/src/menu.h b/src/curses/menu.h
index b178c049..b178c049 100644
--- a/src/menu.h
+++ b/src/curses/menu.h
diff --git a/src/menu_impl.h b/src/curses/menu_impl.h
index 451886b7..451886b7 100644
--- a/src/menu_impl.h
+++ b/src/curses/menu_impl.h
diff --git a/src/scrollpad.cpp b/src/curses/scrollpad.cpp
index 24f45afa..24f45afa 100644
--- a/src/scrollpad.cpp
+++ b/src/curses/scrollpad.cpp
diff --git a/src/scrollpad.h b/src/curses/scrollpad.h
index 1e9b8356..1e9b8356 100644
--- a/src/scrollpad.h
+++ b/src/curses/scrollpad.h
diff --git a/src/strbuffer.h b/src/curses/strbuffer.h
index 9c8ffb18..9c8ffb18 100644
--- a/src/strbuffer.h
+++ b/src/curses/strbuffer.h
diff --git a/src/window.cpp b/src/curses/window.cpp
index a58c6b8f..a58c6b8f 100644
--- a/src/window.cpp
+++ b/src/curses/window.cpp
diff --git a/src/window.h b/src/curses/window.h
index ed51001c..ed51001c 100644
--- a/src/window.h
+++ b/src/curses/window.h
diff --git a/src/display.cpp b/src/display.cpp
index 8fdda0e0..14658cf8 100644
--- a/src/display.cpp
+++ b/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"
diff --git a/src/format.h b/src/format.h
index e45dea09..76e08dc8 100644
--- a/src/format.h
+++ b/src/format.h
@@ -23,7 +23,7 @@
 
 #include <boost/variant.hpp>
 
-#include "menu.h"
+#include "curses/menu.h"
 #include "song.h"
 
 namespace Format {
diff --git a/src/format_impl.h b/src/format_impl.h
index f78a4f08..865fe280 100644
--- a/src/format_impl.h
+++ b/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"
 
diff --git a/src/helpers/song_iterator_maker.h b/src/helpers/song_iterator_maker.h
index 37d4f593..0b3044be 100644
--- a/src/helpers/song_iterator_maker.h
+++ b/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>
diff --git a/src/lastfm_service.h b/src/lastfm_service.h
index e3e7bac3..31d40a9b 100644
--- a/src/lastfm_service.h
+++ b/src/lastfm_service.h
@@ -26,7 +26,7 @@
 #include <map>
 #include <string>
 
-#include "scrollpad.h"
+#include "curses/scrollpad.h"
 
 namespace LastFm {
 
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 8a78de55..a9a7b558 100644
--- a/src/lyrics.cpp
+++ b/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"
diff --git a/src/media_library.cpp b/src/media_library.cpp
index 46fb84d6..63083c95 100644
--- a/src/media_library.cpp
+++ b/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"
diff --git a/src/outputs.cpp b/src/outputs.cpp
index 54866607..cf5e7ab8 100644
--- a/src/outputs.cpp
+++ b/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"
diff --git a/src/playlist.cpp b/src/playlist.cpp
index 9684d364..d143cbee 100644
--- a/src/playlist.cpp
+++ b/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"
diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index 2b8a62d5..039bc3a9 100644
--- a/src/playlist_editor.cpp
+++ b/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"
diff --git a/src/screen.h b/src/screen.h
index 87fe9115..688c45b3 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -21,8 +21,8 @@
 #ifndef NCMPCPP_SCREEN_H
 #define NCMPCPP_SCREEN_H
 
-#include "menu.h"
-#include "scrollpad.h"
+#include "curses/menu.h"
+#include "curses/scrollpad.h"
 #include "screen_type.h"
 
 void drawSeparator(int x);
diff --git a/src/search_engine.cpp b/src/search_engine.cpp
index 9bf5501a..b569f1eb 100644
--- a/src/search_engine.cpp
+++ b/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"
diff --git a/src/sel_items_adder.cpp b/src/sel_items_adder.cpp
index ba49342c..54532ee3 100644
--- a/src/sel_items_adder.cpp
+++ b/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"
diff --git a/src/settings.h b/src/settings.h
index c1386b0c..d61aa1d1 100644
--- a/src/settings.h
+++ b/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
 {
diff --git a/src/song.cpp b/src/song.cpp
index 7bece836..1935b2d2 100644
--- a/src/song.cpp
+++ b/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 {
 
diff --git a/src/song_list.h b/src/song_list.h
index 184c1dc2..6e406070 100644
--- a/src/song_list.h
+++ b/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"
 
diff --git a/src/sort_playlist.cpp b/src/sort_playlist.cpp
index c1c9be26..5289c9d2 100644
--- a/src/sort_playlist.cpp
+++ b/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"
diff --git a/src/status.cpp b/src/status.cpp
index 7f3f8fe1..549d6bea 100644
--- a/src/status.cpp
+++ b/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"
diff --git a/src/statusbar.h b/src/statusbar.h
index 635d20fc..23ca1a7b 100644
--- a/src/statusbar.h
+++ b/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 {
 
diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 645f8c91..3b607adc 100644
--- a/src/tag_editor.cpp
+++ b/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"
diff --git a/src/tiny_tag_editor.cpp b/src/tiny_tag_editor.cpp
index 2abdf08a..5f9bf421 100644
--- a/src/tiny_tag_editor.cpp
+++ b/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"
diff --git a/src/title.h b/src/title.h
index 451e4cc1..70fc5526 100644
--- a/src/title.h
+++ b/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);
 
diff --git a/src/utility/type_conversions.h b/src/utility/type_conversions.h
index c4d82306..15079a71 100644
--- a/src/utility/type_conversions.h
+++ b/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);
diff --git a/src/visualizer.h b/src/visualizer.h
index 597e200c..8ac958e4 100644
--- a/src/visualizer.h
+++ b/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>