diff --git a/src/screen_utils.c b/src/screen_utils.c
index 5e534a12e6f94a4738da3986a20588780a97c265..e44d8eb67cc03e442ef803af0f1da86a15eca39b 100644 (file)
--- a/src/screen_utils.c
+++ b/src/screen_utils.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
#include "screen.h"
#include "mpdclient.h"
#include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
#include "support.h"
#include "options.h"
#include "colors.h"
#include <stdlib.h>
#include <unistd.h>
-#include <string.h>
#define FIND_PROMPT _("Find: ")
#define RFIND_PROMPT _("Find backward: ")
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
colors_use(w, COLOR_STATUS_ALERT);
if (prompt == NULL)
- ret = wreadln_masked(w, _("Password: "), NULL, COLS, NULL, NULL);
- else
- ret = wreadln_masked(w, prompt, NULL, COLS, NULL, NULL);
+ prompt = _("Password: ");
+ ret = wreadln_masked(w, prompt, NULL, COLS, NULL, NULL);
curs_set(0);
return ret;
/* 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,
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)
- lw->repaint = 1;
- else {
- screen_status_printf(_("Unable to find \'%s\'"), screen->findbuf);
+ if (retval != 0) {
+ screen_status_printf(_("Unable to find \'%s\'"),
+ screen.findbuf);
screen_bell();
}
return 1;
}
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 {
}
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);
}
}
colors_use(w, COLOR_LIST);
}
+#ifndef NCMPC_MINI
void
set_xterm_title(const char *format, ...)
{
options.enable_xterm_title = FALSE;
}
}
+#endif