core: add option weechat.look.window_auto_zoom, disable automatic zoom by default when terminal becomes too small for windows

21 files changed, 132 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f1f79a49..69f60969c 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: add option weechat.look.window_auto_zoom, disable automatic zoom by
+  default when terminal becomes too small for windows
 * core: add support of logical and/or for argument "tags" in function hook_print
 * core: rename buffer property "highlight_tags" to "highlight_tags_restrict",
   new behavior for buffer property "highlight_tags" (force highlight on tags),
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 30a388446..0582bfd1e 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -843,6 +843,11 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.look.window_auto_zoom]] *weechat.look.window_auto_zoom*
+** Beschreibung: `automatically zoom on current window if the terminal becomes too small to display all windows (use alt-z to unzoom windows when the terminal is big enough)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
 * [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
 ** Beschreibung: `ist die Option aktiviert dann wird eine horizontale Trennlinie zwischen Fenstern gezeichnet`
 ** Typ: boolesch
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 281b436b1..7706a7097 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -843,6 +843,11 @@
 ** type: string
 ** values: any string (default value: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.look.window_auto_zoom]] *weechat.look.window_auto_zoom*
+** description: `automatically zoom on current window if the terminal becomes too small to display all windows (use alt-z to unzoom windows when the terminal is big enough)`
+** type: boolean
+** values: on, off (default value: `off`)
+
 * [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
 ** description: `display an horizontal separator between windows`
 ** type: boolean
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 190235b26..6a31c4d36 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -843,6 +843,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.look.window_auto_zoom]] *weechat.look.window_auto_zoom*
+** description: `zoomer automatiquement la fenêtre courante si le terminal devient trop petit pour afficher les fenêtres (utilisez alt-z pour dézoomer la fenêtre quand le terminal est suffisamment grand)`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `off`)
+
 * [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
 ** description: `afficher un séparateur horizontal entre les fenêtres`
 ** type: booléen
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index d833094dd..4103bde2f 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -843,6 +843,11 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.look.window_auto_zoom]] *weechat.look.window_auto_zoom*
+** descrizione: `automatically zoom on current window if the terminal becomes too small to display all windows (use alt-z to unzoom windows when the terminal is big enough)`
+** tipo: bool
+** valori: on, off (valore predefinito: `off`)
+
 * [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
 ** descrizione: `mostra un separatore orizzontale tra le finestre`
 ** tipo: bool
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index 2b44fae53..bdd55ca42 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -843,6 +843,11 @@
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"%a, %d %b %Y %T"`)
 
+* [[option_weechat.look.window_auto_zoom]] *weechat.look.window_auto_zoom*
+** 説明: `automatically zoom on current window if the terminal becomes too small to display all windows (use alt-z to unzoom windows when the terminal is big enough)`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `off`)
+
 * [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
 ** 説明: `ウィンドウ間に水平セパレータを表示`
 ** タイプ: ブール
diff --git a/po/cs.po b/po/cs.po
index 130c86eb4..5f1e48be1 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3073,6 +3073,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr "formát času pro data konvertovaná v řetězec a zobrazené ve zprávách"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 351988ff8..a0868b677 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -3544,6 +3544,12 @@ msgstr ""
 "Nachrichten dargestellt wird (siehe man strftime, welche Platzhalter für das "
 "Datum und die Uhrzeit verwendet werden)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 "ist die Option aktiviert dann wird eine horizontale Trennlinie zwischen "
diff --git a/po/es.po b/po/es.po
index e57ac113f..327ee19a0 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3259,6 +3259,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr "formato para la fecha mostrada en los mensajes"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr "muestra un separador horizontal entre ventanas"
 
diff --git a/po/fr.po b/po/fr.po
index 011bd5e95..32710f3ca 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-12-16 09:37+0100\n"
-"PO-Revision-Date: 2013-12-16 09:40+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
+"PO-Revision-Date: 2013-12-18 13:05+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -3454,6 +3454,15 @@ msgstr ""
 "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)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+"zoomer automatiquement la fenêtre courante si le terminal devient trop petit "
+"pour afficher les fenêtres (utilisez alt-z pour dézoomer la fenêtre quand le "
+"terminal est suffisamment grand)"
+
 msgid "display an horizontal separator between windows"
 msgstr "afficher un séparateur horizontal entre les fenêtres"
 
diff --git a/po/hu.po b/po/hu.po
index 9d7805e5a..c32e32558 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2668,6 +2668,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr "új nap kezdetével megjelenő időbélyeg"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 8cd38ab2d..1d8b361f1 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3361,6 +3361,12 @@ msgstr ""
 "formato dell'ora per le date convertite in stringhe e mostrate nei "
 "messaggi(consultare man strftime per i dettagli su data/ora)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr "mostra un separatore orizzontale tra le finestre"
 
diff --git a/po/ja.po b/po/ja.po
index a39e5d320..ffbf10d95 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -3313,6 +3313,12 @@ msgstr ""
 "文字列へ変換されてメッセージ中に表示される日付の時間フォーマット (日付/時間指"
 "定子は strftime の man を参照)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr "ウィンドウ間に水平セパレータを表示"
 
diff --git a/po/pl.po b/po/pl.po
index b7cdf9afb..2a7675e24 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:40+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3402,6 +3402,12 @@ msgstr ""
 "format czasu dla dat, konwertowany do ciągu i wyświetlany w wiadomościach "
 "(zobacz man strftime dla specyfikatorów daty/czasu)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr "wyświetl poziomy separator pomiędzy oknami"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f80237ae..c482279bb 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:40+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3159,6 +3159,12 @@ msgstr ""
 "formato de tempo para datas convertidas para strings e mostradas em "
 "mensagens (veja man strftime fpara especificadores de data/tempo)"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr "exibe um separador horizontal entre janelas"
 
diff --git a/po/ru.po b/po/ru.po
index 1a8661d8f..750b27577 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+0100\n"
 "PO-Revision-Date: 2013-12-15 14:40+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2700,6 +2700,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr "отображение маркера даты при смене дня"
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index a697712aa..17ceb58f3 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+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"
@@ -2409,6 +2409,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr ""
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 
diff --git a/po/weechat.pot b/po/weechat.pot
index 5864e370f..575532852 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-12-16 09:37+0100\n"
+"POT-Creation-Date: 2013-12-18 13:02+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"
@@ -2412,6 +2412,12 @@ msgid ""
 "man strftime for date/time specifiers)"
 msgstr ""
 
+msgid ""
+"automatically zoom on current window if the terminal becomes too small to "
+"display all windows (use alt-z to unzoom windows when the terminal is big "
+"enough)"
+msgstr ""
+
 msgid "display an horizontal separator between windows"
 msgstr ""
 
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 698bee162..66f63463d 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -167,6 +167,7 @@ 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_time_format;
+struct t_config_option *config_look_window_auto_zoom;
 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;
@@ -2593,6 +2594,13 @@ config_weechat_init_options ()
         N_("time format for dates converted to strings and displayed in "
            "messages (see man strftime for date/time specifiers)"),
         NULL, 0, 0, "%a, %d %b %Y %T", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+    config_look_window_auto_zoom = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "window_auto_zoom", "boolean",
+        N_("automatically zoom on current window if the terminal becomes too "
+           "small to display all windows (use alt-z to unzoom windows when the "
+           "terminal is big enough)"),
+        NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_window_separator_horizontal = config_file_new_option (
         weechat_config_file, ptr_section,
         "window_separator_horizontal", "boolean",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 9f1374978..576a4ed80 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -197,6 +197,7 @@ 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_time_format;
+extern struct t_config_option *config_look_window_auto_zoom;
 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;
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index b1bbf0f0b..e89f106a1 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -1722,13 +1722,16 @@ gui_window_refresh_windows ()
                                 gui_window_get_height () - add_top - add_bottom,
                                 0) < 0)
     {
-        ptr_layout = gui_layout_search (GUI_LAYOUT_ZOOM);
-        if (ptr_layout)
+        if (CONFIG_BOOLEAN(config_look_window_auto_zoom))
         {
-            /* remove zoom saved, to force a new zoom */
-            gui_layout_remove (ptr_layout);
+            ptr_layout = gui_layout_search (GUI_LAYOUT_ZOOM);
+            if (ptr_layout)
+            {
+                /* remove zoom saved, to force a new zoom */
+                gui_layout_remove (ptr_layout);
+            }
+            gui_window_zoom (gui_current_window);
         }
-        gui_window_zoom (gui_current_window);
     }
 
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)