pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 15:53:12 +02:00
Code Activity

Added key function "jump_previous_buffer" to jump to buffer previously displayed (new key: alt-J + alt-P) (task #7085)

Browse Source
This commit is contained in:
Sebastien Helleu
2007-07-15 18:06:56 +00:00
parent feec343ffb
commit 3b48025071
38 changed files with 4764 additions and 4454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-07-13
ChangeLog - 2007-07-15
Version 0.2.6 (under dev!):
* added key function "jump_previous_buffer" to jump to buffer previously
displayed (new key: alt-J + alt-P) (task #7085)
* added "%*" to completion template, to repeat last completion
* added "-nojoin" option for /connect and /reconnect commands (task #7074)
* fixed bugs with IRC color in messages, now color codes are inserted in
doc/de/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>zum letzten Puffer springen</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>zum Serverpuffer springen</entry>
doc/en/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>jump to last buffer</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>jump to server buffer</entry>
doc/fr/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>sauter au dernier tampon</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>sauter au tampon du serveur</entry>
po/cs.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
po/de.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
po/es.po
+333 -317
View File
File diff suppressed because it is too large Load Diff
po/fr.po
+338 -321
View File
File diff suppressed because it is too large Load Diff
po/hu.po
+333 -317
View File
File diff suppressed because it is too large Load Diff
po/ru.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+327 -317
View File
File diff suppressed because it is too large Load Diff
src/common/command.c
+2 -2
View File
@@ -96,7 +96,7 @@ t_weechat_command weechat_commands[] =
"number: clear buffer by number"),
"-all", 0, 1, 0, weechat_cmd_clear, NULL },
{ "connect", N_("connect to server(s)"),
N_("[-all [-nojoin] | [-nojoin] servername [servername ...]]"),
N_("[-all [-nojoin] | servername [servername ...] [-nojoin]]"),
N_(" -all: connect to all servers\n"
"servername: server name to connect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
@@ -167,7 +167,7 @@ t_weechat_command weechat_commands[] =
"Without argument, /plugin command lists loaded plugins."),
"list|listfull|load|autoload|reload|unload %P", 0, 2, 0, weechat_cmd_plugin, NULL },
{ "reconnect", N_("reconnect to server(s)"),
N_("[-all [-nojoin] | servername [servername ...]] [-nojoin]"),
N_("[-all [-nojoin] | servername [servername ...] [-nojoin]]"),
N_(" -all: reconnect to all servers\n"
"servername: server name to reconnect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
src/gui/curses/gui-curses-keyboard.c
+2 -1
View File
@@ -95,9 +95,10 @@ gui_keyboard_default_bindings ()
gui_keyboard_bind ( /* m-i */ "meta-i" , "infobar_clear");
gui_keyboard_bind ( /* m-j,m-d */ "meta-jmeta-d", "jump_dcc");
gui_keyboard_bind ( /* m-j,m-l */ "meta-jmeta-l", "jump_last_buffer");
gui_keyboard_bind ( /* m-j,m-p */ "meta-jmeta-p", "jump_previous_buffer");
gui_keyboard_bind ( /* m-j,m-r */ "meta-jmeta-r", "jump_raw_data");
gui_keyboard_bind ( /* m-j,m-s */ "meta-jmeta-s", "jump_server");
gui_keyboard_bind ( /* m-j,m-x */ "meta-jmeta-x", "jump_next_server");
gui_keyboard_bind ( /* m-j,m-r */ "meta-jmeta-r", "jump_raw_data");
gui_keyboard_bind ( /* m-k */ "meta-k", "grab_key");
gui_keyboard_bind ( /* m-n */ "meta-n", "scroll_next_highlight");
gui_keyboard_bind ( /* m-p */ "meta-p", "scroll_previous_highlight");
src/gui/curses/gui-curses-window.c
+1
View File
@@ -448,6 +448,7 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
window->buffer->last_read_line = window->buffer->last_line;
if (buffer->last_read_line == buffer->last_line)
buffer->last_read_line = NULL;
gui_previous_buffer = window->buffer;
}
window->buffer = buffer;
src/gui/gui-action.c
+18
View File
@@ -1191,6 +1191,24 @@ gui_action_jump_last_buffer (t_gui_window *window, char *args)
}
}
/*
* gui_action_jump_previous_buffer: jump to previous buffer (the one displayed
* before current one)
*/
void
gui_action_jump_previous_buffer (t_gui_window *window, char *args)
{
/* make C compiler happy */
(void) args;
if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
{
if (gui_previous_buffer)
gui_buffer_switch_by_number (window, gui_previous_buffer->number);
}
}
/*
* gui_action_jump_server: jump to server buffer
*/
src/gui/gui-buffer.c
+4
View File
@@ -50,6 +50,7 @@
t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */
t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */
t_gui_buffer *gui_previous_buffer = NULL; /* pointer to previous buffer */
t_gui_buffer *gui_buffer_before_dcc = NULL; /* buffer before dcc switch */
t_gui_buffer *gui_buffer_raw_data = NULL; /* buffer with raw IRC data */
t_gui_buffer *gui_buffer_before_raw_data = NULL; /* buffer before raw switch*/
@@ -594,6 +595,9 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
hotlist_remove_buffer (buffer);
if (hotlist_initial_buffer == buffer)
hotlist_initial_buffer = NULL;
if (gui_previous_buffer == buffer)
gui_previous_buffer = NULL;
if (gui_buffer_before_dcc == buffer)
gui_buffer_before_dcc = NULL;
src/gui/gui-buffer.h
+1
View File
@@ -140,6 +140,7 @@ struct t_gui_buffer
extern t_gui_buffer *gui_buffers;
extern t_gui_buffer *last_gui_buffer;
extern t_gui_buffer *gui_previous_buffer;
extern t_gui_buffer *gui_buffer_before_dcc;
extern t_gui_buffer *gui_buffer_raw_data;
extern t_gui_buffer *gui_buffer_before_raw_data;
src/gui/gui-keyboard.c
+2
View File
@@ -122,6 +122,8 @@ t_gui_key_function gui_key_functions[] =
N_("jump to raw IRC data buffer") },
{ "jump_last_buffer", gui_action_jump_last_buffer,
N_("jump to last buffer") },
{ "jump_previous_buffer", gui_action_jump_previous_buffer,
N_("jump to previous buffer") },
{ "jump_server", gui_action_jump_server,
N_("jump to server buffer") },
{ "jump_next_server", gui_action_jump_next_server,
src/gui/gui.h
+1
View File
@@ -157,6 +157,7 @@ extern void gui_action_jump_smart (t_gui_window *, char *);
extern void gui_action_jump_dcc (t_gui_window *, char *);
extern void gui_action_jump_raw_data (t_gui_window *, char *);
extern void gui_action_jump_last_buffer (t_gui_window *, char *);
extern void gui_action_jump_previous_buffer (t_gui_window *, char *);
extern void gui_action_jump_server (t_gui_window *, char *);
extern void gui_action_jump_next_server (t_gui_window *, char *);
extern void gui_action_switch_server (t_gui_window *, char *);
weechat/ChangeLog
+3 -1
View File
@@ -1,10 +1,12 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-07-13
ChangeLog - 2007-07-15
Version 0.2.6 (under dev!):
* added key function "jump_previous_buffer" to jump to buffer previously
displayed (new key: alt-J + alt-P) (task #7085)
* added "%*" to completion template, to repeat last completion
* added "-nojoin" option for /connect and /reconnect commands (task #7074)
* fixed bugs with IRC color in messages, now color codes are inserted in
weechat/doc/de/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>zum letzten Puffer springen</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>zum Serverpuffer springen</entry>
weechat/doc/en/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>jump to last buffer</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>jump to server buffer</entry>
weechat/doc/fr/key_functions.xml
+4
View File
@@ -157,6 +157,10 @@
<entry><literal>jump_last_buffer</literal></entry>
<entry>sauter au dernier tampon</entry>
</row>
<row>
<entry><literal>jump_previous_buffer</literal></entry>
<entry>jump to previous buffer</entry>
</row>
<row>
<entry><literal>jump_server</literal></entry>
<entry>sauter au tampon du serveur</entry>
weechat/po/cs.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
weechat/po/de.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
weechat/po/es.po
+333 -317
View File
File diff suppressed because it is too large Load Diff
weechat/po/fr.po
+338 -321
View File
File diff suppressed because it is too large Load Diff
weechat/po/hu.po
+333 -317
View File
File diff suppressed because it is too large Load Diff
weechat/po/ru.po
+335 -317
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+327 -317
View File
File diff suppressed because it is too large Load Diff
weechat/src/common/command.c
+2 -2
View File
@@ -96,7 +96,7 @@ t_weechat_command weechat_commands[] =
"number: clear buffer by number"),
"-all", 0, 1, 0, weechat_cmd_clear, NULL },
{ "connect", N_("connect to server(s)"),
N_("[-all [-nojoin] | [-nojoin] servername [servername ...]]"),
N_("[-all [-nojoin] | servername [servername ...] [-nojoin]]"),
N_(" -all: connect to all servers\n"
"servername: server name to connect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
@@ -167,7 +167,7 @@ t_weechat_command weechat_commands[] =
"Without argument, /plugin command lists loaded plugins."),
"list|listfull|load|autoload|reload|unload %P", 0, 2, 0, weechat_cmd_plugin, NULL },
{ "reconnect", N_("reconnect to server(s)"),
N_("[-all [-nojoin] | servername [servername ...]] [-nojoin]"),
N_("[-all [-nojoin] | servername [servername ...] [-nojoin]]"),
N_(" -all: reconnect to all servers\n"
"servername: server name to reconnect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
weechat/src/gui/curses/gui-curses-keyboard.c
+2 -1
View File
@@ -95,9 +95,10 @@ gui_keyboard_default_bindings ()
gui_keyboard_bind ( /* m-i */ "meta-i" , "infobar_clear");
gui_keyboard_bind ( /* m-j,m-d */ "meta-jmeta-d", "jump_dcc");
gui_keyboard_bind ( /* m-j,m-l */ "meta-jmeta-l", "jump_last_buffer");
gui_keyboard_bind ( /* m-j,m-p */ "meta-jmeta-p", "jump_previous_buffer");
gui_keyboard_bind ( /* m-j,m-r */ "meta-jmeta-r", "jump_raw_data");
gui_keyboard_bind ( /* m-j,m-s */ "meta-jmeta-s", "jump_server");
gui_keyboard_bind ( /* m-j,m-x */ "meta-jmeta-x", "jump_next_server");
gui_keyboard_bind ( /* m-j,m-r */ "meta-jmeta-r", "jump_raw_data");
gui_keyboard_bind ( /* m-k */ "meta-k", "grab_key");
gui_keyboard_bind ( /* m-n */ "meta-n", "scroll_next_highlight");
gui_keyboard_bind ( /* m-p */ "meta-p", "scroll_previous_highlight");
weechat/src/gui/curses/gui-curses-window.c
+1
View File
@@ -448,6 +448,7 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
window->buffer->last_read_line = window->buffer->last_line;
if (buffer->last_read_line == buffer->last_line)
buffer->last_read_line = NULL;
gui_previous_buffer = window->buffer;
}
window->buffer = buffer;
weechat/src/gui/gui-action.c
+18
View File
@@ -1191,6 +1191,24 @@ gui_action_jump_last_buffer (t_gui_window *window, char *args)
}
}
/*
* gui_action_jump_previous_buffer: jump to previous buffer (the one displayed
* before current one)
*/
void
gui_action_jump_previous_buffer (t_gui_window *window, char *args)
{
/* make C compiler happy */
(void) args;
if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
{
if (gui_previous_buffer)
gui_buffer_switch_by_number (window, gui_previous_buffer->number);
}
}
/*
* gui_action_jump_server: jump to server buffer
*/
weechat/src/gui/gui-buffer.c
+4
View File
@@ -50,6 +50,7 @@
t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */
t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */
t_gui_buffer *gui_previous_buffer = NULL; /* pointer to previous buffer */
t_gui_buffer *gui_buffer_before_dcc = NULL; /* buffer before dcc switch */
t_gui_buffer *gui_buffer_raw_data = NULL; /* buffer with raw IRC data */
t_gui_buffer *gui_buffer_before_raw_data = NULL; /* buffer before raw switch*/
@@ -594,6 +595,9 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
hotlist_remove_buffer (buffer);
if (hotlist_initial_buffer == buffer)
hotlist_initial_buffer = NULL;
if (gui_previous_buffer == buffer)
gui_previous_buffer = NULL;
if (gui_buffer_before_dcc == buffer)
gui_buffer_before_dcc = NULL;
weechat/src/gui/gui-buffer.h
+1
View File
@@ -140,6 +140,7 @@ struct t_gui_buffer
extern t_gui_buffer *gui_buffers;
extern t_gui_buffer *last_gui_buffer;
extern t_gui_buffer *gui_previous_buffer;
extern t_gui_buffer *gui_buffer_before_dcc;
extern t_gui_buffer *gui_buffer_raw_data;
extern t_gui_buffer *gui_buffer_before_raw_data;
weechat/src/gui/gui-keyboard.c
+2
View File
@@ -122,6 +122,8 @@ t_gui_key_function gui_key_functions[] =
N_("jump to raw IRC data buffer") },
{ "jump_last_buffer", gui_action_jump_last_buffer,
N_("jump to last buffer") },
{ "jump_previous_buffer", gui_action_jump_previous_buffer,
N_("jump to previous buffer") },
{ "jump_server", gui_action_jump_server,
N_("jump to server buffer") },
{ "jump_next_server", gui_action_jump_next_server,
weechat/src/gui/gui.h
+1
View File
@@ -157,6 +157,7 @@ extern void gui_action_jump_smart (t_gui_window *, char *);
extern void gui_action_jump_dcc (t_gui_window *, char *);
extern void gui_action_jump_raw_data (t_gui_window *, char *);
extern void gui_action_jump_last_buffer (t_gui_window *, char *);
extern void gui_action_jump_previous_buffer (t_gui_window *, char *);
extern void gui_action_jump_server (t_gui_window *, char *);
extern void gui_action_jump_next_server (t_gui_window *, char *);
extern void gui_action_switch_server (t_gui_window *, char *);