Packman Build Service PMBS

ncmpc.changes Changed

ncmpc.spec Changed

@@ -1,40 +1,54 @@
-# norootforbuild
-
-Name:		ncmpc
-Version:	0.19
-Release:	1
-
-Summary:	Curses Client for the Music Player Daemon
-License:	GPL
-Group:		Productivity/Multimedia/Sound/Players
-
-Source:		http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-
-URL:		http://mpd.wikia.com/wiki/Client:Ncmpc
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-BuildRequires:	glib2-devel libmpdclient-devel pkgconfig ncurses-devel
+# vim: set sw=4 ts=4 et:
+# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+
+
+Name:           ncmpc
+Version:        0.20
+Release:        1
+Summary:        Curses Client for the Music Player Daemon
+License:        GNU General Public License version 2 or later (GPLv2 or later)
+Group:          Productivity/Multimedia/Sound/Players
+Source:         http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
+URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  glib2-devel libmpdclient-devel pkgconfig ncurses-devel
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
 a MPD running on a machine on the local network, and controls this with an 
 interface inspired by cplay.
 
-
-
 %lang_package
-
-
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
 
 %build
-autoreconf -fi
-%configure --docdir=%{_docdir}/%{name}
-%__make %{?_smp_mflags}
+%configure \
+    --docdir="%{_docdir}/%{name}" \
+    --enable-colors \
+    --disable-lirc \
+    --enable-help-screen \
+    --enable-mouse \
+    --enable-artist-screen \
+    --enable-search-screen \
+    --enable-song-screen \
+    --enable-key-screen \
+    --disable-lyrics-screen \
+    --enable-outputs-screen \
+    --disable-werror
 
+%__make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -45,14 +59,12 @@
 %__install -D -m 644 doc/keys.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/keys
 %__install -D -m 644 doc/config.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
 
-
 %clean
-rm -rf %{buildroot}
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files lang -f %{name}.lang
 %defattr(-,root,root)
 
-
 %files
 %defattr(-,root,root)
 %{_bindir}/ncmpc
@@ -61,8 +73,6 @@
 %config %{_sysconfdir}/%{name}/config
 %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/*
-%{_mandir}/man1/ncmpc.1.gz
-
+%doc %{_mandir}/man1/ncmpc.1*
 
 %changelog
-# vim: set sw=4 ts=4 et:

ncmpc-0.19.tar.bz2/m4/cflags.m4 Deleted

ncmpc-0.19.tar.bz2/src/screen_message.c Deleted

@@ -1,42 +0,0 @@
-/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
- * Project homepage: http://musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "screen_message.h"
-#include "screen.h"
-
-#include <stdarg.h>
-
-void
-screen_status_message(const char *msg)
-{
-	status_bar_message(&screen.status_bar, msg);
-}
-
-void
-screen_status_printf(const char *format, ...)
-{
-	char *msg;
-	va_list ap;
-
-	va_start(ap,format);
-	msg = g_strdup_vprintf(format,ap);
-	va_end(ap);
-	screen_status_message(msg);
-	g_free(msg);
-}

ncmpc-0.19.tar.bz2/src/screen_message.h Deleted

@@ -1,29 +0,0 @@
-/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
- * Project homepage: http://musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef NCMPC_SCREEN_MESSAGE_H
-#define NCMPC_SCREEN_MESSAGE_H
-
-void
-screen_status_message(const char *msg);
-
-void
-screen_status_printf(const char *format, ...);
-
-#endif

ncmpc-0.19.tar.bz2/src/str_pool.c Deleted

@@ -1,126 +0,0 @@
-/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
- * Project homepage: http://musicpd.org
- 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "str_pool.h"
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define NUM_SLOTS 4096
-
-struct slot {
-	struct slot *next;
-	unsigned char ref;
-	char value[1];
-} __attribute__((packed));
-
-static struct slot *slots[NUM_SLOTS];
-
-static inline unsigned
-calc_hash(const char *p)
-{
-	unsigned hash = 5381;
-
-	assert(p != NULL);
-
-	while (*p != 0)
-		hash = (hash << 5) + hash + *p++;
-
-	return hash;
-}
-
-static inline struct slot *
-value_to_slot(char *value)
-{
-	return (struct slot*)(value - offsetof(struct slot, value));
-}
-
-static struct slot *slot_alloc(struct slot *next, const char *value)
-{
-	size_t length = strlen(value);
-	struct slot *slot = malloc(sizeof(*slot) + length);
-	if (slot == NULL)
-		abort(); /* XXX */
-
-	slot->next = next;
-	slot->ref = 1;
-	memcpy(slot->value, value, length + 1);
-	return slot;
-}
-
-char *str_pool_get(const char *value)
-{
-	struct slot **slot_p, *slot;
-
-	slot_p = &slots[calc_hash(value) % NUM_SLOTS];
-	for (slot = *slot_p; slot != NULL; slot = slot->next) {
-		if (strcmp(value, slot->value) == 0 && slot->ref < 0xff) {
-			assert(slot->ref > 0);
-			++slot->ref;
-			return slot->value;
-		}
-	}
-
-	slot = slot_alloc(*slot_p, value);
-	*slot_p = slot;
-	return slot->value;
-}
-
-char *str_pool_dup(char *value)
-{
-	struct slot *slot = value_to_slot(value);
-
-	assert(slot->ref > 0);
-
-	if (slot->ref < 0xff) {
-		++slot->ref;
-		return value;
-	} else {
-		/* the reference counter overflows above 0xff;
-		   duplicate the value, and start with 1 */
-		struct slot **slot_p =
-			&slots[calc_hash(slot->value) % NUM_SLOTS];
-		slot = slot_alloc(*slot_p, slot->value);
-		*slot_p = slot;
-		return slot->value;
-	}
-}
-
-void str_pool_put(char *value)
-{
-	struct slot **slot_p, *slot;
-
-	slot = value_to_slot(value);
-	assert(slot->ref > 0);
-	--slot->ref;
-
-	if (slot->ref > 0)
-		return;
-
-	for (slot_p = &slots[calc_hash(value) % NUM_SLOTS];
-	     *slot_p != slot;
-	     slot_p = &(*slot_p)->next) {
-		assert(*slot_p != NULL);
-	}
-
-	*slot_p = slot->next;
-	free(slot);
-}

ncmpc-0.19.tar.bz2/src/str_pool.h Deleted

@@ -1,29 +0,0 @@
-/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
- * Project homepage: http://musicpd.org
- 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef STR_POOL_H
-#define STR_POOL_H
-
-char *str_pool_get(const char *value);
-
-char *str_pool_dup(char *value);
-
-void str_pool_put(char *value);
-
-#endif

ncmpc-0.19.tar.bz2/AUTHORS -> ncmpc-0.20.tar.bz2/AUTHORS Changed

ncmpc-0.19.tar.bz2/Makefile.am -> ncmpc-0.20.tar.bz2/Makefile.am Changed

@@ -29,7 +29,7 @@
 	src/progress_bar.h \
 	src/status_bar.h \
 	src/screen.h \
-	src/screen_message.h \
+	src/screen_status.h \
 	src/screen_interface.h \
 	src/screen_list.h \
 	src/screen_find.h \
@@ -61,12 +61,13 @@
 	src/screen_text.h \
 	src/plugin.h \
 	src/lyrics.h \
-	src/str_pool.h \
-	src/lirc.h
+	src/lirc.h \
+	src/ncmpc_curses.h
 
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
+	$(CURSES_LIB) \
 	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
@@ -87,7 +88,7 @@
 	src/progress_bar.c \
 	src/status_bar.c \
 	src/screen.c \
-	src/screen_message.c \
+	src/screen_status.c \
 	src/screen_list.c \
 	src/screen_find.c \
 	src/screen_utils.c \
@@ -101,8 +102,7 @@
 	src/charset.c \
 	src/wreadln.c \
 	src/strfsong.c \
-	src/utils.c \
-	src/str_pool.c
+	src/utils.c
 
 if NCMPC_MINI
 else
@@ -153,7 +153,7 @@
 endif
 
 
-# build the smalles possible ncmpc binary
+# build the smallest possible ncmpc binary
 src/ncmpc-tiny: $(filter-out %.h,$(src_ncmpc_SOURCES))
 	$(COMPILE) --combine -fwhole-program $(src_ncmpc_LDFLAGS) $(src_ncmpc_LDADD) $(LIBS) $^ -o $@
 	strip --strip-all $@
@@ -169,7 +169,7 @@
 
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
 test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
-test_run_hscroll_LDADD = $(GLIB_LIBS)
+test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
 
 #
 # sparse
@@ -206,10 +206,32 @@
 	AUTHORS NEWS README
 man_MANS = doc/ncmpc.1
 
+if ENABLE_DOCUMENTATION
+doc/api/html/index.html: doc/doxygen.conf
+	@mkdir -p $(@D)
+	$(DOXYGEN) $<
+
+all-local: doc/api/html/index.html
+
+clean-local:
+	rm -rf doc/api
+
+# copied from MPD, disabled  --jn
+#---------------------------------------
+#install-data-local: doc/api/html/index.html
+#	$(mkinstalldirs) $(DESTDIR)$(docdir)/api/html
+#	$(INSTALL_DATA) -c -m 644 doc/api/html/*.* \
+#		$(DESTDIR)$(docdir)/api/html
+#
+#uninstall-local:
+#	rm -f $(DESTDIR)$(docdir)/api/html/*.*
+#---------------------------------------
+endif
+
 #
 # Distribution
 #
 
 EXTRA_DIST = autogen.sh \
 	$(lyrics_plugins) \
-	$(man_MANS) $(doc_DATA)
+	$(man_MANS) $(doc_DATA) doc/doxygen.conf

ncmpc-0.19.tar.bz2/Makefile.in -> ncmpc-0.20.tar.bz2/Makefile.in Changed

@@ -34,6 +34,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 bin_PROGRAMS = src/ncmpc$(EXEEXT)
 @NCMPC_MINI_FALSE@am__append_1 = \
 @NCMPC_MINI_FALSE@	src/hscroll.c \
@@ -54,11 +56,15 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS \
-	build/depcomp build/install-sh build/missing \
+	$(top_srcdir)/configure $(top_srcdir)/doc/doxygen.conf.in \
+	AUTHORS COPYING INSTALL NEWS build/config.guess \
+	build/config.sub build/depcomp build/install-sh build/missing \
 	build/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/cflags.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
+	$(top_srcdir)/m4/ax_append_flag.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/m4/ax_with_curses.m4 \
 	$(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
@@ -68,7 +74,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = doc/doxygen.conf
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lyricsdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
@@ -78,7 +84,7 @@
 	src/options.h src/conf.h src/command.h src/ncu.h src/ncfix.h \
 	src/player_command.h src/window.h src/title_bar.h \
 	src/progress_bar.h src/status_bar.h src/screen.h \
-	src/screen_message.h src/screen_interface.h src/screen_list.h \
+	src/screen_status.h src/screen_interface.h src/screen_list.h \
 	src/screen_find.h src/screen_utils.h src/screen_client.h \
 	src/list_window.h src/song_paint.h src/colors.h src/paint.h \
 	src/hscroll.h src/charset.h src/match.h src/wreadln.h \
@@ -87,17 +93,17 @@
 	src/screen_file.h src/screen_artist.h src/screen_browser.h \
 	src/screen_search.h src/screen_song.h src/screen_keydef.h \
 	src/screen_lyrics.h src/screen_outputs.h src/screen_text.h \
-	src/plugin.h src/lyrics.h src/str_pool.h src/lirc.h \
+	src/plugin.h src/lyrics.h src/lirc.h src/ncmpc_curses.h \
 	src/resolver.c src/main.c src/gidle.c src/mpdclient.c \
 	src/playlist.c src/filelist.c src/options.c src/command.c \
 	src/ncu.c src/player_command.c src/title_bar.c \
 	src/progress_bar.c src/status_bar.c src/screen.c \
-	src/screen_message.c src/screen_list.c src/screen_find.c \
+	src/screen_status.c src/screen_list.c src/screen_find.c \
 	src/screen_utils.c src/screen_client.c src/screen_queue.c \
 	src/screen_browser.c src/screen_file.c src/list_window.c \
 	src/song_paint.c src/colors.c src/charset.c src/wreadln.c \
-	src/strfsong.c src/utils.c src/str_pool.c src/hscroll.c \
-	src/match.c src/conf.c src/screen_help.c src/screen_artist.c \
+	src/strfsong.c src/utils.c src/hscroll.c src/match.c \
+	src/conf.c src/screen_help.c src/screen_artist.c \
 	src/screen_search.c src/screen_song.c src/screen_keydef.c \
 	src/plugin.c src/screen_text.c src/screen_lyrics.c \
 	src/lyrics.c src/screen_outputs.c src/lirc.c
@@ -127,22 +133,22 @@
 	src/options.$(OBJEXT) src/command.$(OBJEXT) src/ncu.$(OBJEXT) \
 	src/player_command.$(OBJEXT) src/title_bar.$(OBJEXT) \
 	src/progress_bar.$(OBJEXT) src/status_bar.$(OBJEXT) \
-	src/screen.$(OBJEXT) src/screen_message.$(OBJEXT) \
+	src/screen.$(OBJEXT) src/screen_status.$(OBJEXT) \
 	src/screen_list.$(OBJEXT) src/screen_find.$(OBJEXT) \
 	src/screen_utils.$(OBJEXT) src/screen_client.$(OBJEXT) \
 	src/screen_queue.$(OBJEXT) src/screen_browser.$(OBJEXT) \
 	src/screen_file.$(OBJEXT) src/list_window.$(OBJEXT) \
 	src/song_paint.$(OBJEXT) src/colors.$(OBJEXT) \
 	src/charset.$(OBJEXT) src/wreadln.$(OBJEXT) \
-	src/strfsong.$(OBJEXT) src/utils.$(OBJEXT) \
-	src/str_pool.$(OBJEXT) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10) $(am__objects_11) $(am__objects_12)
+	src/strfsong.$(OBJEXT) src/utils.$(OBJEXT) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
+	$(am__objects_12)
 src_ncmpc_OBJECTS = $(am_src_ncmpc_OBJECTS)
 am__DEPENDENCIES_1 =
 src_ncmpc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_test_run_hscroll_OBJECTS =  \
 	test/test_run_hscroll-run_hscroll.$(OBJEXT) \
 	src/test_run_hscroll-hscroll.$(OBJEXT) \
@@ -251,10 +257,12 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURSES_LIB = @CURSES_LIB@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOXYGEN = @DOXYGEN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -323,14 +331,22 @@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -385,7 +401,7 @@
 	src/progress_bar.h \
 	src/status_bar.h \
 	src/screen.h \
-	src/screen_message.h \
+	src/screen_status.h \
 	src/screen_interface.h \
 	src/screen_list.h \
 	src/screen_find.h \
@@ -417,10 +433,11 @@
 	src/screen_text.h \
 	src/plugin.h \
 	src/lyrics.h \
-	src/str_pool.h \
-	src/lirc.h
+	src/lirc.h \
+	src/ncmpc_curses.h
 
 src_ncmpc_LDADD = \
+	$(CURSES_LIB) \
 	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
@@ -429,19 +446,19 @@
 	src/gidle.c src/mpdclient.c src/playlist.c src/filelist.c \
 	src/options.c src/command.c src/ncu.c src/player_command.c \
 	src/title_bar.c src/progress_bar.c src/status_bar.c \
-	src/screen.c src/screen_message.c src/screen_list.c \
+	src/screen.c src/screen_status.c src/screen_list.c \
 	src/screen_find.c src/screen_utils.c src/screen_client.c \
 	src/screen_queue.c src/screen_browser.c src/screen_file.c \
 	src/list_window.c src/song_paint.c src/colors.c src/charset.c \
-	src/wreadln.c src/strfsong.c src/utils.c src/str_pool.c \
-	$(am__append_1) $(am__append_2) $(am__append_3) \
-	$(am__append_4) $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_8) $(am__append_9) \
-	$(am__append_10) $(am__append_11)
+	src/wreadln.c src/strfsong.c src/utils.c $(am__append_1) \
+	$(am__append_2) $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7) \
+	$(am__append_8) $(am__append_9) $(am__append_10) \
+	$(am__append_11)
 CLEANFILES = src/ncmpc-tiny
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
 test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
-test_run_hscroll_LDADD = $(GLIB_LIBS)
+test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
 
 #
 # sparse
@@ -469,12 +486,23 @@
 
 man_MANS = doc/ncmpc.1
 
+# copied from MPD, disabled  --jn
+#---------------------------------------
+#install-data-local: doc/api/html/index.html
+#	$(mkinstalldirs) $(DESTDIR)$(docdir)/api/html
+#	$(INSTALL_DATA) -c -m 644 doc/api/html/*.* \
+#		$(DESTDIR)$(docdir)/api/html
+#
+#uninstall-local:
+#	rm -f $(DESTDIR)$(docdir)/api/html/*.*
+#---------------------------------------
+
 #

ncmpc-0.19.tar.bz2/NEWS -> ncmpc-0.20.tar.bz2/NEWS Changed

@@ -1,3 +1,15 @@
+ncmpc 0.20 - (02/05/2012)
+* increase connection timeout to 5 seconds
+* screen_queue: follow songs when they are moved out of the visible
+  range
+* add a doxygen configuration file. Documentation will be generated if the
+  configure script is called with --enable-documentation
+* screen_lyrics: You can now edit lyrics by pressing 'e'
+* configurable timeout for MPD connections
+* screen_keydef: show command descriptions
+* show the paths of the configuration files in --version output
+
+
 ncmpc 0.19 - (07/23/2011)
 * require libmpdclient 2.2
 * show real server address in status message
@@ -100,7 +112,7 @@
 ncmpc 0.11.1 - 2005-01-24
  + Spanish translations from Jose Cedeno
  + Russian translations from Nikolay Pavlov
- + French translations from Yann Cézard
+ + French translations from Yann CÃ©zard
  + ncmpc now supports SIGSTOP and SIGCONT (Ctrl-Z)
  + ncmpc now hides the cursor on the help screen
  + ncmpc now can enqueue and play a song from the browse screen (Enter)

ncmpc-0.19.tar.bz2/aclocal.m4 -> ncmpc-0.20.tar.bz2/aclocal.m4 Changed

@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -406,18 +406,6 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -961,7 +949,10 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/cflags.m4])
+m4_include([m4/ax_append_compile_flags.m4])
+m4_include([m4/ax_append_flag.m4])
+m4_include([m4/ax_check_compile_flag.m4])
+m4_include([m4/ax_with_curses.m4])
 m4_include([m4/glib-gettext.m4])
 m4_include([m4/nls.m4])
 m4_include([m4/pkg.m4])

ncmpc-0.20.tar.bz2/build/config.guess Added

@@ -0,0 +1,1517 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-05-11'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac

ncmpc-0.20.tar.bz2/build/config.sub Added

@@ -0,0 +1,1760 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
+
+timestamp='2011-03-23'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

ncmpc-0.19.tar.bz2/config.h.in -> ncmpc-0.20.tar.bz2/config.h.in Changed

@@ -36,19 +36,31 @@
 /* Enable song viewer screen */
 #undef ENABLE_SONG_SCREEN
 
-/* Enable wide character support */
-#undef ENABLE_WIDE
-
 /* gettext domain */
 #undef GETTEXT_PACKAGE
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
+/* Define to 1 if a SysV or X/Open compatible Curses library is present */
+#undef HAVE_CURSES
+
+/* Define to 1 if library supports color (enhanced functions) */
+#undef HAVE_CURSES_COLOR
+
+/* Define to 1 if library supports X/Open Enhanced functions */
+#undef HAVE_CURSES_ENHANCED
+
+/* Define to 1 if <curses.h> is present */
+#undef HAVE_CURSES_H
+
+/* Define to 1 if library supports certain obsolete features */
+#undef HAVE_CURSES_OBSOLETE
+
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
-/* $ncurses - getmouse() */
+/* Enable mouse support */
 #undef HAVE_GETMOUSE
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
@@ -66,8 +78,23 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
-/* ncursesw/ncurses.h */
-#undef HAVE_NCURSESW_NCURSES_H
+/* Define to 1 if the Ncurses library is present */
+#undef HAVE_NCURSES
+
+/* Define to 1 if the NcursesW library is present */
+#undef HAVE_NCURSESW
+
+/* Define to 1 if <ncursesw/curses.h> is present */
+#undef HAVE_NCURSESW_CURSES_H
+
+/* Define to 1 if <ncursesw.h> is present */
+#undef HAVE_NCURSESW_H
+
+/* Define to 1 if <ncurses/curses.h> is present */
+#undef HAVE_NCURSES_CURSES_H
+
+/* Define to 1 if <ncurses.h> is present */
+#undef HAVE_NCURSES_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H

ncmpc-0.19.tar.bz2/configure -> ncmpc-0.20.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ncmpc 0.19.
+# Generated by GNU Autoconf 2.68 for ncmpc 0.20.
 #
 # Report bugs to <max@duempel.org>.
 #
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -552,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='ncmpc'
 PACKAGE_TARNAME='ncmpc'
-PACKAGE_VERSION='0.19'
-PACKAGE_STRING='ncmpc 0.19'
+PACKAGE_VERSION='0.20'
+PACKAGE_STRING='ncmpc 0.20'
 PACKAGE_BUGREPORT='max@duempel.org'
 PACKAGE_URL=''
 
@@ -599,6 +607,9 @@
 LTLIBOBJS
 LIBOBJS
 AM_CFLAGS
+ENABLE_DOCUMENTATION_FALSE
+ENABLE_DOCUMENTATION_TRUE
+DOXYGEN
 ENABLE_TEST_FALSE
 ENABLE_TEST_TRUE
 ENABLE_OUTPUTS_SCREEN_FALSE
@@ -647,16 +658,25 @@
 MSGFMT_OPTS
 MSGFMT
 USE_NLS
+EGREP
+GREP
+CPP
 LIBMPDCLIENT_LIBS
 LIBMPDCLIENT_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 PKG_CONFIG
-EGREP
-GREP
-CPP
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 NCMPC_MINI_FALSE
 NCMPC_MINI_TRUE
+CURSES_LIB
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -738,10 +758,9 @@
 ac_user_opts='
 enable_option_checking
 enable_dependency_tracking
-enable_mini
-enable_wide
 with_ncurses
 with_ncursesw
+enable_mini
 enable_multibyte
 enable_locale
 enable_nls
@@ -759,6 +778,7 @@
 enable_werror
 enable_debug
 enable_test
+enable_documentation
 '
       ac_precious_vars='build_alias
 host_alias
@@ -768,12 +788,13 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
+CURSES_LIB
 PKG_CONFIG
 GLIB_CFLAGS
 GLIB_LIBS
 LIBMPDCLIENT_CFLAGS
 LIBMPDCLIENT_LIBS
+CPP
 LIBLIRCCLIENT_CFLAGS
 LIBLIRCCLIENT_LIBS'
 
@@ -1180,7 +1201,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1318,7 +1339,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ncmpc 0.19 to adapt to many kinds of systems.
+\`configure' configures ncmpc 0.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1379,12 +1400,16 @@
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ncmpc 0.19:";;
+     short | recursive ) echo "Configuration of ncmpc 0.20:";;
    esac
   cat <<\_ACEOF
 
@@ -1395,11 +1420,9 @@
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-mini           Build ncmpc-mini, i.e. without all optional features
-                          (default: disabled)
-  --enable-wide           Enable wide character support
-  --disable-multibyte     Disable multibyte character support (default:
-                          enabled)
-  --disable-locale        Disable locale support (default: auto)
+                          [default=no]
+  --disable-multibyte     Disable multibyte character support [default=yes]
+  --disable-locale        Disable locale support [default=auto]
   --disable-nls           do not use Native Language Support
   --enable-colors         Enable color support
   --enable-lirc           Enable LIRC support
@@ -1411,16 +1434,16 @@
   --enable-key-screen     Enable key editor screen [default=yes]
   --enable-lyrics-screen  Enable lyrics screen [default=no]
   --enable-outputs-screen Enable outputs screen [default=yes]
-  --enable-werror         Treat warnings as errors (default: disabled)
-  --enable-debug          Enable debugging (default: disabled)
+  --enable-werror         Treat warnings as errors [default=no]
+  --enable-debug          Enable debugging [default=no]
   --enable-test           build the test programs [default=no]
+  --enable-documentation  build doxygen documentation [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-ncurses          compile/link with ncurses library
-  --with-ncursesw         compile/link with wide-char ncurses library
-                          [default]
+  --with-ncurses          force the use of Ncurses or NcursesW
+  --without-ncursesw      do not use NcursesW (wide character support)
   --with-lyrics-plugin-dir=DIRECTORY
                           Directory where lyrics plugins are stored
                           [default=PREFIX/lib/ncmpc/lyrics]
@@ -1433,7 +1456,7 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
+  CURSES_LIB  linker library for Curses, e.g. -lcurses

ncmpc-0.19.tar.bz2/configure.ac -> ncmpc-0.20.tar.bz2/configure.ac Changed

@@ -1,14 +1,19 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.19, max@duempel.org)
+AC_INIT(ncmpc, 0.20, max@duempel.org)
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl Check for programs
 AC_PROG_CC_C99
 AC_PROG_INSTALL
+AX_WITH_CURSES
+
+AS_IF([ test "x$ax_cv_curses" = xno ],
+	[AC_MSG_ERROR([No curses support detected.])
+	])
 
 dnl =======================================================
 dnl initialize variables
@@ -26,7 +31,7 @@
 
 AC_ARG_ENABLE(mini,
     AS_HELP_STRING([--enable-mini],
-		[Build ncmpc-mini, i.e. without all optional features (default: disabled)]),,
+		[Build ncmpc-mini, i.e. without all optional features @<:@default=no@:>@]),,
     [enable_mini=no])
 
 AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
@@ -35,111 +40,49 @@
     auto=no
     disable_mini=no
     auto_mini=no
-    ncurses=ncurses
 else
     auto=auto
     disable_mini=yes
     auto_mini=auto
-    ncurses=auto
 fi
 
+AC_CANONICAL_HOST
 
-dnl
-dnl Check for libraries
-dnl
-
-dnl Try to find the socket functions
-AC_CHECK_FUNC([socket],
-	      [], 
-              [AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"],
-	                    [AC_MSG_ERROR(No UNIX socket API found)])
-              ])
-
-dnl Try to find the gethostbyname functions
-AC_CHECK_FUNC([gethostbyname],
-	      [], 
-              [AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
-	                    [AC_MSG_ERROR(No UNIX gethostbyname API found)])
-              ])
-
-
-dnl wide character support
-AC_ARG_ENABLE([wide],
-    AC_HELP_STRING([--enable-wide],
-		[Enable wide character support]),,
-                   [enable_wide=auto])
-
-
-dnl ncurses
-AC_ARG_WITH([ncurses],
-	    AC_HELP_STRING([--with-ncurses], [compile/link with ncurses library] ),
-	    [ncurses=ncurses])
-AC_ARG_WITH(ncursesw,
-	    AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]),
-	    [ncurses=ncursesw])
-
-if test "x$enable_wide" = "xno"; then
-    if test "x$ncurses" = "xauto"; then
-        dnl select narrow ncurses
-        ncurses=ncurses
-    fi
-
-    if test "x$ncurses" = "xncursesw"; then
-        AC_MSG_WARN([Narrow ncmpc linking against wide libncurses])
-    fi
-fi
+case "$host_os" in
+mingw32* | windows*)
+	LIBS="$LIBS -lws2_32"
+	;;
 
-if test "x$ncurses" = "xauto"; then
-	AC_CHECK_LIB([ncursesw], 
-		     [initscr],
-		     [ncurses=ncursesw],
-		     [ncurses=ncurses])
-fi
+*)
+	AC_CHECK_FUNC([socket],
+		[],
+        	[AC_CHECK_LIB([socket],[socket],[LIBS="$LIBS -lsocket"],
+		[AC_MSG_ERROR(No UNIX socket API found)])
+		])
 
-AC_CHECK_LIB([$ncurses], 
-	     [initscr],
-	     [LIBS="$LIBS -l$ncurses"], 
-	     [AC_MSG_ERROR($ncurses library is required)])
-
-if test "x$ncurses" = "xncursesw"; then
-    AC_CHECK_HEADER([ncursesw/ncurses.h],
-                    AC_DEFINE([HAVE_NCURSESW_NCURSES_H], [1], [ncursesw/ncurses.h]),
-                    ,)
-fi
-
-
-dnl wide character support II
-
-if test "x$enable_wide" = "xauto" ; then
-    AC_CHECK_LIB([$ncurses], 
-	         [wget_wch],
-	         [enable_wide=yes],
-	         [enable_wide=no])
-fi
-
-AC_MSG_CHECKING([wide character support])
-AC_MSG_RESULT([$enable_wide])
-
-if test "x$enable_wide" = "xyes" ; then
-    AC_DEFINE([ENABLE_WIDE], [1], [Enable wide character support])
-fi
+	AC_CHECK_FUNC([gethostbyname],
+		[], 
+		[AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
+		[AC_MSG_ERROR(No UNIX gethostbyname API found)])
+		])
+esac
 
 dnl multi-byte character support
 
 AC_ARG_ENABLE([multibyte],
-	AC_HELP_STRING([--disable-multibyte],
-		[Disable multibyte character support (default: enabled)]),,
+	AS_HELP_STRING([--disable-multibyte],
+		[Disable multibyte character support @<:@default=yes@:>@]),,
 		[enable_multibyte=$disable_mini])
 
 if test x$enable_multibyte = xyes; then
 	AC_DEFINE([ENABLE_MULTIBYTE], [1], [Enable multibyte character support])
 else
-	if test x$enable_wide = xyes; then
+	if test "x$ax_cv_curses_enhanced" = xyes; then
 		AC_MSG_WARN(wide characters without multibyte characters makes little sense)
 	fi
 fi
 
-dnl Check for glib-2.4
+dnl Check for glib-2.12
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12],,
 	[AC_MSG_ERROR([glib 2.12 is required])])
 
@@ -151,8 +94,8 @@
 dnl i18n
 
 AC_ARG_ENABLE([locale],
-	AC_HELP_STRING([--disable-locale],
-		[Disable locale support (default: auto)]),,
+	AS_HELP_STRING([--disable-locale],
+		[Disable locale support @<:@default=auto@:>@]),,
 		[enable_locale=$auto_mini])
 
 if test x$enable_locale = xyes; then
@@ -192,20 +135,33 @@
 fi
 
 dnl enable colors
-AC_MSG_CHECKING([color support])
 AC_ARG_ENABLE([colors],
-	AC_HELP_STRING([--enable-colors],
-		[Enable color support]),,
-	[enable_colors=$disable_mini])
-AC_MSG_RESULT([$enable_colors])
-if test "x$enable_colors" = "xyes" ; then
-    AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])
-fi
+	AS_HELP_STRING([--enable-colors],
+		[Enable color support]),
+		[enable_colors=$enableval],
+		[enable_colors=auto])
+AC_MSG_CHECKING([whether to include color support])
+AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
+	[AS_IF([ test "x$disable_mini" = xyes],
+		[AS_IF([ test "x$ax_cv_curses_color" = xyes ],
+			[AC_MSG_RESULT([yes])
+				AC_DEFINE([ENABLE_COLORS], [1], [Enable color support])],
+				[AS_IF([ test "x$enable_colors" = xyes ],
+					AC_MSG_ERROR(["No color support found in curses library"])

ncmpc-0.19.tar.bz2/doc/config.sample -> ncmpc-0.20.tar.bz2/doc/config.sample Changed

ncmpc-0.20.tar.bz2/doc/doxygen.conf Added

@@ -0,0 +1,1718 @@
+# Doxyfile 1.7.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = ncmpc
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = 0.20
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/api
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        = /home/avuton/src/mpd-release-utils/src/ncmpc.git
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list

ncmpc-0.20.tar.bz2/doc/doxygen.conf.in Added

@@ -0,0 +1,1718 @@
+# Doxyfile 1.7.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = ncmpc
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = @VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/api
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        = @abs_top_srcdir@
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list

ncmpc-0.19.tar.bz2/doc/ncmpc.1 -> ncmpc-0.20.tar.bz2/doc/ncmpc.1 Changed

@@ -28,7 +28,7 @@
 Display help.
 .TP 
 .B \-V,  \-\-version
-Display version information.
+Display version information and build-time configuration.
 .TP 
 .B \-c,  \-\-colors
 Enable colors.
@@ -42,9 +42,6 @@
 .B \-M,  \-\-no\-mouse
 Disable mouse.
 .TP 
-.B \-e,  \-\-exit
-Exit on connection errors. The default is to reconnect.
-.TP 
 .B \-h, \-\-host=HOSTNAME
 Specify MPD host.
 .TP 
@@ -60,25 +57,28 @@
 .B \-k, \-\-key\-file=FILE
 Read key bindings from FILE.
 .TP
-.B \-S, \-\-no\-splash
-Disable the splash screen.
-.TP 
 Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options.
 .SH "CONFIGURATION"
-When ncmpc start it tries to read user setting from the ~/.ncmpc/config. If no user configuration is found ncmpc tries to load global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed on the help screen). An example configuration file (config.sample) should be provided with ncmpc.
+When ncmpc starts it tries to read the user's configuration file, ~/.ncmpc/config. If no user configuration file is found then ncmpc tries to load the global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed in the output of the --version option). An example configuration file (config.sample) should be provided with ncmpc.
 
 
 
 .SS Connection
 .TP
 .B host = HOST
-Connect to mpd running on specified host
+Connect to mpd running on the specified host.
 .TP
 .B port = PORT
-Connect to mpd on the specified port
+Connect to mpd on the specified port.
 .TP
 .B password = PASSWORD
 Connect to mpd using the specified password.
+.TP
+.B timeout = TIMEOUT
+Attempt to reconnect to mpd if a response to a command is not received within
+TIMEOUT seconds. Specifying a value in the configuration file overrides the
+"MPD_TIMEOUT" environment variable. If no timeout is specified in the
+configuration file or in the environment, the default is 5 seconds.
 .SS Interface
 .TP
 .B enable\-mouse = yes|no
@@ -88,7 +88,7 @@
 A list of screens to cycle through when using the previous/next screen commands. Valid choices, if enabled at compile time, are playlist, browse, artist, help, search, song, keydef, lyrics, and outputs.
 .TP
 .B search\-mode = MODE
-Default search mode for the search screen. The mode is an integer index, with 0 for title, 1 for artist, 2 for album, 3 for filename, and 4 for artist+title.
+Default search mode for the search screen. MODE must be one of title, artist, album, filename, and artist+title, or an interger index (0 for title, 1 for artist etc.).
 .TP 
 .B auto\-center = yes|no
 Enable/disable auto center mode. When auto center mode is enabled 
@@ -116,13 +116,13 @@
 Visible bell on alerts.
 .TP
 .B crossfade\-time = CROSSFADE TIME
-Default crossfade time in seconds
+Default crossfade time in seconds.
 .TP
 .B seek\-time = NUM
 Seek forward/backward by NUM seconds.
 .TP 
 .B lyrics\-timeout = NUM
-Quits downloading lyrics of a song after the timeout of NUM seconds is reached.
+Quits downloading lyrics of a song after the timeout of NUM seconds is reached, if NUM is greater than zero.
 .TP
 .B jump\-prefix\-only = yes|no
 When using the jump command, search for the prefix of an entry. That means typing "m" will start to the first entry which begins with "m".
@@ -130,6 +130,15 @@
 .B lyrics\-autosave = yes|no
 Automatically save lyrics after receiving them.
 .TP
+.B lyrics\-show\-plugin = yes|no
+Show the name of the plugin used to receive lyrics on the lyrics screen.
+.TP
+.B text\-editor = EDITOR
+The text editor used for editing lyrics.
+.TP
+.B text\-editor\-ask = yes|no
+Ask before starting an editor.
+.TP
 .B second-column = yes|no
 Display song length in a second column.
 .SS Display
@@ -150,7 +159,7 @@
 Scroll the title if it is too long for the screen.
 .TP
 .B scroll\-sep = STRING
-The separator to show at the end of the scrolling title.
+the separator to show at the end of the scrolling title.
 .TP 
 .B list\-format = SONG FORMAT
 The format used to display songs in the main window.
@@ -202,6 +211,12 @@
 .B color list\-bold = COLOR[,ATTRIBUTE]...
 Set the bold text color in the main area of ncmpc.
 .TP 
+.B color browser-directory = COLOR[,ATTRIBUTE]...
+Set the text color used to display directories in the browser window.
+.TP 
+.B color browser-playlist = COLOR[,ATTRIBUTE]...
+Set the text color used to display playlists in the browser window.
+.TP 
 .B color progressbar = COLOR[,ATTRIBUTE]...
 Set the color of the progress indicator.
 .TP 
@@ -215,22 +230,22 @@
 Set the text color used to display time the status window. 
 .TP 
 .B color alert = COLOR[,ATTRIBUTE]...
-Text color used to display alerts in the status window.
+Set the text color used to display alerts in the status window.
 .TP 
 .B colordef COLOR = R, G, B
-Redefine any of the base colors. The RGB values must be an integer value between 0 and 1000. 
+Redefine any of the base colors. The RGB values must be integer values between 0 and 1000. 
 \fBNote\fR: Only some terminals allow redefinitions of colors! 
 
 .SH "KEYS"
-When ncmpc start it tries to read user key bindings from the ~/.ncmpc/keys file. If no user key bindings is found ncmpc tries to load global key bindings from $SYSCONFDIR/ncmpc/keys (the actual path is displayed on the help screen). 
+When ncmpc starts it tries to read user-defined key bindings from the ~/.ncmpc/keys file. If no user-defined key bindings are found then ncmpc tries to load the global key bindings from $SYSCONFDIR/ncmpc/keys (the actual path is displayed on the help screen). 
 
 You can view ncmpc's key bindings by pressing '1' (help) when 
-ncmpc is running. To edit key bindings use the key editor in ncmpc (press 'K').
+ncmpc is running. To edit key bindings press 'K' and use the key editor in ncmpc.
 .SH "SONG FORMAT"
 Format of song display for status and the list window.
 The  metadata  delimiters  are: %name%, %artist%, %track%, %time%, %file%, %shortfile%.
 
-The [] operators is used to group output such that if no metadata delimiters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are output. '&' and '|' are logical operators for AND and OR. '#'  is used to escape characters. 
+The [] operators are used to group output such that if no metadata delimiters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are output. '&' and '|' are logical operators for AND and OR. '#'  is used to escape characters. 
 
 Some  useful examples for format are:

ncmpc-0.19.tar.bz2/doc/ncmpc.lirc -> ncmpc-0.20.tar.bz2/doc/ncmpc.lirc Changed

ncmpc-0.19.tar.bz2/lyrics/20-lyricwiki.rb -> ncmpc-0.20.tar.bz2/lyrics/20-lyricwiki.rb Changed

ncmpc-0.20.tar.bz2/m4/ax_append_compile_flags.m4 Added

@@ -0,0 +1,63 @@
+# ===========================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   For every FLAG1, FLAG2 it is checked whether the compiler works with the
+#   flag.  If it does, the flag is added FLAGS-VARIABLE
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  During the check the flag is always added to the
+#   current language's flags.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   NOTE: This macro depends on the AX_APPEND_FLAG and
+#   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
+#   AX_APPEND_LINK_FLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
+[for flag in $1; do
+  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
+done
+])dnl AX_APPEND_COMPILE_FLAGS

ncmpc-0.20.tar.bz2/m4/ax_append_flag.m4 Added

@@ -0,0 +1,69 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_APPEND_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
+AS_VAR_SET_IF(FLAGS,
+  [case " AS_VAR_GET(FLAGS) " in
+    *" $1 "*)
+      AC_RUN_LOG([: FLAGS already contains $1])
+      ;;
+    *)
+      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
+      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
+      ;;
+   esac],
+  [AS_VAR_SET(FLAGS,["$1"])])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG

ncmpc-0.20.tar.bz2/m4/ax_check_compile_flag.m4 Added

@@ -0,0 +1,72 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS

ncmpc-0.20.tar.bz2/m4/ax_with_curses.m4 Added

@@ -0,0 +1,518 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_WITH_CURSES
+#
+# DESCRIPTION
+#
+#   This macro checks whether a SysV or X/Open-compatible Curses library is
+#   present, along with the associated header file.  The NcursesW
+#   (wide-character) library is searched for first, followed by Ncurses,
+#   then the system-default plain Curses.  The first library found is the
+#   one returned.
+#
+#   The following options are understood: --with-ncursesw, --with-ncurses,
+#   --without-ncursesw, --without-ncurses.  The "--with" options force the
+#   macro to use that particular library, terminating with an error if not
+#   found.  The "--without" options simply skip the check for that library.
+#   The effect on the search pattern is:
+#
+#     (no options)                           - NcursesW, Ncurses, Curses
+#     --with-ncurses     --with-ncursesw     - NcursesW only [*]
+#     --without-ncurses  --with-ncursesw     - NcursesW only [*]
+#                        --with-ncursesw     - NcursesW only [*]
+#     --with-ncurses     --without-ncursesw  - Ncurses only [*]
+#     --with-ncurses                         - NcursesW, Ncurses [**]
+#     --without-ncurses  --without-ncursesw  - Curses only
+#                        --without-ncursesw  - Ncurses, Curses
+#     --without-ncurses                      - NcursesW, Curses
+#
+#   [*]  If the library is not found, abort the configure script.
+#
+#   [**] If the second library (Ncurses) is not found, abort configure.
+#
+#   The following preprocessor symbols may be defined by this macro if the
+#   appropriate conditions are met:
+#
+#     HAVE_CURSES             - if any SysV or X/Open Curses library found
+#     HAVE_CURSES_ENHANCED    - if library supports X/Open Enhanced functions
+#     HAVE_CURSES_COLOR       - if library supports color (enhanced functions)
+#     HAVE_CURSES_OBSOLETE    - if library supports certain obsolete features
+#     HAVE_NCURSESW           - if NcursesW (wide char) library is to be used
+#     HAVE_NCURSES            - if the Ncurses library is to be used
+#
+#     HAVE_CURSES_H           - if <curses.h> is present and should be used
+#     HAVE_NCURSESW_H         - if <ncursesw.h> should be used
+#     HAVE_NCURSES_H          - if <ncurses.h> should be used
+#     HAVE_NCURSESW_CURSES_H  - if <ncursesw/curses.h> should be used
+#     HAVE_NCURSES_CURSES_H   - if <ncurses/curses.h> should be used
+#
+#   (These preprocessor symbols are discussed later in this document.)
+#
+#   The following output variable is defined by this macro; it is precious
+#   and may be overridden on the ./configure command line:
+#
+#     CURSES_LIB  - library to add to xxx_LDADD
+#
+#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
+#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
+#   Makefile.am.  For example:
+#
+#     prog_LDADD = @CURSES_LIB@
+#
+#   If CURSES_LIB is set on the configure command line (such as by running
+#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
+#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
+#   override the standard #include search path.  If the user needs to
+#   specify an alternative path for a library (such as for a non-standard
+#   NcurseW), the user should use the LDFLAGS variable.
+#
+#   The following shell variables may be defined by this macro:
+#
+#     ax_cv_curses           - set to "yes" if any Curses library found
+#     ax_cv_curses_enhanced  - set to "yes" if Enhanced functions present
+#     ax_cv_curses_color     - set to "yes" if color functions present
+#     ax_cv_curses_obsolete  - set to "yes" if obsolete features present
+#
+#     ax_cv_ncursesw      - set to "yes" if NcursesW library found
+#     ax_cv_ncurses       - set to "yes" if Ncurses library found
+#     ax_cv_plaincurses   - set to "yes" if plain Curses library found
+#     ax_cv_curses_which  - set to "ncursesw", "ncurses", "plaincurses" or "no"
+#
+#   These variables can be used in your configure.ac to determine the level
+#   of support you need from the Curses library.  For example, if you must
+#   have either Ncurses or NcursesW, you could include:
+#
+#     AX_WITH_CURSES
+#     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+#         AX_MSG_ERROR([requires either NcursesW or Ncurses library])
+#     fi
+#
+#   If any Curses library will do (but one must be present and must support
+#   color), you could use:
+#
+#     AX_WITH_CURSES
+#     if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then
+#         AC_MSG_ERROR([requires an X/Open-compatible Curses library with color])
+#     fi
+#
+#   Certain preprocessor symbols and shell variables defined by this macro
+#   can be used to determine various features of the Curses library.  In
+#   particular, HAVE_CURSES and ax_cv_curses are defined if the Curses
+#   library found conforms to the traditional SysV and/or X/Open Base Curses
+#   definition.  Any working Curses library conforms to this level.
+#
+#   HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the
+#   library supports the X/Open Enhanced Curses definition.  In particular,
+#   the wide-character types attr_t, cchar_t and wint_t, the functions
+#   wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES
+#   are checked.  The Ncurses library does NOT conform to this definition,
+#   although NcursesW does.
+#
+#   HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library
+#   supports color functions and macros such as COLOR_PAIR, A_COLOR,
+#   COLOR_WHITE, COLOR_RED and init_pair().  These are NOT part of the
+#   X/Open Base Curses definition, but are part of the Enhanced set of
+#   functions.  The Ncurses library DOES support these functions, as does
+#   NcursesW.
+#
+#   HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the
+#   library supports certain features present in SysV and BSD Curses but not
+#   defined in the X/Open definition.  In particular, the functions
+#   getattrs(), getcurx() and getmaxx() are checked.
+#
+#   To use the HAVE_xxx_H preprocessor symbols, insert the following into
+#   your system.h (or equivalent) header file:
+#
+#     #if defined(HAVE_NCURSESW_CURSES_H)
+#     #  include <ncursesw/curses.h>
+#     #elif defined(HAVE_NCURSESW_H)
+#     #  include <ncursesw.h>
+#     #elif defined(HAVE_NCURSES_CURSES_H)
+#     #  include <ncurses/curses.h>
+#     #elif defined(HAVE_NCURSES_H)
+#     #  include <ncurses.h>
+#     #elif defined(HAVE_CURSES_H)
+#     #  include <curses.h>
+#     #else
+#     #  error "SysV or X/Open-compatible Curses header file required"
+#     #endif
+#
+#   For previous users of this macro: you should not need to change anything
+#   in your configure.ac or Makefile.am, as the previous (serial 10)
+#   semantics are still valid.  However, you should update your system.h (or
+#   equivalent) header file to the fragment shown above. You are encouraged
+#   also to make use of the extended functionality provided by this version
+#   of AX_WITH_CURSES, as well as in the additional macros
+#   AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Mark Pulford <mark@kyne.com.au>
+#   Copyright (c) 2009 Damian Pietras <daper@daper.net>
+#   Copyright (c) 2011 Reuben Thomas <rrt@sc3d.org>
+#   Copyright (c) 2011 John Zaitseff <J.Zaitseff@zap.org.au>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 11
+
+AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
+AC_DEFUN([AX_WITH_CURSES], [
+    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
+        [force the use of Ncurses or NcursesW])],
+        [], [with_ncurses=check])
+    AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw],
+        [do not use NcursesW (wide character support)])],
+        [], [with_ncursesw=check])
+
+    ax_saved_LIBS=$LIBS
+    AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
+        [ax_with_plaincurses=no], [ax_with_plaincurses=check])

ncmpc-0.19.tar.bz2/m4/nls.m4 -> ncmpc-0.20.tar.bz2/m4/nls.m4 Changed

ncmpc-0.19.tar.bz2/po/Makefile.in.in -> ncmpc-0.20.tar.bz2/po/Makefile.in.in Changed

@@ -79,7 +79,7 @@
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	$(AM_V_GEN) file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
 
 .po.cat:
@@ -93,7 +93,8 @@
 all-no:
 
 $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
+	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \
+	  --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --keyword=C_:1c,2 \
 	  --keyword=NC_:1c,2 \
@@ -119,7 +120,7 @@
           --flag=g_snprintf:3:c-format \
           --flag=g_scanner_error:2:c-format \
           --flag=g_scanner_warn:2:c-format \
-	  --files-from=$(srcdir)/POTFILES.in \
+	  $(POTFILES) \
 	&& test ! -f $(GETTEXT_PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
 		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )

ncmpc-0.19.tar.bz2/po/ncmpc.pot -> ncmpc-0.20.tar.bz2/po/ncmpc.pot Changed

@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-02-05 11:04-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,29 +18,29 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:42
+#: ../src/i18n.h:42
 msgid "y"
 msgstr ""
 
-#: src/i18n.h:43
+#: ../src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: ../src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: ../src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: src/main.c:337
+#: ../src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 
-#: src/main.c:356
+#: ../src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr ""
@@ -47,36 +48,36 @@
 #. to translators: a key was bound twice in the key editor,
 #. and this is a hint for the user what to press to correct
 #. that
-#: src/main.c:529
+#: ../src/main.c:529
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: ../src/player_command.c:177 ../src/screen_queue.c:752
 msgid "Shuffled playlist"
 msgstr ""
 
-#: src/player_command.c:187
+#: ../src/player_command.c:187
 msgid "Cleared playlist"
 msgstr ""
 
-#: src/screen.c:205 src/screen.c:269
+#: ../src/screen.c:205 ../src/screen.c:272
 msgid "Error: Screen too small"
 msgstr ""
 
-#: src/screen.c:389
+#: ../src/screen.c:394
 msgid "Repeat mode is on"
 msgstr ""
 
-#: src/screen.c:390
+#: ../src/screen.c:395
 msgid "Repeat mode is off"
 msgstr ""
 
-#: src/screen.c:394
+#: ../src/screen.c:399
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:395
+#: ../src/screen.c:400
 msgid "Random mode is off"
 msgstr ""
 
@@ -85,11 +86,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: ../src/screen.c:409
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:405
+#: ../src/screen.c:410
 msgid "Single mode is off"
 msgstr ""
 
@@ -97,153 +98,155 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: ../src/screen.c:418
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:414
+#: ../src/screen.c:419
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:417
+#: ../src/screen.c:422
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:429
+#: ../src/screen.c:434
 msgid "Database updated"
 msgstr ""
 
-#: src/screen.c:505
+#: ../src/screen.c:514
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:506
+#: ../src/screen.c:515
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:511
+#: ../src/screen.c:520
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:512
+#: ../src/screen.c:521
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: ../src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr ""
 
-#: src/screen_artist.c:401
+#: ../src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:406
+#: ../src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:415
+#: ../src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:418
+#: ../src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:422
+#: ../src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:465
+#: ../src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: src/screen_artist.c:467
+#: ../src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: src/screen_browser.c:131

ncmpc-0.19.tar.bz2/po/uk.gmo -> ncmpc-0.20.tar.bz2/po/uk.gmo Changed

ncmpc-0.19.tar.bz2/po/uk.po -> ncmpc-0.20.tar.bz2/po/uk.po Changed

@@ -1,13 +1,13 @@
 # Ukrainian translations for ncmpc package.
 # This file is distributed under the same license as the ncmpc package.
-# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009.
+# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-07-23 21:08+0200\n"
-"PO-Revision-Date: 2009-09-22 20:41+0300\n"
+"PO-Revision-Date: 2011-08-11 10:30+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "Language: uk\n"
@@ -29,7 +29,7 @@
 
 #: src/main.c:243 src/main.c:265 src/main.c:283
 msgid "unknown"
-msgstr ""
+msgstr "невідомо"
 
 #: src/main.c:313
 #, c-format
@@ -157,19 +157,19 @@
 msgstr "Альбом: %s - %s"
 
 #: src/screen_artist.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "Tracks of no album of artist: %s"
-msgstr "Альбоми виконавця: %s"
+msgstr "Доріжки без альбому виконавця: %s"
 
 #: src/screen_artist.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "Adding album %s..."
-msgstr "Завантажується перелік програвання %s..."
+msgstr "Додається альбом %s..."
 
 #: src/screen_artist.c:467
-#, fuzzy, c-format
+#, c-format
 msgid "Adding %s..."
-msgstr "завантаження..."
+msgstr "Додається %s..."
 
 #: src/screen_browser.c:131
 #, c-format
@@ -183,7 +183,7 @@
 
 #: src/screen_client.c:93
 msgid "Database update running..."
-msgstr "Працює оновлення бази даних..."
+msgstr "Виконується оновлення бази даних..."
 
 #: src/screen_client.c:105
 #, c-format
@@ -340,7 +340,7 @@
 #: src/screen_search.c:233
 #, c-format
 msgid "Bad search tag %s"
-msgstr "Нерівна мітка %s"
+msgstr "Неправильна мітка %s"
 
 #: src/screen_search.c:237
 #, c-format
@@ -525,9 +525,8 @@
 msgstr "Зберегти текст пісні"
 
 #: src/screen_help.c:166
-#, fuzzy
 msgid "Delete saved lyrics"
-msgstr "Зберегти текст пісні"
+msgstr "Видалити збережений текст пісні"
 
 #: src/screen_help.c:171 src/command.c:245
 msgid "Outputs screen"
@@ -583,14 +582,12 @@
 msgstr "Текст пісні збережений"
 
 #: src/screen_lyrics.c:310
-#, fuzzy
 msgid "Lyrics deleted"
-msgstr "Перелік програвання видалений"
+msgstr "Текст пісні видалений"
 
 #: src/screen_lyrics.c:313
-#, fuzzy
 msgid "No saved lyrics"
-msgstr "Зберегти текст пісні"
+msgstr "Немає збереженого тексту пісні"
 
 #: src/screen_outputs.c:73
 #, c-format
@@ -1068,7 +1065,7 @@
 
 #: src/conf.c:102 src/conf.c:111
 msgid "Malformed hotkey definition"
-msgstr "Невірно сформоване визначення гарячої клавіші"
+msgstr "Неправильне визначення гарячої клавіші"
 
 #. the hotkey configuration contains an unknown
 #. command
@@ -1087,7 +1084,7 @@
 #. contained an invalid setting
 #: src/conf.c:185
 msgid "Bad time display type"
-msgstr "Невірний тип показу часу"
+msgstr "Неправильний тип показу часу"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
@@ -1097,7 +1094,7 @@
 
 #: src/conf.c:256
 msgid "Bad color name"
-msgstr "Невірна назва кольору"
+msgstr "Неправильна назва кольору"
 
 #: src/conf.c:265
 msgid "Incomplete color definition"
@@ -1105,11 +1102,11 @@
 
 #: src/conf.c:271
 msgid "Invalid number"
-msgstr "Невірне число"
+msgstr "Неправильне число"
 
 #: src/conf.c:279
 msgid "Malformed color definition"
-msgstr "Невірно сформоване визначення кольору"
+msgstr "Неправильне визначення кольору"
 
 #. an unknown screen name was specified in the
 #. configuration file

ncmpc-0.19.tar.bz2/src/charset.c -> ncmpc-0.20.tar.bz2/src/charset.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "charset.h"
 
@@ -35,7 +35,7 @@
 }
 #endif
 
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
 static inline unsigned
 unicode_char_width(gunichar ch)
 {
@@ -49,17 +49,17 @@
 
 	return 1;
 }
-#endif /* ENABLE_WIDE */
+#endif /* HAVE_CURSES_ENHANCED */
 
 unsigned
 utf8_width(const char *str)
 {
 	assert(str != NULL);
 
-#if defined(ENABLE_MULTIBYTE) && !defined(ENABLE_WIDE)
+#if defined(ENABLE_MULTIBYTE) && !defined(HAVE_CURSES_ENHANCED)
 	return g_utf8_strlen(str, -1);
 #else
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
 	if (g_utf8_validate(str, -1, NULL)) {
 		size_t len = g_utf8_strlen(str, -1);
 		unsigned width = 0;
@@ -148,12 +148,12 @@
 {
 	assert(p != NULL);
 
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
 	if (!g_utf8_validate(p, -1, NULL))
 		return ascii_cut_width(p, max_width);
 
 	return wide_cut_width(p, max_width);
-#elif defined(ENABLE_MULTIBYTE) && !defined(ENABLE_WIDE)
+#elif defined(ENABLE_MULTIBYTE) && !defined(HAVE_CURSES_ENHANCED)
 	return narrow_cut_width(p, max_width);
 #else
 	return ascii_cut_width(p, max_width);

ncmpc-0.19.tar.bz2/src/charset.h -> ncmpc-0.20.tar.bz2/src/charset.h Changed

ncmpc-0.19.tar.bz2/src/colors.c -> ncmpc-0.20.tar.bz2/src/colors.c Changed

ncmpc-0.19.tar.bz2/src/colors.h -> ncmpc-0.20.tar.bz2/src/colors.h Changed

@@ -1,32 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef COLORS_H
 #define COLORS_H
 
 #include "config.h"
-
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
+#include "ncmpc_curses.h"
 
 enum color {
 	COLOR_TITLE = 1,

ncmpc-0.19.tar.bz2/src/command.c -> ncmpc-0.20.tar.bz2/src/command.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "command.h"
 #include "config.h"
@@ -32,43 +32,38 @@
 #include <signal.h>
 #include <unistd.h>
 
-#undef DEBUG_KEYS
-
-#ifdef DEBUG_KEYS
-#define DK(x) x
-#else
-#define DK(x)
-#endif
+#define KEY_CTL(x) ((x) & 0x1f) /* KEY_CTL(A) == ^A == \1 */
 
-#define BS KEY_BACKSPACE
-#define DEL KEY_DC
-#define UP KEY_UP
-#define DWN KEY_DOWN
+#define BS   KEY_BACKSPACE
+#define DEL  KEY_DC
+#define UP   KEY_UP
+#define DWN  KEY_DOWN
 #define LEFT KEY_LEFT
 #define RGHT KEY_RIGHT
 #define HOME KEY_HOME
-#define END KEY_END
+#define END  KEY_END
 #define PGDN KEY_NPAGE
 #define PGUP KEY_PPAGE
-#define TAB 0x09
+#define TAB  0x09
 #define STAB 0x161
-#define ESC 0x1B
-#define F1 KEY_F(1)
-#define F2 KEY_F(2)
-#define F3 KEY_F(3)
-#define F4 KEY_F(4)
-#define F5 KEY_F(5)
-#define F6 KEY_F(6)
-#define F7 KEY_F(7)
-#define F8 KEY_F(8)
-
+#define ESC  0x1B
+#define RET  '\r'
+#define F1   KEY_F(1)
+#define F2   KEY_F(2)
+#define F3   KEY_F(3)
+#define F4   KEY_F(4)
+#define F5   KEY_F(5)
+#define F6   KEY_F(6)
+#define F7   KEY_F(7)
+#define F8   KEY_F(8)
+#define C(x) KEY_CTL(x)
 
 static command_definition_t cmds[] = {
 #ifdef ENABLE_KEYDEF_SCREEN
 	{ {'K', 0, 0 }, 0, CMD_SCREEN_KEYDEF, "screen-keyedit",
 	  N_("Key configuration screen") },
 #endif
-	{ { 'q', 'Q', 3 }, 0, CMD_QUIT, "quit",
+	{ { 'q', 'Q', C('C') }, 0, CMD_QUIT, "quit",
 	  N_("Quit") },
 
 	/* movement */
@@ -82,9 +77,9 @@
 	  N_("Move cursor to the middle of screen") },
 	{ { 'L', 0, 0 }, 0, CMD_LIST_BOTTOM, "bottom",
 	  N_("Move cursor to the bottom of screen") },
-	{ { HOME, 0x01, 0 }, 0, CMD_LIST_FIRST, "home",
+	{ { HOME, C('A'), 0 }, 0, CMD_LIST_FIRST, "home",
 	  N_("Move cursor to the top of the list") },
-	{ { END, 0x05, 0 }, 0, CMD_LIST_LAST, "end",
+	{ { END, C('E'), 0 }, 0, CMD_LIST_LAST, "end",
 	  N_("Move cursor to the bottom of the list") },
 	{ { PGUP, 0, 0 }, 0, CMD_LIST_PREVIOUS_PAGE, "pgup",
 	  N_("Page up") },
@@ -92,9 +87,9 @@
 	  N_("Page down") },
 	{ { 'v',  0, 0 }, 0, CMD_LIST_RANGE_SELECT, "range-select",
 	  N_("Range selection") },
-	{ { 14,  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_LINE, "scroll-down-line",
+	{ { C('N'),  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_LINE, "scroll-down-line",
 	  N_("Scroll up one line") },
-	{ { 2,  0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line",
+	{ { C('B'),  0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line",
 	  N_("Scroll down one line") },
 	{ { 'N',  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_HALF, "scroll-down-half",
 	  N_("Scroll up half a screen") },
@@ -114,7 +109,7 @@
 
 
 	/* player commands */
-	{ { 13, 0, 0 }, 0, CMD_PLAY, "play",
+	{ { RET, 0, 0 }, 0, CMD_PLAY, "play",
 	  N_("Play/Enter directory") },
 	{ { 'P', 0, 0 }, 0, CMD_PAUSE,"pause",
 	  N_("Pause") },
@@ -154,7 +149,7 @@
 	  N_("Toggle consume mode") },
 	{ { 'x', 0, 0 }, 0, CMD_CROSSFADE, "crossfade",
 	  N_("Toggle crossfade mode") },
-	{ { 21, 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
+	{ { C('U'), 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
 	  N_("Start a music database update") },
 	{ { 'S', 0, 0 }, 0, CMD_SAVE_PLAYLIST, "save",
 	  N_("Save playlist") },
@@ -170,11 +165,11 @@
 	  N_("Locate song in browser") },
 
 	/* lists */
-	{ { 11, 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
+	{ { C('K'), 0, 0 }, 0, CMD_LIST_MOVE_UP, "move-up",
 	  N_("Move item up") },
-	{ { 10, 0, 0 }, 0, CMD_LIST_MOVE_DOWN, "move-down",
+	{ { C('J'), 0, 0 }, 0, CMD_LIST_MOVE_DOWN, "move-down",
 	  N_("Move item down") },
-	{ { 12, 0, 0 }, 0, CMD_SCREEN_UPDATE, "update",
+	{ { C('L'), 0, 0 }, 0, CMD_SCREEN_UPDATE, "update",
 	  N_("Refresh screen") },
 
 
@@ -238,6 +233,10 @@
 	  N_("Interrupt action") },
 	{ {'u', 0, 0 }, 0, CMD_LYRICS_UPDATE, "lyrics-update",
 	  N_("Update Lyrics") },
+	/* this command may move out of #ifdef ENABLE_LYRICS_SCREEN
+	   at some point */
+	{ {'e', 0, 0 }, 0, CMD_EDIT, "edit",
+	  N_("Edit the current item") },
 #endif
 
 #ifdef ENABLE_OUTPUTS_SCREEN
@@ -255,6 +254,30 @@
 {
 	return cmds;
 }
+
+size_t
+get_cmds_max_name_width(command_definition_t *c)
+{
+	static size_t max = 0;
+
+	if (max != 0)
+		return max;
+
+	size_t len;
+	command_definition_t *p;
+
+	for (p = c; p->name != NULL; p++) {
+		/*
+		 * width and length are considered the same here, as command
+		 * names are not translated.
+		 */
+		len = (size_t) strlen(p->name);
+		if (len > max)
+			max = len;
+	}
+
+	return max;
+}
 #endif
 
 const char *
@@ -269,7 +292,7 @@
 		return _("Undefined");
 	case ' ':
 		return _("Space");
-	case 13:
+	case RET:
 		return _("Enter");
 	case BS:
 		return _("Backspace");
@@ -302,13 +325,13 @@
 	default:
 		for (i = 0; i <= 63; i++)

ncmpc-0.19.tar.bz2/src/command.h -> ncmpc-0.20.tar.bz2/src/command.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef COMMAND_H
 #define COMMAND_H
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <stddef.h>
+#include <stdbool.h>
 
 #ifndef NCMPC_MINI
 #include <stdio.h>
@@ -96,6 +97,7 @@
 	CMD_SCREEN_LYRICS,
 	CMD_SCREEN_OUTPUTS,
 	CMD_LYRICS_UPDATE,
+	CMD_EDIT,
 	CMD_INTERRUPT,
 	CMD_GO_ROOT_DIRECTORY,
 	CMD_GO_PARENT_DIRECTORY,
@@ -125,6 +127,7 @@
 
 #ifdef ENABLE_KEYDEF_SCREEN
 command_definition_t *get_command_definitions(void);
+size_t get_cmds_max_name_width(command_definition_t *cmds);
 #endif
 
 command_t find_key_command(int key, command_definition_t *cmds);
@@ -141,7 +144,7 @@
 const char *key2str(int key);
 const char *get_key_description(command_t command);
 const char *get_key_command_name(command_t command);
-const char *get_key_names(command_t command, int all);
+const char *get_key_names(command_t command, bool all);
 command_t get_key_command(int key);
 command_t get_key_command_from_name(char *name);
 int assign_keys(command_t command, int keys[MAX_COMMAND_KEYS]);

ncmpc-0.19.tar.bz2/src/conf.c -> ncmpc-0.20.tar.bz2/src/conf.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "conf.h"
 #include "config.h"
@@ -31,10 +31,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #define MAX_LINE_LENGTH 1024
 #define COMMENT_TOKEN '#'
@@ -68,15 +67,19 @@
 #define CONF_HOST "host"
 #define CONF_PORT "port"
 #define CONF_PASSWORD "password"
+#define CONF_TIMEOUT "timeout"
 #define CONF_LYRICS_TIMEOUT "lyrics-timeout"
-#define CONF_SHOW_SPLASH "show-splash"
 #define CONF_SCROLL "scroll"
 #define CONF_SCROLL_SEP "scroll-sep"
 #define CONF_VISIBLE_BITRATE "visible-bitrate"
+#define CONF_HARDWARE_CURSOR "hardware-cursor"
 #define CONF_WELCOME_SCREEN_LIST "welcome-screen-list"
 #define CONF_DISPLAY_TIME "display-time"
 #define CONF_JUMP_PREFIX_ONLY "jump-prefix-only"
 #define CONF_LYRICS_AUTOSAVE "lyrics-autosave"
+#define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
+#define CONF_TEXT_EDITOR "text-editor"
+#define CONF_TEXT_EDITOR_ASK "text-editor-ask"
 #define CONF_SECOND_COLUMN "second-column"
 
 static bool
@@ -377,10 +380,8 @@
 	bool match_found;
 
 	/* get the name part */
-	while (i < len && line[i] != '=' &&
-	       !g_ascii_isspace(line[i])) {
+	while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
 		name[j++] = line[i++];
-	}
 
 	name[j] = '\0';
 
@@ -421,7 +422,7 @@
 	/* wide cursor */
 	else if (!strcasecmp(CONF_WIDE_CURSOR, name))
 		options.wide_cursor = str2bool(value);
-	else if (strcasecmp(name, "hardware-cursor") == 0)
+	else if (strcasecmp(name, CONF_HARDWARE_CURSOR) == 0)
 		options.hardware_cursor = str2bool(value);
 	/* welcome screen list */
 	else if (!strcasecmp(CONF_WELCOME_SCREEN_LIST, name))
@@ -484,14 +485,15 @@
 	else if (!strcasecmp(CONF_SCREEN_LIST, name)) {
 		g_strfreev(options.screen_list);
 		options.screen_list = check_screen_list(value);
-	} else if (!strcasecmp(CONF_SHOW_SPLASH, name)) {
-		/* the splash screen was removed */
 	} else if (!strcasecmp(CONF_HOST, name))
 		options.host = get_format(value);
 	else if (!strcasecmp(CONF_PORT, name))
 		options.port = atoi(get_format(value));
 	else if (!strcasecmp(CONF_PASSWORD, name))
 		options.password = get_format(value);
+	else if (!strcasecmp(CONF_TIMEOUT, name))
+		options.timeout_ms = atoi(get_format(value))
+				     * 1000 /* seconds -> milliseconds */;
 	else if (!strcasecmp(CONF_LYRICS_TIMEOUT, name))
 #ifdef ENABLE_LYRICS_SCREEN
 		options.lyrics_timeout = atoi(get_format(value));
@@ -521,6 +523,27 @@
 #else
 	{}
 #endif
+	else if (!strcasecmp(CONF_LYRICS_SHOW_PLUGIN, name))
+#ifdef ENABLE_LYRICS_SCREEN
+		options.lyrics_show_plugin = str2bool(value);
+#else
+		{}
+#endif
+	else if (!strcasecmp(name, CONF_TEXT_EDITOR))
+#ifdef ENABLE_LYRICS_SCREEN
+		{
+			g_free(options.text_editor);
+			options.text_editor = get_format(value);
+		}
+#else
+		{}
+#endif
+	else if (!strcasecmp(name, CONF_TEXT_EDITOR_ASK))
+#ifdef ENABLE_LYRICS_SCREEN
+		options.text_editor_ask = str2bool(value);
+#else
+		{}
+#endif
 	else if (!strcasecmp(CONF_SECOND_COLUMN, name))
 #ifdef NCMPC_MINI
 		{}
@@ -531,8 +554,7 @@
 		match_found = false;
 
 	if (!match_found)
-		print_error(_("Unknown configuration parameter"),
-			    name);
+		print_error(_("Unknown configuration parameter"), name);
 
 	return match_found;
 }
@@ -574,18 +596,30 @@
 		return 0;
 	}
 
-	retval = mkdir(directory, 0755);
+	retval = g_mkdir(directory, 0755);
 	g_free(directory);
 	return retval;
 }
 
 char *
-get_user_key_binding_filename(void)
+build_user_conf_filename(void)
+{
+	return g_build_filename(g_get_home_dir(), "." PACKAGE, "config", NULL);
+}
+
+char *
+build_system_conf_filename(void)
+{
+	return g_build_filename(SYSCONFDIR, PACKAGE, "config", NULL);
+}
+
+char *
+build_user_key_binding_filename(void)
 {
 	return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
 }
 
-int
+void
 read_configuration(void)
 {
 	char *filename = NULL;
@@ -596,8 +630,7 @@
 
 	/* check for user configuration ~/.ncmpc/config */
 	if (filename == NULL) {
-		filename = g_build_filename(g_get_home_dir(),
-					    "." PACKAGE, "config", NULL);
+		filename = build_user_conf_filename();
 		if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
 			g_free(filename);
 			filename = NULL;
@@ -606,7 +639,7 @@
 
 	/* check for  global configuration SYSCONFDIR/ncmpc/config */
 	if (filename == NULL) {
-		filename = g_build_filename(SYSCONFDIR, PACKAGE, "config", NULL);
+		filename = build_system_conf_filename();
 		if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
 			g_free(filename);
 			filename = NULL;
@@ -626,7 +659,7 @@
 
 	/* check for  user key bindings ~/.ncmpc/keys */
 	if (filename == NULL) {
-		filename = get_user_key_binding_filename();
+		filename = build_user_key_binding_filename();
 		if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
 			g_free(filename);
 			filename = NULL;
@@ -648,6 +681,4 @@
 		g_free(filename);

ncmpc-0.19.tar.bz2/src/conf.h -> ncmpc-0.20.tar.bz2/src/conf.h Changed

@@ -1,27 +1,30 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "options.h"
 
 int check_user_conf_dir(void);
 
-char *get_user_key_binding_filename(void);
+char *build_user_conf_filename(void);
+char *build_system_conf_filename(void);
+
+char *build_user_key_binding_filename(void);
 
-int read_configuration(void);
+void read_configuration(void);

ncmpc-0.19.tar.bz2/src/defaults.h -> ncmpc-0.20.tar.bz2/src/defaults.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef DEFAULTS_H
 #define DEFAULTS_H
@@ -34,6 +34,8 @@
 
 #define DEFAULT_LYRICS_TIMEOUT 100
 
+#define DEFAULT_MPD_TIMEOUT 5000 /* 5 seconds */
+
 #define DEFAULT_SCROLL TRUE
 #define DEFAULT_SCROLL_SEP " *** "

ncmpc-0.19.tar.bz2/src/filelist.c -> ncmpc-0.20.tar.bz2/src/filelist.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "filelist.h"
 
@@ -139,15 +139,11 @@
 
 	if (filelist->entries->len < 2)
 		return;
+
+	/* If the first entry is NULL, skip it, because NULL stands for "[..]" */
 	iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, 0))->entity;
-	/* This can only happen at the beginning of the filelist,
-	 * because NULL stands for "[..]" */
-	if (iter == NULL) {
-		iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, 1))->entity;
-		first = 1;
-	}
-	else
-		first = 0;
+	first = (iter == NULL)? 1 : 0;
+
 	/* find the last directory entry */
 	for (last = first+1; last < filelist->entries->len; last++) {
 		iter = ((struct filelist_entry*) g_ptr_array_index(filelist->entries, last))->entity;

ncmpc-0.19.tar.bz2/src/filelist.h -> ncmpc-0.20.tar.bz2/src/filelist.h Changed

ncmpc-0.19.tar.bz2/src/gidle.c -> ncmpc-0.20.tar.bz2/src/gidle.c Changed

ncmpc-0.19.tar.bz2/src/hscroll.c -> ncmpc-0.20.tar.bz2/src/hscroll.c Changed

ncmpc-0.19.tar.bz2/src/hscroll.h -> ncmpc-0.20.tar.bz2/src/hscroll.h Changed

@@ -1,35 +1,30 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef HSCROLL_H
 #define HSCROLL_H
 
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 /**
  * This class is used to auto-scroll text which does not fit on the
  * screen.  Call hscroll_init() to initialize the object,

ncmpc-0.19.tar.bz2/src/i18n.h -> ncmpc-0.20.tar.bz2/src/i18n.h Changed

ncmpc-0.19.tar.bz2/src/lirc.c -> ncmpc-0.20.tar.bz2/src/lirc.c Changed

ncmpc-0.19.tar.bz2/src/lirc.h -> ncmpc-0.20.tar.bz2/src/lirc.h Changed

ncmpc-0.19.tar.bz2/src/list_window.c -> ncmpc-0.20.tar.bz2/src/list_window.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "list_window.h"
 #include "config.h"
@@ -25,7 +25,7 @@
 #include "command.h"
 #include "colors.h"
 #include "paint.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "i18n.h"
 
 #include <assert.h>
@@ -93,26 +93,7 @@
 static void
 list_window_check_origin(struct list_window *lw)
 {
-	int start = lw->start;
-
-	if ((unsigned) options.scroll_offset * 2 >= lw->rows)
-		// Center if the offset is more than half the screen
-		start = lw->selected - lw->rows / 2;
-	else {
-		if (lw->selected < lw->start + options.scroll_offset)
-			start = lw->selected - options.scroll_offset;
-
-		if (lw->selected >= lw->start + lw->rows - options.scroll_offset)
-			start = lw->selected - lw->rows + 1 + options.scroll_offset;
-	}
-
-	if (start + lw->rows > lw->length)
-		start = lw->length - lw->rows;
-
-	if (start < 0 || lw->length == 0)
-		start = 0;
-
-	lw->start = start;
+	list_window_scroll_to(lw, lw->selected);
 }
 
 void
@@ -153,6 +134,31 @@
 }
 
 void
+list_window_scroll_to(struct list_window *lw, unsigned n)
+{
+	int start = lw->start;
+
+	if ((unsigned) options.scroll_offset * 2 >= lw->rows)
+		// Center if the offset is more than half the screen
+		start = n - lw->rows / 2;
+	else {
+		if (n < lw->start + options.scroll_offset)
+			start = n - options.scroll_offset;
+
+		if (n >= lw->start + lw->rows - options.scroll_offset)
+			start = n - lw->rows + 1 + options.scroll_offset;
+	}
+
+	if (start + lw->rows > lw->length)
+		start = lw->length - lw->rows;
+
+	if (start < 0 || lw->length == 0)
+		start = 0;
+
+	lw->start = start;
+}
+
+void
 list_window_set_cursor(struct list_window *lw, unsigned i)
 {
 	lw->range_selection = false;
@@ -315,7 +321,7 @@
 {
 	if (lw->start + lw->rows < lw->length)
 	{
-		if ( lw->start + lw->rows + n > lw->length - 1)
+		if (lw->start + lw->rows + n > lw->length - 1)
 			lw->start = lw->length - lw->rows;
 		else
 			lw->start += n;
@@ -636,7 +642,7 @@
 		break;
 
 	case CMD_LIST_NEXT_PAGE:
-		lw->start += lw->rows - 1;
+		lw->start += lw->rows;
 		if (lw->start + lw->rows > lw->length) {
 			if (lw->length > lw->rows)
 				lw->start = lw->length - lw->rows;

ncmpc-0.19.tar.bz2/src/list_window.h -> ncmpc-0.20.tar.bz2/src/list_window.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef LIST_WINDOW_H
 #define LIST_WINDOW_H
@@ -23,16 +23,11 @@
 #include "config.h"
 #include "command.h"
 #include "colors.h"
+#include "ncmpc_curses.h"
 
 #include <glib.h>
 #include <stdbool.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 typedef const char *
 (*list_window_callback_fn_t)(unsigned i, void *data);
 
@@ -106,7 +101,7 @@
 list_window_cmd(struct list_window *lw, command_t cmd);
 
 /**
- * Scroll the window.  Returns non-zero if the command has been
+ * Scroll the window.  Returns true if the command has been
  * consumed.
  */
 bool
@@ -121,10 +116,20 @@
 list_window_mouse(struct list_window *lw, unsigned long bstate, int y);
 #endif
 
+/**
+ * Centers the visible range around item n on the list.
+ */
 void
 list_window_center(struct list_window *lw, unsigned n);
 
 /**
+ * Scrolls the view to item n, as if the cursor would have been moved
+ * to the position.
+ */
+void
+list_window_scroll_to(struct list_window *lw, unsigned n);
+
+/**
  * Sets the position of the cursor.  Disables range selection.
  */
 void

ncmpc-0.19.tar.bz2/src/lyrics.c -> ncmpc-0.20.tar.bz2/src/lyrics.c Changed

ncmpc-0.19.tar.bz2/src/lyrics.h -> ncmpc-0.20.tar.bz2/src/lyrics.h Changed

ncmpc-0.19.tar.bz2/src/main.c -> ncmpc-0.20.tar.bz2/src/main.c Changed

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "config.h"
 #include "ncmpc.h"
@@ -27,7 +27,7 @@
 #include "ncu.h"
 #include "screen.h"
 #include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
@@ -112,6 +112,7 @@
 	}
 }
 
+#ifndef WIN32
 static void
 catch_sigint(G_GNUC_UNUSED int sig)
 {
@@ -157,6 +158,7 @@
 	if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
 		exit(EXIT_FAILURE);
 }
+#endif /* WIN32 */
 
 static void
 idle_callback(enum mpd_error error,
@@ -269,7 +271,12 @@
 
 	return name;
 #else
-	return g_strdup(options.host);
+	/*
+	 * localhost is actually not correct, we only know that
+	 * mpd_connection_new() has connected to the "default host".
+	 */
+	const char *name = options.host ?: "localhost";
+	return g_strdup(name);
 #endif
 }
 
@@ -286,12 +293,7 @@
 #else
 	(void)connection;
 
-	/*
-	 * localhost is actually not correct, we only know that
-	 * mpd_connection_new() has connected to the "default host".
-	 */
-	const char *name = options.host ?: "localhost";
-	return g_strdup(name);
+	return default_settings_name();
 #endif
 }
 
@@ -311,14 +313,14 @@
 
 	char *name = default_settings_name();
 	screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
-			     name, get_key_names(CMD_QUIT,0) );
+			     name, get_key_names(CMD_QUIT, false));
 	g_free(name);
 	doupdate();
 
 	mpdclient_disconnect(mpd);
 	success = mpdclient_connect(mpd,
 				    options.host, options.port,
-				    1.5,
+				    options.timeout_ms,
 				    options.password);
 	if (!success) {
 		/* try again in 5 seconds */
@@ -358,9 +360,7 @@
 	doupdate();
 
 	/* update immediately */
-	mpd->events = MPD_IDLE_DATABASE|MPD_IDLE_STORED_PLAYLIST|
-		MPD_IDLE_QUEUE|MPD_IDLE_PLAYER|MPD_IDLE_MIXER|MPD_IDLE_OUTPUT|
-		MPD_IDLE_OPTIONS|MPD_IDLE_UPDATE;
+	mpd->events = MPD_IDLE_ALL;
 
 	do_mpd_update();
 
@@ -380,7 +380,7 @@
 
 /**
  * This function is called by the gidle.c library when MPD sends us an
- * idle event (or when the connectiond dies).
+ * idle event (or when the connection dies).
  */
 static void
 idle_callback(enum mpd_error error, enum mpd_server_error server_error,
@@ -391,7 +391,7 @@
 
 	c->idle = false;
 
-	assert(mpdclient_get_connection(c) != NULL);
+	assert(mpdclient_is_connected(c));
 
 	if (error != MPD_ERROR_SUCCESS) {
 		char *allocated;
@@ -527,7 +527,7 @@
 	   and this is a hint for the user what to press to correct
 	   that */
 	g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
-		   get_key_names(CMD_SCREEN_KEYDEF, 0));
+		   get_key_names(CMD_SCREEN_KEYDEF, false));
 	g_strlcat(buf, comment, sizeof(buf));
 	g_strlcat(buf, ")", sizeof(buf));
 #endif
@@ -542,8 +542,13 @@
 int
 main(int argc, const char *argv[])
 {
+#ifndef WIN32
 	struct sigaction act;
+#endif
 #ifdef ENABLE_LOCALE
+#ifndef ENABLE_NLS
+	G_GNUC_UNUSED
+#endif
 	const char *charset = NULL;
 #endif
 	GIOChannel *keyboard_channel;
@@ -592,6 +597,7 @@
 	/* parse command line options - 2 pass */
 	options_parse(argc, argv);
 
+#ifndef WIN32
 	/* setup signal behavior - SIGINT */
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = 0;
@@ -641,6 +647,7 @@
 		perror("sigaction(SIGPIPE)");
 		exit(EXIT_FAILURE);
 	}
+#endif
 
 	ncu_init();
 
@@ -670,6 +677,7 @@
 	}
 #endif
 
+#ifndef WIN32
 	if (!pipe(sigwinch_pipes) &&
 		!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
 		sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
@@ -679,6 +687,7 @@
 		perror("sigwinch pipe creation failed");
 		exit(EXIT_FAILURE);
 	}
+#endif
 
 	/* attempt to connect */
 	reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);

ncmpc-0.19.tar.bz2/src/match.c -> ncmpc-0.20.tar.bz2/src/match.c Changed

ncmpc-0.19.tar.bz2/src/match.h -> ncmpc-0.20.tar.bz2/src/match.h Changed

ncmpc-0.19.tar.bz2/src/mpdclient.c -> ncmpc-0.20.tar.bz2/src/mpdclient.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "mpdclient.h"
 #include "filelist.h"
@@ -83,13 +83,6 @@
 	return false;
 }
 
-static bool
-mpdclient_finish_command(struct mpdclient *c)
-{
-	return mpd_response_finish(c->connection)
-		? true : mpdclient_handle_error(c);
-}
-
 struct mpdclient *
 mpdclient_new(void)
 {
@@ -136,24 +129,22 @@
 		c->song = NULL;
 
 	/* everything has changed after a disconnect */
-	c->events |= MPD_IDLE_DATABASE|MPD_IDLE_STORED_PLAYLIST|
-		MPD_IDLE_QUEUE|MPD_IDLE_PLAYER|MPD_IDLE_MIXER|MPD_IDLE_OUTPUT|
-		MPD_IDLE_OPTIONS|MPD_IDLE_UPDATE;
+	c->events |= MPD_IDLE_ALL;
 }
 
 bool
 mpdclient_connect(struct mpdclient *c,
 		  const gchar *host,
 		  gint port,
-		  gfloat _timeout,
+		  unsigned timeout_ms,
 		  const gchar *password)
 {
 	/* close any open connection */
-	if( c->connection )
+	if (c->connection)
 		mpdclient_disconnect(c);
 
 	/* connect to MPD */
-	c->connection = mpd_connection_new(host, port, _timeout * 1000);
+	c->connection = mpd_connection_new(host, port, timeout_ms);
 	if (c->connection == NULL)
 		g_error("Out of memory");
 
@@ -412,8 +403,8 @@
 	if (connection == NULL)
 		return false;
 
-	mpd_send_add(connection, path_utf8);
-	return mpdclient_finish_command(c);
+	return mpd_send_add(connection, path_utf8)?
+		mpdclient_finish_command(c) : false;
 }
 
 bool

ncmpc-0.19.tar.bz2/src/mpdclient.h -> ncmpc-0.20.tar.bz2/src/mpdclient.h Changed

@@ -2,6 +2,7 @@
 #define MPDCLIENT_H
 
 #include "playlist.h"
+#include "mpdclient.h"
 
 #include <mpd/client.h>
 
@@ -41,16 +42,44 @@
 	enum mpd_idle events;
 };
 
+enum {
+	/**
+	 * all idle events the version of libmpdclient, ncmpc is compiled
+	 * against, supports
+	 */
+	MPD_IDLE_ALL = MPD_IDLE_DATABASE
+		| MPD_IDLE_STORED_PLAYLIST
+		| MPD_IDLE_QUEUE
+		| MPD_IDLE_PLAYER
+		| MPD_IDLE_MIXER
+		| MPD_IDLE_OUTPUT
+		| MPD_IDLE_OPTIONS
+		| MPD_IDLE_UPDATE
+#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
+		| MPD_IDLE_STICKER
+		| MPD_IDLE_SUBSCRIPTION
+		| MPD_IDLE_MESSAGE
+#endif
+};
+
 /** functions ***************************************************************/
 
 bool
 mpdclient_handle_error(struct mpdclient *c);
 
+static inline bool
+mpdclient_finish_command(struct mpdclient *c)
+{
+	return mpd_response_finish(c->connection)
+		? true : mpdclient_handle_error(c);
+}
+
 struct mpdclient *
 mpdclient_new(void);
 
 void mpdclient_free(struct mpdclient *c);
 
+G_GNUC_PURE
 static inline bool
 mpdclient_is_connected(const struct mpdclient *c)
 {
@@ -66,6 +95,7 @@
 		 mpd_status_get_state(c->status) == MPD_STATE_PAUSE);
 }
 
+G_GNUC_PURE
 static inline const struct mpd_song *
 mpdclient_get_current_song(const struct mpdclient *c)
 {
@@ -76,7 +106,7 @@
 
 bool
 mpdclient_connect(struct mpdclient *c, const gchar *host, gint port,
-		  gfloat timeout_, const gchar *password);
+		  unsigned timeout_ms, const gchar *password);
 
 void
 mpdclient_disconnect(struct mpdclient *c);

ncmpc-0.19.tar.bz2/src/ncfix.h -> ncmpc-0.20.tar.bz2/src/ncfix.h Changed

ncmpc-0.19.tar.bz2/src/ncmpc.h -> ncmpc-0.20.tar.bz2/src/ncmpc.h Changed

@@ -1,27 +1,28 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef NCMPC_H
 #define NCMPC_H
 
 #include "command.h"
 
+/** put the terminal in a sane mode and stop/suspend ncmpc */
 void
 sigstop(void);

ncmpc-0.20.tar.bz2/src/ncmpc_curses.h Added

@@ -0,0 +1,32 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#if defined(HAVE_NCURSESW_CURSES_H)
+#  include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSESW_H)
+#  include <ncursesw.h>
+#elif defined(HAVE_NCURSES_CURSES_H)
+#  include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+#  include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+#  include <curses.h>
+#else
+#  error "SysV or X/Open-compatible Curses header file required"
+#endif

ncmpc-0.19.tar.bz2/src/ncu.c -> ncmpc-0.20.tar.bz2/src/ncu.c Changed

@@ -1,24 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "ncu.h"
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #ifdef ENABLE_COLORS
 #include "colors.h"
@@ -28,12 +29,6 @@
 #include "options.h"
 #endif
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 static SCREEN *ncu_screen;
 
 void

ncmpc-0.19.tar.bz2/src/ncu.h -> ncmpc-0.20.tar.bz2/src/ncu.h Changed

ncmpc-0.19.tar.bz2/src/options.c -> ncmpc-0.20.tar.bz2/src/options.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "options.h"
 #include "config.h"
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <glib.h>
 
-#define MAX_LONGOPT_LENGTH 32
-
 #define ERROR_UNKNOWN_OPTION    0x01
 #define ERROR_BAD_ARGUMENT      0x02
 #define ERROR_GOT_ARGUMENT      0x03
@@ -54,6 +52,8 @@
 #ifdef ENABLE_LYRICS_SCREEN
 	.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
 	.lyrics_autosave = false,
+	.lyrics_show_plugin = false,
+	.text_editor_ask = true,
 #endif
 	.find_wrap = true,
 	.scroll_offset = 0,
@@ -61,6 +61,7 @@
 	.audible_bell = true,
 	.bell_on_wrap = true,
 	.status_message_time = 3,
+	.timeout_ms = DEFAULT_MPD_TIMEOUT,
 #ifndef NCMPC_MINI
 	.scroll = DEFAULT_SCROLL,
 	.welcome_screen_list = true,
@@ -83,8 +84,7 @@
 	{ 'h', "host", "HOST", "Connect to server on host" },
 	{ 'P', "password","PASSWORD", "Connect with password" },
 	{ 'f', "config", "FILE", "Read configuration from file" },
-	{ 'k', "key-file","FILE", "Read configuration from file" },
-	{ 'S', "no-splash", NULL, "Don't show the splash screen" },
+	{ 'k', "key-file","FILE", "Read key bindings from file" },
 #ifndef NDEBUG
 	{ 'K', "dump-keys", NULL, "Dump key bindings to stdout" },
 #endif
@@ -99,9 +99,9 @@
 
 	for (i = 0; i < option_table_size; ++i) {
 		if (l && strcmp(l, option_table[i].longopt) == 0)
-			return &option_table[i];;
+			return &option_table[i];
 		if (s && s == option_table[i].shortopt)
-			return &option_table[i];;
+			return &option_table[i];
 	}
 
 	return NULL;
@@ -139,10 +139,10 @@
 	printf("Usage: %s [OPTION]...\n", PACKAGE);
 
 	for (i = 0; i < option_table_size; ++i) {
-		char tmp[MAX_LONGOPT_LENGTH];
+		char tmp[32];
 
 		if (option_table[i].argument)
-			g_snprintf(tmp, MAX_LONGOPT_LENGTH, "%s=%s",
+			g_snprintf(tmp, sizeof(tmp), "%s=%s",
 				   option_table[i].longopt,
 				   option_table[i].argument);
 		else
@@ -174,7 +174,7 @@
 #ifdef ENABLE_MULTIBYTE
 		     " multibyte"
 #endif
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
 		     " wide"
 #endif
 #ifdef ENABLE_LOCALE
@@ -218,6 +218,16 @@
 
 		     "\n");
 #ifndef NCMPC_MINI
+		{
+			char *user_conf = build_user_conf_filename();
+			char *system_conf = build_system_conf_filename();
+
+			printf("configuration files:\n %s\n %s\n\n",
+			       user_conf, system_conf);
+
+			g_free(user_conf);
+			g_free(system_conf);
+		}
 		if (strcmp("translator-credits", _("translator-credits")) != 0)
 			/* To translators: these credits are shown
 			   when ncmpc is started with "--version" */
@@ -266,18 +276,13 @@
 		g_free(options.key_file);
 		options.key_file = g_strdup(arg);
 		break;
-	case 'S': /* --key-file */
-		/* the splash screen was removed */
-		break;
-#ifndef NDEBUG
-#ifndef NCMPC_MINI
+#if !defined(NDEBUG) && !defined(NCMPC_MINI)
 	case 'K': /* --dump-keys */
 		read_configuration();
 		write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
 		exit(EXIT_SUCCESS);
 		break;
 #endif
-#endif
 	default:
 		fprintf(stderr,"Unknown Option %c = %s\n", c, arg);
 		break;
@@ -291,8 +296,7 @@
 	const arg_opt_t *opt = NULL;
 	option_callback_fn_t option_cb = handle_option;
 
-	i=1;
-	while (i < argc) {
+	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 		size_t len = strlen(arg);
 
@@ -356,7 +360,6 @@
 			} else
 				option_error(ERROR_BAD_ARGUMENT, arg, NULL);
 		}
-		i++;
 	}
 
 	if (opt && opt->argument == NULL)
@@ -380,6 +383,9 @@
 #ifndef NCMPC_MINI
 	options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
+	if (getenv("MPD_TIMEOUT") != NULL)
+		/* let libmpdclient parse the environment variable */
+		options.timeout_ms = 0;
 }
 
 void
@@ -397,4 +403,7 @@
 	g_free(options.xterm_title_format);
 	g_free(options.scroll_sep);
 #endif
+#ifdef ENABLE_LYRICS_SCREEN
+	g_free(options.text_editor);
+#endif
 }

ncmpc-0.19.tar.bz2/src/options.h -> ncmpc-0.20.tar.bz2/src/options.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
@@ -40,6 +40,7 @@
 	char **screen_list;
 	bool display_remaining_time;
 	int port;
+	int timeout_ms;
 	int crossfade_time;
 	int search_mode;
 	int hide_cursor;
@@ -47,6 +48,9 @@
 #ifdef ENABLE_LYRICS_SCREEN
 	int lyrics_timeout;
 	bool lyrics_autosave;
+	bool lyrics_show_plugin;
+	char *text_editor;
+	bool text_editor_ask;
 #endif
 	bool find_wrap;
 	bool find_show_last_pattern;

ncmpc-0.19.tar.bz2/src/paint.h -> ncmpc-0.20.tar.bz2/src/paint.h Changed

ncmpc-0.19.tar.bz2/src/player_command.c -> ncmpc-0.20.tar.bz2/src/player_command.c Changed

@@ -1,17 +1,17 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -22,7 +22,7 @@
 #include "options.h"
 #include "i18n.h"
 #include "screen_client.h"
-#include "screen_message.h"
+#include "screen_status.h"
 
 int seek_id = -1;
 int seek_target_time;

ncmpc-0.19.tar.bz2/src/player_command.h -> ncmpc-0.20.tar.bz2/src/player_command.h Changed

ncmpc-0.19.tar.bz2/src/playlist.c -> ncmpc-0.20.tar.bz2/src/playlist.c Changed

ncmpc-0.19.tar.bz2/src/playlist.h -> ncmpc-0.20.tar.bz2/src/playlist.h Changed

ncmpc-0.19.tar.bz2/src/plugin.c -> ncmpc-0.20.tar.bz2/src/plugin.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "plugin.h"
 
@@ -168,7 +168,7 @@
 	} else {
 		/* success: invoke the callback */
 		cycle->callback(cycle->pipe_stdout.data, true,
-				cycle->callback_data);
+				cycle->argv[0], cycle->callback_data);
 	}
 }
 
@@ -217,7 +217,7 @@
 	assert(cycle->pipe_stderr.fd < 0);
 	assert(cycle->pid < 0);
 
-	cycle->callback(cycle->all_errors, false, cycle->callback_data);
+	cycle->callback(cycle->all_errors, false, NULL, cycle->callback_data);
 
 	return FALSE;
 }

ncmpc-0.19.tar.bz2/src/plugin.h -> ncmpc-0.20.tar.bz2/src/plugin.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef PLUGIN_H
 #define PLUGIN_H
@@ -38,10 +38,12 @@
  * messages on failure as determined by success
  * @param success result of the plugin cycle; true if result is meaningful
  * output, false if result contains error messages
+ * @param plugin_name the name of the plugin which succeeded; becomes invalid
+ * when plugin_stop is called (i.e. strdup it if you need it afterwards).
  * @param data the caller defined pointer passed to plugin_run()
  */
 typedef void (*plugin_callback_t)(const GString *result, const bool success,
-				  void *data);
+				  const char *plugin_name, void *data);
 
 /**
  * This object represents a cycle through all available plugins, until

ncmpc-0.19.tar.bz2/src/resolver.c -> ncmpc-0.20.tar.bz2/src/resolver.c Changed

ncmpc-0.19.tar.bz2/src/screen.c -> ncmpc-0.20.tar.bz2/src/screen.c Changed

@@ -1,27 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen.h"
 #include "screen_interface.h"
 #include "screen_list.h"
 #include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "config.h"
 #include "i18n.h"
 #include "charset.h"
@@ -202,11 +202,14 @@
 {
 	if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
 		screen_exit();
-		fprintf(stderr, "%s", _("Error: Screen too small"));
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
 		exit(EXIT_FAILURE);
 	}
-
+#ifdef PDCURSES
+	resize_term(LINES, COLS);
+#else 
 	resizeterm(LINES, COLS);
+#endif
 
 	screen.cols = COLS;
 	screen.rows = LINES;
@@ -290,7 +293,9 @@
 	/* create main window */
 	window_init(&screen.main_window, screen.rows - 4, screen.cols, 2, 0);
 
-	//  leaveok(screen.main_window.w, TRUE); temporary disabled
+	if (!options.hardware_cursor)
+		leaveok(screen.main_window.w, TRUE);
+
 	keypad(screen.main_window.w, TRUE);
 
 	/* create progress window */
@@ -466,8 +471,12 @@
 {
 	MEVENT event;
 
-	/* retrieve the mouse event from ncurses */
+	/* retrieve the mouse event from curses */
+#ifdef PDCURSES
+	nc_getmouse(&event);
+#else
 	getmouse(&event);
+#endif
 	/* calculate the selected row in the list window */
 	*row = event.y - screen.title_bar.window.rows;
 	/* copy button state bits */
@@ -560,10 +569,10 @@
 	case CMD_SCREEN_OUTPUTS:
 		screen_switch(&screen_outputs, c);
 		break;
+#endif
 	case CMD_SCREEN_SWAP:
 		screen_swap(c, NULL);
 		break;
-#endif
 
 	default:
 		break;

ncmpc-0.19.tar.bz2/src/screen.h -> ncmpc-0.20.tar.bz2/src/screen.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef SCREEN_H
 #define SCREEN_H
@@ -26,17 +26,12 @@
 #include "title_bar.h"
 #include "progress_bar.h"
 #include "status_bar.h"
+#include "ncmpc_curses.h"
 
 #include <mpd/client.h>
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 struct mpdclient;
 struct screen_functions;

ncmpc-0.19.tar.bz2/src/screen_artist.c -> ncmpc-0.20.tar.bz2/src/screen_artist.c Changed

@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_artist.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_find.h"
 #include "screen_browser.h"
 #include "screen.h"
@@ -162,8 +162,7 @@
 		mpd_search_commit(connection);
 		recv_tag_values(connection, MPD_TAG_ARTIST, artist_list);
 
-		if (!mpd_response_finish(connection))
-			mpdclient_handle_error(c);
+		mpdclient_finish_command(c);
 	}
 
 	/* sort list */
@@ -193,8 +192,7 @@
 
 		recv_tag_values(connection, MPD_TAG_ALBUM, album_list);
 
-		if (!mpd_response_finish(connection))
-			mpdclient_handle_error(c);
+		mpdclient_finish_command(c);
 	}
 
 	/* sort list */
@@ -228,8 +226,7 @@
 
 		filelist_recv(browser.filelist, connection);
 
-		if (!mpd_response_finish(connection))
-			mpdclient_handle_error(c);
+		mpdclient_finish_command(c);
 	}
 
 	/* fix highlights */
@@ -448,8 +445,12 @@
 		artist_repaint();
 }
 
+/* add_query - Add all songs satisfying specified criteria.
+   _artist is actually only used in the ALBUM case to distinguish albums with
+   the same name from different artists. */
 static void
-add_query(struct mpdclient *c, enum mpd_tag_type table, char *_filter)
+add_query(struct mpdclient *c, enum mpd_tag_type table, const char *_filter,
+	  const char *_artist)
 {
 	struct mpd_connection *connection = mpdclient_get_connection(c);
 	char *str;
@@ -472,15 +473,13 @@
 				      table, _filter);
 	if (table == MPD_TAG_ALBUM)
 		mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
-					      MPD_TAG_ARTIST, artist);
+					      MPD_TAG_ARTIST, _artist);
 	mpd_search_commit(connection);
 
 	addlist = filelist_new_recv(connection);
 
-	if (mpd_response_finish(connection))
+	if (mpdclient_finish_command(c))
 		mpdclient_filelist_add_all(c, addlist);
-	else
-		mpdclient_handle_error(c);
 
 	filelist_free(addlist);
 }
@@ -667,7 +666,7 @@
 			list_window_get_range(browser.lw, &range);
 			for (unsigned i = range.start; i < range.end; ++i) {
 				selected = g_ptr_array_index(artist_list, i);
-				add_query(c, MPD_TAG_ARTIST, selected);
+				add_query(c, MPD_TAG_ARTIST, selected, NULL);
 				cmd = CMD_LIST_NEXT; /* continue and select next item... */
 			}
 			break;
@@ -676,12 +675,12 @@
 			list_window_get_range(browser.lw, &range);
 			for (unsigned i = range.start; i < range.end; ++i) {
 				if(i == album_list->len + 1)
-					add_query(c, MPD_TAG_ARTIST, artist);
+					add_query(c, MPD_TAG_ARTIST, artist, NULL);
 				else if (i > 0)
 				{
 					selected = g_ptr_array_index(album_list,
 								     browser.lw->selected - 1);
-					add_query(c, MPD_TAG_ALBUM, selected);
+					add_query(c, MPD_TAG_ALBUM, selected, artist);
 					cmd = CMD_LIST_NEXT; /* continue and select next item... */
 				}
 			}

ncmpc-0.19.tar.bz2/src/screen_browser.c -> ncmpc-0.20.tar.bz2/src/screen_browser.c Changed

@@ -1,28 +1,28 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "config.h"
 #include "screen_browser.h"
 #include "screen_file.h"
 #include "screen_song.h"
 #include "screen_lyrics.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_find.h"
 #include "screen.h"
 #include "i18n.h"

ncmpc-0.19.tar.bz2/src/screen_browser.h -> ncmpc-0.20.tar.bz2/src/screen_browser.h Changed

@@ -1,36 +1,31 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef SCREEN_BROWSER_H
 #define SCREEN_BROWSER_H
 
 #include "command.h"
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #include <stdbool.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 struct mpdclient;
 struct mpdclient_playlist;
 struct filelist;

ncmpc-0.19.tar.bz2/src/screen_client.c -> ncmpc-0.20.tar.bz2/src/screen_client.c Changed

ncmpc-0.19.tar.bz2/src/screen_file.c -> ncmpc-0.20.tar.bz2/src/screen_file.c Changed

@@ -1,26 +1,26 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_file.h"
 #include "screen_browser.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_queue.h"
 #include "screen.h"
 #include "config.h"
@@ -63,10 +63,8 @@
 	mpd_send_list_meta(connection, current_path);
 	filelist_recv(filelist, connection);
 
-	if (mpd_response_finish(connection))
+	if (mpdclient_finish_command(c))
 		filelist_sort_dir_play(filelist, compare_filelist_entry_path);
-	else
-		mpdclient_handle_error(c);
 }
 
 static void
@@ -204,7 +202,6 @@
 	struct mpd_entity *entity;
 	const struct mpd_playlist *playlist;
 	char *str, *buf;
-	int key;
 
 	if (connection == NULL)
 		return;
@@ -231,9 +228,10 @@
 		str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
 		buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
 		g_free(str);
-		key = tolower(screen_getch(buf));
+		bool delete = screen_get_yesno(buf, false);
 		g_free(buf);
-		if( key != YES[0] ) {
+
+		if (!delete) {
 			/* translators: a dialog was aborted by the user */
 			screen_status_printf(_("Aborted"));
 			return;

ncmpc-0.19.tar.bz2/src/screen_find.c -> ncmpc-0.20.tar.bz2/src/screen_find.c Changed

ncmpc-0.19.tar.bz2/src/screen_find.h -> ncmpc-0.20.tar.bz2/src/screen_find.h Changed

ncmpc-0.19.tar.bz2/src/screen_help.c -> ncmpc-0.20.tar.bz2/src/screen_help.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_help.h"
 #include "screen_interface.h"
@@ -162,6 +162,7 @@
 	   from the server */
 	{ 0, CMD_INTERRUPT, N_("Interrupt retrieval") },
 	{ 0, CMD_LYRICS_UPDATE, N_("Download lyrics for currently playing song") },
+	{ 0, CMD_EDIT, N_("Add or edit lyrics") },
 	{ 0, CMD_SAVE_PLAYLIST, N_("Save lyrics") },
 	{ 0, CMD_DELETE, N_("Delete saved lyrics") },
 #endif
@@ -179,6 +180,7 @@
 	{ 2, CMD_NONE, NULL },
 	{ 0, CMD_PLAY, N_("Edit keydefs for selected command") },
 	{ 0, CMD_DELETE, N_("Remove selected keydef") },
+	{ 0, CMD_ADD, N_("Add a keydef") },
 	{ 0, CMD_GO_PARENT_DIRECTORY, N_("Go up a level") },
 	{ 0, CMD_SAVE_PLAYLIST, N_("Apply and save changes") },
 #endif

ncmpc-0.19.tar.bz2/src/screen_interface.h -> ncmpc-0.20.tar.bz2/src/screen_interface.h Changed

ncmpc-0.19.tar.bz2/src/screen_keydef.c -> ncmpc-0.20.tar.bz2/src/screen_keydef.c Changed

@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_keydef.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_find.h"
 #include "i18n.h"
 #include "conf.h"
@@ -31,31 +31,91 @@
 #include <string.h>
 #include <glib.h>
 
-#define STATIC_ITEMS      0
-#define STATIC_SUB_ITEMS  1
-#define BUFSIZE 256
+static struct list_window *lw;
 
-#define LIST_ITEM_APPLY()   ((unsigned)command_list_length)
-#define LIST_ITEM_SAVE()    (LIST_ITEM_APPLY()+1)
-#define LIST_LENGTH()       (LIST_ITEM_SAVE()+1)
+static command_definition_t *cmds = NULL;
 
-#define LIST_ITEM_SAVE_LABEL  _("===> Apply & Save key bindings  ")
-#define LIST_ITEM_APPLY_LABEL _("===> Apply key bindings ")
+/** the number of commands */
+static unsigned command_n_commands = 0;
 
+/**
+ * the position of the "apply" item. It's the same as command_n_commands,
+ * because array subscripts start at 0, while numbers of items start at 1.
+ */
+static G_GNUC_PURE inline unsigned
+command_item_apply(void)
+{
+	return command_n_commands;
+}
 
-static struct list_window *lw;
-static unsigned command_list_length = 0;
-static command_definition_t *cmds = NULL;
+/** the position of the "apply and save" item */
+static G_GNUC_PURE inline unsigned
+command_item_save(void)
+{
+	return command_item_apply() + 1;
+}
 
+/** the number of items in the "command" view */
+static G_GNUC_PURE inline unsigned
+command_length(void)
+{
+	return command_item_save() + 1;
+}
+
+
+/**
+ * The command being edited, represented by a array subscript to @cmds, or -1,
+ * if no command is being edited
+ */
 static int subcmd = -1;
-static unsigned subcmd_length = 0;
-static unsigned subcmd_addpos = 0;
+
+/** The number of keys assigned to the current command */
+static unsigned subcmd_n_keys = 0;
+
+/** The position of the up ("[..]") item */
+static G_GNUC_CONST inline unsigned
+subcmd_item_up(void)
+{
+	return 0;
+}
+
+/** The position of the "add a key" item */
+static G_GNUC_PURE inline unsigned
+subcmd_item_add(void)
+{
+	return subcmd_n_keys + 1;
+}
+
+/** The number of items in the list_window, if there's a command being edited */
+static G_GNUC_PURE inline unsigned
+subcmd_length(void)
+{
+	return subcmd_item_add() + 1;
+}
+
+/** Check whether a given item is a key */
+static G_GNUC_PURE inline bool
+subcmd_item_is_key(unsigned i)
+{
+	return (i > subcmd_item_up() && i < subcmd_item_add());
+}
+
+/**
+ * Convert an item id (as in lw->selected) into a "key id", which is an array
+ * subscript to cmds[subcmd].keys.
+ */
+static G_GNUC_CONST inline unsigned
+subcmd_item_to_key_id(unsigned i)
+{
+	return i - 1;
+}
+
 
 static int
 keybindings_changed(void)
 {
 	command_definition_t *orginal_cmds = get_command_definitions();
-	size_t size = command_list_length * sizeof(command_definition_t);
+	size_t size = command_n_commands * sizeof(command_definition_t);
 
 	return memcmp(orginal_cmds, cmds, size);
 }
@@ -65,7 +125,7 @@
 {
 	if (keybindings_changed()) {
 		command_definition_t *orginal_cmds = get_command_definitions();
-		size_t size = command_list_length * sizeof(command_definition_t);
+		size_t size = command_n_commands * sizeof(command_definition_t);
 
 		memcpy(orginal_cmds, cmds, size);
 		screen_status_printf(_("You have new key bindings"));
@@ -86,7 +146,7 @@
 		return -1;
 	}
 
-	filename = get_user_key_binding_filename();
+	filename = build_user_key_binding_filename();
 
 	if ((f = fopen(filename,"w")) == NULL) {
 		screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
@@ -104,21 +164,20 @@
 	return fclose(f);
 }
 
+/* TODO: rename to check_n_keys / subcmd_count_keys? */
 static void
 check_subcmd_length(void)
 {
-	subcmd_length = 0;
-	while (subcmd_length < MAX_COMMAND_KEYS &&
-	       cmds[subcmd].keys[subcmd_length] > 0)
-		++subcmd_length;
-
-	if (subcmd_length < MAX_COMMAND_KEYS) {
-		subcmd_addpos = subcmd_length;
-		subcmd_length++;
-	} else
-		subcmd_addpos = 0;
-	subcmd_length += STATIC_SUB_ITEMS;
-	list_window_set_length(lw, subcmd_length);
+	unsigned i;
+
+	/* this loops counts the continous valid keys at the start of the the keys
+	   array, so make sure you don't have gaps */
+	for (i = 0; i < MAX_COMMAND_KEYS; i++)
+		if (cmds[subcmd].keys[i] == 0)
+			break;
+	subcmd_n_keys = i;
+
+	list_window_set_length(lw, subcmd_length());
 }
 
 static void
@@ -131,18 +190,60 @@
 	wrefresh(lw->w);
 }
 
+/** lw->start the last time switch_to_subcmd_mode() was called */
+static unsigned saved_start = 0;
+
+static void
+switch_to_subcmd_mode(int cmd)
+{
+	assert(subcmd == -1);
+

ncmpc-0.19.tar.bz2/src/screen_list.c -> ncmpc-0.20.tar.bz2/src/screen_list.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_list.h"
 #include "screen_interface.h"
@@ -62,14 +62,12 @@
 #endif
 };
 
-static const unsigned NUM_SCREENS = sizeof(screens) / sizeof(screens[0]);
-
 void
 screen_list_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	unsigned i;
 
-	for (i = 0; i < NUM_SCREENS; ++i) {
+	for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
 		const struct screen_functions *sf = screens[i].functions;
 
 		if (sf->init)
@@ -82,7 +80,7 @@
 {
 	unsigned i;
 
-	for (i = 0; i < NUM_SCREENS; ++i) {
+	for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
 		const struct screen_functions *sf = screens[i].functions;
 
 		if (sf->exit)
@@ -95,7 +93,7 @@
 {
 	unsigned i;
 
-	for (i = 0; i < NUM_SCREENS; ++i) {
+	for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
 		const struct screen_functions *sf = screens[i].functions;
 
 		if (sf->resize)
@@ -108,7 +106,7 @@
 {
 	unsigned i;
 
-	for (i = 0; i < NUM_SCREENS; ++i)
+	for (i = 0; i < G_N_ELEMENTS(screens); ++i)
 		if (screens[i].functions == sf)
 			return screens[i].name;
 
@@ -120,7 +118,7 @@
 {
 	unsigned i;
 
-	for (i = 0; i < NUM_SCREENS; ++i)
+	for (i = 0; i < G_N_ELEMENTS(screens); ++i)
 		if (strcmp(name, screens[i].name) == 0)
 			return screens[i].functions;

ncmpc-0.19.tar.bz2/src/screen_list.h -> ncmpc-0.20.tar.bz2/src/screen_list.h Changed

@@ -1,32 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef SCREEN_LIST_H
 #define SCREEN_LIST_H
 
 #include "config.h"
-
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
+#include "ncmpc_curses.h"
 
 struct screen_functions;

ncmpc-0.19.tar.bz2/src/screen_lyrics.c -> ncmpc-0.20.tar.bz2/src/screen_lyrics.c Changed

@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_lyrics.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_file.h"
 #include "screen_song.h"
 #include "i18n.h"
@@ -28,9 +28,13 @@
 #include "screen.h"
 #include "lyrics.h"
 #include "screen_text.h"
+#include "screen_utils.h"
+#include "ncu.h"
 
 #include <assert.h>
+#include <errno.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -45,9 +49,11 @@
 static struct {
 	struct mpd_song *song;
 
-	char *artist, *title;
+	char *artist, *title, *plugin_name;
 
 	struct plugin_cycle *loader;
+
+	guint loader_timeout;
 } current;
 
 static void
@@ -58,6 +64,16 @@
 		current.loader = NULL;
 	}
 
+	if (current.loader_timeout != 0) {
+		g_source_remove(current.loader_timeout);
+		current.loader_timeout = 0;
+	}
+
+	if (current.plugin_name != NULL) {
+		g_free(current.plugin_name);
+		current.plugin_name = NULL;
+	}
+
 	if (current.artist != NULL) {
 		g_free(current.artist);
 		current.artist = NULL;
@@ -65,7 +81,7 @@
 
 	if (current.title != NULL) {
 		g_free(current.title);
-		current.artist = NULL;
+		current.title = NULL;
 	}
 
 	if (current.song != NULL) {
@@ -165,10 +181,12 @@
 
 static void
 screen_lyrics_callback(const GString *result, const bool success,
-		       G_GNUC_UNUSED void *data)
+		       const char *plugin_name, G_GNUC_UNUSED void *data)
 {
 	assert(current.loader != NULL);
 
+	current.plugin_name = g_strdup(plugin_name);
+
 	/* Display result, which may be lyrics or error messages */
 	if (result != NULL)
 		screen_lyrics_set(result);
@@ -182,10 +200,28 @@
 		screen_status_message (_("No lyrics"));
 	}
 
+	if (current.loader_timeout != 0) {
+		g_source_remove(current.loader_timeout);
+		current.loader_timeout = 0;
+	}
+
 	plugin_stop(current.loader);
 	current.loader = NULL;
 }
 
+static gboolean
+screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
+{
+	plugin_stop(current.loader);
+	current.loader = NULL;
+
+	screen_status_printf(_("Lyrics timeout occurred after %d seconds"),
+			     options.lyrics_timeout);
+
+	current.loader_timeout = 0;
+	return FALSE;
+}
+
 static void
 screen_lyrics_load(const struct mpd_song *song)
 {
@@ -205,6 +241,24 @@
 
 	current.loader = lyrics_load(current.artist, current.title,
 				     screen_lyrics_callback, NULL);
+
+	if (options.lyrics_timeout != 0) {
+		current.loader_timeout =
+			g_timeout_add_seconds(options.lyrics_timeout,
+					      screen_lyrics_timeout_callback,
+					      NULL);
+	}
+}
+
+static void
+screen_lyrics_reload(void)
+{
+	if (current.loader == NULL && current.artist != NULL &&
+	    current.title != NULL) {
+		current.loader = lyrics_load(current.artist, current.title,
+					     screen_lyrics_callback, NULL);
+		screen_text_repaint(&text);
+	}
 }
 
 static void
@@ -239,9 +293,10 @@
 		    mpd_song_get_uri(current.song)) != 0))
 		screen_lyrics_load(next_song_c);
 
-	if (next_song != NULL)
+	if (next_song != NULL) {
 		mpd_song_free(next_song);
-	next_song = NULL;
+		next_song = NULL;
+	}
 }
 
 static void
@@ -269,9 +324,16 @@
 		return str;
 	} else if (current.artist != NULL && current.title != NULL &&
 		   !screen_text_is_empty(&text)) {
-		snprintf(str, size, "%s: %s - %s",
-			 _("Lyrics"),
-			 current.artist, current.title);
+		int n;
+		n = snprintf(str, size, "%s: %s - %s",
+			     _("Lyrics"),
+			     current.artist, current.title);
+
+		if (options.lyrics_show_plugin && current.plugin_name != NULL &&
+		    (unsigned int) n < size - 1)
+			snprintf(str + n, size - n, " (%s)",
+				 current.plugin_name);
+
 		return str;
 	} else
 		return _("Lyrics");
@@ -283,6 +345,71 @@
 	screen_text_paint(&text);
 }
 
+/* save current lyrics to a file and run editor on it */
+static void
+lyrics_edit(void)
+{
+	char *editor = options.text_editor;
+	int status;
+
+	if (editor == NULL) {
+		screen_status_message(_("Editor not configured"));
+		return;
+	}

ncmpc-0.19.tar.bz2/src/screen_outputs.c -> ncmpc-0.20.tar.bz2/src/screen_outputs.c Changed

@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_outputs.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "paint.h"
 #include "i18n.h"
 #include "list_window.h"
@@ -130,8 +130,7 @@
 		g_ptr_array_add(mpd_outputs, output);
 	}
 
-	if (!mpd_response_finish(connection))
-		mpdclient_handle_error(c);
+	mpdclient_finish_command(c);
 
 	list_window_set_length(lw, mpd_outputs->len);
 }
@@ -245,7 +244,7 @@
 	.close     = outputs_close,
 	.resize    = outputs_resize,
 	.paint     = outputs_paint,
-	.update = screen_outputs_update,
+	.update    = screen_outputs_update,
 	.cmd       = outputs_cmd,
 	.get_title = outputs_title,
 };

ncmpc-0.19.tar.bz2/src/screen_queue.c -> ncmpc-0.20.tar.bz2/src/screen_queue.c Changed

@@ -20,7 +20,7 @@
 #include "screen_queue.h"
 #include "screen_interface.h"
 #include "screen_file.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_find.h"
 #include "config.h"
 #include "i18n.h"
@@ -268,7 +268,7 @@
 			filename=g_strstrip(filename);
 	} else
 #endif
-			filename=g_strdup(name);
+		filename=g_strdup(name);
 
 	if (filename == NULL)
 		return -1;
@@ -287,14 +287,14 @@
 		    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
 		    mpd_connection_clear_error(connection)) {
 			char *buf;
-			int key;
+			bool replace;
 
 			buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
 					      filename, YES, NO);
-			key = tolower(screen_getch(buf));
+			replace = screen_get_yesno(buf, false);
 			g_free(buf);
 
-			if (key != YES[0]) {
+			if (!replace) {
 				g_free(filename_utf8);
 				g_free(filename);
 				screen_status_printf(_("Aborted"));
@@ -554,7 +554,7 @@
 		screen_queue_restore_selection();
 	else
 		/* the queue size may have changed, even if we havn't
-		   revceived the QUEUE idle event yet */
+		   received the QUEUE idle event yet */
 		list_window_set_length(lw, playlist_length(playlist));
 
 	if (((c->events & MPD_IDLE_PLAYER) != 0 &&
@@ -765,6 +765,10 @@
 		lw->selected--;
 		lw->range_base--;
 
+		if (lw->range_selection)
+			list_window_scroll_to(lw, lw->range_base);
+		list_window_scroll_to(lw, lw->selected);
+
 		screen_queue_save_selection();
 		return true;
 
@@ -779,6 +783,10 @@
 		lw->selected++;
 		lw->range_base++;
 
+		if (lw->range_selection)
+			list_window_scroll_to(lw, lw->range_base);
+		list_window_scroll_to(lw, lw->selected);
+
 		screen_queue_save_selection();
 		return true;

ncmpc-0.19.tar.bz2/src/screen_search.c -> ncmpc-0.20.tar.bz2/src/screen_search.c Changed

@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_search.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen.h"
 #include "i18n.h"
 #include "options.h"
@@ -36,6 +36,7 @@
 
 enum {
 	SEARCH_URI = MPD_TAG_COUNT + 100,
+	SEARCH_ARTIST_TITLE
 };
 
 static const struct {
@@ -72,8 +73,6 @@
 	return -1;
 }
 
-#define SEARCH_ARTIST_TITLE 999
-
 typedef struct {
 	enum mpd_tag_type table;
 	const char *label;
@@ -383,7 +382,7 @@
 	//    search_new(screen, c);
 	// else
 	screen_status_printf(_("Press %s for a new search"),
-			     get_key_names(CMD_SCREEN_SEARCH,0));
+			     get_key_names(CMD_SCREEN_SEARCH, false));
 	search_check_mode();
 }
 
@@ -417,7 +416,7 @@
 			   _(mode[options.search_mode].label));
 	else
 		g_snprintf(str, size, _("Search: Press %s for a new search [%s]"),
-			   get_key_names(CMD_SCREEN_SEARCH,0),
+			   get_key_names(CMD_SCREEN_SEARCH, false),
 			   _(mode[options.search_mode].label));
 
 	return str;

ncmpc-0.19.tar.bz2/src/screen_song.c -> ncmpc-0.20.tar.bz2/src/screen_song.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_song.h"
 #include "screen_interface.h"
@@ -36,6 +36,7 @@
 
 enum {
 	LABEL_LENGTH = MPD_TAG_COUNT,
+	LABEL_PATH,
 	LABEL_BITRATE,
 };
 
@@ -51,6 +52,7 @@
 	[MPD_TAG_DATE] = N_("Date"),
 	[MPD_TAG_GENRE] = N_("Genre"),
 	[MPD_TAG_COMMENT] = N_("Comment"),
+	[LABEL_PATH] = N_("Path"),
 	[LABEL_BITRATE] = N_("Bitrate"),
 };
 
@@ -308,10 +310,11 @@
 	screen_song_append_tag(song, MPD_TAG_GENRE);
 	screen_song_append_tag(song, MPD_TAG_COMMENT);
 
-	screen_song_append(_("Path"), mpd_song_get_uri(song),
+	screen_song_append(_(tag_labels[LABEL_PATH]), mpd_song_get_uri(song),
 			   max_tag_label_width);
 	if (mpdclient_is_playing(c) && c->song != NULL &&
-	    strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0) {
+	    strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0 &&
+	    mpd_status_get_kbit_rate(c->status)) {
 		char buf[16];
 		g_snprintf(buf, sizeof(buf), _("%d kbps"),
 			   mpd_status_get_kbit_rate(c->status));

ncmpc-0.20.tar.bz2/src/screen_status.c Added

@@ -0,0 +1,42 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "screen_status.h"
+#include "screen.h"
+
+#include <stdarg.h>
+
+void
+screen_status_message(const char *msg)
+{
+	status_bar_message(&screen.status_bar, msg);
+}
+
+void
+screen_status_printf(const char *format, ...)
+{
+	char *msg;
+	va_list ap;
+
+	va_start(ap,format);
+	msg = g_strdup_vprintf(format,ap);
+	va_end(ap);
+	screen_status_message(msg);
+	g_free(msg);
+}

ncmpc-0.20.tar.bz2/src/screen_status.h Added

@@ -0,0 +1,29 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef NCMPC_SCREEN_STATUS_H
+#define NCMPC_SCREEN_STATUS_H
+
+void
+screen_status_message(const char *msg);
+
+void
+screen_status_printf(const char *format, ...);
+
+#endif

ncmpc-0.19.tar.bz2/src/screen_text.c -> ncmpc-0.20.tar.bz2/src/screen_text.c Changed

ncmpc-0.19.tar.bz2/src/screen_text.h -> ncmpc-0.20.tar.bz2/src/screen_text.h Changed

ncmpc-0.19.tar.bz2/src/screen_utils.c -> ncmpc-0.20.tar.bz2/src/screen_utils.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_utils.h"
 #include "screen.h"
@@ -27,6 +27,7 @@
 #include "wreadln.h"
 
 #include <mpd/client.h>
+#include <ctype.h>
 
 void
 screen_bell(void)
@@ -66,6 +67,21 @@
 	return key;
 }
 
+bool
+screen_get_yesno(const char *prompt, bool def)
+{
+	/* NOTE: if one day a translator decides to use a multi-byte character
+	   for one of the yes/no keys, we'll have to parse it properly */
+
+	int key = tolower(screen_getch(prompt));
+	if (key == YES[0])
+		return true;
+	else if (key == NO[0])
+		return false;
+	else
+		return def;
+}
+
 char *
 screen_readln(const char *prompt,
 	      const char *value,

ncmpc-0.19.tar.bz2/src/screen_utils.h -> ncmpc-0.20.tar.bz2/src/screen_utils.h Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef SCREEN_UTILS_H
 #define SCREEN_UTILS_H
@@ -32,6 +32,15 @@
 /* read a character from the status window */
 int screen_getch(const char *prompt);
 
+/**
+ * display a prompt, wait for the user to press a key, and compare it with
+ * the default keys for "yes" and "no" (and their upper-case pendants).
+ *
+ * @returns true, if the user pressed the key for "yes"; false, if the user
+ *	    pressed the key for "no"; def otherwise
+ */
+bool screen_get_yesno(const char *prompt, bool def);
+
 char *
 screen_read_password(const char *prompt);

ncmpc-0.19.tar.bz2/src/song_paint.c -> ncmpc-0.20.tar.bz2/src/song_paint.c Changed

ncmpc-0.19.tar.bz2/src/song_paint.h -> ncmpc-0.20.tar.bz2/src/song_paint.h Changed

ncmpc-0.19.tar.bz2/src/strfsong.c -> ncmpc-0.20.tar.bz2/src/strfsong.c Changed

ncmpc-0.19.tar.bz2/src/strfsong.h -> ncmpc-0.20.tar.bz2/src/strfsong.h Changed

ncmpc-0.19.tar.bz2/src/title_bar.c -> ncmpc-0.20.tar.bz2/src/title_bar.c Changed

ncmpc-0.19.tar.bz2/src/utils.c -> ncmpc-0.20.tar.bz2/src/utils.c Changed

ncmpc-0.19.tar.bz2/src/utils.h -> ncmpc-0.20.tar.bz2/src/utils.h Changed

ncmpc-0.19.tar.bz2/src/window.h -> ncmpc-0.20.tar.bz2/src/window.h Changed

ncmpc-0.19.tar.bz2/src/wreadln.c -> ncmpc-0.20.tar.bz2/src/wreadln.c Changed

@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "wreadln.h"
 #include "charset.h"
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined(WIN32)
 #include <sys/poll.h>
 #endif
 
@@ -84,7 +84,7 @@
 static unsigned
 byte_to_screen(const gchar *data, size_t x)
 {
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 	gchar *dup;
 	char *p;
 	unsigned width;
@@ -110,7 +110,7 @@
 static size_t
 screen_to_bytes(const gchar *data, unsigned width)
 {
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 	size_t length = strlen(data);
 	gchar *dup = g_strdup(data);
 	char *p;
@@ -150,7 +150,7 @@
 static inline size_t
 right_align_bytes(const gchar *data, size_t right, unsigned width)
 {
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 	gchar *dup;
 	size_t start = 0;
 
@@ -192,7 +192,7 @@
 static inline size_t
 next_char_size(const gchar *data)
 {
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 	char *p = locale_to_utf8(data), *q;
 	gunichar c;
 	size_t size;
@@ -217,7 +217,7 @@
 static inline size_t
 prev_char_size(const gchar *data, size_t x)
 {
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 	char *p = locale_to_utf8(data), *q;
 	gunichar c;
 	size_t size;
@@ -301,7 +301,7 @@
 	doupdate();
 }
 
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)
 static bool
 multibyte_is_complete(const char *p, size_t length)
 {
@@ -322,7 +322,7 @@
 wreadln_insert_byte(struct wreadln *wr, gint key)
 {
 	size_t rest = strlen(wr->line + wr->cursor) + 1;
-#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
+#if (defined(HAVE_CURSES_ENHANCED) || defined(ENABLE_MULTIBYTE)) && !defined (WIN32)
 	char buffer[32] = { key };
 	size_t length = 1;
 	struct pollfd pfd = {

ncmpc-0.19.tar.bz2/src/wreadln.h -> ncmpc-0.20.tar.bz2/src/wreadln.h Changed

@@ -1,35 +1,30 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef WREADLN_H
 #define WREADLN_H
 
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 #ifndef NCMPC_MINI
 
 /* completion callback data */

Changes of Revision 4