1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 03:33:12 +02:00

core: use new key name in command /key and configuration file

Legacy keys are automatically converted to new names when loading configuration
file `weechat.conf`.

Examples:

  "ctrl-I" => "tab"
  "meta2-1;3A" => "meta-up"
  "meta2-Z" => "shift-tab"
  "meta-wmeta-meta2-A" => "meta-w,meta-up"
  "ctrl-Cb" => "ctrl-c,b"
This commit is contained in:
Sébastien Helleu
2023-02-22 21:18:22 +01:00
parent 5b5ccb236f
commit 1f5c791c37
22 changed files with 654 additions and 552 deletions
+7 -15
View File
@@ -424,21 +424,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
int i;
char str_key[256];
char *default_keys[][2] = {
{ /* m-B */ "meta-B", "/buflist toggle" },
{ /* <f1> */ "meta-OP", "/bar scroll buflist * -100%" },
{ /* <f1> */ "meta2-11~", "/bar scroll buflist * -100%" },
{ /* <f2> */ "meta-OQ", "/bar scroll buflist * +100%" },
{ /* <f2> */ "meta2-12~", "/bar scroll buflist * +100%" },
{ /* c-<f1> */ "meta2-11^", "/bar scroll buflist * -100%" },
{ /* c-<f1> */ "meta2-1;5P", "/bar scroll buflist * -100%" },
{ /* c-<f2> */ "meta2-12^", "/bar scroll buflist * +100%" },
{ /* c-<f2> */ "meta2-1;5Q", "/bar scroll buflist * +100%" },
{ /* m-<f1> */ "meta-meta-OP", "/bar scroll buflist * b" },
{ /* m-<f1> */ "meta-meta2-11~", "/bar scroll buflist * b" },
{ /* m-<f1> */ "meta2-1;3P", "/bar scroll buflist * b" },
{ /* m-<f2> */ "meta-meta-OQ", "/bar scroll buflist * e" },
{ /* m-<f2> */ "meta-meta2-12~", "/bar scroll buflist * e" },
{ /* m-<f2> */ "meta2-1;3Q", "/bar scroll buflist * e" },
{ "meta-B", "/buflist toggle" },
{ "f1", "/bar scroll buflist * -100%" },
{ "f2", "/bar scroll buflist * +100%" },
{ "ctrl-f1", "/bar scroll buflist * -100%" },
{ "ctrl-f2", "/bar scroll buflist * +100%" },
{ "meta-f1", "/bar scroll buflist * b" },
{ "meta-f2", "/bar scroll buflist * e" },
{ NULL, NULL },
};
+15 -16
View File
@@ -1417,29 +1417,28 @@ void
fset_buffer_set_keys ()
{
char *keys[][2] = {
{ "meta2-A", "/fset -up" },
{ "meta2-B", "/fset -down" },
{ "meta-meta2-1~", "/fset -go 0" },
{ "meta-meta2-4~", "/fset -go end" },
{ "meta2-23~", "/fset -left" },
{ "meta2-24~", "/fset -right" },
{ "up", "/fset -up" },
{ "down", "/fset -down" },
{ "meta-home", "/fset -go 0" },
{ "meta-end", "/fset -go end" },
{ "f11", "/fset -left" },
{ "f12", "/fset -right" },
{ "meta-space", "/fset -toggle" },
{ "meta--", "/fset -add -1" },
{ "meta-+", "/fset -add 1" },
{ "meta-fmeta-r", "/fset -reset" },
{ "meta-fmeta-u", "/fset -unset" },
{ "meta-ctrl-j", "/fset -set" },
{ "meta-ctrl-m", "/fset -set" },
{ "meta-fmeta-n", "/fset -setnew" },
{ "meta-fmeta-a", "/fset -append" },
{ "meta-,", "/fset -mark" },
{ "meta2-a", "/fset -up; /fset -mark" },
{ "meta2-b", "/fset -mark; /fset -down" },
{ "meta-f,meta-r", "/fset -reset" },
{ "meta-f,meta-u", "/fset -unset" },
{ "meta-return", "/fset -set" },
{ "meta-f,meta-n", "/fset -setnew" },
{ "meta-f,meta-a", "/fset -append" },
{ "meta-comma", "/fset -mark" },
{ "shift-up", "/fset -up; /fset -mark" },
{ "shift-down", "/fset -mark; /fset -down" },
{ "ctrl-l", "/fset -refresh" },
{ "meta-p", "/mute /set fset.look.show_plugins_desc toggle" },
{ "meta-v", "/bar toggle " FSET_BAR_NAME },
{ "ctrl-x", "/fset -format" },
{ NULL, NULL },
{ NULL, NULL },
};
char str_key[64];
int i;
+2 -2
View File
@@ -257,8 +257,8 @@ relay_buffer_open ()
weechat_buffer_set (relay_buffer, "type", "free");
weechat_buffer_set (relay_buffer, "title", _("List of clients for relay"));
weechat_buffer_set (relay_buffer, "key_bind_meta2-A", "/relay up");
weechat_buffer_set (relay_buffer, "key_bind_meta2-B", "/relay down");
weechat_buffer_set (relay_buffer, "key_bind_up", "/relay up");
weechat_buffer_set (relay_buffer, "key_bind_down", "/relay down");
weechat_buffer_set (relay_buffer, "localvar_set_type", "relay");
}
}
+14 -12
View File
@@ -1090,21 +1090,23 @@ script_buffer_set_callbacks ()
void
script_buffer_set_keys ()
{
char *keys[][2] = { { "meta-A", "toggleautoload" },
{ "meta-l", "load" },
{ "meta-u", "unload" },
{ "meta-L", "reload" },
{ "meta-i", "install" },
{ "meta-r", "remove" },
{ "meta-h", "hold" },
{ "meta-v", "show" },
{ "meta-d", "showdiff" },
{ NULL, NULL } };
char *keys[][2] = {
{ "meta-A", "toggleautoload" },
{ "meta-l", "load" },
{ "meta-u", "unload" },
{ "meta-L", "reload" },
{ "meta-i", "install" },
{ "meta-r", "remove" },
{ "meta-h", "hold" },
{ "meta-v", "show" },
{ "meta-d", "showdiff" },
{ NULL, NULL },
};
char str_key[64], str_command[64];
int i;
weechat_buffer_set (script_buffer, "key_bind_meta2-A", "/script up");
weechat_buffer_set (script_buffer, "key_bind_meta2-B", "/script down");
weechat_buffer_set (script_buffer, "key_bind_up", "/script up");
weechat_buffer_set (script_buffer, "key_bind_down", "/script down");
for (i = 0; keys[i][0]; i++)
{
if (weechat_config_boolean (script_config_look_use_keys))
+2 -2
View File
@@ -358,8 +358,8 @@ xfer_buffer_open ()
weechat_buffer_set (xfer_buffer, "type", "free");
weechat_buffer_set (xfer_buffer, "title", _("Xfer list"));
weechat_buffer_set (xfer_buffer, "key_bind_meta2-A", "/xfer up");
weechat_buffer_set (xfer_buffer, "key_bind_meta2-B", "/xfer down");
weechat_buffer_set (xfer_buffer, "key_bind_up", "/xfer up");
weechat_buffer_set (xfer_buffer, "key_bind_down", "/xfer down");
weechat_buffer_set (xfer_buffer, "localvar_set_type", "xfer");
}
}