disable more features with --enable-mini

[ncmpc.git] / src / screen_utils.c

diff --git a/src/screen_utils.c b/src/screen_utils.c
index 6029596bdc47ea43488f93f08c48b912dd86f3f0..e44d8eb67cc03e442ef803af0f1da86a15eca39b 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
@@ -20,7 +20,7 @@
 #include "screen.h"
 #include "mpdclient.h"
 #include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
 #include "support.h"
 #include "options.h"
 #include "colors.h"
@@ -28,7 +28,6 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
 
 #define FIND_PROMPT  _("Find: ")
 #define RFIND_PROMPT _("Find backward: ")
@@ -46,18 +45,16 @@ int
 screen_getch(WINDOW *w, const char *prompt)
 {
        int key = -1;
-       int prompt_len = strlen(prompt);
 
        colors_use(w, COLOR_STATUS_ALERT);
        wclear(w);
        wmove(w, 0, 0);
        waddstr(w, prompt);
-       wmove(w, 0, prompt_len);
 
        echo();
        curs_set(1);
 
-       while ((key=my_wgetch(w)) == ERR)
+       while ((key = wgetch(w)) == ERR)
                ;
 
 #ifdef HAVE_GETMOUSE
@@ -146,8 +143,7 @@ screen_auth(struct mpdclient *c)
 
 /* query user for a string and find it in a list window */
 int
-screen_find(screen_t *screen,
-           list_window_t *lw,
+screen_find(list_window_t *lw,
            int rows,
            command_t findcmd,
            list_window_callback_fn_t callback_fn,
@@ -166,40 +162,41 @@ screen_find(screen_t *screen,
        switch (findcmd) {
        case CMD_LIST_FIND:
        case CMD_LIST_RFIND:
-               if (screen->findbuf) {
-                       g_free(screen->findbuf);
-                       screen->findbuf=NULL;
+               if (screen.findbuf) {
+                       g_free(screen.findbuf);
+                       screen.findbuf=NULL;
                }
                /* continue... */
 
        case CMD_LIST_FIND_NEXT:
        case CMD_LIST_RFIND_NEXT:
-               if (!screen->findbuf)
-                       screen->findbuf=screen_readln(screen->status_window.w,
-                                                     prompt,
-                                                     value,
-                                                     &screen->find_history,
-                                                     NULL);
-
-               if (!screen->findbuf || !screen->findbuf[0])
+               if (!screen.findbuf)
+                       screen.findbuf=screen_readln(screen.status_window.w,
+                                                    prompt,
+                                                    value,
+                                                    &screen.find_history,
+                                                    NULL);
+
+               if (!screen.findbuf || !screen.findbuf[0])
                        return 1;
 
                if (reversed)
                        retval = list_window_rfind(lw,
                                                   callback_fn,
                                                   callback_data,
-                                                  screen->findbuf,
+                                                  screen.findbuf,
                                                   options.find_wrap,
                                                   rows);
                else
                        retval = list_window_find(lw,
                                                  callback_fn,
                                                  callback_data,
-                                                 screen->findbuf,
+                                                 screen.findbuf,
                                                  options.find_wrap);
 
                if (retval != 0) {
-                       screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf);
+                       screen_status_printf(_("Unable to find \'%s\'"),
+                                            screen.findbuf);
                        screen_bell();
                }
                return 1;
@@ -210,17 +207,17 @@ screen_find(screen_t *screen,
 }
 
 void
-screen_display_completion_list(screen_t *screen, GList *list)
+screen_display_completion_list(GList *list)
 {
        static GList *prev_list = NULL;
        static guint prev_length = 0;
        static guint offset = 0;
-       WINDOW *w = screen->main_window.w;
+       WINDOW *w = screen.main_window.w;
        guint length, y=0;
 
        length = g_list_length(list);
        if (list == prev_list && length == prev_length) {
-               offset += screen->main_window.rows;
+               offset += screen.main_window.rows;
                if (offset >= length)
                        offset = 0;
        } else {
@@ -230,14 +227,14 @@ screen_display_completion_list(screen_t *screen, GList *list)
        }
 
        colors_use(w, COLOR_STATUS_ALERT);
-       while (y < screen->main_window.rows) {
+       while (y < screen.main_window.rows) {
                GList *item = g_list_nth(list, y+offset);
 
                wmove(w, y++, 0);
                wclrtoeol(w);
                if (item) {
                        gchar *tmp = g_strdup(item->data);
-                       waddstr(w, basename(tmp));
+                       waddstr(w, g_basename(tmp));
                        g_free(tmp);
                }
        }
@@ -247,6 +244,7 @@ screen_display_completion_list(screen_t *screen, GList *list)
        colors_use(w, COLOR_LIST);
 }
 
+#ifndef NCMPC_MINI
 void
 set_xterm_title(const char *format, ...)
 {
@@ -267,3 +265,4 @@ set_xterm_title(const char *format, ...)
                        options.enable_xterm_title = FALSE;
        }
 }
+#endif