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

New backlog option in logger plugin, added variable names in .h files, replaced "void *" pointers by structures

Browse Source
This commit is contained in:
Sebastien Helleu
2007-12-17 17:07:08 +01:00
parent e62ec5204c
commit dba084f3d6
113 changed files with 3146 additions and 3815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-buffer.h
+4 -4
View File
@@ -42,9 +42,9 @@ struct t_irc_buffer_data
int all_servers;
};
extern struct t_irc_buffer_data *irc_buffer_data_create (struct t_irc_server *);
extern void irc_buffer_data_free (struct t_gui_buffer *);
extern void irc_buffer_merge_servers (struct t_gui_window *);
extern void irc_buffer_split_server (struct t_gui_window *);
extern struct t_irc_buffer_data *irc_buffer_data_create (struct t_irc_server *server);
extern void irc_buffer_data_free (struct t_gui_buffer *buffer);
extern void irc_buffer_merge_servers (struct t_gui_window *window);
extern void irc_buffer_split_server (struct t_gui_window *window);
#endif /* irc-buffer.h */
src/plugins/irc/irc-channel.c
+9 -9
View File
@@ -48,7 +48,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
struct t_gui_buffer *new_buffer;
/* alloc memory for new channel */
if ((new_channel = (struct t_irc_channel *) malloc (sizeof (struct t_irc_channel))) == NULL)
if ((new_channel = (struct t_irc_channel *)malloc (sizeof (struct t_irc_channel))) == NULL)
{
weechat_printf (NULL,
_("%sirc: cannot allocate new channel"),
@@ -88,7 +88,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
//new_buffer->notify_level = irc_channel_get_notify_level (server, new_channel);
/* add new channel to channels list */
new_channel->prev_channel = ((struct t_irc_server *)server)->last_channel;
new_channel->prev_channel = server->last_channel;
new_channel->next_channel = NULL;
if (server->channels)
(server->last_channel)->next_channel = new_channel;
@@ -346,17 +346,17 @@ irc_channel_set_away (struct t_irc_channel *channel, char *nick, int is_away)
*/
int
irc_channel_create_dcc (void *dcc)
irc_channel_create_dcc (struct t_irc_dcc *dcc)
{
struct t_irc_channel *ptr_channel;
ptr_channel = irc_channel_search_dcc (((struct t_irc_dcc *)dcc)->server,
((struct t_irc_dcc *)dcc)->nick);
ptr_channel = irc_channel_search_dcc (dcc->server, dcc->nick);
if (!ptr_channel)
{
ptr_channel = irc_channel_new (((struct t_irc_dcc *)dcc)->server,
ptr_channel = irc_channel_new (dcc->server,
IRC_CHANNEL_TYPE_DCC_CHAT,
((struct t_irc_dcc *)dcc)->nick, 0);
dcc->nick,
0);
if (!ptr_channel)
return 0;
}
@@ -366,7 +366,7 @@ irc_channel_create_dcc (void *dcc)
return 0;
ptr_channel->dcc_chat = dcc;
((struct t_irc_dcc *)dcc)->channel = ptr_channel;
dcc->channel = ptr_channel;
//gui_window_redraw_buffer (ptr_channel->buffer);
return 1;
}
@@ -395,7 +395,7 @@ irc_channel_get_notify_level (struct t_irc_server *server,
&& (server_default_notify == 1))
server_default_notify = 2;
name = (char *) malloc (strlen (channel->name) + 2);
name = (char *)malloc (strlen (channel->name) + 2);
strcpy (name, channel->name);
strcat (name, ":");
pos = strstr (server->notify_levels, name);
src/plugins/irc/irc-channel.h
+51 -37
View File
@@ -34,44 +34,58 @@
struct t_irc_channel
{
int type; /* channel type */
struct t_irc_dcc *dcc_chat; /* DCC CHAT pointer (NULL if not DCC) */
char *name; /* name of channel (exemple: "#abc") */
char *topic; /* topic of channel (host for private) */
char *modes; /* channel modes */
int limit; /* user limit (0 is limit not set) */
char *key; /* channel key (NULL if no key is set) */
int nicks_count; /* # nicks on channel (0 if dcc/pv) */
int checking_away; /* = 1 if checking away with WHO cmd */
char *away_message; /* to display away only once in private */
int cycle; /* currently cycling (/part then /join) */
int close; /* close request (/buffer close) */
int display_creation_date; /* 1 if creation date should be displayed*/
int nick_completion_reset; /* 1 if nick completion should be rebuilt*/
/* there was some join/part on channel */
struct t_irc_nick *nicks; /* nicks on the channel */
struct t_irc_nick *last_nick; /* last nick on the channel */
struct t_weelist *nicks_speaking; /* for smart completion */
struct t_gui_buffer *buffer; /* buffer allocated for channel */
struct t_irc_channel *prev_channel; /* link to previous channel */
struct t_irc_channel *next_channel; /* link to next channel */
int type; /* channel type */
struct t_irc_dcc *dcc_chat; /* DCC CHAT pointer (NULL if not DCC)*/
char *name; /* name of channel (exemple: "#abc") */
char *topic; /* topic of channel (host for pv) */
char *modes; /* channel modes */
int limit; /* user limit (0 is limit not set) */
char *key; /* channel key (NULL if no key set) */
int nicks_count; /* # nicks on channel (0 if dcc/pv) */
int checking_away; /* = 1 if checking away with WHO cmd */
char *away_message; /* to display away only once in pv */
int cycle; /* currently cycling (/part + /join) */
int close; /* close request (/buffer close) */
int display_creation_date; /* 1 for displaying creation date */
int nick_completion_reset; /* 1 for resetting nick completion */
/* there was some join/part on chan */
struct t_irc_nick *nicks; /* nicks on the channel */
struct t_irc_nick *last_nick; /* last nick on the channel */
struct t_weelist *nicks_speaking; /* for smart completion */
struct t_gui_buffer *buffer; /* buffer allocated for channel */
struct t_irc_channel *prev_channel; /* link to previous channel */
struct t_irc_channel *next_channel; /* link to next channel */
};
extern struct t_irc_channel *irc_channel_new (struct t_irc_server *, int, char *, int);
extern void irc_channel_free (struct t_irc_server *, struct t_irc_channel *);
extern void irc_channel_free_all (struct t_irc_server *);
extern struct t_irc_channel *irc_channel_search (struct t_irc_server *, char *);
extern struct t_irc_channel *irc_channel_search_any (struct t_irc_server *, char *);
extern struct t_irc_channel *irc_channel_search_any_without_buffer (struct t_irc_server *, char *);
extern struct t_irc_channel *irc_channel_search_dcc (struct t_irc_server *, char *);
extern int irc_channel_is_channel (char *);
extern void irc_channel_remove_away (struct t_irc_channel *);
extern void irc_channel_check_away (struct t_irc_server *, struct t_irc_channel *, int);
extern void irc_channel_set_away (struct t_irc_channel *, char *, int);
extern int irc_channel_create_dcc (void *);
extern int irc_channel_get_notify_level (struct t_irc_server *, struct t_irc_channel *);
extern void irc_channel_set_notify_level (struct t_irc_server *, struct t_irc_channel *, int);
extern void irc_channel_add_nick_speaking (struct t_irc_channel *, char *);
extern void irc_channel_print_log (struct t_irc_channel *);
extern struct t_irc_channel *irc_channel_new (struct t_irc_server *server,
int channel_type,
char *channel_name,
int switch_to_channel);
extern void irc_channel_free (struct t_irc_server *server,
struct t_irc_channel *channel);
extern void irc_channel_free_all (struct t_irc_server *server);
extern struct t_irc_channel *irc_channel_search (struct t_irc_server *server,
char *channel_name);
extern struct t_irc_channel *irc_channel_search_any (struct t_irc_server *server,
char *channel_name);
extern struct t_irc_channel *irc_channel_search_any_without_buffer (struct t_irc_server *server,
char *channel_name);
extern struct t_irc_channel *irc_channel_search_dcc (struct t_irc_server *server,
char *channel_name);
extern int irc_channel_is_channel (char *string);
extern void irc_channel_remove_away (struct t_irc_channel *channel);
extern void irc_channel_check_away (struct t_irc_server *server,
struct t_irc_channel *channel, int force);
extern void irc_channel_set_away (struct t_irc_channel *channel, char *nick,
int is_away);
extern int irc_channel_create_dcc (struct t_irc_dcc *dcc);
extern int irc_channel_get_notify_level (struct t_irc_server *server,
struct t_irc_channel *channel);
extern void irc_channel_set_notify_level (struct t_irc_server *server,
struct t_irc_channel *channel,
int notify);
extern void irc_channel_add_nick_speaking (struct t_irc_channel *channel,
char *nick);
extern void irc_channel_print_log (struct t_irc_channel *channel);
#endif /* irc-channel.h */
src/plugins/irc/irc-color.c
+2 -1
View File
@@ -40,7 +40,8 @@
*/
unsigned char *
irc_color_decode (unsigned char *string, int keep_irc_colors, int keep_weechat_attr)
irc_color_decode (unsigned char *string, int keep_irc_colors,
int keep_weechat_attr)
{
/*unsigned char *out;
int out_length, out_pos, length;
src/plugins/irc/irc-color.h
+5 -3
View File
@@ -51,8 +51,10 @@
#define IRC_COLOR_UNDERLINE_CHAR '\x1F'
#define IRC_COLOR_UNDERLINE_STR "\x1F"
extern unsigned char *irc_color_decode (unsigned char *, int, int);
extern unsigned char *irc_color_decode_for_user_entry (unsigned char *);
extern unsigned char *irc_color_encode (unsigned char *, int);
extern unsigned char *irc_color_decode (unsigned char *string,
int keep_irc_colors,
int keep_weechat_attr);
extern unsigned char *irc_color_decode_for_user_entry (unsigned char *string);
extern unsigned char *irc_color_encode (unsigned char *string, int keep_colors);
#endif /* irc-color.h */
src/plugins/irc/irc-command.c
+125 -124
View File
@@ -45,8 +45,8 @@
*/
int
irc_command_admin (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_admin (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -143,8 +143,8 @@ irc_command_mode_nicks (struct t_irc_server *server, char *channel,
*/
int
irc_command_ame (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_ame (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
struct t_irc_server *ptr_server;
struct t_irc_channel *ptr_channel;
@@ -181,8 +181,8 @@ irc_command_ame (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_amsg (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_amsg (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
struct t_irc_server *ptr_server;
struct t_irc_channel *ptr_channel;
@@ -261,7 +261,7 @@ irc_command_away_server (struct t_irc_server *server, char *arguments)
{
if (server->away_message)
free (server->away_message);
server->away_message = (char *) malloc (strlen (arguments) + 1);
server->away_message = (char *)malloc (strlen (arguments) + 1);
if (server->away_message)
strcpy (server->away_message, arguments);
@@ -376,8 +376,8 @@ irc_command_away_server (struct t_irc_server *server, char *arguments)
*/
int
irc_command_away (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_away (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server)
@@ -410,8 +410,8 @@ irc_command_away (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_ban (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_ban (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *pos_channel;
int pos_args;
@@ -522,8 +522,8 @@ irc_command_connect_one_server (struct t_irc_server *server, int no_join)
*/
int
irc_command_connect (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
struct t_irc_server server_tmp;
int i, nb_connect, connect_ok, all_servers, no_join, port, ipv6, ssl;
@@ -672,8 +672,8 @@ irc_command_connect (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_ctcp (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *pos, *irc_cmd;
struct timeval tv;
@@ -760,8 +760,8 @@ irc_command_ctcp (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_cycle (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_cycle (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *channel_name, *pos_args, *ptr_arg, *buf, *version;
char **channels;
@@ -863,8 +863,8 @@ irc_command_cycle (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_dcc (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_dcc (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -872,6 +872,7 @@ irc_command_dcc (void *data, void *buffer, int argc, char **argv,
/* make compiler happy */
(void) data;
(void) argv_eol; // to remove!
if (argc > 1)
{
@@ -928,8 +929,8 @@ irc_command_dcc (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_dehalfop (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_dehalfop (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -965,8 +966,8 @@ irc_command_dehalfop (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_deop (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_deop (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1002,8 +1003,8 @@ irc_command_deop (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_devoice (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_devoice (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1039,8 +1040,8 @@ irc_command_devoice (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_die (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_die (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1129,8 +1130,8 @@ irc_command_disconnect_one_server (struct t_irc_server *server)
*/
int
irc_command_disconnect (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_disconnect (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int i, disconnect_ok;
@@ -1191,8 +1192,8 @@ irc_command_disconnect (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_halfop (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_halfop (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1228,8 +1229,8 @@ irc_command_halfop (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_info (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_info (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1251,8 +1252,8 @@ irc_command_info (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_invite (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_invite (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1287,8 +1288,8 @@ irc_command_invite (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_ison (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_ison (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1326,8 +1327,8 @@ irc_command_join_server (struct t_irc_server *server, char *arguments)
*/
int
irc_command_join (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_join (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1352,8 +1353,8 @@ irc_command_join (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_kick (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_kick (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *pos_channel, *pos_nick, *pos_comment;
@@ -1418,8 +1419,8 @@ irc_command_kick (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_kickban (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_kickban (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *pos_channel, *pos_nick, *pos_comment;
@@ -1486,8 +1487,8 @@ irc_command_kickban (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_kill (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_kill (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1515,8 +1516,8 @@ irc_command_kill (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_links (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_links (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1539,8 +1540,8 @@ irc_command_links (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_list (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_list (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char buf[512];
int ret;
@@ -1562,7 +1563,7 @@ irc_command_list (void *data, void *buffer, int argc, char **argv,
if (argc > 1)
{
ptr_server->cmd_list_regexp = (regex_t *) malloc (sizeof (regex_t));
ptr_server->cmd_list_regexp = (regex_t *)malloc (sizeof (regex_t));
if (ptr_server->cmd_list_regexp)
{
if ((ret = regcomp (ptr_server->cmd_list_regexp,
@@ -1600,8 +1601,8 @@ irc_command_list (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_lusers (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_lusers (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1624,7 +1625,7 @@ irc_command_lusers (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_me (void *data, void *buffer, int argc, char **argv,
irc_command_me (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
@@ -1670,8 +1671,8 @@ irc_command_mode_server (struct t_irc_server *server, char *arguments)
*/
int
irc_command_mode (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_mode (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1696,8 +1697,8 @@ irc_command_mode (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_motd (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_motd (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1720,8 +1721,8 @@ irc_command_motd (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_msg (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char **targets;
int num_targets, i;
@@ -1895,8 +1896,8 @@ irc_command_msg (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_names (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_names (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -1959,8 +1960,8 @@ irc_send_nick_server (struct t_irc_server *server, char *nickname)
*/
int
irc_command_nick (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_nick (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server)
@@ -2003,8 +2004,8 @@ irc_command_nick (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_notice (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *string;
@@ -2045,7 +2046,7 @@ irc_command_notice (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_op (void *data, void *buffer, int argc, char **argv,
irc_command_op (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
@@ -2082,8 +2083,8 @@ irc_command_op (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_oper (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_oper (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -2108,8 +2109,8 @@ irc_command_oper (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_part (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_part (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *channel_name, *pos_args, *ptr_arg, *buf, *version;
@@ -2155,7 +2156,7 @@ irc_command_part (void *data, void *buffer, int argc, char **argv,
}
if (!ptr_channel->nicks)
{
weechat_buffer_close (ptr_channel->buffer);
weechat_buffer_close (ptr_channel->buffer, 1);
ptr_channel->buffer = NULL;
irc_channel_free (ptr_server, ptr_channel);
//gui_status_draw (gui_current_window->buffer, 1);
@@ -2194,8 +2195,8 @@ irc_command_part (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_ping (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_ping (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -2220,8 +2221,8 @@ irc_command_ping (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_pong (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_pong (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server)
@@ -2246,8 +2247,8 @@ irc_command_pong (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_query (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_query (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *string;
@@ -2310,8 +2311,8 @@ irc_command_query (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_quote (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_quote (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server)// || !ptr_server->is_connected)
@@ -2367,8 +2368,8 @@ irc_command_reconnect_one_server (struct t_irc_server *server, int no_join)
*/
int
irc_command_reconnect (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_reconnect (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int i, nb_reconnect, reconnect_ok, all_servers, no_join;
@@ -2442,8 +2443,8 @@ irc_command_reconnect (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_rehash (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_rehash (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -2465,8 +2466,8 @@ irc_command_rehash (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_restart (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_restart (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -2488,8 +2489,8 @@ irc_command_restart (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_server (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int i, detailed_list, one_server_found;
struct t_irc_server server_tmp, *ptr_server, *server_found, *new_server;
@@ -2568,7 +2569,7 @@ irc_command_server (void *data, void *buffer, int argc, char **argv,
{
IRC_COMMAND_TOO_FEW_ARGUMENTS(NULL, "server add");
}
if (irc_server_name_already_exists (argv[2]))
if (irc_server_search (argv[2]))
{
weechat_printf (NULL,
_("%sirc: server \"%s\" already exists, "
@@ -2974,8 +2975,8 @@ irc_command_server (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_service (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_service (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3000,8 +3001,8 @@ irc_command_service (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_servlist (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_servlist (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3024,8 +3025,8 @@ irc_command_servlist (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_squery (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_squery (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3055,8 +3056,8 @@ irc_command_squery (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_squit (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_squit (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3081,8 +3082,8 @@ irc_command_squit (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_stats (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_stats (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3106,8 +3107,8 @@ irc_command_stats (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_summon (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_summon (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3132,8 +3133,8 @@ irc_command_summon (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_time (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_time (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3156,8 +3157,8 @@ irc_command_time (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_topic (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_topic (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *channel_name, *new_topic;
@@ -3219,8 +3220,8 @@ irc_command_topic (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_trace (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_trace (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3243,8 +3244,8 @@ irc_command_trace (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_unban (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_unban (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *pos_channel;
int pos_args;
@@ -3309,8 +3310,8 @@ irc_command_unban (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_userhost (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_userhost (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3335,8 +3336,8 @@ irc_command_userhost (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_users (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_users (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3359,8 +3360,8 @@ irc_command_users (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_version (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_version (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3391,8 +3392,8 @@ irc_command_version (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_voice (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_voice (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3429,8 +3430,8 @@ irc_command_voice (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_wallops (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_wallops (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3455,8 +3456,8 @@ irc_command_wallops (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_who (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_who (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3479,8 +3480,8 @@ irc_command_who (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_whois (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_whois (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
@@ -3505,8 +3506,8 @@ irc_command_whois (void *data, void *buffer, int argc, char **argv,
*/
int
irc_command_whowas (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
irc_command_whowas (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
IRC_GET_SERVER(buffer);
if (!ptr_server || !ptr_server->is_connected)
src/plugins/irc/irc-command.h
+9 -5
View File
@@ -20,7 +20,7 @@
#ifndef __WEECHAT_IRC_COMMAND_H
#define __WEECHAT_IRC_COMMAND_H 1
#include "irc-server.h"
struct t_irc_server;
#define IRC_COMMAND_TOO_FEW_ARGUMENTS(__buffer, __command) \
weechat_printf (__buffer, \
@@ -29,10 +29,14 @@
return WEECHAT_RC_ERROR;
extern void irc_command_away_server (struct t_irc_server *, char *);
extern void irc_command_join_server (struct t_irc_server *, char *);
extern void irc_command_mode_server (struct t_irc_server *, char *);
extern void irc_command_quit_server (struct t_irc_server *, char *);
extern void irc_command_away_server (struct t_irc_server *server,
char *arguments);
extern void irc_command_join_server (struct t_irc_server *server,
char *arguments);
extern void irc_command_mode_server (struct t_irc_server *server,
char *arguments);
extern void irc_command_quit_server (struct t_irc_server *server,
char *arguments);
extern void irc_command_init ();
#endif /* irc-command.h */
src/plugins/irc/irc-completion.c
+45 -19
View File
@@ -40,8 +40,8 @@
*/
int
irc_completion_server_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_server_cb (void *data, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
IRC_GET_SERVER(buffer);
@@ -61,8 +61,9 @@ irc_completion_server_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_server_nicks_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_server_nicks_cb (void *data, char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list)
{
struct t_irc_server *ptr_server2;
struct t_irc_channel *ptr_channel2;
@@ -117,8 +118,8 @@ irc_completion_server_nicks_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_servers_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_servers_cb (void *data, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
struct t_irc_server *ptr_server;
@@ -141,8 +142,8 @@ irc_completion_servers_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_channel_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_channel_cb (void *data, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
IRC_GET_SERVER_CHANNEL(buffer);
@@ -162,8 +163,9 @@ irc_completion_channel_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_channel_nicks_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_channel_nicks_cb (void *data, char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list)
{
struct t_irc_nick *ptr_nick;
char *nick;
@@ -218,8 +220,9 @@ irc_completion_channel_nicks_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_channel_nicks_hosts_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_channel_nicks_hosts_cb (void *data, char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list)
{
struct t_irc_nick *ptr_nick;
char *buf;
@@ -243,7 +246,7 @@ irc_completion_channel_nicks_hosts_cb (void *data, char *completion, void *buffe
{
length = strlen (ptr_nick->nick) + 1 +
strlen (ptr_nick->host) + 1;
buf = (char *) malloc (length);
buf = (char *)malloc (length);
if (buf)
{
snprintf (buf, length, "%s!%s",
@@ -270,8 +273,9 @@ irc_completion_channel_nicks_hosts_cb (void *data, char *completion, void *buffe
*/
int
irc_completion_channel_topic_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_channel_topic_cb (void *data, char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list)
{
IRC_GET_SERVER_CHANNEL(buffer);
@@ -292,8 +296,8 @@ irc_completion_channel_topic_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_channels_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_channels_cb (void *data, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
struct t_irc_server *ptr_server;
struct t_irc_channel *ptr_channel;
@@ -321,8 +325,8 @@ irc_completion_channels_cb (void *data, char *completion, void *buffer,
*/
int
irc_completion_msg_part_cb (void *data, char *completion, void *buffer,
void *list)
irc_completion_msg_part_cb (void *data, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
/* make C compiler happy */
(void) data;
@@ -339,3 +343,25 @@ irc_completion_msg_part_cb (void *data, char *completion, void *buffer,
return WEECHAT_RC_OK;
}
/*
* irc_completion_init: init completion for IRC plugin
*/
void
irc_completion_init ()
{
weechat_hook_completion ("irc_server", &irc_completion_server_cb, NULL);
weechat_hook_completion ("irc_server_nicks",
&irc_completion_server_nicks_cb, NULL);
weechat_hook_completion ("irc_servers", &irc_completion_servers_cb, NULL);
weechat_hook_completion ("irc_channel", &irc_completion_channel_cb, NULL);
weechat_hook_completion ("irc_channel_nicks",
&irc_completion_channel_nicks_cb, NULL);
weechat_hook_completion ("irc_channel_nicks_hosts",
&irc_completion_channel_nicks_hosts_cb, NULL);
weechat_hook_completion ("irc_channel_topic",
&irc_completion_channel_topic_cb, NULL);
weechat_hook_completion ("irc_channels", &irc_completion_channels_cb, NULL);
weechat_hook_completion ("irc_msg_part", &irc_completion_msg_part_cb, NULL);
}
src/plugins/irc/irc-completion.h
+1 -10
View File
@@ -20,15 +20,6 @@
#ifndef __WEECHAT_IRC_COMPLETION_H
#define __WEECHAT_IRC_COMPLETION_H 1
extern int irc_completion_server_cb (void *, char *, void *, void *);
extern int irc_completion_server_nicks_cb (void *, char *, void *, void *);
extern int irc_completion_servers_cb (void *, char *, void *, void *);
extern int irc_completion_channel_cb (void *, char *, void *, void *);
extern int irc_completion_channel_nicks_cb (void *, char *, void *, void *);
extern int irc_completion_channel_nicks_hosts_cb (void *, char *, void *,
void *);
extern int irc_completion_channel_topic_cb (void *, char *, void *, void *);
extern int irc_completion_channels_cb (void *, char *, void *, void *);
extern int irc_completion_msg_part_cb (void *, char *, void *, void *);
extern void irc_completion_init ();
#endif /* irc-completion.h */
src/plugins/irc/irc-config.c
+7 -4
View File
@@ -211,7 +211,8 @@ irc_config_change_notify_levels ()
*/
void
irc_config_read_server_line (void *config_file, char *option_name, char *value)
irc_config_read_server_line (struct t_config_file *config_file,
char *option_name, char *value)
{
struct t_config_option *ptr_option;
int rc;
@@ -228,7 +229,7 @@ irc_config_read_server_line (void *config_file, char *option_name, char *value)
option_name);
if (ptr_option)
{
rc = weechat_config_option_set (ptr_option, value);
rc = weechat_config_option_set (ptr_option, value, 0);
switch (rc)
{
case 2:
@@ -280,7 +281,8 @@ irc_config_read_server_line (void *config_file, char *option_name, char *value)
*/
void
irc_config_write_servers (void *config_file, char *section_name)
irc_config_write_servers (struct t_config_file *config_file,
char *section_name)
{
struct t_irc_server *ptr_server;
@@ -337,7 +339,8 @@ irc_config_write_servers (void *config_file, char *section_name)
*/
void
irc_config_write_server_default (void *config_file, char *section_name)
irc_config_write_server_default (struct t_config_file *config_file,
char *section_name)
{
struct passwd *my_passwd;
char *realname, *pos;
src/plugins/irc/irc-config.h
-5
View File
@@ -67,11 +67,6 @@ struct t_config_option *irc_config_log_auto_channel;
struct t_config_option *irc_config_log_auto_private;
struct t_config_option *irc_config_log_hide_nickserv_pwd;
void irc_config_change_noop ();
void irc_config_change_one_server_buffer ();
void irc_config_change_away_check ();
void irc_config_change_log ();
void irc_config_change_notify_levels ();
int irc_config_init ();
int irc_config_read ();
int irc_config_reload_cb ();
src/plugins/irc/irc-dcc.c
+258 -257
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-dcc.h
+19 -13
View File
@@ -110,20 +110,26 @@ extern struct t_irc_dcc *irc_dcc_list;
extern struct t_irc_dcc *irc_last_dcc;
extern char *irc_dcc_status_string[6];
extern void irc_dcc_redraw (int);
extern void irc_dcc_free (struct t_irc_dcc *);
extern void irc_dcc_close (struct t_irc_dcc *, int);
extern void irc_dcc_chat_remove_channel (struct t_irc_channel *);
extern void irc_dcc_accept (struct t_irc_dcc *);
extern void irc_dcc_accept_resume (struct t_irc_server *, char *, int, unsigned long);
extern void irc_dcc_start_resume (struct t_irc_server *, char *, int, unsigned long);
extern void irc_dcc_redraw (int highlight);
extern void irc_dcc_free (struct t_irc_dcc *dcc);
extern void irc_dcc_close (struct t_irc_dcc *dcc, int status);
extern void irc_dcc_chat_remove_channel (struct t_irc_channel *channel);
extern void irc_dcc_accept (struct t_irc_dcc *dcc);
extern void irc_dcc_accept_resume (struct t_irc_server *server, char *filename,
int port, unsigned long pos_start);
extern void irc_dcc_start_resume (struct t_irc_server *server, char *filename,
int port, unsigned long pos_start);
extern struct t_irc_dcc *irc_dcc_alloc ();
extern struct t_irc_dcc *irc_dcc_add (struct t_irc_server *, int, unsigned long, int, char *, int,
char *, char *, unsigned long);
extern void irc_dcc_send_request (struct t_irc_server *, int, char *, char *);
extern void irc_dcc_chat_sendf (struct t_irc_dcc *, char *, ...);
extern void irc_dcc_file_send_fork (struct t_irc_dcc *);
extern void irc_dcc_file_recv_fork (struct t_irc_dcc *);
extern struct t_irc_dcc *irc_dcc_add (struct t_irc_server *server,
int type, unsigned long addr,
int port, char *nick, int sock,
char *filename, char *local_filename,
unsigned long size);
extern void irc_dcc_send_request (struct t_irc_server *server, int type,
char *nick, char *filename);
extern void irc_dcc_chat_sendf (struct t_irc_dcc *dcc, char *format, ...);
extern void irc_dcc_file_send_fork (struct t_irc_dcc *dcc);
extern void irc_dcc_file_recv_fork (struct t_irc_dcc *dcc);
extern void irc_dcc_handle ();
extern void irc_dcc_end ();
extern void irc_dcc_print_log ();
src/plugins/irc/irc-display.h
+11 -7
View File
@@ -20,12 +20,16 @@
#ifndef __WEECHAT_IRC_DISPLAY_H
#define __WEECHAT_IRC_DISPLAY_H 1
extern void irc_display_hide_password (char *, int);
extern void irc_display_nick (struct t_gui_buffer *, struct t_irc_nick *,
char *, int, int, char *, int);
extern void irc_display_away (struct t_irc_server *, char *, char *);
extern void irc_display_mode (struct t_gui_buffer *, char *, char *,
char, char *, char *, char *, char *);
extern void irc_display_server (struct t_irc_server *, int);
extern void irc_display_hide_password (char *string, int look_for_nickserv);
extern void irc_display_nick (struct t_gui_buffer *buffer,
struct t_irc_nick *nick, char *nickname,
int type, int display_around, char *force_color,
int no_nickmode);
extern void irc_display_away (struct t_irc_server *server, char *string1,
char *string2);
extern void irc_display_mode (struct t_gui_buffer *buffer, char *channel_name,
char *nick_name, char set_flag, char *symbol,
char *nick_host, char *message, char *param);
extern void irc_display_server (struct t_irc_server *server, int with_detail);
#endif /* irc-display.h */
src/plugins/irc/irc-mode.c
+5 -5
View File
@@ -239,8 +239,8 @@ irc_mode_user_add (struct t_irc_server *server, char mode)
{
if (!strchr (server->nick_modes, mode))
{
server->nick_modes = (char *) realloc (server->nick_modes,
strlen (server->nick_modes) + 1 + 1);
server->nick_modes = (char *)realloc (server->nick_modes,
strlen (server->nick_modes) + 1 + 1);
strcat (server->nick_modes, str_mode);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
@@ -248,7 +248,7 @@ irc_mode_user_add (struct t_irc_server *server, char mode)
}
else
{
server->nick_modes = (char *) malloc (2);
server->nick_modes = (char *)malloc (2);
strcpy (server->nick_modes, str_mode);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
@@ -272,8 +272,8 @@ irc_mode_user_remove (struct t_irc_server *server, char mode)
{
new_size = strlen (server->nick_modes);
memmove (pos, pos + 1, strlen (pos + 1) + 1);
server->nick_modes = (char *) realloc (server->nick_modes,
new_size);
server->nick_modes = (char *)realloc (server->nick_modes,
new_size);
//gui_status_draw (gui_current_window->buffer, 1);
//gui_input_draw (gui_current_window->buffer, 1);
}
src/plugins/irc/irc-mode.h
+5 -4
View File
@@ -22,9 +22,10 @@
#include "irc-server.h"
extern void irc_mode_channel_set (struct t_irc_server *,
struct t_irc_channel *, char *);
extern void irc_mode_user_set (struct t_irc_server *, char *);
extern int irc_mode_nick_prefix_allowed (struct t_irc_server *, char);
extern void irc_mode_channel_set (struct t_irc_server *server,
struct t_irc_channel *channel, char *modes);
extern void irc_mode_user_set (struct t_irc_server *server, char *modes);
extern int irc_mode_nick_prefix_allowed (struct t_irc_server *server,
char prefix);
#endif /* irc-mode.h */
src/plugins/irc/irc-nick.c
+3 -2
View File
@@ -49,7 +49,8 @@ irc_nick_find_color (struct t_irc_nick *nick)
{
color += (int)(nick->nick[i]);
}
color = (color % weechat_config_integer (weechat_config_get ("look_color_nicks_number")));
color = (color %
weechat_config_integer (weechat_config_get_weechat ("look_color_nicks_number")));
return color;
}
@@ -164,7 +165,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel,
}
// alloc memory for new nick
if ((new_nick = (struct t_irc_nick *) malloc (sizeof (struct t_irc_nick))) == NULL)
if ((new_nick = (struct t_irc_nick *)malloc (sizeof (struct t_irc_nick))) == NULL)
return NULL;
// initialize new nick
src/plugins/irc/irc-nick.h
+25 -14
View File
@@ -50,19 +50,30 @@ struct t_irc_nick
struct t_irc_nick *next_nick; /* link to next nick on channel */
};
extern int irc_nick_find_color (struct t_irc_nick *);
extern void irc_nick_get_gui_infos (struct t_irc_nick *, int *, char *, int *);
extern struct t_irc_nick *irc_nick_new (struct t_irc_server *,
struct t_irc_channel *, char *,
int, int, int, int, int, int, int);
extern void irc_nick_change (struct t_irc_server *, struct t_irc_channel *,
struct t_irc_nick *, char *);
extern void irc_nick_free (struct t_irc_channel *, struct t_irc_nick *);
extern void irc_nick_free_all (struct t_irc_channel *);
extern struct t_irc_nick *irc_nick_search (struct t_irc_channel *, char *);
extern void irc_nick_count (struct t_irc_channel *, int *, int *, int *, int *, int *);
extern void irc_nick_set_away (struct t_irc_channel *, struct t_irc_nick *, int);
extern char *irc_nick_as_prefix (struct t_irc_nick *, char *, char *);
extern void irc_nick_print_log (struct t_irc_nick *);
extern int irc_nick_find_color (struct t_irc_nick *nick);
extern void irc_nick_get_gui_infos (struct t_irc_nick *nick, int *sort_index,
char *prefix, int *color_prefix);
extern struct t_irc_nick *irc_nick_new (struct t_irc_server *server,
struct t_irc_channel *channel,
char *nick_name, int is_chanowner,
int is_chanadmin, int is_chanadmin2,
int is_op, int is_halfop,
int has_voice, int is_chanuser);
extern void irc_nick_change (struct t_irc_server *server,
struct t_irc_channel *channel,
struct t_irc_nick *nick, char *new_nick);
extern void irc_nick_free (struct t_irc_channel *channel,
struct t_irc_nick *nick);
extern void irc_nick_free_all (struct t_irc_channel *channel);
extern struct t_irc_nick *irc_nick_search (struct t_irc_channel *channel,
char *nickname);
extern void irc_nick_count (struct t_irc_channel *channel, int *total,
int *count_op, int *count_halfop, int *count_voice,
int *count_normal);
extern void irc_nick_set_away (struct t_irc_channel *channel,
struct t_irc_nick *nick, int is_away);
extern char *irc_nick_as_prefix (struct t_irc_nick *nick, char *nickname,
char *force_color);
extern void irc_nick_print_log (struct t_irc_nick *nick);
#endif /* irc-nick.h */
src/plugins/irc/irc-protocol.c
+8 -8
View File
@@ -1177,7 +1177,7 @@ irc_protocol_cmd_notice (struct t_irc_server *server, char *irc_message, char *h
(void) irc_message;
look_infobar_delay_highlight = weechat_config_integer (
weechat_config_get ("look_infobar_delay_highlight"));
weechat_config_get_weechat ("look_infobar_delay_highlight"));
host2 = NULL;
if (host)
@@ -1485,7 +1485,7 @@ irc_protocol_cmd_part (struct t_irc_server *server, char *irc_message, char *hos
}
if (ptr_channel->close)
{
weechat_buffer_close (ptr_channel->buffer);
weechat_buffer_close (ptr_channel->buffer, 1);
ptr_channel->buffer = NULL;
irc_channel_free (server, ptr_channel);
ptr_channel = NULL;
@@ -1608,7 +1608,7 @@ irc_protocol_reply_version (struct t_irc_server *server, struct t_irc_channel *c
pos = NULL;
}
buf = (struct utsname *) malloc (sizeof (struct utsname));
buf = (struct utsname *)malloc (sizeof (struct utsname));
if (buf && (uname (buf) >= 0))
{
irc_server_sendf (server,
@@ -1679,7 +1679,7 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, char *irc_message, char *
}
look_infobar_delay_highlight = weechat_config_integer (
weechat_config_get ("look_infobar_delay_highlight"));
weechat_config_get_weechat ("look_infobar_delay_highlight"));
pos = strchr (host, '!');
if (pos)
@@ -3817,10 +3817,10 @@ irc_protocol_cmd_324 (struct t_irc_server *server, char *irc_message, char *host
if (pos_modes[0])
{
if (ptr_channel->modes)
ptr_channel->modes = (char *) realloc (ptr_channel->modes,
strlen (pos_modes) + 1);
ptr_channel->modes = (char *)realloc (ptr_channel->modes,
strlen (pos_modes) + 1);
else
ptr_channel->modes = (char *) malloc (strlen (pos_modes) + 1);
ptr_channel->modes = (char *)malloc (strlen (pos_modes) + 1);
strcpy (ptr_channel->modes, pos_modes);
irc_mode_channel_set (server, ptr_channel, pos_modes);
}
@@ -4715,7 +4715,7 @@ irc_protocol_cmd_352 (struct t_irc_server *server, char *irc_message, char *host
if (ptr_nick->host)
free (ptr_nick->host);
length = strlen (pos_user) + 1 + strlen (pos_host) + 1;
ptr_nick->host = (char *) malloc (length);
ptr_nick->host = (char *)malloc (length);
if (ptr_nick->host)
snprintf (ptr_nick->host, length, "%s@%s", pos_user, pos_host);
irc_nick_set_away (ptr_channel, ptr_nick,
src/plugins/irc/irc-protocol.h
+63 -62
View File
@@ -22,8 +22,9 @@
#include "irc-server.h"
typedef int (t_irc_recv_func)(struct t_irc_server *, char *, char *, char *,
char *, int, int);
typedef int (t_irc_recv_func)(struct t_irc_server *server, char *irc_message,
char *host, char *nick, char *arguments,
int ignore, int highlight);
struct t_irc_protocol_msg
{
@@ -34,65 +35,65 @@ struct t_irc_protocol_msg
extern int irc_protocol_is_highlight (char *, char *);
extern int irc_protocol_recv_command (struct t_irc_server *, char *, char *, char *, char *);
extern int irc_protocol_cmd_error (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_invite (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_join (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_kick (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_kill (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_mode (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_nick (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_notice (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_part (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_ping (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_pong (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_privmsg (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_quit (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_server_mode_reason (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_server_msg (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_server_reply (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_topic (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_wallops (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_001 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_005 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_221 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_301 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_302 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_303 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_305 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_306 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_whois_nick_msg (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_310 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_311 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_312 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_314 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_315 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_317 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_319 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_321 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_322 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_323 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_324 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_327 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_329 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_331 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_332 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_333 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_338 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_341 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_344 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_345 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_348 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_349 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_351 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_352 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_353 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_365 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_366 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_367 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_368 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_432 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_433 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_438 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_671 (struct t_irc_server *, char *, char *, char *, char *, int, int);
extern int irc_protocol_cmd_error (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_invite (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_join (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_kick (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_kill (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_mode (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_nick (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_notice (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_part (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_ping (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_pong (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_privmsg (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_quit (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_server_mode_reason (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_server_msg (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_server_reply (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_topic (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_wallops (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_001 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_005 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_221 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_301 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_302 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_303 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_305 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_306 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_whois_nick_msg (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_310 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_311 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_312 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_314 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_315 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_317 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_319 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_321 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_322 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_323 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_324 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_327 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_329 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_331 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_332 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_333 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_338 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_341 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_344 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_345 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_348 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_349 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_351 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_352 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_353 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_365 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_366 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_367 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_368 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_432 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_433 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_438 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
extern int irc_protocol_cmd_671 (struct t_irc_server *server, char *irc_message, char *host, char *nick, char *arguments, int ignore, int highlight);
#endif /* irc-protocol.h */
src/plugins/irc/irc-server.c
+56 -61
View File
@@ -235,7 +235,7 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
server->autojoin = strdup (pos_channel);
else
{
server->autojoin = (char *) malloc (strlen (pos_channel) + 2);
server->autojoin = (char *)malloc (strlen (pos_channel) + 2);
strcpy (server->autojoin, "#");
strcat (server->autojoin, pos_channel);
}
@@ -249,10 +249,10 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
/* some default values */
if (server->port < 0)
server->port = IRC_SERVER_DEFAULT_PORT;
server->nick2 = (char *) malloc (strlen (server->nick1) + 2);
server->nick2 = (char *)malloc (strlen (server->nick1) + 2);
strcpy (server->nick2, server->nick1);
server->nick2 = strcat (server->nick2, "1");
server->nick3 = (char *) malloc (strlen (server->nick1) + 2);
server->nick3 = (char *)malloc (strlen (server->nick1) + 2);
strcpy (server->nick3, server->nick1);
server->nick3 = strcat (server->nick3, "2");
@@ -266,7 +266,7 @@ irc_server_init_with_url (struct t_irc_server *server, char *irc_url)
void
irc_server_init_with_config_options (struct t_irc_server *server,
void *section,
struct t_config_section *section,
int config_reload)
{
struct t_config_option *ptr_option;
@@ -423,7 +423,7 @@ irc_server_alloc ()
struct t_irc_server *new_server;
/* alloc memory for new server */
if ((new_server = (struct t_irc_server *) malloc (sizeof (struct t_irc_server))) == NULL)
if ((new_server = (struct t_irc_server *)malloc (sizeof (struct t_irc_server))) == NULL)
{
weechat_printf (NULL,
_("%sirc: error when allocating new server"),
@@ -952,7 +952,7 @@ irc_server_send_one_msg (struct t_irc_server *server, char *message)
*/
void
irc_server_sendf (struct t_irc_server *server, char *fmt, ...)
irc_server_sendf (struct t_irc_server *server, char *format, ...)
{
va_list args;
static char buffer[4096];
@@ -962,8 +962,8 @@ irc_server_sendf (struct t_irc_server *server, char *fmt, ...)
if (!server)
return;
va_start (args, fmt);
vsnprintf (buffer, sizeof (buffer) - 1, fmt, args);
va_start (args, format);
vsnprintf (buffer, sizeof (buffer) - 1, format, args);
va_end (args);
ptr_buf = buffer;
@@ -1044,7 +1044,7 @@ irc_server_msgq_add_msg (struct t_irc_server *server, char *msg)
if (!server->unterminated_message && !msg[0])
return;
message = (struct t_irc_message *) malloc (sizeof (struct t_irc_message));
message = (struct t_irc_message *)malloc (sizeof (struct t_irc_message));
if (!message)
{
weechat_printf (server->buffer,
@@ -1056,8 +1056,8 @@ irc_server_msgq_add_msg (struct t_irc_server *server, char *msg)
message->server = server;
if (server->unterminated_message)
{
message->data = (char *) malloc (strlen (server->unterminated_message) +
strlen (msg) + 1);
message->data = (char *)malloc (strlen (server->unterminated_message) +
strlen (msg) + 1);
if (!message->data)
{
weechat_printf (server->buffer,
@@ -1102,9 +1102,9 @@ irc_server_msgq_add_unterminated (struct t_irc_server *server, char *string)
if (server->unterminated_message)
{
server->unterminated_message =
(char *) realloc (server->unterminated_message,
strlen (server->unterminated_message) +
strlen (string) + 1);
(char *)realloc (server->unterminated_message,
strlen (server->unterminated_message) +
strlen (string) + 1);
if (!server->unterminated_message)
{
weechat_printf (server->buffer,
@@ -1292,11 +1292,11 @@ irc_server_msgq_flush ()
}
/*
* irc_server_recv: receive data from an irc server
* irc_server_recv_cb: receive data from an irc server
*/
int
irc_server_recv (void *arg_server)
irc_server_recv_cb (void *arg_server)
{
struct t_irc_server *server;
@@ -1335,12 +1335,12 @@ irc_server_recv (void *arg_server)
}
/*
* irc_server_timer: timer called each second to perform some operations
* on servers
* irc_server_timer_cb: timer called each second to perform some operations
* on servers
*/
void
irc_server_timer (void *empty)
irc_server_timer_cb (void *empty)
{
struct t_irc_server *ptr_server;
time_t new_time;
@@ -1540,7 +1540,8 @@ irc_server_child_read (void *arg_server)
num_read = read (server->child_read, buffer, sizeof (buffer));
if (num_read > 0)
{
config_proxy_use = weechat_config_boolean (weechat_config_get ("proxy_use"));
config_proxy_use = weechat_config_boolean (
weechat_config_get_weechat ("proxy_use"));
switch (buffer[0])
{
/* connection OK */
@@ -1568,7 +1569,7 @@ irc_server_child_read (void *arg_server)
weechat_unhook (server->hook_fd);
server->hook_fd = weechat_hook_fd (server->sock,
1, 0, 0,
irc_server_recv,
irc_server_recv_cb,
server);
break;
/* adress not found */
@@ -1630,7 +1631,7 @@ irc_server_child_read (void *arg_server)
*/
void
irc_server_convbase64_8x3_to_6x4 (char *from, char* to)
irc_server_convbase64_8x3_to_6x4 (char *from, char *to)
{
unsigned char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -1700,8 +1701,10 @@ irc_server_pass_httpproxy (int sock, char *address, int port)
char *config_proxy_username, *config_proxy_password;
int n, m;
config_proxy_username = weechat_config_string (weechat_config_get ("proxy_username"));
config_proxy_username = weechat_config_string (weechat_config_get ("proxy_password"));
config_proxy_username = weechat_config_string (
weechat_config_get_weechat ("proxy_username"));
config_proxy_username = weechat_config_string (
weechat_config_get_weechat ("proxy_password"));
if (config_proxy_username && config_proxy_username[0])
{
@@ -1854,8 +1857,10 @@ irc_server_pass_socks5proxy (int sock, char *address, int port)
socks5.version = 5;
socks5.nmethods = 1;
config_proxy_username = weechat_config_string (weechat_config_get ("proxy_username"));
config_proxy_username = weechat_config_string (weechat_config_get ("proxy_password"));
config_proxy_username = weechat_config_string (
weechat_config_get_weechat ("proxy_username"));
config_proxy_username = weechat_config_string (
weechat_config_get_weechat ("proxy_password"));
if (config_proxy_username && config_proxy_username[0])
socks5.method = 2; /* with authentication */
@@ -1913,7 +1918,7 @@ irc_server_pass_socks5proxy (int sock, char *address, int port)
/* authentication successful then giving address/port to connect */
addr_len = strlen(address);
addr_buffer_len = 4 + 1 + addr_len + 2;
addr_buffer = (unsigned char *) malloc (addr_buffer_len * sizeof(*addr_buffer));
addr_buffer = (unsigned char *)malloc (addr_buffer_len * sizeof(*addr_buffer));
if (!addr_buffer)
return 1;
addr_buffer[0] = 5; /* version 5 */
@@ -1985,7 +1990,8 @@ irc_server_pass_proxy (int sock, char *address, int port, char *username)
int rc;
char *config_proxy_type;
config_proxy_type = weechat_config_string (weechat_config_get ("proxy_type"));
config_proxy_type = weechat_config_string (
weechat_config_get_weechat ("proxy_type"));
rc = 1;
if (config_proxy_type)
@@ -2015,10 +2021,14 @@ irc_server_child (struct t_irc_server *server)
res = NULL;
res_local = NULL;
config_proxy_use = weechat_config_boolean (weechat_config_get ("proxy_use"));
config_proxy_ipv6 = weechat_config_integer (weechat_config_get ("proxy_ipv6"));
config_proxy_port = weechat_config_integer (weechat_config_get ("proxy_port"));
config_proxy_address = weechat_config_string (weechat_config_get ("proxy_address"));
config_proxy_use = weechat_config_boolean (
weechat_config_get_weechat ("proxy_use"));
config_proxy_ipv6 = weechat_config_integer (
weechat_config_get_weechat ("proxy_ipv6"));
config_proxy_port = weechat_config_integer (
weechat_config_get_weechat ("proxy_port"));
config_proxy_address = weechat_config_string (
weechat_config_get_weechat ("proxy_address"));
if (config_proxy_use)
{
@@ -2155,11 +2165,16 @@ irc_server_connect (struct t_irc_server *server, int disable_autojoin)
char *config_proxy_type, *config_proxy_address;
int config_proxy_use, config_proxy_ipv6, config_proxy_port;
config_proxy_use = weechat_config_boolean (weechat_config_get ("proxy_use"));
config_proxy_ipv6 = weechat_config_boolean (weechat_config_get ("proxy_ipv6"));
config_proxy_type = weechat_config_string (weechat_config_get ("proxy_type"));
config_proxy_address = weechat_config_string (weechat_config_get ("proxy_address"));
config_proxy_port = weechat_config_integer (weechat_config_get ("proxy_port"));
config_proxy_use = weechat_config_boolean (
weechat_config_get_weechat ("proxy_use"));
config_proxy_ipv6 = weechat_config_boolean (
weechat_config_get_weechat ("proxy_ipv6"));
config_proxy_type = weechat_config_string (
weechat_config_get_weechat ("proxy_type"));
config_proxy_address = weechat_config_string (
weechat_config_get_weechat ("proxy_address"));
config_proxy_port = weechat_config_integer (
weechat_config_get_weechat ("proxy_port"));
if (!server->buffer)
{
@@ -2167,6 +2182,7 @@ irc_server_connect (struct t_irc_server *server, int disable_autojoin)
if (!server->buffer)
return 0;
weechat_buffer_set (server->buffer, "display", "1");
weechat_hook_signal_send ("logger_backlog", server->buffer);
}
#ifndef HAVE_GNUTLS
@@ -2477,17 +2493,17 @@ irc_server_autojoin_channels (struct t_irc_server *server)
*/
struct t_irc_server *
irc_server_search (char *servername)
irc_server_search (char *server_name)
{
struct t_irc_server *ptr_server;
if (!servername)
if (!server_name)
return NULL;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
if (strcmp (ptr_server->name, servername) == 0)
if (strcmp (ptr_server->name, server_name) == 0)
return ptr_server;
}
return NULL;
@@ -2537,27 +2553,6 @@ irc_server_get_number_buffer (struct t_irc_server *server,
}
}
/*
* irc_server_name_already_exists: return 1 if server name already exists
* otherwise return 0
*/
int
irc_server_name_already_exists (char *name)
{
struct t_irc_server *ptr_server;
if (!name)
return 0;
for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server)
{
if (strcmp (ptr_server->name, name) == 0)
return 1;
}
return 0;
}
/*
* irc_server_get_channel_count: return number of channels for server
*/
src/plugins/irc/irc-server.h
+57 -41
View File
@@ -132,54 +132,70 @@ extern const int gnutls_prot_prio[];
#endif
extern struct t_irc_message *irc_recv_msgq, *irc_msgq_last_msg;
extern void irc_server_init (struct t_irc_server *);
extern int irc_server_init_with_url (struct t_irc_server *, char *);
extern void irc_server_init_with_config_options (struct t_irc_server *, void *,
int);
extern void irc_server_init (struct t_irc_server *server);
extern int irc_server_init_with_url (struct t_irc_server *server, char *irc_url);
extern void irc_server_init_with_config_options (struct t_irc_server *server,
struct t_config_section *section,
int config_reload);
extern struct t_irc_server *irc_server_alloc ();
extern void irc_server_outqueue_free_all (struct t_irc_server *);
extern void irc_server_free_data (struct t_irc_server *);
extern void irc_server_free (struct t_irc_server *);
extern void irc_server_outqueue_free_all (struct t_irc_server *server);
extern void irc_server_free_data (struct t_irc_server *server);
extern void irc_server_free (struct t_irc_server *server);
extern void irc_server_free_all ();
extern struct t_irc_server *irc_server_new (char *, int, int, int, int, char *,
int, int, int, char *, char *,
char *, char *, char *, char *,
char *, char *, int, char *, int,
char *);
extern struct t_irc_server *irc_server_duplicate (struct t_irc_server *, char *);
extern int irc_server_rename (struct t_irc_server *, char *);
extern int irc_server_send (struct t_irc_server *, char *, int);
extern void irc_server_outqueue_send (struct t_irc_server *);
extern void irc_server_sendf (struct t_irc_server *, char *, ...);
extern void irc_server_parse_message (char *, char **, char **, char **);
extern int irc_server_recv (void *);
extern void irc_server_timer (void *);
extern void irc_server_timer_check_away (void *);
extern int irc_server_child_read (void *);
extern void irc_server_convbase64_8x3_to_6x4 (char *, char*);
extern void irc_server_base64encode (char *, char *);
extern int irc_server_pass_httpproxy (int, char*, int);
extern int irc_server_resolve (char *, char *, int *);
extern int irc_server_pass_socks4proxy (int, char*, int, char*);
extern int irc_server_pass_socks5proxy (int, char*, int);
extern int irc_server_pass_proxy (int, char*, int, char*);
extern int irc_server_connect (struct t_irc_server *, int);
extern void irc_server_reconnect (struct t_irc_server *);
extern void irc_server_auto_connect (int, int);
extern void irc_server_disconnect (struct t_irc_server *, int);
extern struct t_irc_server *irc_server_new (char *name, int autoconnect,
int autoreconnect,
int autoreconnect_delay,
int temp_server, char *address,
int port, int ipv6, int ssl,
char *password, char *nick1,
char *nick2, char *nick3,
char *username, char *realname,
char *hostname, char *command,
int command_delay, char *autojoin,
int autorejoin,
char *notify_levels);
extern struct t_irc_server *irc_server_duplicate (struct t_irc_server *server,
char *new_name);
extern int irc_server_rename (struct t_irc_server *server, char *new_name);
extern int irc_server_send (struct t_irc_server *server, char *buffer,
int size_buf);
extern void irc_server_outqueue_send (struct t_irc_server *server);
extern void irc_server_sendf (struct t_irc_server *server, char *format, ...);
extern void irc_server_parse_message (char *message, char **host,
char **command, char **args);
extern int irc_server_recv_cb (void *arg_server);
extern void irc_server_timer_cb (void *empty);
extern void irc_server_timer_check_away (void *empty);
extern int irc_server_child_read (void *arg_server);
extern void irc_server_convbase64_8x3_to_6x4 (char *from, char *to);
extern void irc_server_base64encode (char *from, char *to);
extern int irc_server_pass_httpproxy (int sock, char *address, int port);
extern int irc_server_resolve (char *hostname, char *ip, int *version);
extern int irc_server_pass_socks4proxy (int sock, char *address, int port,
char *username);
extern int irc_server_pass_socks5proxy (int sock, char *address, int port);
extern int irc_server_pass_proxy (int sock, char *address, int port,
char *username);
extern int irc_server_connect (struct t_irc_server *server,
int disable_autojoin);
extern void irc_server_reconnect (struct t_irc_server *server);
extern void irc_server_auto_connect (int auto_connect, int temp_server);
extern void irc_server_disconnect (struct t_irc_server *server, int reconnect);
extern void irc_server_disconnect_all ();
extern void irc_server_autojoin_channels ();
extern struct t_irc_server *irc_server_search (char *);
extern struct t_irc_server *irc_server_search (char *server_name);
extern int irc_server_get_number_connected ();
extern void irc_server_get_number_buffer (struct t_irc_server *, int *, int *);
extern int irc_server_name_already_exists (char *);
extern int irc_server_get_channel_count (struct t_irc_server *);
extern int irc_server_get_pv_count (struct t_irc_server *);
extern void irc_server_get_number_buffer (struct t_irc_server *server,
int *server_pos, int *server_total);
extern int irc_server_get_channel_count (struct t_irc_server *server);
extern int irc_server_get_pv_count (struct t_irc_server *server);
extern void irc_server_remove_away ();
extern void irc_server_check_away ();
extern void irc_server_set_away (struct t_irc_server *, char *, int);
extern int irc_server_get_default_notify_level (struct t_irc_server *);
extern void irc_server_set_default_notify_level (struct t_irc_server *, int);
extern void irc_server_set_away (struct t_irc_server *server, char *nick,
int is_away);
extern int irc_server_get_default_notify_level (struct t_irc_server *server);
extern void irc_server_set_default_notify_level (struct t_irc_server *server,
int notify);
extern void irc_server_print_log ();
#endif /* irc-server.h */
src/plugins/irc/irc.c
+1 -13
View File
@@ -180,19 +180,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
weechat_hook_signal ("quit", &irc_quit_cb, NULL);
/* hook completions */
weechat_hook_completion ("irc_server", &irc_completion_server_cb, NULL);
weechat_hook_completion ("irc_server_nicks",
&irc_completion_server_nicks_cb, NULL);
weechat_hook_completion ("irc_servers", &irc_completion_servers_cb, NULL);
weechat_hook_completion ("irc_channel", &irc_completion_channel_cb, NULL);
weechat_hook_completion ("irc_channel_nicks",
&irc_completion_channel_nicks_cb, NULL);
weechat_hook_completion ("irc_channel_nicks_hosts",
&irc_completion_channel_nicks_hosts_cb, NULL);
weechat_hook_completion ("irc_channel_topic",
&irc_completion_channel_topic_cb, NULL);
weechat_hook_completion ("irc_channels", &irc_completion_channels_cb, NULL);
weechat_hook_completion ("irc_msg_part", &irc_completion_msg_part_cb, NULL);
irc_completion_init ();
//irc_server_auto_connect (1, 0);