![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 397933a14578367e58159f02c765898d8d98ce96..a37d27d2a0dfb2eda684beef648c30782823e1b5 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.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"
-
-#ifndef DISABLE_KEYDEF_SCREEN
#include "ncmpc.h"
#include "mpdclient.h"
#include "options.h"
static int
keybindings_changed(void)
{
- command_definition_t *orginal_cmds = get_command_definitions();
- size_t size = command_list_length*sizeof(command_definition_t);
-
- return memcmp(orginal_cmds, cmds, size);
+ command_definition_t *orginal_cmds = get_command_definitions();
+ size_t size = command_list_length * sizeof(command_definition_t);
+
+ return memcmp(orginal_cmds, cmds, size);
}
static void
apply_keys(void)
{
- if( keybindings_changed() )
- {
- command_definition_t *orginal_cmds = get_command_definitions();
- size_t size = command_list_length*sizeof(command_definition_t);
-
- memcpy(orginal_cmds, cmds, size);
- screen_status_printf(_("You have new key bindings!"));
- }
- else
- screen_status_printf(_("Keybindings unchanged."));
+ if (keybindings_changed()) {
+ command_definition_t *orginal_cmds = get_command_definitions();
+ size_t size = command_list_length * sizeof(command_definition_t);
+
+ memcpy(orginal_cmds, cmds, size);
+ screen_status_printf(_("You have new key bindings!"));
+ } else
+ screen_status_printf(_("Keybindings unchanged."));
}
static int
save_keys(void)
{
- FILE *f;
- char *filename;
-
- if( check_user_conf_dir() )
- {
- screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"),
- strerror(errno));
- screen_bell();
- return -1;
- }
-
- filename = get_user_key_binding_filename();
-
- if( (f=fopen(filename,"w")) == NULL )
- {
- screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
- screen_bell();
- g_free(filename);
- return -1;
- }
- if( write_key_bindings(f, KEYDEF_WRITE_HEADER) )
- screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
- else
- screen_status_printf(_("Wrote %s"), filename);
-
- g_free(filename);
- return fclose(f);
+ FILE *f;
+ char *filename;
+
+ if (check_user_conf_dir()) {
+ screen_status_printf(_("Error: Unable to create direcory ~/.ncmpc - %s"),
+ strerror(errno));
+ screen_bell();
+ return -1;
+ }
+
+ filename = get_user_key_binding_filename();
+
+ if ((f = fopen(filename,"w")) == NULL) {
+ screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
+ screen_bell();
+ g_free(filename);
+ return -1;
+ }
+
+ if (write_key_bindings(f, KEYDEF_WRITE_HEADER))
+ screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
+ else
+ screen_status_printf(_("Wrote %s"), filename);
+
+ g_free(filename);
+ return fclose(f);
}
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;
+ 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;
+}
+
+static void
+keydef_paint(mpdclient_t *c);
+
+static void
+keydef_repaint(void)
+{
+ keydef_paint(NULL);
+ wrefresh(lw->w);
}
static void
delete_key(int cmd_index, int key_index)
{
- int i = key_index+1;
-
- screen_status_printf(_("Deleted"));
- while( i<MAX_COMMAND_KEYS && cmds[cmd_index].keys[i] )
- cmds[cmd_index].keys[key_index++] = cmds[cmd_index].keys[i++];
- cmds[cmd_index].keys[key_index] = 0;
- cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
- check_subcmd_length();
- lw->clear = 1;
- lw->repaint = 1;
- /* update key conflict flags */
- check_key_bindings(cmds, NULL, 0);
+ int i = key_index+1;
+
+ screen_status_printf(_("Deleted"));
+ while (i < MAX_COMMAND_KEYS && cmds[cmd_index].keys[i])
+ cmds[cmd_index].keys[key_index++] = cmds[cmd_index].keys[i++];
+ cmds[cmd_index].keys[key_index] = 0;
+ cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
+ check_subcmd_length();
+
+ /* repaint */
+ keydef_repaint();
+
+ /* update key conflict flags */
+ check_key_bindings(cmds, NULL, 0);
}
static void
assign_new_key(WINDOW *w, int cmd_index, int key_index)
{
- int key;
- char *buf;
- command_t cmd;
-
- buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name);
- key = screen_getch(w, buf);
- g_free(buf);
- if( key==KEY_RESIZE )
- screen_resize();
- if( key==ERR )
- {
- screen_status_printf(_("Aborted!"));
- return;
- }
- cmd = find_key_command(key, cmds);
- if( cmd!=CMD_NONE && cmd!= cmds[cmd_index].command )
- {
- screen_status_printf(_("Error: key %s is already used for %s"),
- key2str(key),
- get_key_command_name(cmd));
- screen_bell();
- return;
- }
- cmds[cmd_index].keys[key_index] = key;
- cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
-
- screen_status_printf(_("Assigned %s to %s"),
- key2str(key),cmds[cmd_index].name);
- check_subcmd_length();
- lw->repaint = 1;
- /* update key conflict flags */
- check_key_bindings(cmds, NULL, 0);
+ int key;
+ char *buf;
+ command_t cmd;
+
+ buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name);
+ key = screen_getch(w, buf);
+ g_free(buf);
+
+ if (key == KEY_RESIZE)
+ screen_resize();
+
+ if (key==ERR) {
+ screen_status_printf(_("Aborted!"));
+ return;
+ }
+
+ cmd = find_key_command(key, cmds);
+ if (cmd != CMD_NONE && cmd != cmds[cmd_index].command) {
+ screen_status_printf(_("Error: key %s is already used for %s"),
+ key2str(key),
+ get_key_command_name(cmd));
+ screen_bell();
+ return;
+ }
+
+ cmds[cmd_index].keys[key_index] = key;
+ cmds[cmd_index].flags |= COMMAND_KEY_MODIFIED;
+
+ screen_status_printf(_("Assigned %s to %s"),
+ key2str(key),cmds[cmd_index].name);
+ check_subcmd_length();
+
+ /* repaint */
+ keydef_repaint();
+
+ /* update key conflict flags */
+ check_key_bindings(cmds, NULL, 0);
}
static const char *
{
static char buf[BUFSIZE];
- *highlight = 0;
if (subcmd < 0) {
if (idx < (unsigned)command_list_length) {
if (cmds[idx].flags & COMMAND_KEY_CONFLICT)
return NULL;
}
-static void
+static void
keydef_init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
+ lw = list_window_init(w, cols, rows);
}
static void
keydef_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ lw->cols = cols;
+ lw->rows = rows;
}
-static void
+static void
keydef_exit(void)
{
- list_window_free(lw);
- if( cmds )
- g_free(cmds);
- cmds = NULL;
- lw = NULL;
+ list_window_free(lw);
+ if (cmds)
+ g_free(cmds);
+ cmds = NULL;
+ lw = NULL;
}
-static void
+static void
keydef_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
{
- if( cmds == NULL )
- {
- command_definition_t *current_cmds = get_command_definitions();
- size_t cmds_size;
-
- command_list_length = 0;
- while( current_cmds[command_list_length].name )
- command_list_length++;
-
- cmds_size = (command_list_length+1)*sizeof(command_definition_t);
- cmds = g_malloc0(cmds_size);
- memcpy(cmds, current_cmds, cmds_size);
- command_list_length += STATIC_ITEMS;
- screen_status_printf(_("Welcome to the key editor!"));
- }
-
- subcmd = -1;
- list_window_check_selected(lw, LIST_LENGTH());
+ if (cmds == NULL) {
+ command_definition_t *current_cmds = get_command_definitions();
+ size_t cmds_size;
+
+ command_list_length = 0;
+ while (current_cmds[command_list_length].name)
+ command_list_length++;
+
+ cmds_size = (command_list_length+1) * sizeof(command_definition_t);
+ cmds = g_malloc0(cmds_size);
+ memcpy(cmds, current_cmds, cmds_size);
+ command_list_length += STATIC_ITEMS;
+ screen_status_printf(_("Welcome to the key editor!"));
+ }
+
+ subcmd = -1;
+ list_window_check_selected(lw, LIST_LENGTH());
}
-static void
+static void
keydef_close(void)
{
- if( cmds && !keybindings_changed() )
- {
- g_free(cmds);
- cmds = NULL;
- }
- else
- screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?"));
+ if (cmds && !keybindings_changed()) {
+ g_free(cmds);
+ cmds = NULL;
+ } else
+ screen_status_printf(_("Note: Did you forget to \'Apply\' your changes?"));
}
static const char *
keydef_title(char *str, size_t size)
{
- if( subcmd<0 )
- return _("Edit key bindings");
-
- g_snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name);
- return str;
-}
+ if (subcmd < 0)
+ return _("Edit key bindings");
-static void
-keydef_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
-{
- lw->clear = 1;
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
+ g_snprintf(str, size, _("Edit keys for %s"), cmds[subcmd].name);
+ return str;
}
-static void
-keydef_update(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
-{
- if( lw->repaint )
- {
- list_window_paint(lw, list_callback, NULL);
- wrefresh(lw->w);
- lw->repaint = 0;
- }
+static void
+keydef_paint(mpd_unused mpdclient_t *c)
+{
+ list_window_paint(lw, list_callback, NULL);
}
static int
if (subcmd >= 0)
length = subcmd_length;
+ if (list_window_cmd(lw, length, cmd)) {
+ keydef_repaint();
+ return 1;
+ }
+
switch(cmd) {
case CMD_PLAY:
- if( subcmd<0 ) {
- if( lw->selected == LIST_ITEM_APPLY() )
+ if (subcmd < 0) {
+ if (lw->selected == LIST_ITEM_APPLY())
apply_keys();
- else if( lw->selected == LIST_ITEM_SAVE() ) {
+ else if (lw->selected == LIST_ITEM_SAVE()) {
apply_keys();
save_keys();
} else {
subcmd = lw->selected;
lw->selected=0;
check_subcmd_length();
+
+ keydef_repaint();
}
} else {
if (lw->selected == 0) { /* up */
lw->selected = subcmd;
subcmd = -1;
+
+ keydef_repaint();
} else
assign_new_key(screen->status_window.w,
subcmd,
- lw->selected-STATIC_SUB_ITEMS);
+ lw->selected - STATIC_SUB_ITEMS);
}
- lw->repaint = 1;
- lw->clear = 1;
return 1;
case CMD_DELETE:
if (subcmd >= 0 && lw->selected >= STATIC_SUB_ITEMS)
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- return screen_find(screen,
- lw, length,
- cmd, list_callback, NULL);
+ screen_find(screen,
+ lw, length,
+ cmd, list_callback, NULL);
+ keydef_repaint();
+ return 1;
default:
break;
}
- return list_window_cmd(lw, length, cmd);
+ return 0;
}
const struct screen_functions screen_keydef = {
.close = keydef_close,
.resize = keydef_resize,
.paint = keydef_paint,
- .update = keydef_update,
.cmd = keydef_cmd,
.get_title = keydef_title,
};
-
-#endif