Saner defaults for mouse scrolling

doc/config

@@ -405,8 +405,6 @@
 #
 #cyclic_scrolling = no
 #
-#lines_scrolled = 2
-#
 #lyrics_fetchers = azlyrics, genius, sing365, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet
 #
 #follow_now_playing_lyrics = no
@@ -498,7 +496,9 @@
 #
 #mouse_support = yes
 #
-#mouse_list_scroll_whole_page = yes
+#mouse_list_scroll_whole_page = no
+#
+#lines_scrolled = 5
 #
 #empty_tag_marker = <empty>
 #

doc/ncmpcpp.1

@@ -287,9 +287,6 @@ If enabled, text in header window will scroll if its length is longer then actua
 .B cyclic_scrolling = yes/no
 If enabled, cyclic scrolling is used (e.g. if you press down arrow being at the end of list, it'll take you to the beginning)
 .TP
-.B lines_scrolled = NUMBER
-Number of lines that are scrolled with mouse wheel.
-.TP
 .B lyrics_fetchers = FETCHERS
 Comma separated list of lyrics fetchers.
 .TP
@@ -371,6 +368,9 @@ If set to yes, mouse support will be enabled.
 .B mouse_list_scroll_whole_page = yes/no
 If enabled, mouse wheel will scroll the whole page of item list at a time, otherwise the number of lines specified by lines_scrolled variable.
 .TP
+.B lines_scrolled = NUMBER
+Number of lines that are scrolled with mouse wheel.
+.TP
 .B empty_tag_marker = TEXT
 Text that will be displayed, if requested tag is not set.
 .TP

src/settings.cpp

@@ -476,7 +476,6 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
 	p.add("titles_visibility", &titles_visibility, "yes", yes_no);
 	p.add("header_text_scrolling", &header_text_scrolling, "yes", yes_no);
 	p.add("cyclic_scrolling", &use_cyclic_scrolling, "no", yes_no);
-	p.add("lines_scrolled", &lines_scrolled, "2");
 	p.add("lyrics_fetchers", &lyrics_fetchers,
 	      "azlyrics, genius, sing365, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet",
 	      list_of<LyricsFetcher_>);
@@ -558,7 +557,8 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
 	p.add("block_search_constraints_change_if_items_found",
 	      &block_search_constraints_change, "yes", yes_no);
 	p.add("mouse_support", &mouse_support, "yes", yes_no);
-	p.add("mouse_list_scroll_whole_page", &mouse_list_scroll_whole_page, "yes", yes_no);
+	p.add("mouse_list_scroll_whole_page", &mouse_list_scroll_whole_page, "no", yes_no);
+	p.add("lines_scrolled", &lines_scrolled, "5");
 	p.add("empty_tag_marker", &empty_tag, "<empty>");
 	p.add("tags_separator", &MPD::Song::TagsSeparator, " | ");
 	p.add("tag_editor_extended_numeration", &tag_editor_extended_numeration, "no", yes_no);