summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-11-09 17:07:02 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-11-09 17:07:02 +0100
commit90774b73d8d08e7aa2139250f333cd5cf88fecb2 (patch)
treed1d550c9ea483e65a83089889b6487cd4a07027a
parent18ff3064cf1f889ce050c2e18b5f827e4dd3de7f (diff)
downloadweechat-90774b73d8d08e7aa2139250f333cd5cf88fecb2.zip
core: rename option weechat.look.set_title to weechat.look.window_title (evaluated string)
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--NEWS11
-rw-r--r--doc/de/autogen/user/weechat_options.txt10
-rw-r--r--doc/en/autogen/user/weechat_options.txt10
-rw-r--r--doc/fr/autogen/user/weechat_options.txt10
-rw-r--r--doc/it/autogen/user/weechat_options.txt10
-rw-r--r--doc/ja/autogen/user/weechat_options.txt10
-rw-r--r--po/cs.po14
-rw-r--r--po/de.po18
-rw-r--r--po/es.po18
-rw-r--r--po/fr.po22
-rw-r--r--po/hu.po15
-rw-r--r--po/it.po20
-rw-r--r--po/ja.po18
-rw-r--r--po/pl.po16
-rw-r--r--po/pt_BR.po20
-rw-r--r--po/ru.po15
-rw-r--r--po/tr.po10
-rw-r--r--po/weechat.pot10
-rw-r--r--src/core/wee-config.c23
-rw-r--r--src/core/wee-config.h2
-rw-r--r--src/core/weechat.c2
-rw-r--r--src/gui/curses/gui-curses-main.c12
-rw-r--r--src/gui/curses/gui-curses-window.c112
-rw-r--r--src/plugins/plugin.c3
25 files changed, 244 insertions, 169 deletions
diff --git a/ChangeLog b/ChangeLog
index a0da39296..704556870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 0.4.3 (under dev)
+* core: rename option weechat.look.set_title to weechat.look.window_title,
+ value is now a string (evaluated)
* core: add infos "term_width" and "term_height"
* core: add bar item "buffer_zoom", add signals "buffer_{zoomed|unzoomed}"
(patch #8204)
diff --git a/NEWS b/NEWS
index 54f0258f6..06ec429c8 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,17 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
== Version 0.4.3 (under dev)
+=== Terminal title
+
+The boolean option 'weechat.look.set_title' has been renamed to
+'weechat.look.window_title' and is now a string.
+
+The content is evaluated and the default value is `WeeChat ${info:version}`.
+
+[NOTE]
+Only static content should be used in this option, because the title is
+refreshed only when the option is changed.
+
=== New bar item buffer_zoom
A new bar item has been added: 'buffer_zoom'.
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 994b56e90..44bf16421 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -828,11 +828,6 @@
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
-* [[option_weechat.look.set_title]] *weechat.look.set_title*
-** Beschreibung: `setzt den Fenstertitel (oder Terminal-Titel im Curses-GUI), mit Name und Version`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
-
* [[option_weechat.look.time_format]] *weechat.look.time_format*
** Beschreibung: `Format für das Datum, wenn dieses in eine Zeichenkette umgewandelt und in Nachrichten dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)`
** Typ: Zeichenkette
@@ -848,6 +843,11 @@
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
+* [[option_weechat.look.window_title]] *weechat.look.window_title*
+** Beschreibung: `title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"WeeChat ${info:version}"`)
+
* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
** Beschreibung: `Zeitüberschreitung (in Sekunden) für eine Verbindung zu einem entfernten Rechner (mittels einem Kindprozess)`
** Typ: integer
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 44e9d27d6..52374c7fc 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -828,11 +828,6 @@
** type: string
** values: any string (default value: `""`)
-* [[option_weechat.look.set_title]] *weechat.look.set_title*
-** description: `set title for window (terminal for Curses GUI) with name and version`
-** type: boolean
-** values: on, off (default value: `on`)
-
* [[option_weechat.look.time_format]] *weechat.look.time_format*
** description: `time format for dates converted to strings and displayed in messages (see man strftime for date/time specifiers)`
** type: string
@@ -848,6 +843,11 @@
** type: boolean
** values: on, off (default value: `on`)
+* [[option_weechat.look.window_title]] *weechat.look.window_title*
+** description: `title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval)`
+** type: string
+** values: any string (default value: `"WeeChat ${info:version}"`)
+
* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
** description: `timeout (in seconds) for connection to a remote host (made in a child process)`
** type: integer
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 4db34e8c0..2d4f9d0db 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -828,11 +828,6 @@
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
-* [[option_weechat.look.set_title]] *weechat.look.set_title*
-** description: `définit le titre de la fenêtre (terminal pour l'interface Curses) avec le nom et la version`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
-
* [[option_weechat.look.time_format]] *weechat.look.time_format*
** description: `format de date/heure pour les dates converties en chaînes et affichées dans les messages (voir man strftime pour le format de date/heure)`
** type: chaîne
@@ -848,6 +843,11 @@
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
+* [[option_weechat.look.window_title]] *weechat.look.window_title*
+** description: `titre pour la fenêtre (le terminal pour l'interface Curses), défini au démarrage; une chaîne vide gardera le titre inchangé (note: le contenu est évalué, voir /help eval)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"WeeChat ${info:version}"`)
+
* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
** description: `délai d'attente maximum (en secondes) pour la connexion à une machine distante (effectuée dans un processus fils)`
** type: entier
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 35b698cd8..8b16db354 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -828,11 +828,6 @@
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
-* [[option_weechat.look.set_title]] *weechat.look.set_title*
-** descrizione: `imposta titolo per la finestra (terminale per interfacce Curses) con nome e versione`
-** tipo: bool
-** valori: on, off (valore predefinito: `on`)
-
* [[option_weechat.look.time_format]] *weechat.look.time_format*
** descrizione: `formato dell'ora per le date convertite in stringhe e mostrate nei messaggi(consultare man strftime per i dettagli su data/ora)`
** tipo: stringa
@@ -848,6 +843,11 @@
** tipo: bool
** valori: on, off (valore predefinito: `on`)
+* [[option_weechat.look.window_title]] *weechat.look.window_title*
+** descrizione: `title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"WeeChat ${info:version}"`)
+
* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
** descrizione: `timeout (in secondi) per la connessione ad un host remoto (eseguita in un processo figlio)`
** tipo: intero
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index 27e95ec93..a5c17a3ec 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -828,11 +828,6 @@
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
-* [[option_weechat.look.set_title]] *weechat.look.set_title*
-** 説明: `名前とバージョンを含むウィンドウのタイトルを設定 (Curses GUI 用のターミナル)`
-** タイプ: ブール
-** 値: on, off (デフォルト値: `on`)
-
* [[option_weechat.look.time_format]] *weechat.look.time_format*
** 説明: `文字列へ変換されてメッセージ中に表示される日付の時間フォーマット (日付/時間指定子は strftime の man を参照)`
** タイプ: 文字列
@@ -848,6 +843,11 @@
** タイプ: ブール
** 値: on, off (デフォルト値: `on`)
+* [[option_weechat.look.window_title]] *weechat.look.window_title*
+** 説明: `title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval)`
+** タイプ: 文字列
+** 値: 未制約文字列 (デフォルト値: `"WeeChat ${info:version}"`)
+
* [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
** 説明: `リモートホストへの接続タイムアウト時間 (秒単位) (子プロセスが行う)`
** タイプ: 整数
diff --git a/po/cs.po b/po/cs.po
index 7583e8f69..731278293 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3034,9 +3034,6 @@ msgstr ""
"výběrem URL v některých terminálech), znaky kódované do více bytů zde NEJSOU "
"povoleny"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
-
#, fuzzy
msgid ""
"time format for dates converted to strings and displayed in messages (see "
@@ -3049,6 +3046,12 @@ msgstr ""
msgid "display a vertical separator between windows"
msgstr ""
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
+
msgid "text color for '+' when scrolling bars"
msgstr "barva textu pro '+' při posouvání polí"
@@ -9884,3 +9887,6 @@ msgstr ""
msgid "Constants"
msgstr ""
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
diff --git a/po/de.po b/po/de.po
index 2c0a271b0..840955c43 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.3-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -3497,11 +3497,6 @@ msgstr ""
"Wird kein Zeichen angegeben, dann zeichnet ncurses eine durchgängige Linie. "
"Wide Chars sind für diese Option NICHT erlaubt"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"setzt den Fenstertitel (oder Terminal-Titel im Curses-GUI), mit Name und "
-"Version"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3520,6 +3515,12 @@ msgstr ""
"ist die Option aktiviert dann wird eine vertikale Trennlinie zwischen "
"Fenstern gezeichnet"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr "Passwort für Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"
+
msgid "text color for '+' when scrolling bars"
msgstr "Farbe des '+' beim Scrollen von Info-Bars"
@@ -10926,3 +10927,8 @@ msgstr "Type"
msgid "Constants"
msgstr "Konstanten"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "setzt den Fenstertitel (oder Terminal-Titel im Curses-GUI), mit Name und "
+#~ "Version"
diff --git a/po/es.po b/po/es.po
index bf02aecef..abb875ea5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3218,11 +3218,6 @@ msgstr ""
"vacío dibujará una línea verdadera con ncurses), caracteres unicode NO están "
"permitidos"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"define el título de la ventana (el terminal para la interfaz Curses) con el "
-"nombre y la versión"
-
#, fuzzy
msgid ""
"time format for dates converted to strings and displayed in messages (see "
@@ -3235,6 +3230,12 @@ msgstr "muestra un separador horizontal entre ventanas"
msgid "display a vertical separator between windows"
msgstr "muestra un separador vertical entre ventanas"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
+
msgid "text color for '+' when scrolling bars"
msgstr "color del '+' cuando se desplaza las barras"
@@ -10146,3 +10147,8 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Constantes"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "define el título de la ventana (el terminal para la interfaz Curses) con "
+#~ "el nombre y la versión"
diff --git a/po/fr.po b/po/fr.po
index 17bc093d0..10f1b4938 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
-"PO-Revision-Date: 2013-11-09 15:47+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
+"PO-Revision-Date: 2013-11-09 17:02+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -3388,11 +3388,6 @@ msgstr ""
"fenêtres (une valeur vide tracera une vraie ligne avec ncurses), les "
"caractères larges ne sont PAS autorisés ici"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
-"nom et la version"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3406,6 +3401,14 @@ msgstr "afficher un séparateur horizontal entre les fenêtres"
msgid "display a vertical separator between windows"
msgstr "afficher un séparateur vertical entre les fenêtres"
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"titre pour la fenêtre (le terminal pour l'interface Curses), défini au "
+"démarrage; une chaîne vide gardera le titre inchangé (note: le contenu est "
+"évalué, voir /help eval)"
+
msgid "text color for '+' when scrolling bars"
msgstr "couleur du texte pour les '+' lors du défilement des barres"
@@ -10658,3 +10661,8 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
+#~ "nom et la version"
diff --git a/po/hu.po b/po/hu.po
index adf674f7e..97296e3d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2629,11 +2629,6 @@ msgid ""
"will draw a real line with ncurses), wide chars are NOT allowed here"
msgstr ""
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"ablak címsorának beállítása (Curses GUI esetén a terminálé) a program nevére "
-"és verziójára"
-
#, fuzzy
msgid ""
"time format for dates converted to strings and displayed in messages (see "
@@ -2647,6 +2642,14 @@ msgid "display a vertical separator between windows"
msgstr ""
#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"ablak címsorának beállítása (Curses GUI esetén a terminálé) a program nevére "
+"és verziójára"
+
+#, fuzzy
msgid "text color for '+' when scrolling bars"
msgstr "a '+' jel színe téma görgetésekor"
diff --git a/po/it.po b/po/it.po
index b77faf469..72aa17be2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3316,11 +3316,6 @@ msgstr ""
"alle finestre (un valore vuoto disegnerà una riga reale con ncurses), i "
"caratteri wide qui NON sono consentiti"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"imposta titolo per la finestra (terminale per interfacce Curses) con nome e "
-"versione"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3334,6 +3329,14 @@ msgstr "mostra un separatore orizzontale tra le finestre"
msgid "display a vertical separator between windows"
msgstr "mostra un separatore verticale tra le finestre"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"password per il server (nota: il contenuto viene valutato, consultare /help "
+"eval)"
+
msgid "text color for '+' when scrolling bars"
msgstr "colore del testo '+' allo scorrimento delle barre"
@@ -10286,3 +10289,8 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Costanti"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "imposta titolo per la finestra (terminale per interfacce Curses) con nome "
+#~ "e versione"
diff --git a/po/ja.po b/po/ja.po
index 97bbd10a0..70ac3f77f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -3267,10 +3267,6 @@ msgstr ""
"の実行が描画されるが、いくつかのターミナルでは URL 選択の際にバグを生ずる可能"
"性がある)、ワイドキャラクタは使えない"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"名前とバージョンを含むウィンドウのタイトルを設定 (Curses GUI 用のターミナル)"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3284,6 +3280,13 @@ msgstr "ウィンドウ間に水平セパレータを表示"
msgid "display a vertical separator between windows"
msgstr "ウィンドウ間に垂直セパレータを表示"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"SASL 認証のパスワード (注意: 値は評価されます、/help eval を参照してください)"
+
msgid "text color for '+' when scrolling bars"
msgstr "バーをスクロールする際の '+' のテキスト色"
@@ -10261,3 +10264,8 @@ msgstr "タイプ"
msgid "Constants"
msgstr "定数"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "名前とバージョンを含むウィンドウのタイトルを設定 (Curses GUI 用のターミナ"
+#~ "ル)"
diff --git a/po/pl.po b/po/pl.po
index d3a4698a8..038fa315e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3350,9 +3350,6 @@ msgstr ""
"(pusta wartość oznacza rysowanie prawdziwych linii za pomocą ncurses), "
"szerokie znaki NIE są dozwolone"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr "ustaw tytuł okna (terminal dla GUI w Curses) na nazwę i wersję"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3366,6 +3363,14 @@ msgstr "wyświetl poziomy separator pomiędzy oknami"
msgid "display a vertical separator between windows"
msgstr "wyświetl pionowy separator pomiędzy oknami"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"hasło dla uwierzytelniania SASL (uwaga: zawartość jest przetwarzana, zobacz /"
+"help eval)"
+
msgid "text color for '+' when scrolling bars"
msgstr "kolor '+' przy przewijaniu pasków"
@@ -10442,3 +10447,6 @@ msgstr "Typ"
msgid "Constants"
msgstr "Stałe"
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr "ustaw tytuł okna (terminal dla GUI w Curses) na nazwę i wersję"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4706b2ace..225c6359b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3116,11 +3116,6 @@ msgstr ""
"janelas(valor vazio vai desenhar uam linha real com ncurses), caracteres "
"extendidos NÃO são aceitos aqui"
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"define o título para a janela (terminal para a interface Curses) com nome e "
-"versão"
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -3134,6 +3129,14 @@ msgstr "exibe um separador horizontal entre janelas"
msgid "display a vertical separator between windows"
msgstr "exibe um separador vertical entre janelas"
+#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
+"(nota: conteúdo é avaliado, veja /help eval)"
+
msgid "text color for '+' when scrolling bars"
msgstr "cor de texto para '+' quando estiver rolando barras"
@@ -9511,3 +9514,8 @@ msgstr ""
msgid "Constants"
msgstr ""
+
+#~ msgid "set title for window (terminal for Curses GUI) with name and version"
+#~ msgstr ""
+#~ "define o título para a janela (terminal para a interface Curses) com nome "
+#~ "e versão"
diff --git a/po/ru.po b/po/ru.po
index 0ceab19fe..b19f537cf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:18+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2661,11 +2661,6 @@ msgid ""
"will draw a real line with ncurses), wide chars are NOT allowed here"
msgstr ""
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-"устанавливать заголовок окна (терминала при интерфейсе Curses) с именем и "
-"версией"
-
#, fuzzy
msgid ""
"time format for dates converted to strings and displayed in messages (see "
@@ -2679,6 +2674,14 @@ msgid "display a vertical separator between windows"
msgstr ""
#, fuzzy
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+"устанавливать заголовок окна (терминала при интерфейсе Curses) с именем и "
+"версией"
+
+#, fuzzy
msgid "text color for '+' when scrolling bars"
msgstr "цвет '+' при прокрутке топика"
diff --git a/po/tr.po b/po/tr.po
index 47198948b..64661de00 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-11-09 10:13+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2368,9 +2368,6 @@ msgid ""
"will draw a real line with ncurses), wide chars are NOT allowed here"
msgstr ""
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -2382,6 +2379,11 @@ msgstr ""
msgid "display a vertical separator between windows"
msgstr ""
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+
msgid "text color for '+' when scrolling bars"
msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 0b864ad8f..d71c8b42d 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-11-09 15:46+0100\n"
+"POT-Creation-Date: 2013-11-09 17:01+0100\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2372,9 +2372,6 @@ msgid ""
"will draw a real line with ncurses), wide chars are NOT allowed here"
msgstr ""
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-
msgid ""
"time format for dates converted to strings and displayed in messages (see "
"man strftime for date/time specifiers)"
@@ -2386,6 +2383,11 @@ msgstr ""
msgid "display a vertical separator between windows"
msgstr ""
+msgid ""
+"title for window (terminal for Curses GUI), set on startup; an empty string "
+"will keep title unchanged (note: content is evaluated, see /help eval)"
+msgstr ""
+
msgid "text color for '+' when scrolling bars"
msgstr ""
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index b9815641a..67cdd8f2a 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -164,10 +164,10 @@ struct t_config_option *config_look_scroll_page_percent;
struct t_config_option *config_look_search_text_not_found_alert;
struct t_config_option *config_look_separator_horizontal;
struct t_config_option *config_look_separator_vertical;
-struct t_config_option *config_look_set_title;
struct t_config_option *config_look_time_format;
struct t_config_option *config_look_window_separator_horizontal;
struct t_config_option *config_look_window_separator_vertical;
+struct t_config_option *config_look_window_title;
/* config, colors section */
@@ -316,18 +316,17 @@ config_change_save_config_on_exit (void *data, struct t_config_option *option)
}
/*
- * Callback for changes on option "weechat.look.set_title".
+ * Callback for changes on option "weechat.look.window_title".
*/
void
-config_change_title (void *data, struct t_config_option *option)
+config_change_window_title (void *data, struct t_config_option *option)
{
/* make C compiler happy */
(void) data;
(void) option;
- if (CONFIG_BOOLEAN(config_look_set_title))
- gui_window_set_title (version_get_name_version ());
+ gui_window_set_title (CONFIG_STRING(config_look_window_title));
}
/*
@@ -2525,12 +2524,6 @@ config_weechat_init_options ()
"(empty value will draw a real line with ncurses), wide chars are "
"NOT allowed here"),
NULL, 0, 0, "", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
- config_look_set_title = config_file_new_option (
- weechat_config_file, ptr_section,
- "set_title", "boolean",
- N_("set title for window (terminal for Curses GUI) with "
- "name and version"),
- NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_title, NULL, NULL, NULL);
config_look_time_format = config_file_new_option (
weechat_config_file, ptr_section,
"time_format", "string",
@@ -2547,6 +2540,14 @@ config_weechat_init_options ()
"window_separator_vertical", "boolean",
N_("display a vertical separator between windows"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+ config_look_window_title = config_file_new_option (
+ weechat_config_file, ptr_section,
+ "window_title", "string",
+ N_("title for window (terminal for Curses GUI), set on startup; "
+ "an empty string will keep title unchanged "
+ "(note: content is evaluated, see /help eval)"),
+ NULL, 0, 0, "WeeChat ${info:version}", NULL, 0, NULL, NULL,
+ &config_change_window_title, NULL, NULL, NULL);
/* palette */
ptr_section = config_file_new_section (weechat_config_file, "palette",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index db943e601..9fe7eb2e2 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -188,10 +188,10 @@ extern struct t_config_option *config_look_scroll_page_percent;
extern struct t_config_option *config_look_search_text_not_found_alert;
extern struct t_config_option *config_look_separator_horizontal;
extern struct t_config_option *config_look_separator_vertical;
-extern struct t_config_option *config_look_set_title;
extern struct t_config_option *config_look_time_format;
extern struct t_config_option *config_look_window_separator_horizontal;
extern struct t_config_option *config_look_window_separator_vertical;
+extern struct t_config_option *config_look_window_title;
extern struct t_config_option *config_color_bar_more;
extern struct t_config_option *config_color_chat;
diff --git a/src/core/weechat.c b/src/core/weechat.c
index 98aaefa52..a3722c34c 100644
--- a/src/core/weechat.c
+++ b/src/core/weechat.c
@@ -75,6 +75,7 @@
#include "../gui/gui-layout.h"
#include "../gui/gui-main.h"
#include "../plugins/plugin.h"
+#include "../plugins/plugin-api.h"
int weechat_debug_core = 0; /* debug level for core */
@@ -452,6 +453,7 @@ main (int argc, char *argv[])
weechat_parse_args (argc, argv); /* parse command line args */
weechat_create_home_dir (); /* create WeeChat home directory */
log_init (); /* init log file */
+ plugin_api_init (); /* create some hooks (info,hdata,..)*/
secure_read (); /* read secured data options */
config_weechat_read (); /* read WeeChat options */
network_init_gnutls (); /* init GnuTLS */
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index 45563b054..b7358914c 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -210,8 +210,11 @@ gui_main_init ()
{
gui_current_window = gui_windows;
- if (CONFIG_BOOLEAN(config_look_set_title))
- gui_window_set_title (version_get_name_version ());
+ if (CONFIG_STRING(config_look_window_title)
+ && CONFIG_STRING(config_look_window_title)[0])
+ {
+ gui_window_set_title (CONFIG_STRING(config_look_window_title));
+ }
}
/*
@@ -538,8 +541,11 @@ gui_main_end (int clean_exit)
gui_history_global_free ();
/* reset title */
- if (CONFIG_BOOLEAN(config_look_set_title))
+ if (CONFIG_STRING(config_look_window_title)
+ && CONFIG_STRING(config_look_window_title)[0])
+ {
gui_window_set_title (NULL);
+ }
/* end color */
gui_color_end ();
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index d4c23157a..9007e19d8 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -35,6 +35,7 @@
#include "../../core/weechat.h"
#include "../../core/wee-config.h"
+#include "../../core/wee-eval.h"
#include "../../core/wee-hook.h"
#include "../../core/wee-log.h"
#include "../../core/wee-string.h"
@@ -2344,90 +2345,77 @@ gui_window_refresh_screen (int full_refresh)
/*
* Sets terminal title.
+ *
+ * Note: the content of "title" (if not NULL) is evaluated, so variables like
+ * "${info:version}" can be used inside.
*/
void
gui_window_set_title (const char *title)
{
- char *shell, *shellname;
- char *envterm = getenv ("TERM");
- char *envshell = getenv ("SHELL");
+ char *new_title, *envterm, *envshell, *shell, *shellname;
- if (envterm)
+ envterm = getenv ("TERM");
+ if (!envterm)
+ return;
+
+ new_title = (title && title[0]) ?
+ eval_expression (title, NULL, NULL, NULL) : strdup ("Terminal");
+ if (!new_title)
+ return;
+
+ if (strcmp (envterm, "sun-cmd") == 0)
+ {
+ printf ("\033]l%s\033\\", new_title);
+ }
+ else if (strcmp (envterm, "hpterm") == 0)
+ {
+ printf ("\033&f0k%dD%s", (int)(strlen (new_title) + 1), new_title);
+ }
+ /* the following terminals support the xterm escape codes */
+ else if ((strncmp (envterm, "xterm", 5) == 0)
+ || (strncmp (envterm, "rxvt", 4) == 0)
+ || (strcmp (envterm, "Eterm") == 0)
+ || (strcmp (envterm, "aixterm") == 0)
+ || (strcmp (envterm, "iris-ansi") == 0)
+ || (strcmp (envterm, "dtterm") == 0))
+ {
+ printf ("\33]0;%s\7", new_title);
+ }
+ else if (strncmp (envterm, "screen", 6) == 0)
{
if (title && title[0])
{
- if (strcmp (envterm, "sun-cmd") == 0)
- {
- printf ("\033]l%s\033\\", title);
- }
- else if (strcmp (envterm, "hpterm") == 0)
- {
- printf ("\033&f0k%dD%s", (int)(strlen(title) + 1), title);
- }
- /* the following terminals support the xterm escape codes */
- else if ((strncmp (envterm, "xterm", 5) == 0)
- || (strncmp (envterm, "rxvt", 4) == 0)
- || (strcmp (envterm, "Eterm") == 0)
- || (strcmp (envterm, "aixterm") == 0)
- || (strcmp (envterm, "iris-ansi") == 0)
- || (strcmp (envterm, "dtterm") == 0))
- {
- printf ("\33]0;%s\7", title);
- }
- else if (strncmp (envterm, "screen", 6) == 0)
- {
- printf ("\033k%s\033\\", title);
- /* trying to set the title of a backgrounded xterm like terminal */
- printf ("\33]0;%s\7", title);
- }
+ printf ("\033k%s\033\\", title);
}
else
{
- if (strcmp (envterm, "sun-cmd") == 0)
+ envshell = getenv ("SHELL");
+ if (envshell)
{
- printf ("\033]l%s\033\\", "Terminal");
- }
- else if (strcmp (envterm, "hpterm") == 0)
- {
- printf ("\033&f0k%dD%s", (int)strlen("Terminal"), "Terminal");
- }
- /* the following terminals support the xterm escape codes */
- else if ((strncmp (envterm, "xterm", 5) == 0)
- || (strncmp (envterm, "rxvt", 4) == 0)
- || (strcmp (envterm, "Eterm") == 0)
- || (strcmp( envterm, "aixterm") == 0)
- || (strcmp( envterm, "iris-ansi") == 0)
- || (strcmp( envterm, "dtterm") == 0))
- {
- printf ("\33]0;%s\7", "Terminal");
- }
- else if (strncmp (envterm, "screen", 6) == 0)
- {
- if (envshell)
+ shell = strdup (envshell);
+ if (shell)
{
- shell = strdup (envshell);
- if (shell)
- {
- shellname = basename (shell);
- printf ("\033k%s\033\\", (shellname) ? shellname : shell);
- free (shell);
- }
- else
- {
- printf ("\033k%s\033\\", envterm);
- }
+ shellname = basename (shell);
+ printf ("\033k%s\033\\", (shellname) ? shellname : shell);
+ free (shell);
}
else
{
printf ("\033k%s\033\\", envterm);
}
- /* tryning to reset the title of a backgrounded xterm like terminal */
- printf ("\33]0;%s\7", "Terminal");
+ }
+ else
+ {
+ printf ("\033k%s\033\\", envterm);
}
}
- fflush (stdout);
+ /* trying to set the title of a backgrounded xterm like terminal */
+ printf ("\33]0;%s\7", new_title);
}
+ fflush (stdout);
+
+ free (new_title);
}
/*
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index 4051689fa..bd46acb9e 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -1183,9 +1183,6 @@ plugin_display_short_list ()
void
plugin_init (int auto_load, int argc, char *argv[])
{
- /* init plugin API (create some hooks) */
- plugin_api_init ();
-
/* read plugins options on disk */
plugin_config_init ();
plugin_config_read ();
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:27:10 +0000