![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_help.c b/src/screen_help.c
index 7416e6e404f6a6dfcaaf5d35d646fe2ecbbf032d..8804c950bd22735da8b7be9a28af74797c3cb085 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
*/
#include "config.h"
-#include "ncmpc.h"
+#include "i18n.h"
#include "mpdclient.h"
#include "command.h"
#include "screen.h"
#include "screen_utils.h"
-#include "gcc.h"
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <ncurses.h>
-
typedef struct {
signed char highlight;
const char *text;
} help_text_row_t;
-static help_text_row_t help_text[] =
-{
- { 1, CMD_NONE, N_("Keys - Movement") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_LIST_PREVIOUS, NULL },
- { 0, CMD_LIST_NEXT, NULL },
- { 0, CMD_LIST_PREVIOUS_PAGE, NULL },
- { 0, CMD_LIST_NEXT_PAGE, NULL },
- { 0, CMD_LIST_FIRST, NULL },
- { 0, CMD_LIST_LAST, NULL },
- { 0, CMD_NONE, NULL },
- { 0, CMD_SCREEN_PREVIOUS,NULL },
- { 0, CMD_SCREEN_NEXT, NULL },
- { 0, CMD_SCREEN_HELP, NULL },
- { 0, CMD_SCREEN_PLAY, NULL },
- { 0, CMD_SCREEN_FILE, NULL },
+static help_text_row_t help_text[] = {
+ { 1, CMD_NONE, N_("Keys - Movement") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_LIST_PREVIOUS, NULL },
+ { 0, CMD_LIST_NEXT, NULL },
+ { 0, CMD_LIST_PREVIOUS_PAGE, NULL },
+ { 0, CMD_LIST_NEXT_PAGE, NULL },
+ { 0, CMD_LIST_FIRST, NULL },
+ { 0, CMD_LIST_LAST, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_SCREEN_PREVIOUS,NULL },
+ { 0, CMD_SCREEN_NEXT, NULL },
+ { 0, CMD_SCREEN_HELP, NULL },
+ { 0, CMD_SCREEN_PLAY, NULL },
+ { 0, CMD_SCREEN_FILE, NULL },
+#ifdef ENABLE_ARTIST_SCREEN
+ { 0, CMD_SCREEN_ARTIST, NULL },
+#endif
#ifdef ENABLE_SEARCH_SCREEN
- { 0, CMD_SCREEN_SEARCH, NULL },
+ { 0, CMD_SCREEN_SEARCH, NULL },
#endif
#ifdef ENABLE_KEYDEF_SCREEN
- { 0, CMD_SCREEN_KEYDEF, NULL },
+ { 0, CMD_SCREEN_KEYDEF, NULL },
#endif
- { 0, CMD_NONE, NULL },
- { 0, CMD_NONE, NULL },
- { 1, CMD_NONE, N_("Keys - Global") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_STOP, NULL },
- { 0, CMD_PAUSE, NULL },
- { 0, CMD_TRACK_NEXT, NULL },
- { 0, CMD_TRACK_PREVIOUS, NULL },
- { 0, CMD_SEEK_FORWARD, NULL },
- { 0, CMD_SEEK_BACKWARD, NULL },
- { 0, CMD_VOLUME_DOWN, NULL },
- { 0, CMD_VOLUME_UP, NULL },
- { 0, CMD_NONE, NULL },
- { 0, CMD_REPEAT, NULL },
- { 0, CMD_RANDOM, NULL },
- { 0, CMD_CROSSFADE, NULL },
- { 0, CMD_SHUFFLE, NULL },
- { 0, CMD_DB_UPDATE, NULL },
- { 0, CMD_NONE, NULL },
- { 0, CMD_LIST_FIND, NULL },
- { 0, CMD_LIST_RFIND, NULL },
- { 0, CMD_LIST_FIND_NEXT, NULL },
- { 0, CMD_LIST_RFIND_NEXT, NULL },
- { 0, CMD_TOGGLE_FIND_WRAP, NULL },
- { 0, CMD_NONE, NULL },
- { 0, CMD_QUIT, NULL },
-
- { 0, CMD_NONE, NULL },
- { 0, CMD_NONE, NULL },
- { 1, CMD_NONE, N_("Keys - Playlist screen") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_PLAY, N_("Play") },
- { 0, CMD_DELETE, NULL },
- { 0, CMD_CLEAR, NULL },
- { 1, CMD_LIST_MOVE_UP, N_("Move song up") },
- { 0, CMD_LIST_MOVE_DOWN, N_("Move song down") },
- { 0, CMD_ADD, NULL },
- { 0, CMD_SAVE_PLAYLIST, NULL },
- { 0, CMD_SCREEN_UPDATE, N_("Center") },
- { 0, CMD_TOGGLE_AUTOCENTER, NULL },
-
- { 0, CMD_NONE, NULL },
- { 0, CMD_NONE, NULL },
- { 1, CMD_NONE, N_("Keys - Browse screen") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_PLAY, N_("Enter directory/Select and play song") },
- { 0, CMD_SELECT, NULL },
- { 0, CMD_SAVE_PLAYLIST, NULL },
- { 0, CMD_DELETE, N_("Delete playlist") },
- { 0, CMD_GO_PARENT_DIRECTORY, NULL },
- { 0, CMD_GO_ROOT_DIRECTORY, NULL },
- { 0, CMD_SCREEN_UPDATE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Global") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_STOP, NULL },
+ { 0, CMD_PAUSE, NULL },
+ { 0, CMD_CROP, NULL },
+ { 0, CMD_TRACK_NEXT, NULL },
+ { 0, CMD_TRACK_PREVIOUS, NULL },
+ { 0, CMD_SEEK_FORWARD, NULL },
+ { 0, CMD_SEEK_BACKWARD, NULL },
+ { 0, CMD_VOLUME_DOWN, NULL },
+ { 0, CMD_VOLUME_UP, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_REPEAT, NULL },
+ { 0, CMD_RANDOM, NULL },
+ { 0, CMD_CROSSFADE, NULL },
+ { 0, CMD_SHUFFLE, NULL },
+ { 0, CMD_DB_UPDATE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_LIST_FIND, NULL },
+ { 0, CMD_LIST_RFIND, NULL },
+ { 0, CMD_LIST_FIND_NEXT, NULL },
+ { 0, CMD_LIST_RFIND_NEXT, NULL },
+ { 0, CMD_TOGGLE_FIND_WRAP, NULL },
+ { 0, CMD_LOCATE, NULL },
+ { 0, CMD_VIEW, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_QUIT, NULL },
+
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Playlist screen") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_PLAY, N_("Play") },
+ { 0, CMD_DELETE, NULL },
+ { 0, CMD_CLEAR, NULL },
+ { 1, CMD_LIST_MOVE_UP, N_("Move song up") },
+ { 0, CMD_LIST_MOVE_DOWN, N_("Move song down") },
+ { 0, CMD_ADD, NULL },
+ { 0, CMD_SAVE_PLAYLIST, NULL },
+ { 0, CMD_SCREEN_UPDATE, N_("Center") },
+ { 0, CMD_TOGGLE_AUTOCENTER, NULL },
+
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Browse screen") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_PLAY, N_("Enter directory/Select and play song") },
+ { 0, CMD_SELECT, NULL },
+ { 0, CMD_ADD, N_("Append song to playlist") },
+ { 0, CMD_SAVE_PLAYLIST, NULL },
+ { 0, CMD_DELETE, N_("Delete playlist") },
+ { 0, CMD_GO_PARENT_DIRECTORY, NULL },
+ { 0, CMD_GO_ROOT_DIRECTORY, NULL },
+ { 0, CMD_SCREEN_UPDATE, NULL },
#ifdef ENABLE_SEARCH_SCREEN
- { 0, CMD_NONE, NULL },
- { 0, CMD_NONE, NULL },
- { 1, CMD_NONE, N_("Keys - Search screen") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_SCREEN_SEARCH, N_("Search") },
- { 0, CMD_PLAY, N_("Select and play") },
- { 0, CMD_SELECT, NULL },
- { 0, CMD_SELECT_ALL, NULL },
- { 0, CMD_SEARCH_MODE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Search screen") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_SCREEN_SEARCH, N_("Search") },
+ { 0, CMD_PLAY, N_("Select and play") },
+ { 0, CMD_SELECT, NULL },
+ { 0, CMD_ADD, N_("Append song to playlist") },
+ { 0, CMD_SELECT_ALL, NULL },
+ { 0, CMD_SEARCH_MODE, NULL },
#endif
#ifdef ENABLE_LYRICS_SCREEN
- { 0, CMD_NONE, NULL },
- { 0, CMD_NONE, NULL },
- { 1, CMD_NONE, N_("Keys - Lyrics screen") },
- { 2, CMD_NONE, NULL },
- { 0, CMD_SCREEN_LYRICS, N_("View Lyrics") },
- { 0, CMD_SELECT, N_("(Re)load lyrics") },
- { 0, CMD_INTERRUPT, N_("Interrupt retrieval") },
- { 0, CMD_LYRICS_UPDATE, N_("Explicitly download lyrics") },
- { 0, CMD_ADD, N_("Save lyrics") },
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Lyrics screen") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_SCREEN_LYRICS, N_("View Lyrics") },
+ { 0, CMD_SELECT, N_("(Re)load lyrics") },
+ { 0, CMD_INTERRUPT, N_("Interrupt retrieval") },
+ { 0, CMD_LYRICS_UPDATE, N_("Explicitly download lyrics") },
+ { 0, CMD_ADD, N_("Save lyrics") },
#endif
};
#define help_text_rows (sizeof(help_text) / sizeof(help_text[0]))
-static list_window_t *lw = NULL;
-
+static list_window_t *lw;
static const char *
-list_callback(unsigned idx, int *highlight, mpd_unused void *data)
+list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED void *data)
{
static char buf[512];
return NULL;
if (help_text[idx].highlight)
- *highlight = 1;
+ *highlight = true;
if (help_text[idx].command == CMD_NONE) {
if (help_text[idx].text)
help_init(WINDOW *w, int cols, int rows)
{
lw = list_window_init(w, cols, rows);
- lw->flags = LW_HIDE_CURSOR;
+ lw->hide_cursor = true;
}
static void
static const char *
-help_title(mpd_unused char *str, mpd_unused size_t size)
+help_title(G_GNUC_UNUSED char *str, G_GNUC_UNUSED size_t size)
{
return _("Help");
}
static void
-help_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+help_paint(void)
{
- lw->clear = 1;
list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
}
-static int
-help_cmd(screen_t *screen, mpd_unused mpdclient_t *c, command_t cmd)
+static bool
+help_cmd(G_GNUC_UNUSED mpdclient_t *c, command_t cmd)
{
if (list_window_scroll_cmd(lw, help_text_rows, cmd)) {
list_window_paint(lw, list_callback, NULL);
wrefresh(lw->w);
- return 1;
+ return true;
}
lw->selected = lw->start+lw->rows;
- if (screen_find(screen,
- lw, help_text_rows,
+ if (screen_find(lw, help_text_rows,
cmd, list_callback, NULL)) {
/* center the row */
list_window_center(lw, help_text_rows, lw->selected);
list_window_paint(lw, list_callback, NULL);
wrefresh(lw->w);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
const struct screen_functions screen_help = {