![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 87c5067c301864539b1cd56b94e0f3678f737f27..32791b8c0e364a2eb32eab2006e2c7d098c8442f 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
* the position of the "apply" item. It's the same as command_n_commands,
* because array subscripts start at 0, while numbers of items start at 1.
*/
-#define command_item_apply (command_n_commands)
+static G_GNUC_PURE inline unsigned
+command_item_apply(void)
+{
+ return command_n_commands;
+}
/** the position of the "apply and save" item */
-#define command_item_save (command_item_apply + 1)
+static G_GNUC_PURE inline unsigned
+command_item_save(void)
+{
+ return command_item_apply() + 1;
+}
-/** the number of items on the "command" view */
-#define command_length (command_item_save + 1)
+/** the number of items in the "command" view */
+static G_GNUC_PURE inline unsigned
+command_length(void)
+{
+ return command_item_save() + 1;
+}
/**
static unsigned subcmd_n_keys = 0;
/** The position of the up ("[..]") item */
-#define subcmd_item_up 0
+static G_GNUC_CONST inline unsigned
+subcmd_item_up(void)
+{
+ return 0;
+}
/** The position of the "add a key" item */
-#define subcmd_item_add (subcmd_n_keys + 1)
+static G_GNUC_PURE inline unsigned
+subcmd_item_add(void)
+{
+ return subcmd_n_keys + 1;
+}
/** The number of items in the list_window, if there's a command being edited */
-#define subcmd_length (subcmd_item_add + 1)
+static G_GNUC_PURE inline unsigned
+subcmd_length(void)
+{
+ return subcmd_item_add() + 1;
+}
/** Check whether a given item is a key */
-#define subcmd_item_is_key(i) \
- ((i) > subcmd_item_up && (i) < subcmd_item_add)
+static G_GNUC_PURE inline bool
+subcmd_item_is_key(unsigned i)
+{
+ return (i > subcmd_item_up() && i < subcmd_item_add());
+}
/**
* Convert an item id (as in lw->selected) into a "key id", which is an array
* subscript to cmds[subcmd].keys.
*/
-#define subcmd_item_to_key_id(i) ((i) - 1)
+static G_GNUC_CONST inline unsigned
+subcmd_item_to_key_id(unsigned i)
+{
+ return i - 1;
+}
static int
return -1;
}
- filename = get_user_key_binding_filename();
+ filename = build_user_key_binding_filename();
if ((f = fopen(filename,"w")) == NULL) {
screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
break;
subcmd_n_keys = i;
- list_window_set_length(lw, subcmd_length);
+ list_window_set_length(lw, subcmd_length());
}
static void
wrefresh(lw->w);
}
+/** lw->start the last time switch_to_subcmd_mode() was called */
+static unsigned saved_start = 0;
+
+static void
+switch_to_subcmd_mode(int cmd)
+{
+ assert(subcmd == -1);
+
+ saved_start = lw->start;
+
+ subcmd = cmd;
+ list_window_reset(lw);
+ check_subcmd_length();
+
+ keydef_repaint();
+}
+
+static void
+switch_to_command_mode(void)
+{
+ assert(subcmd != -1);
+
+ list_window_set_length(lw, command_length());
+ list_window_set_cursor(lw, subcmd);
+ subcmd = -1;
+
+ lw->start = saved_start;
+
+ keydef_repaint();
+}
+
/**
* Delete a key from a given command's definition
* @param cmd_index the command
key = screen_getch(buf);
g_free(buf);
- if (key==ERR) {
+ if (key == ERR) {
screen_status_printf(_("Aborted"));
return;
}
+ if (key == '\0') {
+ screen_status_printf(_("Ctrl-Space can't be used"));
+ return;
+ }
+
cmd = find_key_command(key, cmds);
if (cmd != CMD_NONE) {
screen_status_printf(_("Error: key %s is already used for %s"),
- key2str(key),
- get_key_command_name(cmd));
+ key2str(key), get_key_command_name(cmd));
screen_bell();
return;
}
static char buf[256];
if (subcmd == -1) {
- if (idx == command_item_apply)
+ if (idx == command_item_apply())
return _("===> Apply key bindings ");
- if (idx == command_item_save)
+ if (idx == command_item_save())
return _("===> Apply & Save key bindings ");
assert(idx < (unsigned) command_n_commands);
return buf;
} else {
- if (idx == subcmd_item_up)
+ if (idx == subcmd_item_up())
return "[..]";
- if (idx == subcmd_item_add) {
+ if (idx == subcmd_item_add()) {
g_snprintf(buf, sizeof(buf), "%d. %s",
idx, _("Add new key"));
return buf;
}
subcmd = -1;
- list_window_set_length(lw, command_length);
+ list_window_set_length(lw, command_length());
}
static void
switch(cmd) {
case CMD_PLAY:
if (subcmd == -1) {
- if (lw->selected == command_item_apply) {
+ if (lw->selected == command_item_apply()) {
apply_keys();
- } else if (lw->selected == command_item_save) {
+ } else if (lw->selected == command_item_save()) {
apply_keys();
save_keys();
} else {
- subcmd = lw->selected;
- list_window_reset(lw);
- check_subcmd_length();
-
- keydef_repaint();
+ switch_to_subcmd_mode(lw->selected);
}
} else {
- if (lw->selected == subcmd_item_up) {
- list_window_set_length(lw, command_length);
- list_window_set_cursor(lw, subcmd);
- subcmd = -1;
-
- keydef_repaint();
- } else if (lw->selected == subcmd_item_add) {
+ if (lw->selected == subcmd_item_up()) {
+ switch_to_command_mode();
+ } else if (lw->selected == subcmd_item_add()) {
add_key(subcmd);
} else {
/* just to be sure ;-) */
}
return true;
case CMD_GO_PARENT_DIRECTORY:
- if (subcmd != -1) {
- list_window_set_length(lw, command_length);
- list_window_set_cursor(lw, subcmd);
- subcmd = -1;
-
- keydef_repaint();
- }
+ case CMD_GO_ROOT_DIRECTORY:
+ if (subcmd != -1)
+ switch_to_command_mode();
return true;
case CMD_DELETE:
if (subcmd != -1 && subcmd_item_is_key(lw->selected))
delete_key(subcmd, subcmd_item_to_key_id(lw->selected));
return true;
+ case CMD_ADD:
+ if (subcmd != -1)
+ add_key(subcmd);
+ return true;
case CMD_SAVE_PLAYLIST:
apply_keys();
save_keys();