Update copyright notices

[ncmpc.git] / src / wreadln.c

diff --git a/src/wreadln.c b/src/wreadln.c
index 7abfc4ac203a65270f65c0176b812d336ca64d43..b6579410a3bf5b9adbd1605042ae49cac8217887 100644 (file)
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -1,20 +1,21 @@
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
+
+ * 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"
@@ -26,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
 #include <sys/poll.h>
 #endif
 
@@ -72,15 +73,17 @@ struct wreadln {
 /** max items stored in the history list */
 static const guint wrln_max_history_length = 32;
 
+#ifndef NCMPC_MINI
 void *wrln_completion_callback_data = NULL;
 wrln_gcmp_pre_cb_t wrln_pre_completion_callback = NULL;
 wrln_gcmp_post_cb_t wrln_post_completion_callback = NULL;
+#endif
 
 /** converts a byte position to a screen column */
 static unsigned
 byte_to_screen(const gchar *data, size_t x)
 {
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        gchar *dup;
        char *p;
        unsigned width;
@@ -107,7 +110,7 @@ byte_to_screen(const gchar *data, size_t x)
 static size_t
 screen_to_bytes(const gchar *data, unsigned width)
 {
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        size_t length = strlen(data);
        gchar *dup = g_strdup(data);
        char *p;
@@ -147,7 +150,7 @@ cursor_column(const struct wreadln *wr)
 static inline size_t
 right_align_bytes(const gchar *data, size_t right, unsigned width)
 {
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        gchar *dup;
        size_t start = 0;
 
@@ -189,7 +192,7 @@ right_align_bytes(const gchar *data, size_t right, unsigned width)
 static inline size_t
 next_char_size(const gchar *data)
 {
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        char *p = locale_to_utf8(data), *q;
        gunichar c;
        size_t size;
@@ -214,7 +217,7 @@ next_char_size(const gchar *data)
 static inline size_t
 prev_char_size(const gchar *data, size_t x)
 {
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        char *p = locale_to_utf8(data), *q;
        gunichar c;
        size_t size;
@@ -298,7 +301,7 @@ static inline void drawline(const struct wreadln *wr)
        doupdate();
 }
 
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
 static bool
 multibyte_is_complete(const char *p, size_t length)
 {
@@ -319,7 +322,7 @@ static void
 wreadln_insert_byte(struct wreadln *wr, gint key)
 {
        size_t rest = strlen(wr->line + wr->cursor) + 1;
-#ifdef ENABLE_WIDE
+#if defined(ENABLE_WIDE) || defined(ENABLE_MULTIBYTE)
        char buffer[32] = { key };
        size_t length = 1;
        struct pollfd pfd = {
@@ -396,6 +399,10 @@ _wreadln(WINDOW *w,
        gint key = 0;
        size_t i;
 
+#ifdef NCMPC_MINI
+       (void)gcmp;
+#endif
+
        /* turn off echo */
        noecho();
        /* make shure the cursor is visible */
@@ -458,6 +465,7 @@ _wreadln(WINDOW *w,
                        break;
 
                case TAB:
+#ifndef NCMPC_MINI
                        if (gcmp) {
                                char *prefix = NULL;
                                GList *list;
@@ -477,6 +485,7 @@ _wreadln(WINDOW *w,
                                        wrln_post_completion_callback(gcmp, wr.line, list,
                                                                      wrln_completion_callback_data);
                        }
+#endif
                        break;
 
                case KEY_CTRL_G:
@@ -595,6 +604,9 @@ _wreadln(WINDOW *w,
                }
        }
 
+       if (wr.line[0] == 0)
+               return NULL;
+
        return g_strdup(wr.line);
 }