pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-10 19:25:42 +02:00
Code Activity

Added command & autojoin channels when connected to server

Browse Source
This commit is contained in:
Sebastien Helleu
2003-10-04 10:47:11 +00:00
parent ede76f7b44
commit 2968e61d97
12 changed files with 222 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2003-10-04
Version 0.0.2 (under dev!):
* command & auto-join channels when connected to server
* new commands for alias: /alias, /unalias (new section in config file)
* config is now saved automatically when quitting WeeChat, /save command added
* new commands for servers: /server, /connect, /disconnect
src/command.c
+65 -17
View File
File diff suppressed because it is too large Load Diff
src/config.c
+18 -1
View File
@@ -484,6 +484,14 @@ t_config_option weechat_options_server[] =
N_("real name to use on IRC server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.realname), NULL },
{ "server_command", N_("first command to run when connected to server"),
N_("first command to run when connected to server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.command), NULL },
{ "server_autojoin", N_("list of channels to join when connected to server"),
N_("comma separated list of channels to join when connected to server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.autojoin), NULL },
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -551,7 +559,8 @@ config_allocate_server (char *filename, int line_number)
if (!server_new (cfg_server.name,
cfg_server.autoconnect, cfg_server.address, cfg_server.port,
cfg_server.password, cfg_server.nick1, cfg_server.nick2,
cfg_server.nick3, cfg_server.username, cfg_server.realname))
cfg_server.nick3, cfg_server.username, cfg_server.realname,
cfg_server.command, cfg_server.autojoin))
{
server_free_all ();
gui_printf (NULL,
@@ -1016,6 +1025,8 @@ config_create_default ()
fputs ("server_nick3=weechat3\n", file);
fputs ("server_username=weechat\n", file);
fputs ("server_realname=WeeChat default realname\n", file);
fputs ("server_command=\n", file);
fputs ("server_autojoin=\n", file);
fclose (file);
free (filename);
@@ -1160,6 +1171,12 @@ config_write (char *config_name)
fputs (line, file);
sprintf (line, "server_realname=%s\n", ptr_server->realname);
fputs (line, file);
sprintf (line, "server_command=%s\n",
(ptr_server->command) ? ptr_server->command : "");
fputs (line, file);
sprintf (line, "server_autojoin=%s\n",
(ptr_server->autojoin) ? ptr_server->autojoin : "");
fputs (line, file);
}
fclose (file);
src/irc/irc-commands.c
+9
View File
@@ -2104,6 +2104,15 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
server->is_connected = 1;
gui_redraw_window_status (server->window);
gui_redraw_window_input (server->window);
/* execute command once connected */
if (server->command && server->command[0])
user_command(server, server->command);
/* autojoin */
if (server->autojoin && server->autojoin[0])
return irc_cmd_send_join (server, server->autojoin);
return 0;
}
src/irc/irc-server.c
+15 -3
View File
@@ -66,6 +66,8 @@ server_init (t_irc_server *server)
server->nick3 = NULL;
server->username = NULL;
server->realname = NULL;
server->command = NULL;
server->autojoin = NULL;
server->nick = NULL;
server->is_connected = 0;
server->sock4 = -1;
@@ -137,6 +139,10 @@ server_destroy (t_irc_server *server)
free (server->username);
if (server->realname)
free (server->realname);
if (server->command)
free (server->command);
if (server->autojoin)
free (server->autojoin);
if (server->nick)
free (server->nick);
if (server->channels)
@@ -153,6 +159,8 @@ server_free (t_irc_server *server)
t_irc_server *new_irc_servers;
/* remove server from queue */
if (last_irc_server == server)
last_irc_server = server->prev_server;
if (server->prev_server)
{
(server->prev_server)->next_server = server->next_server;
@@ -190,7 +198,7 @@ server_free_all ()
t_irc_server *
server_new (char *name, int autoconnect, char *address, int port,
char *password, char *nick1, char *nick2, char *nick3,
char *username, char *realname)
char *username, char *realname, char *command, char *autojoin)
{
t_irc_server *new_server;
@@ -199,10 +207,12 @@ server_new (char *name, int autoconnect, char *address, int port,
#if DEBUG >= 1
log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, "
"nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s)\n",
"nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "
"command:%s, autojoin:%s)\n",
name, address, port, (password) ? password : "",
(nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
(username) ? username : "", (realname) ? realname : "");
(username) ? username : "", (realname) ? realname : "",
(command) ? command : "", (autojoin) ? autojoin : "");
#endif
if ((new_server = server_alloc ()))
@@ -219,6 +229,8 @@ server_new (char *name, int autoconnect, char *address, int port,
(username) ? strdup (username) : strdup ("weechat");
new_server->realname =
(realname) ? strdup (realname) : strdup ("realname");
new_server->command = command;
new_server->autojoin = autojoin;
new_server->nick = strdup (new_server->nick1);
}
else
src/irc/irc.h
+3 -1
View File
@@ -87,6 +87,8 @@ struct t_irc_server
char *nick3; /* 2nd alternate nickname */
char *username; /* user name */
char *realname; /* real name */
char *command; /* command to run once connected */
char *autojoin; /* channels to automatically join */
/* internal vars */
char *nick; /* current nickname */
@@ -144,7 +146,7 @@ extern void server_destroy (t_irc_server *);
extern void server_free (t_irc_server *);
extern void server_free_all ();
extern t_irc_server *server_new (char *, int, char *, int, char *, char *,
char *, char *, char *, char *);
char *, char *, char *, char *, char *, char *);
extern int server_send (t_irc_server *, char *, int);
extern int server_sendf (t_irc_server *, char *, ...);
extern void server_recv (t_irc_server *);
weechat/ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2003-10-04
Version 0.0.2 (under dev!):
* command & auto-join channels when connected to server
* new commands for alias: /alias, /unalias (new section in config file)
* config is now saved automatically when quitting WeeChat, /save command added
* new commands for servers: /server, /connect, /disconnect
weechat/src/command.c
+65 -17
View File
File diff suppressed because it is too large Load Diff
weechat/src/config.c
+18 -1
View File
@@ -484,6 +484,14 @@ t_config_option weechat_options_server[] =
N_("real name to use on IRC server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.realname), NULL },
{ "server_command", N_("first command to run when connected to server"),
N_("first command to run when connected to server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.command), NULL },
{ "server_autojoin", N_("list of channels to join when connected to server"),
N_("comma separated list of channels to join when connected to server"),
OPTION_TYPE_STRING, 0, 0, 0,
"", NULL, NULL, &(cfg_server.autojoin), NULL },
{ NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -551,7 +559,8 @@ config_allocate_server (char *filename, int line_number)
if (!server_new (cfg_server.name,
cfg_server.autoconnect, cfg_server.address, cfg_server.port,
cfg_server.password, cfg_server.nick1, cfg_server.nick2,
cfg_server.nick3, cfg_server.username, cfg_server.realname))
cfg_server.nick3, cfg_server.username, cfg_server.realname,
cfg_server.command, cfg_server.autojoin))
{
server_free_all ();
gui_printf (NULL,
@@ -1016,6 +1025,8 @@ config_create_default ()
fputs ("server_nick3=weechat3\n", file);
fputs ("server_username=weechat\n", file);
fputs ("server_realname=WeeChat default realname\n", file);
fputs ("server_command=\n", file);
fputs ("server_autojoin=\n", file);
fclose (file);
free (filename);
@@ -1160,6 +1171,12 @@ config_write (char *config_name)
fputs (line, file);
sprintf (line, "server_realname=%s\n", ptr_server->realname);
fputs (line, file);
sprintf (line, "server_command=%s\n",
(ptr_server->command) ? ptr_server->command : "");
fputs (line, file);
sprintf (line, "server_autojoin=%s\n",
(ptr_server->autojoin) ? ptr_server->autojoin : "");
fputs (line, file);
}
fclose (file);
weechat/src/irc/irc-commands.c
+9
View File
@@ -2104,6 +2104,15 @@ irc_cmd_recv_004 (t_irc_server *server, char *host, char *arguments)
server->is_connected = 1;
gui_redraw_window_status (server->window);
gui_redraw_window_input (server->window);
/* execute command once connected */
if (server->command && server->command[0])
user_command(server, server->command);
/* autojoin */
if (server->autojoin && server->autojoin[0])
return irc_cmd_send_join (server, server->autojoin);
return 0;
}
weechat/src/irc/irc-server.c
+15 -3
View File
@@ -66,6 +66,8 @@ server_init (t_irc_server *server)
server->nick3 = NULL;
server->username = NULL;
server->realname = NULL;
server->command = NULL;
server->autojoin = NULL;
server->nick = NULL;
server->is_connected = 0;
server->sock4 = -1;
@@ -137,6 +139,10 @@ server_destroy (t_irc_server *server)
free (server->username);
if (server->realname)
free (server->realname);
if (server->command)
free (server->command);
if (server->autojoin)
free (server->autojoin);
if (server->nick)
free (server->nick);
if (server->channels)
@@ -153,6 +159,8 @@ server_free (t_irc_server *server)
t_irc_server *new_irc_servers;
/* remove server from queue */
if (last_irc_server == server)
last_irc_server = server->prev_server;
if (server->prev_server)
{
(server->prev_server)->next_server = server->next_server;
@@ -190,7 +198,7 @@ server_free_all ()
t_irc_server *
server_new (char *name, int autoconnect, char *address, int port,
char *password, char *nick1, char *nick2, char *nick3,
char *username, char *realname)
char *username, char *realname, char *command, char *autojoin)
{
t_irc_server *new_server;
@@ -199,10 +207,12 @@ server_new (char *name, int autoconnect, char *address, int port,
#if DEBUG >= 1
log_printf ("creating new server (name:%s, address:%s, port:%d, pwd:%s, "
"nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s)\n",
"nick1:%s, nick2:%s, nick3:%s, username:%s, realname:%s, "
"command:%s, autojoin:%s)\n",
name, address, port, (password) ? password : "",
(nick1) ? nick1 : "", (nick2) ? nick2 : "", (nick3) ? nick3 : "",
(username) ? username : "", (realname) ? realname : "");
(username) ? username : "", (realname) ? realname : "",
(command) ? command : "", (autojoin) ? autojoin : "");
#endif
if ((new_server = server_alloc ()))
@@ -219,6 +229,8 @@ server_new (char *name, int autoconnect, char *address, int port,
(username) ? strdup (username) : strdup ("weechat");
new_server->realname =
(realname) ? strdup (realname) : strdup ("realname");
new_server->command = command;
new_server->autojoin = autojoin;
new_server->nick = strdup (new_server->nick1);
}
else
weechat/src/irc/irc.h
+3 -1
View File
@@ -87,6 +87,8 @@ struct t_irc_server
char *nick3; /* 2nd alternate nickname */
char *username; /* user name */
char *realname; /* real name */
char *command; /* command to run once connected */
char *autojoin; /* channels to automatically join */
/* internal vars */
char *nick; /* current nickname */
@@ -144,7 +146,7 @@ extern void server_destroy (t_irc_server *);
extern void server_free (t_irc_server *);
extern void server_free_all ();
extern t_irc_server *server_new (char *, int, char *, int, char *, char *,
char *, char *, char *, char *);
char *, char *, char *, char *, char *, char *);
extern int server_send (t_irc_server *, char *, int);
extern int server_sendf (t_irc_server *, char *, ...);
extern void server_recv (t_irc_server *);