pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 01:03:14 +02:00
Code Activity

Fixed /away command, new [irc] config section, option "look_display_away" moved to "irc_display_away", added default away/part/quit messages in config file

Browse Source
This commit is contained in:
Sebastien Helleu
2005-01-04 22:48:40 +00:00
parent 96fc2c9aec
commit 2f5c9a8fd4
12 changed files with 996 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/weeconfig.c
+34 -9
View File
@@ -49,6 +49,7 @@ t_config_section config_sections[CONFIG_NUMBER_SECTIONS] =
{ CONFIG_SECTION_COLORS, "colors" },
{ CONFIG_SECTION_HISTORY, "history" },
{ CONFIG_SECTION_LOG, "log" },
{ CONFIG_SECTION_IRC, "irc" },
{ CONFIG_SECTION_DCC, "dcc" },
{ CONFIG_SECTION_PROXY, "proxy" },
{ CONFIG_SECTION_ALIAS, "alias" },
@@ -76,7 +77,6 @@ int cfg_look_nickmode;
int cfg_look_nickmode_empty;
char *cfg_look_no_nickname;
char *cfg_look_completor;
int cfg_look_display_away;
int cfg_look_infobar;
char *cfg_look_infobar_timestamp;
int cfg_look_infobar_delay_highlight;
@@ -152,10 +152,6 @@ t_config_option weechat_options_look[] =
N_("the string inserted after nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
":", NULL, NULL, &cfg_look_completor, config_change_noop },
{ "look_display_away", N_("display message to all channels when away"),
N_("display message to all channels when (un)marking as away"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_display_away, NULL, config_change_noop },
{ "look_infobar", N_("enable info bar"),
N_("enable info bar"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
@@ -458,6 +454,33 @@ t_config_option weechat_options_log[] =
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
/* config, irc section */
int cfg_irc_display_away;
char *cfg_irc_default_msg_away;
char *cfg_irc_default_msg_part;
char *cfg_irc_default_msg_quit;
t_config_option weechat_options_irc[] =
{ { "irc_display_away", N_("display message to all channels when away"),
N_("display message to all channels when (un)marking as away"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_irc_display_away, NULL, config_change_noop },
{ "irc_default_msg_away", N_("default message when away"),
N_("default message when away"),
OPTION_TYPE_STRING, 0, 0, 0,
"away", NULL, NULL, &cfg_irc_default_msg_away, config_change_noop },
{ "irc_default_msg_part", N_("default part message (leaving channel)"),
N_("default part message (leaving channel)"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &cfg_irc_default_msg_part, config_change_noop },
{ "irc_default_msg_quit", N_("default quit message"),
N_("default quit message ('%v' will be replaced by WeeChat version in string)"),
OPTION_TYPE_STRING, 0, 0, 0,
"WeeChat %v", NULL, NULL, &cfg_irc_default_msg_quit, config_change_noop },
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
/* config, dcc section */
int cfg_dcc_auto_accept_files;
@@ -608,8 +631,8 @@ t_config_option weechat_options_server[] =
t_config_option *weechat_options[CONFIG_NUMBER_SECTIONS] =
{ weechat_options_look, weechat_options_colors, weechat_options_history,
weechat_options_log, weechat_options_dcc, weechat_options_proxy,
NULL, weechat_options_server
weechat_options_log, weechat_options_irc, weechat_options_dcc,
weechat_options_proxy, NULL, weechat_options_server
};
@@ -1159,8 +1182,7 @@ config_create_default ()
if ((i != CONFIG_SECTION_ALIAS) && (i != CONFIG_SECTION_SERVER))
{
fprintf (file, "\n[%s]\n", config_sections[i].section_name);
if ((i == CONFIG_SECTION_HISTORY) || (i == CONFIG_SECTION_LOG) ||
(i == CONFIG_SECTION_DCC) || (i == CONFIG_SECTION_PROXY))
if (i == CONFIG_SECTION_PROXY)
fprintf (file,
"# WARNING!!! Options for section \"%s\" are not developed!\n",
config_sections[i].section_name);
@@ -1225,6 +1247,8 @@ config_create_default ()
fprintf (file, "\n[server]\n");
fprintf (file, "server_name=freenode\n");
fprintf (file, "server_autoconnect=on\n");
fprintf (file, "server_autoreconnect=on\n");
fprintf (file, "server_autoreconnect_delay=30\n");
fprintf (file, "server_address=irc.freenode.net\n");
fprintf (file, "server_port=6667\n");
fprintf (file, "server_password=\n");
@@ -1269,6 +1293,7 @@ config_create_default ()
}
fprintf (file, "server_command=\n");
fprintf (file, "server_command_delay=0\n");
fprintf (file, "server_autojoin=\n");
fprintf (file, "server_autorejoin=on\n");
src/common/weeconfig.h
+11 -6
View File
@@ -28,11 +28,12 @@
#define CONFIG_SECTION_COLORS 1
#define CONFIG_SECTION_HISTORY 2
#define CONFIG_SECTION_LOG 3
#define CONFIG_SECTION_DCC 4
#define CONFIG_SECTION_PROXY 5
#define CONFIG_SECTION_ALIAS 6
#define CONFIG_SECTION_SERVER 7
#define CONFIG_NUMBER_SECTIONS 8
#define CONFIG_SECTION_IRC 4
#define CONFIG_SECTION_DCC 5
#define CONFIG_SECTION_PROXY 6
#define CONFIG_SECTION_ALIAS 7
#define CONFIG_SECTION_SERVER 8
#define CONFIG_NUMBER_SECTIONS 9
#define OPTION_TYPE_BOOLEAN 1 /* values: on/off */
#define OPTION_TYPE_INT 2 /* values: from min to max */
@@ -90,7 +91,6 @@ extern int cfg_look_nickmode;
extern int cfg_look_nickmode_empty;
extern char *cfg_look_no_nickname;
extern char *cfg_look_completor;
extern int cfg_look_display_away;
extern int cfg_look_infobar;
extern char *cfg_look_infobar_timestamp;
extern int cfg_look_infobar_delay_highlight;
@@ -148,6 +148,11 @@ extern char *cfg_log_path;
extern char *cfg_log_timestamp;
extern int cfg_log_hide_nickserv_pwd;
extern int cfg_irc_display_away;
extern char *cfg_irc_default_msg_away;
extern char *cfg_irc_default_msg_part;
extern char *cfg_irc_default_msg_quit;
extern int cfg_dcc_auto_accept_files;
extern int cfg_dcc_auto_accept_chats;
extern int cfg_dcc_timeout;
src/irc/irc-send.c
+79 -51
View File
@@ -88,7 +88,8 @@ irc_cmd_send_admin (t_irc_server *server, char *arguments)
int
irc_cmd_send_away (t_irc_server *server, char *arguments)
{
char *pos;
char *pos, *ptr_away_msg;
char *ptr_away_default_msg = "away";
t_irc_server *ptr_server;
time_t elapsed;
char buffer[4096];
@@ -106,37 +107,37 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
{
if (ptr_server->is_connected)
{
if (pos)
if (ptr_server->is_away && (!pos))
{
ptr_server->is_away = 1;
ptr_server->away_time = time (NULL);
server_sendf (ptr_server, "AWAY :%s\r\n", pos);
if (cfg_look_display_away)
server_sendf (ptr_server, "AWAY\r\n");
ptr_server->is_away = 0;
if (server->away_time != 0)
{
snprintf (buffer, sizeof (buffer), "is away: %s", pos);
irc_send_me_all_channels (ptr_server, buffer);
elapsed = time (NULL) - ptr_server->away_time;
ptr_server->away_time = 0;
if (cfg_irc_display_away)
{
snprintf (buffer, sizeof (buffer),
"is back (gone %.2ld:%.2ld:%.2ld)",
elapsed / 3600,
(elapsed / 60) % 60,
elapsed % 60);
irc_send_me_all_channels (ptr_server, buffer);
}
}
}
else
{
if (ptr_server->is_away)
ptr_server->is_away = 1;
ptr_server->away_time = time (NULL);
ptr_away_msg = (pos) ? pos :
((cfg_irc_default_msg_away && cfg_irc_default_msg_away[0]) ?
cfg_irc_default_msg_away : ptr_away_default_msg);
server_sendf (ptr_server, "AWAY :%s\r\n", ptr_away_msg);
if (cfg_irc_display_away)
{
server_sendf (ptr_server, "AWAY\r\n");
ptr_server->is_away = 0;
if (server->away_time != 0)
{
elapsed = time (NULL) - ptr_server->away_time;
ptr_server->away_time = 0;
if (cfg_look_display_away)
{
snprintf (buffer, sizeof (buffer),
"is back (gone %.2ld:%.2ld:%.2ld)",
elapsed / 3600,
(elapsed / 60) % 60,
elapsed % 60);
irc_send_me_all_channels (ptr_server, buffer);
}
}
snprintf (buffer, sizeof (buffer), "is away: %s", ptr_away_msg);
irc_send_me_all_channels (ptr_server, buffer);
}
}
}
@@ -144,37 +145,37 @@ irc_cmd_send_away (t_irc_server *server, char *arguments)
}
else
{
if (arguments)
if (server->is_away && (!arguments))
{
server->is_away = 1;
server->away_time = time (NULL);
server_sendf (server, "AWAY :%s\r\n", arguments);
if (cfg_look_display_away)
server_sendf (server, "AWAY\r\n");
server->is_away = 0;
if (server->away_time != 0)
{
snprintf (buffer, sizeof (buffer), "is away: %s", arguments);
irc_send_me_all_channels (server, buffer);
elapsed = time (NULL) - server->away_time;
server->away_time = 0;
if (cfg_irc_display_away)
{
snprintf (buffer, sizeof (buffer),
"is back (gone %.2ld:%.2ld:%.2ld)",
elapsed / 3600,
(elapsed / 60) % 60,
elapsed % 60);
irc_send_me_all_channels (server, buffer);
}
}
}
else
{
if (server->is_away)
server->is_away = 1;
server->away_time = time (NULL);
ptr_away_msg = (arguments) ? arguments :
((cfg_irc_default_msg_away && cfg_irc_default_msg_away[0]) ?
cfg_irc_default_msg_away : ptr_away_default_msg);
server_sendf (server, "AWAY :%s\r\n", ptr_away_msg);
if (cfg_irc_display_away)
{
server_sendf (server, "AWAY\r\n");
server->is_away = 0;
if (server->away_time != 0)
{
elapsed = time (NULL) - server->away_time;
server->away_time = 0;
if (cfg_look_display_away)
{
snprintf (buffer, sizeof (buffer),
"is back (gone %.2ld:%.2ld:%.2ld)",
elapsed / 3600,
(elapsed / 60) % 60,
elapsed % 60);
irc_send_me_all_channels (server, buffer);
}
}
snprintf (buffer, sizeof (buffer), "is away: %s", ptr_away_msg);
irc_send_me_all_channels (server, buffer);
}
}
}
@@ -881,7 +882,14 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
if (pos_args)
server_sendf (server, "PART %s :%s\r\n", channel_name, pos_args);
else
server_sendf (server, "PART %s\r\n", channel_name);
{
if (cfg_irc_default_msg_part && cfg_irc_default_msg_part[0])
server_sendf (server, "PART %s :%s\r\n",
channel_name, cfg_irc_default_msg_part);
else
server_sendf (server, "PART %s\r\n", channel_name);
}
return 0;
}
@@ -987,6 +995,7 @@ int
irc_cmd_send_quit (t_irc_server *server, char *arguments)
{
t_irc_server *ptr_server;
char *pos, buffer[4096];
/* make gcc happy */
(void) server;
@@ -999,7 +1008,26 @@ irc_cmd_send_quit (t_irc_server *server, char *arguments)
if (arguments)
server_sendf (ptr_server, "QUIT :%s\r\n", arguments);
else
server_sendf (ptr_server, "QUIT\r\n");
{
if (cfg_irc_default_msg_quit && cfg_irc_default_msg_quit[0])
{
pos = strstr (cfg_irc_default_msg_quit, "%v");
if (pos)
{
pos[0] = '\0';
snprintf (buffer, sizeof (buffer), "%s%s%s",
cfg_irc_default_msg_quit, PACKAGE_VERSION,
pos + 2);
pos[0] = '%';
}
else
snprintf (buffer, sizeof (buffer), "%s",
cfg_irc_default_msg_quit);
server_sendf (ptr_server, "QUIT :%s\r\n", buffer);
}
else
server_sendf (ptr_server, "QUIT\r\n");
}
}
}
quit_weechat = 1;