From bd0b7957a3057ca653d74c053a604f11e5653817 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Wed, 18 Jul 2007 13:11:58 +0000 Subject: [PATCH] Added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete) --- ChangeLog | 1 + doc/de/weechat.de.xml | 6 +++--- doc/en/weechat.en.xml | 6 +++--- doc/fr/weechat.fr.xml | 6 +++--- src/gui/curses/gui-curses-keyboard.c | 3 +++ weechat/ChangeLog | 1 + weechat/doc/de/weechat.de.xml | 6 +++--- weechat/doc/en/weechat.en.xml | 6 +++--- weechat/doc/fr/weechat.fr.xml | 6 +++--- weechat/src/gui/curses/gui-curses-keyboard.c | 3 +++ 10 files changed, 26 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index a334211fe..0fd3353b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ ChangeLog - 2007-07-18 Version 0.2.6 (under dev!): + * added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete) * added "buffer_move" event handler to plugins API (task #6708) * added key function "jump_previous_buffer" to jump to buffer previously displayed (new key: alt-J + alt-P) (task #7085) diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml index 5e03ae0a4..8407bc38a 100644 --- a/doc/de/weechat.de.xml +++ b/doc/de/weechat.de.xml @@ -463,13 +463,13 @@ along with this program. If not, see . - Links + Links / Strg + B Gehe zum vorherigen Zeichen in der Kommandozeile - Rechts + Rechts / Strg + F Gehe zum nächsten Zeichen in der Kommandozeile @@ -579,7 +579,7 @@ along with this program. If not, see . - Entfernen + Entfernen / Strg + D Lösche das nächste Zeichen in der Kommandozeile diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml index 23559fbc8..fd931e2dd 100644 --- a/doc/en/weechat.en.xml +++ b/doc/en/weechat.en.xml @@ -458,13 +458,13 @@ along with this program. If not, see . - Left arrow + Left arrow / Ctrl + B Go to previous char in command line - Right arrow + Right arrow / Ctrl + F Go to next char in command line @@ -573,7 +573,7 @@ along with this program. If not, see . - Delete + Delete / Ctrl + D Delete next char in command line diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml index 53b6a39e1..edf48da68 100644 --- a/doc/fr/weechat.fr.xml +++ b/doc/fr/weechat.fr.xml @@ -467,13 +467,13 @@ along with this program. If not, see . - Flèche gauche + Flèche gauche / Ctrl + B Aller au caractère précédent sur la ligne de commande - Flèche droite + Flèche droite / Ctrl + F Aller au caractère suivant sur la ligne de commande @@ -582,7 +582,7 @@ along with this program. If not, see . - Delete + Delete / Ctrl + D Effacer le caractère suivant sur la ligne de commande diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c index 24e4c9fdf..feb86e28f 100644 --- a/src/gui/curses/gui-curses-keyboard.c +++ b/src/gui/curses/gui-curses-keyboard.c @@ -51,6 +51,7 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* basckpace */ "ctrl-H", "backspace"); gui_keyboard_bind ( /* basckpace */ "ctrl-?", "backspace"); gui_keyboard_bind ( /* del */ "meta2-3~", "delete"); + gui_keyboard_bind ( /* ^D */ "ctrl-D", "delete"); gui_keyboard_bind ( /* ^K */ "ctrl-K", "delete_end_line"); gui_keyboard_bind ( /* ^U */ "ctrl-U", "delete_beginning_line"); gui_keyboard_bind ( /* ^W */ "ctrl-W", "delete_previous_word"); @@ -65,7 +66,9 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* end */ "meta2-8~", "end"); gui_keyboard_bind ( /* ^E */ "ctrl-E", "end"); gui_keyboard_bind ( /* left */ "meta2-D", "left"); + gui_keyboard_bind ( /* ^B */ "ctrl-B", "left"); gui_keyboard_bind ( /* right */ "meta2-C", "right"); + gui_keyboard_bind ( /* ^F */ "ctrl-F", "right"); gui_keyboard_bind ( /* up */ "meta2-A", "up"); gui_keyboard_bind ( /* ^up */ "meta-Oa", "up_global"); gui_keyboard_bind ( /* down */ "meta2-B", "down"); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index a334211fe..0fd3353b8 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -5,6 +5,7 @@ ChangeLog - 2007-07-18 Version 0.2.6 (under dev!): + * added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete) * added "buffer_move" event handler to plugins API (task #6708) * added key function "jump_previous_buffer" to jump to buffer previously displayed (new key: alt-J + alt-P) (task #7085) diff --git a/weechat/doc/de/weechat.de.xml b/weechat/doc/de/weechat.de.xml index 5e03ae0a4..8407bc38a 100644 --- a/weechat/doc/de/weechat.de.xml +++ b/weechat/doc/de/weechat.de.xml @@ -463,13 +463,13 @@ along with this program. If not, see . - Links + Links / Strg + B Gehe zum vorherigen Zeichen in der Kommandozeile - Rechts + Rechts / Strg + F Gehe zum nächsten Zeichen in der Kommandozeile @@ -579,7 +579,7 @@ along with this program. If not, see . - Entfernen + Entfernen / Strg + D Lösche das nächste Zeichen in der Kommandozeile diff --git a/weechat/doc/en/weechat.en.xml b/weechat/doc/en/weechat.en.xml index 23559fbc8..fd931e2dd 100644 --- a/weechat/doc/en/weechat.en.xml +++ b/weechat/doc/en/weechat.en.xml @@ -458,13 +458,13 @@ along with this program. If not, see . - Left arrow + Left arrow / Ctrl + B Go to previous char in command line - Right arrow + Right arrow / Ctrl + F Go to next char in command line @@ -573,7 +573,7 @@ along with this program. If not, see . - Delete + Delete / Ctrl + D Delete next char in command line diff --git a/weechat/doc/fr/weechat.fr.xml b/weechat/doc/fr/weechat.fr.xml index 53b6a39e1..edf48da68 100644 --- a/weechat/doc/fr/weechat.fr.xml +++ b/weechat/doc/fr/weechat.fr.xml @@ -467,13 +467,13 @@ along with this program. If not, see . - Flèche gauche + Flèche gauche / Ctrl + B Aller au caractère précédent sur la ligne de commande - Flèche droite + Flèche droite / Ctrl + F Aller au caractère suivant sur la ligne de commande @@ -582,7 +582,7 @@ along with this program. If not, see . - Delete + Delete / Ctrl + D Effacer le caractère suivant sur la ligne de commande diff --git a/weechat/src/gui/curses/gui-curses-keyboard.c b/weechat/src/gui/curses/gui-curses-keyboard.c index 24e4c9fdf..feb86e28f 100644 --- a/weechat/src/gui/curses/gui-curses-keyboard.c +++ b/weechat/src/gui/curses/gui-curses-keyboard.c @@ -51,6 +51,7 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* basckpace */ "ctrl-H", "backspace"); gui_keyboard_bind ( /* basckpace */ "ctrl-?", "backspace"); gui_keyboard_bind ( /* del */ "meta2-3~", "delete"); + gui_keyboard_bind ( /* ^D */ "ctrl-D", "delete"); gui_keyboard_bind ( /* ^K */ "ctrl-K", "delete_end_line"); gui_keyboard_bind ( /* ^U */ "ctrl-U", "delete_beginning_line"); gui_keyboard_bind ( /* ^W */ "ctrl-W", "delete_previous_word"); @@ -65,7 +66,9 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* end */ "meta2-8~", "end"); gui_keyboard_bind ( /* ^E */ "ctrl-E", "end"); gui_keyboard_bind ( /* left */ "meta2-D", "left"); + gui_keyboard_bind ( /* ^B */ "ctrl-B", "left"); gui_keyboard_bind ( /* right */ "meta2-C", "right"); + gui_keyboard_bind ( /* ^F */ "ctrl-F", "right"); gui_keyboard_bind ( /* up */ "meta2-A", "up"); gui_keyboard_bind ( /* ^up */ "meta-Oa", "up_global"); gui_keyboard_bind ( /* down */ "meta2-B", "down");