pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 18:23:13 +02:00
Code Activity

Added options "look_open_near_server" and "look_nick_complete_first" (patch from Gwenn)

Browse Source
This commit is contained in:
Sebastien Helleu
2006-01-30 20:22:40 +00:00
parent 99a3434733
commit 70ad116c0f
20 changed files with 3086 additions and 2904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/en/config.xml
+14
View File
@@ -68,6 +68,13 @@
<entry></entry>
<entry>Use same buffer for all servers</entry>
</row>
<row>
<entry><option>look_open_near_server</option></entry>
<entry>boolean</entry>
<entry>'on' or 'off'</entry>
<entry></entry>
<entry>Open new channels/privates near server</entry>
</row>
<row>
<entry><option>look_scroll_amount</option></entry>
<entry>integer</entry>
@@ -159,6 +166,13 @@
<entry></entry>
<entry>Chars ignored for nick completion</entry>
</row>
<row>
<entry><option>look_nick_complete_first</option></entry>
<entry>boolean</entry>
<entry>'on' or 'off'</entry>
<entry></entry>
<entry>Complete only with first nick found</entry>
</row>
<row>
<entry><option>look_infobar</option></entry>
<entry>boolean</entry>
doc/fr/config.xml
+14
View File
@@ -68,6 +68,13 @@
<entry>'off'</entry>
<entry>Utiliser le même tampon pour tous les serveurs</entry>
</row>
<row>
<entry><option>look_open_near_server</option></entry>
<entry>booléen</entry>
<entry>'on' ou 'off'</entry>
<entry>'off'</entry>
<entry>Ouvrir les nouveaux canaux/privés près du serveur</entry>
</row>
<row>
<entry><option>look_scroll_amount</option></entry>
<entry>entier</entry>
@@ -159,6 +166,13 @@
<entry>'[]-^'</entry>
<entry>Caractères à ignorer pour la complétion des pseudos</entry>
</row>
<row>
<entry><option>look_nick_complete_first</option></entry>
<entry>booléen</entry>
<entry>'on' ou 'off'</entry>
<entry>'off'</entry>
<entry>Compléter seulement avec le premier pseudo trouvé</entry>
</row>
<row>
<entry><option>look_infobar</option></entry>
<entry>booléen</entry>
po/cs.po
+370 -362
View File
File diff suppressed because it is too large Load Diff
po/es.po
+370 -362
View File
File diff suppressed because it is too large Load Diff
po/fr.po
+371 -363
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+373 -365
View File
File diff suppressed because it is too large Load Diff
src/common/completion.c
+7
View File
@@ -1059,6 +1059,11 @@ completion_nick (t_completion *completion)
if ((!completion->word_found) || word_found_seen)
{
completion->word_found = ptr_nick->nick;
if (cfg_look_nick_complete_first)
{
completion->position = -1;
return;
}
for (ptr_nick2 = ptr_nick->next_nick; ptr_nick2;
ptr_nick2 = ptr_nick2->next_nick)
{
@@ -1070,8 +1075,10 @@ completion_nick (t_completion *completion)
if (other_completion == 0)
completion->position = -1;
else
{
if (completion->position < 0)
completion->position = 0;
}
return;
}
other_completion++;
src/common/weeconfig.c
+10
View File
@@ -74,6 +74,7 @@ char *cfg_look_charset_encode;
char *cfg_look_charset_internal;
int cfg_look_one_server_buffer;
int cfg_look_scroll_amount;
int cfg_look_open_near_server;
char *cfg_look_buffer_timestamp;
int cfg_look_color_nicks_number;
int cfg_look_color_actions;
@@ -88,6 +89,7 @@ int cfg_look_nickmode_empty;
char *cfg_look_no_nickname;
char *cfg_look_completor;
char *cfg_look_nick_completion_ignore;
int cfg_look_nick_complete_first;
int cfg_look_infobar;
char *cfg_look_infobar_timestamp;
int cfg_look_infobar_seconds;
@@ -138,6 +140,10 @@ t_config_option weechat_options_look[] =
N_("use same buffer for all servers"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_one_server_buffer, NULL, config_change_one_server_buffer },
{ "look_open_near_server", N_("open new channels/privates near server"),
N_("open new channels/privates near server"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_open_near_server, NULL, config_change_noop },
{ "look_scroll_amount", N_("how many lines to scroll by with scroll_up and scroll_down"),
N_("how many lines to scroll by with scroll_up and scroll_down"),
OPTION_TYPE_INT, 1, INT_MAX, 3,
@@ -192,6 +198,10 @@ t_config_option weechat_options_look[] =
N_("chars ignored for nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
"[]-^", NULL, NULL, &cfg_look_nick_completion_ignore, config_change_noop },
{ "look_nick_complete_first", N_("complete only with first nick found"),
N_("complete only with first nick found"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_nick_complete_first, NULL, config_change_noop },
{ "look_infobar", N_("enable info bar"),
N_("enable info bar"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
src/common/weeconfig.h
+2
View File
@@ -92,6 +92,7 @@ extern char *cfg_look_charset_decode_utf;
extern char *cfg_look_charset_encode;
extern char *cfg_look_charset_internal;
extern int cfg_look_one_server_buffer;
extern int cfg_look_open_near_server;
extern int cfg_look_scroll_amount;
extern char *cfg_look_buffer_timestamp;
extern int cfg_look_color_nicks_number;
@@ -105,6 +106,7 @@ extern int cfg_look_nickmode_empty;
extern char *cfg_look_no_nickname;
extern char *cfg_look_completor;
extern char *cfg_look_nick_completion_ignore;
extern int cfg_look_nick_complete_first;
extern int cfg_look_infobar;
extern char *cfg_look_infobar_timestamp;
extern int cfg_look_infobar_seconds;
src/gui/gui-common.c
+12
View File
@@ -491,6 +491,18 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc,
last_gui_buffer = new_buffer;
new_buffer->next_buffer = NULL;
/* move buffer next to server */
if (server && cfg_look_open_near_server && (!cfg_look_one_server_buffer))
{
ptr_buffer = SERVER(new_buffer)->buffer;
while (ptr_buffer && (ptr_buffer->server == server))
{
ptr_buffer = ptr_buffer->next_buffer;
}
if (ptr_buffer)
gui_buffer_move_to_number (new_buffer, ptr_buffer->number);
}
/* switch to new buffer */
if (switch_to_buffer)
gui_switch_to_buffer (window, new_buffer);
weechat/doc/en/config.xml
+14
View File
@@ -68,6 +68,13 @@
<entry></entry>
<entry>Use same buffer for all servers</entry>
</row>
<row>
<entry><option>look_open_near_server</option></entry>
<entry>boolean</entry>
<entry>'on' or 'off'</entry>
<entry></entry>
<entry>Open new channels/privates near server</entry>
</row>
<row>
<entry><option>look_scroll_amount</option></entry>
<entry>integer</entry>
@@ -159,6 +166,13 @@
<entry></entry>
<entry>Chars ignored for nick completion</entry>
</row>
<row>
<entry><option>look_nick_complete_first</option></entry>
<entry>boolean</entry>
<entry>'on' or 'off'</entry>
<entry></entry>
<entry>Complete only with first nick found</entry>
</row>
<row>
<entry><option>look_infobar</option></entry>
<entry>boolean</entry>
weechat/doc/fr/config.xml
+14
View File
@@ -68,6 +68,13 @@
<entry>'off'</entry>
<entry>Utiliser le même tampon pour tous les serveurs</entry>
</row>
<row>
<entry><option>look_open_near_server</option></entry>
<entry>booléen</entry>
<entry>'on' ou 'off'</entry>
<entry>'off'</entry>
<entry>Ouvrir les nouveaux canaux/privés près du serveur</entry>
</row>
<row>
<entry><option>look_scroll_amount</option></entry>
<entry>entier</entry>
@@ -159,6 +166,13 @@
<entry>'[]-^'</entry>
<entry>Caractères à ignorer pour la complétion des pseudos</entry>
</row>
<row>
<entry><option>look_nick_complete_first</option></entry>
<entry>booléen</entry>
<entry>'on' ou 'off'</entry>
<entry>'off'</entry>
<entry>Compléter seulement avec le premier pseudo trouvé</entry>
</row>
<row>
<entry><option>look_infobar</option></entry>
<entry>booléen</entry>
weechat/po/cs.po
+370 -362
View File
File diff suppressed because it is too large Load Diff
weechat/po/es.po
+370 -362
View File
File diff suppressed because it is too large Load Diff
weechat/po/fr.po
+371 -363
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+373 -365
View File
File diff suppressed because it is too large Load Diff
weechat/src/common/completion.c
+7
View File
@@ -1059,6 +1059,11 @@ completion_nick (t_completion *completion)
if ((!completion->word_found) || word_found_seen)
{
completion->word_found = ptr_nick->nick;
if (cfg_look_nick_complete_first)
{
completion->position = -1;
return;
}
for (ptr_nick2 = ptr_nick->next_nick; ptr_nick2;
ptr_nick2 = ptr_nick2->next_nick)
{
@@ -1070,8 +1075,10 @@ completion_nick (t_completion *completion)
if (other_completion == 0)
completion->position = -1;
else
{
if (completion->position < 0)
completion->position = 0;
}
return;
}
other_completion++;
weechat/src/common/weeconfig.c
+10
View File
@@ -74,6 +74,7 @@ char *cfg_look_charset_encode;
char *cfg_look_charset_internal;
int cfg_look_one_server_buffer;
int cfg_look_scroll_amount;
int cfg_look_open_near_server;
char *cfg_look_buffer_timestamp;
int cfg_look_color_nicks_number;
int cfg_look_color_actions;
@@ -88,6 +89,7 @@ int cfg_look_nickmode_empty;
char *cfg_look_no_nickname;
char *cfg_look_completor;
char *cfg_look_nick_completion_ignore;
int cfg_look_nick_complete_first;
int cfg_look_infobar;
char *cfg_look_infobar_timestamp;
int cfg_look_infobar_seconds;
@@ -138,6 +140,10 @@ t_config_option weechat_options_look[] =
N_("use same buffer for all servers"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_one_server_buffer, NULL, config_change_one_server_buffer },
{ "look_open_near_server", N_("open new channels/privates near server"),
N_("open new channels/privates near server"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_open_near_server, NULL, config_change_noop },
{ "look_scroll_amount", N_("how many lines to scroll by with scroll_up and scroll_down"),
N_("how many lines to scroll by with scroll_up and scroll_down"),
OPTION_TYPE_INT, 1, INT_MAX, 3,
@@ -192,6 +198,10 @@ t_config_option weechat_options_look[] =
N_("chars ignored for nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
"[]-^", NULL, NULL, &cfg_look_nick_completion_ignore, config_change_noop },
{ "look_nick_complete_first", N_("complete only with first nick found"),
N_("complete only with first nick found"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_nick_complete_first, NULL, config_change_noop },
{ "look_infobar", N_("enable info bar"),
N_("enable info bar"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
weechat/src/common/weeconfig.h
+2
View File
@@ -92,6 +92,7 @@ extern char *cfg_look_charset_decode_utf;
extern char *cfg_look_charset_encode;
extern char *cfg_look_charset_internal;
extern int cfg_look_one_server_buffer;
extern int cfg_look_open_near_server;
extern int cfg_look_scroll_amount;
extern char *cfg_look_buffer_timestamp;
extern int cfg_look_color_nicks_number;
@@ -105,6 +106,7 @@ extern int cfg_look_nickmode_empty;
extern char *cfg_look_no_nickname;
extern char *cfg_look_completor;
extern char *cfg_look_nick_completion_ignore;
extern int cfg_look_nick_complete_first;
extern int cfg_look_infobar;
extern char *cfg_look_infobar_timestamp;
extern int cfg_look_infobar_seconds;
weechat/src/gui/gui-common.c
+12
View File
@@ -491,6 +491,18 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int dcc,
last_gui_buffer = new_buffer;
new_buffer->next_buffer = NULL;
/* move buffer next to server */
if (server && cfg_look_open_near_server && (!cfg_look_one_server_buffer))
{
ptr_buffer = SERVER(new_buffer)->buffer;
while (ptr_buffer && (ptr_buffer->server == server))
{
ptr_buffer = ptr_buffer->next_buffer;
}
if (ptr_buffer)
gui_buffer_move_to_number (new_buffer, ptr_buffer->number);
}
/* switch to new buffer */
if (switch_to_buffer)
gui_switch_to_buffer (window, new_buffer);