pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 04:46:37 +02:00
Code Activity

core: add option -all for command /buffer unmerge

Browse Source
This commit is contained in:
Sebastien Helleu
2011-08-04 17:24:53 +02:00
parent d7a46135ee
commit 6442302f3f
18 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,12 +1,13 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.6-dev, 2011-08-02
v0.3.6-dev, 2011-08-04
Version 0.3.6 (under dev!)
--------------------------
* core: add option -all for command /buffer unmerge
* core: fix crash when invalid UTF-8 chars are inserted in command line
(bug #33471)
* core: stop horizontal bar scroll at the end of content (for bars with
doc/de/autogen/user/weechat_commands.txt
+1 -1
View File
@@ -65,7 +65,7 @@ Examples:
/buffer list
clear [<number>|-merged|-all]
move|merge <number>
unmerge [<number>]
unmerge [<number>|-all]
close [<n1>[-<n2>]|<name>]
notify <level>
localvar
doc/en/autogen/user/weechat_commands.txt
+1 -1
View File
@@ -65,7 +65,7 @@ Examples:
/buffer list
clear [<number>|-merged|-all]
move|merge <number>
unmerge [<number>]
unmerge [<number>|-all]
close [<n1>[-<n2>]|<name>]
notify <level>
localvar
doc/fr/autogen/user/weechat_commands.txt
+1 -1
View File
@@ -65,7 +65,7 @@ Exemples:
/buffer list
clear [<nombre>|-merged|-all]
move|merge <nombre>
unmerge [<nombre>]
unmerge [<nombre>|-all]
close [<n1>[-<n2>]|<nom>]
notify <niveau>
localvar
doc/it/autogen/user/weechat_commands.txt
+1 -1
View File
@@ -65,7 +65,7 @@ Examples:
/buffer list
clear [<number>|-merged|-all]
move|merge <number>
unmerge [<number>]
unmerge [<number>|-all]
close [<n1>[-<n2>]|<name>]
notify <level>
localvar
po/cs.po
+3 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-07-05 15:37+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -932,8 +932,8 @@ msgstr "řídit buffery"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge "
"[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set "
po/de.po
+3 -3
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-07-14 20:53+0100\n"
"Last-Translator: Nils Görs\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -950,8 +950,8 @@ msgstr "Buffer verwalten"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]] || notify <level> || localvar || set "
po/es.po
+3 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-07-05 15:37+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -937,8 +937,8 @@ msgstr "gestionar los buffers"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<número>|-merged|-all] || move|merge <número> || unmerge "
"[<número>] || close [<n1>[-<n2>]] || notify <nivel> || localvar || set "
po/fr.po
+6 -6
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"PO-Revision-Date: 2011-08-04 16:00+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-08-04 17:13+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -935,12 +935,12 @@ msgstr "gestion des tampons"
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<nombre>|-merged|-all] || move|merge <nombre> || unmerge "
"[<nombre>] || close [<n1>[-<n2>]|<nom>] || notify <niveau> || localvar || "
"set <propriété> <valeur> || get <propriété> || <nombre>|<nom>"
"[<nombre>|-all] || close [<n1>[-<n2>]|<nom>] || notify <niveau> || localvar "
"|| set <propriété> <valeur> || get <propriété> || <nombre>|<nom>"
msgid ""
" list: list buffers (without argument, this list is displayed)\n"
po/hu.po
+3 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-05-15 10:51+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -916,8 +916,8 @@ msgstr "pufferek kezelése"
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
#, fuzzy
po/it.po
+3 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-07-16 11:32+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -931,8 +931,8 @@ msgstr "gestione buffer"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<numero>|-merged|-all] || move|merge <numero> || unmerge "
"[<numero>] || close [<n1>[-<n2>]] || notify <livello> || localvar || set "
po/pl.po
+3 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-07-05 15:38+0200\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -940,8 +940,8 @@ msgstr "zarządzaj buforami"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"list || clear [<numer>|-merged|-all] || move|merge <numer> || unmerge "
"[<numer>] || close [<n1>[-<n2>]] || notify <poziom> || localvar || set "
po/pt_BR.po
+3 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-05-15 10:52+0200\n"
"Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -944,8 +944,8 @@ msgstr "gerenciar buffers"
#, fuzzy
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
"[clear [número | -merged | -all] | move número | merge número | unmerge "
"[número] | close [n1[-n2]] | list | notify nível | localvar | set property "
po/ru.po
+3 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.6-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: 2011-05-15 10:52+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -923,8 +923,8 @@ msgstr "управление буферами"
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
#, fuzzy
po/weechat.pot
+3 -3
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2011-08-04 16:12+0200\n"
"POT-Creation-Date: 2011-08-04 17:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -816,8 +816,8 @@ msgstr ""
msgid ""
"list || clear [<number>|-merged|-all] || move|merge <number> || unmerge "
"[<number>] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar || "
"set <property> <value> || get <property> || <number>|<name>"
"[<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || localvar "
"|| set <property> <value> || get <property> || <number>|<name>"
msgstr ""
msgid ""
src/core/wee-command.c
+17 -10
View File
@@ -651,15 +651,22 @@ COMMAND_CALLBACK(buffer)
number = -1;
if (argc >= 3)
{
error = NULL;
number = strtol (argv[2], &error, 10);
if (!error || error[0])
if (string_strcasecmp (argv[2], "-all") == 0)
{
/* invalid number */
gui_chat_printf (NULL,
_("%sError: incorrect buffer number"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
return WEECHAT_RC_OK;
gui_buffer_unmerge_all ();
}
else
{
error = NULL;
number = strtol (argv[2], &error, 10);
if (!error || error[0])
{
/* invalid number */
gui_chat_printf (NULL,
_("%sError: incorrect buffer number"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
return WEECHAT_RC_OK;
}
}
}
gui_buffer_unmerge (buffer, (int) number);
@@ -5159,7 +5166,7 @@ command_init ()
N_("list"
" || clear [<number>|-merged|-all]"
" || move|merge <number>"
" || unmerge [<number>]"
" || unmerge [<number>|-all]"
" || close [<n1>[-<n2>]|<name>]"
" || notify <level>"
" || localvar"
@@ -5217,7 +5224,7 @@ command_init ()
"clear -merged|-all|%(buffers_numbers)"
" || move %(buffers_numbers)"
" || merge %(buffers_numbers)"
" || unmerge %(buffers_numbers)"
" || unmerge %(buffers_numbers)|-all"
" || close %(buffers_plugins_names)"
" || list"
" || notify reset|none|highlight|message|all"
src/gui/gui-buffer.c
+27
View File
@@ -2580,6 +2580,33 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number)
WEECHAT_HOOK_SIGNAL_POINTER, buffer);
}
/*
* gui_buffer_unmerge_all: unmerge all merged buffers
*/
void
gui_buffer_unmerge_all ()
{
int number, count_merged, i;
struct t_gui_buffer *ptr_buffer;
number = 1;
while (number <= last_gui_buffer->number)
{
count_merged = gui_buffer_count_merged_buffers (number);
if (count_merged > 1)
{
for (i = 0; i < count_merged - 1; i++)
{
ptr_buffer = gui_buffer_search_by_number (number);
if (ptr_buffer)
gui_buffer_unmerge (ptr_buffer, -1);
}
}
number++;
}
}
/*
* gui_buffer_undo_snap: do a "snapshot" of buffer input (save content and
* position)
src/gui/gui-buffer.h
+1
View File
@@ -278,6 +278,7 @@ extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number);
extern void gui_buffer_merge (struct t_gui_buffer *buffer,
struct t_gui_buffer *target_buffer);
extern void gui_buffer_unmerge (struct t_gui_buffer *buffer, int number);
extern void gui_buffer_unmerge_all ();
extern void gui_buffer_undo_snap (struct t_gui_buffer *buffer);
extern void gui_buffer_undo_snap_free (struct t_gui_buffer *buffer);
extern void gui_buffer_undo_add (struct t_gui_buffer *buffer);