diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 16 | ||||
| -rw-r--r-- | doc/de/weechat_user.de.txt | 8 | ||||
| -rw-r--r-- | doc/en/weechat_user.en.txt | 8 | ||||
| -rw-r--r-- | doc/fr/weechat_user.fr.txt | 8 | ||||
| -rw-r--r-- | doc/it/weechat_user.it.txt | 8 | ||||
| -rw-r--r-- | doc/ja/weechat_user.ja.txt | 8 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-key.c | 2 |
8 files changed, 34 insertions, 28 deletions
@@ -11,8 +11,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] == Version 0.4.3 (under dev) -* core: replace default key ctrl+"c", "r" by ctrl+"c", "v" for reverse video in - messages +* core: replace default keys ctrl+"c", "r" / "u" by ctrl+"c", "v" / "_" for + reverse video and underlined text in messages * core: fix random crash when closing a buffer * core: fix crash on /buffer close core.weechat * core: add option "libs" for command /debug @@ -15,18 +15,24 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] === Colors in messages -The color code for "reverse video" in IRC has been fixed: now WeeChat uses -0x16 like other clients (and not 0x12 any more). - +The color code for "reverse video" in IRC message has been fixed: now WeeChat +uses 0x16 like other clients (and not 0x12 any more). + The code 0x12 is not decoded any more, so if it is received (for example from an old WeeChat version), it is not displayed as reverse video. -The default key ctrl+"c", "r" has been changed to ctrl+"c", "v". +The color code for "underlined text" in input line has been fixed: now WeeChat +uses 0x1F, the same code sent to IRC server. + +The default keys for "reverse video" and "underlined text" have changed: + +* reverse video: key ctrl+"c", "r" is replaced by ctrl+"c", "v" +* underlined text: key ctrl+"c", "u" is replaced by ctrl+"c", "_" -You can remove the old key and add the new one with these commands: +You can remove the old keys and add the new ones with these commands: ---- /key unbind ctrl-Cr +/key unbind ctrl-Cu /key missing ---- diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 9719ed580..9f5c54dbc 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -940,8 +940,8 @@ Befehl festgelegt werden: | @k(C-)@k(c) , @k(c) | fügt Steuerzeichen für Textfarbe ein | `/input insert \x03` | @k(C-)@k(c) , @k(i) | fügt Steuerzeichen für kursiven Text ein | `/input insert \x1D` | @k(C-)@k(c) , @k(o) | fügt Steuerzeichen für Standardfarbe ein | `/input insert \x0F` -| @k(C-)@k(c) , @k(u) | fügt Steuerzeichen für unterstrichenen Text ein | `/input insert \x15` | @k(C-)@k(c) , @k(v) | fügt Steuerzeichen für Hintergrundfarbe ein | `/input insert \x16` +| @k(C-)@k(c) , @k(_) | fügt Steuerzeichen für unterstrichenen Text ein | `/input insert \x1F` | @k(Del) .2+| entfernt in der Befehlszeile das nächste Zeichen .2+| `/input delete_next_char` | @k(C-)@k(d) | @k(Backsp.) .2+| entfernt in der Befehlszeile das vorherige Zeichen .2+| `/input delete_previous_char` @@ -1281,12 +1281,12 @@ Zeichen, genutzt werden: @k(C-)@k(c) , @k(o):: deaktiviert Farben und Attribute -@k(C-)@k(c) , @k(u):: - Text wird mit Unterstrich dargestellt - @k(C-)@k(c) , @k(v):: Farben umkehren (kehrt Textfarbe und Hintergrundfarbe um) +@k(C-)@k(c) , @k(_):: + Text wird mit Unterstrich dargestellt + [NOTE] Der selbe Befehl (ohne den Wert für @k(C-)@k(c) , @k(c)) sollte genutzt werden um die Farbkodierungen bzw. Attribute zu deaktivieren. diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index df0060baf..f3df64532 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -927,8 +927,8 @@ The notify level for a buffer can be set with command `/buffer`: | @k(C-)@k(c) , @k(c) | Insert code for colored text | `/input insert \x03` | @k(C-)@k(c) , @k(i) | Insert code for italic text | `/input insert \x1D` | @k(C-)@k(c) , @k(o) | Insert code for color reset | `/input insert \x0F` -| @k(C-)@k(c) , @k(u) | Insert code for underlined text | `/input insert \x15` | @k(C-)@k(c) , @k(v) | Insert code for reverse color | `/input insert \x16` +| @k(C-)@k(c) , @k(_) | Insert code for underlined text | `/input insert \x1F` | @k(Del) .2+| Delete next char in command line .2+| `/input delete_next_char` | @k(C-)@k(d) | @k(Backsp.) .2+| Delete previous char in command line .2+| `/input delete_previous_char` @@ -1265,12 +1265,12 @@ follow (press @k(C-)@k(c) then following letter, with optional value): @k(C-)@k(c) , @k(o):: disable color and attributes -@k(C-)@k(c) , @k(u):: - underlined text - @k(C-)@k(c) , @k(v):: reverse video (revert text color with background) +@k(C-)@k(c) , @k(_):: + underlined text + [NOTE] The same code (without number for @k(C-)@k(c) , @k(c)) may be used to stop the attribute. diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 95900a40f..da02c190f 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -953,8 +953,8 @@ commande `/buffer` : | @k(C-)@k(c) , @k(c) | Insérer le code pour écrire en couleur | `/input insert \x03` | @k(C-)@k(c) , @k(i) | Insérer le code pour mettre le texte en italique | `/input insert \x1D` | @k(C-)@k(c) , @k(o) | Insérer le code pour réinitialiser la couleur | `/input insert \x0F` -| @k(C-)@k(c) , @k(u) | Insérer le code pour écrire en souligné | `/input insert \x15` | @k(C-)@k(c) , @k(v) | Insérer le code pour écrire en couleur inversée | `/input insert \x16` +| @k(C-)@k(c) , @k(_) | Insérer le code pour écrire en souligné | `/input insert \x1F` | @k(Del) .2+| Effacer le caractère suivant sur la ligne de commande .2+| `/input delete_next_char` | @k(C-)@k(d) | @k(Backsp.) .2+| Effacer le caractère précédent sur la ligne de commande .2+| `/input delete_previous_char` @@ -1302,12 +1302,12 @@ suit et éventuellement une valeur) : @k(C-)@k(c) , @k(o):: désactiver la couleur et tous les attributs -@k(C-)@k(c) , @k(u):: - texte souligné - @k(C-)@k(c) , @k(v):: vidéo inverse (inversion de la couleur d'écriture et du fond) +@k(C-)@k(c) , @k(_):: + texte souligné + [NOTE] Le même code (sans le numéro pour @k(C-)@k(c) , @k(c)) peut être utilisé pour stopper l'attribut défini. diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 251c1e7da..f495aa780 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -962,8 +962,8 @@ Il livello di notifica per un buffer può essere impostato con il comando `/buff | @k(C-)@k(c) , @k(c) | Inserisce il codice per il testo colorato | `/input insert \x03` | @k(C-)@k(c) , @k(i) | Inserisce il codice per il testo in corsivo | `/input insert \x1D` | @k(C-)@k(c) , @k(o) | Inserisce il codice per il reset dei colori | `/input insert \x0F` -| @k(C-)@k(c) , @k(u) | Inserisce il codice per il testo sottolineato | `/input insert \x15` | @k(C-)@k(c) , @k(v) | Inserisce il codice per l'inversione dei colori | `/input insert \x16` +| @k(C-)@k(c) , @k(_) | Inserisce il codice per il testo sottolineato | `/input insert \x1F` | @k(Del) .2+| Elimina il carattere successivo nella riga di comando .2+| `/input delete_next_char` | @k(C-)@k(d) | @k(Backsp.) .2+| Elimina il carattere precedente nella riga di comando .2+| `/input delete_previous_char` @@ -1314,12 +1314,12 @@ opzionale): @k(C-)@k(c) , @k(o):: disabilita colori ed attributi -@k(C-)@k(c) , @k(u):: - testo sottolineato - @k(C-)@k(c) , @k(v):: video inverso (inverte il colore del testo con quello di sfondo) +@k(C-)@k(c) , @k(_):: + testo sottolineato + [NOTE] Lo stesso codice (senza numero per @k(C-)@k(c) , @k(c)) può essere usato per terminare l'attributo. diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index 8250e968a..e52cff01a 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -933,8 +933,8 @@ irc サーバ "freenode" に含まれる全てのバッファに対して設定 | @k(C-)@k(c) , @k(c) | テキストに色をつけるコードの挿入 | `/input insert \x03` | @k(C-)@k(c) , @k(i) | テキストをイタリック体にするコードの挿入 | `/input insert \x1D` | @k(C-)@k(c) , @k(o) | テキスト色のリセットを行うコードの挿入 | `/input insert \x0F` -| @k(C-)@k(c) , @k(u) | テキストに下線を引くコードの挿入 | `/input insert \x15` | @k(C-)@k(c) , @k(v) | テキスト色の反転を行うコードの挿入 | `/input insert \x16` +| @k(C-)@k(c) , @k(_) | テキストに下線を引くコードの挿入 | `/input insert \x1F` | @k(Del) .2+| コマンドラインで次の文字を削除 .2+| `/input delete_next_char` | @k(C-)@k(d) | @k(Backsp.) .2+| コマンドラインで前の文字を削除 .2+| `/input delete_previous_char` @@ -1272,12 +1272,12 @@ IRC 等のプラグインでは、以下の色コードと属性を利用でき @k(C-)@k(c) , @k(o):: テキスト表示色と属性をリセット -@k(C-)@k(c) , @k(u):: - テキストに下線を引く - @k(C-)@k(c) , @k(v):: テキストを反転 (テキスト表示色と背景色の入れ替え) +@k(C-)@k(c) , @k(_):: + テキストに下線を引く + [NOTE] 同じコードで (色コードを入力せずに @k(C-)@k(c) , @k(c) を使うことで) 属性をキャンセルすることができます。 diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index 1d848d687..850ff2b6d 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -144,8 +144,8 @@ gui_key_default_bindings (int context) BIND(/* ^Cc */ "ctrl-Cc", "/input insert \\x03"); BIND(/* ^Ci */ "ctrl-Ci", "/input insert \\x1D"); BIND(/* ^Co */ "ctrl-Co", "/input insert \\x0F"); - BIND(/* ^Cu */ "ctrl-Cu", "/input insert \\x15"); BIND(/* ^Cv */ "ctrl-Cv", "/input insert \\x16"); + BIND(/* ^C_ */ "ctrl-C_", "/input insert \\x1F"); BIND(/* m-right */ "meta-meta2-C", "/buffer +1"); BIND(/* m-right */ "meta2-1;3C", "/buffer +1"); BIND(/* m-down */ "meta-meta2-B", "/buffer +1"); |