foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

v2.8-utf8proc
Sebastien Helleu 2007-12-17 17:07:08 +01:00
parent e62ec5204c
commit dba084f3d6
113 changed files with 3146 additions and 3815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-12-14
ChangeLog - 2007-12-17
Version 0.2.7 (under dev!):
* added backlog option in logger plugin
* improved main loop: higher timout in select(), less CPU usage
* added /reload command to reload WeeChat and plugins config files
* new plugins: IRC, alias, demo, fifo, logger, trigger

62
src/core/wee-command.c
View File

@ -38,6 +38,7 @@
#include "wee-string.h"
#include "wee-utf8.h"
#include "wee-list.h"
#include "../gui/gui-buffer.h"
#include "../gui/gui-chat.h"
#include "../gui/gui-color.h"
#include "../gui/gui-history.h"
@ -54,7 +55,7 @@
*/
int
command_buffer (void *data, void *buffer,
command_buffer (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
struct t_gui_buffer *ptr_buffer;
@ -84,7 +85,7 @@ command_buffer (void *data, void *buffer,
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
GUI_COLOR(GUI_COLOR_CHAT),
(ptr_buffer->plugin) ?
((struct t_weechat_plugin *)ptr_buffer->plugin)->name :
ptr_buffer->plugin->name :
"weechat",
ptr_buffer->category,
ptr_buffer->name);
@ -114,10 +115,10 @@ command_buffer (void *data, void *buffer,
{
if (argv[2][0] == '+')
gui_buffer_move_to_number (buffer,
((struct t_gui_buffer *)buffer)->number + ((int) number));
buffer->number + ((int) number));
else if (argv[2][0] == '-')
gui_buffer_move_to_number (buffer,
((struct t_gui_buffer *)buffer)->number - ((int) number));
buffer->number - ((int) number));
else
gui_buffer_move_to_number (buffer, (int) number);
}
@ -132,7 +133,7 @@ command_buffer (void *data, void *buffer,
}
else if (string_strcasecmp (argv[1], "close") == 0)
{
if (!((struct t_gui_buffer *)buffer)->plugin)
if (!buffer->plugin)
{
gui_chat_printf (NULL,
_("%sError: WeeChat main buffer can't be "
@ -140,7 +141,7 @@ command_buffer (void *data, void *buffer,
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
return WEECHAT_RC_ERROR;
}
gui_buffer_free (buffer, 1);
gui_buffer_close (buffer, 1);
gui_status_draw (gui_current_window->buffer, 1);
gui_input_draw (gui_current_window->buffer, 1);
}
@ -186,7 +187,7 @@ command_buffer (void *data, void *buffer,
"%d %s"),
gui_chat_prefix[GUI_CHAT_PREFIX_INFO],
GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
((struct t_gui_buffer *)buffer)->name,
buffer->name,
GUI_COLOR(GUI_COLOR_CHAT),
number,
GUI_COLOR(GUI_COLOR_CHAT));
@ -258,7 +259,7 @@ command_buffer (void *data, void *buffer,
number = strtol (argv[1] + 1, &error, 10);
if (error && (error[0] == '\0'))
{
target_buffer = ((struct t_gui_buffer *)buffer)->number - (int) number;
target_buffer = buffer->number - (int) number;
if (target_buffer < 1)
target_buffer = (last_gui_buffer) ?
last_gui_buffer->number + target_buffer : 1;
@ -273,7 +274,7 @@ command_buffer (void *data, void *buffer,
number = strtol (argv[1] + 1, &error, 10);
if (error && (error[0] == '\0'))
{
target_buffer = ((struct t_gui_buffer *)buffer)->number + (int) number;
target_buffer = buffer->number + (int) number;
if (last_gui_buffer && target_buffer > last_gui_buffer->number)
target_buffer -= last_gui_buffer->number;
gui_buffer_switch_by_number (gui_current_window,
@ -321,7 +322,7 @@ command_buffer (void *data, void *buffer,
*/
int
command_builtin (void *data, void *buffer,
command_builtin (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
char *command;
@ -354,7 +355,7 @@ command_builtin (void *data, void *buffer,
*/
int
command_clear (void *data, void *buffer,
command_clear (void *data, struct t_gui_buffer *buffer,
int argc, char**argv, char **argv_eol)
{
struct t_gui_buffer *ptr_buffer;
@ -435,7 +436,7 @@ command_debug_display_windows (struct t_gui_window_tree *tree, int indent)
*/
int
command_debug (void *data, void *buffer,
command_debug (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/* make C compiler happy */
@ -479,7 +480,7 @@ command_debug (void *data, void *buffer,
*/
int
command_help (void *data, void *buffer,
command_help (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
struct t_hook *ptr_hook;
@ -605,7 +606,7 @@ command_help (void *data, void *buffer,
*/
int
command_history (void *data, void *buffer,
command_history (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
struct t_gui_history *ptr_history;
@ -628,10 +629,10 @@ command_history (void *data, void *buffer,
n_user = atoi (argv[1]);
}
if (((struct t_gui_buffer *)buffer)->history)
if (buffer->history)
{
n_total = 1;
for (ptr_history = ((struct t_gui_buffer *)buffer)->history;
for (ptr_history = buffer->history;
ptr_history->next_history;
ptr_history = ptr_history->next_history)
{
@ -696,7 +697,7 @@ command_key_display (t_gui_key *key, int new_key)
*/
int
command_key (void *data, void *buffer,
command_key (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
char *args, *internal_code;
@ -1059,7 +1060,7 @@ command_plugin_list (char *name, int full)
*/
int
command_plugin (void *data, void *buffer,
command_plugin (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/* make C compiler happy */
@ -1123,7 +1124,7 @@ command_plugin (void *data, void *buffer,
*/
int
command_quit (void *data, void *buffer,
command_quit (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/* make C compiler happy */
@ -1132,7 +1133,7 @@ command_quit (void *data, void *buffer,
(void) argc;
(void) argv;
hook_signal_exec ("quit",
hook_signal_send ("quit",
(argc > 1) ?
argv_eol[1] : CONFIG_STRING(config_look_default_msg_quit));
@ -1146,7 +1147,7 @@ command_quit (void *data, void *buffer,
*/
int
command_reload (void *data, void *buffer,
command_reload (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/* make C compiler happy */
@ -1177,7 +1178,7 @@ command_reload (void *data, void *buffer,
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
/* tell to plugins to reload their configuration */
hook_signal_exec ("config_reload", NULL);
hook_signal_send ("config_reload", NULL);
return WEECHAT_RC_OK;
}
@ -1187,7 +1188,7 @@ command_reload (void *data, void *buffer,
*/
int
command_save (void *data, void *buffer,
command_save (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/* make C compiler happy */
@ -1339,7 +1340,7 @@ command_set_display_option_list (struct t_config_file *config_file,
*/
int
command_set (void *data, void *buffer,
command_set (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
char *value;
@ -1407,7 +1408,8 @@ command_set (void *data, void *buffer,
}
value = string_remove_quotes (argv_eol[3], "'\"");
rc = config_file_option_set (ptr_option,
(value) ? value : argv_eol[3]);
(value) ? value : argv_eol[3],
0);
if (value)
free (value);
if (rc > 0)
@ -1437,7 +1439,7 @@ command_set (void *data, void *buffer,
*/
int
command_setp (void *data, void *buffer,
command_setp (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
char *pos, *ptr_name, *value;
@ -1557,7 +1559,7 @@ command_setp (void *data, void *buffer,
*/
int
command_upgrade (void *data, void *buffer,
command_upgrade (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
/*int filename_length;
@ -1602,7 +1604,7 @@ command_upgrade (void *data, void *buffer,
}
filename_length = strlen (weechat_home) + strlen (WEECHAT_SESSION_NAME) + 2;
filename = (char *) malloc (filename_length * sizeof (char));
filename = (char *)malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s" WEECHAT_SESSION_NAME,
@ -1655,7 +1657,7 @@ command_upgrade (void *data, void *buffer,
*/
int
command_uptime (void *data, void *buffer,
command_uptime (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
time_t running_time;
@ -1716,7 +1718,7 @@ command_uptime (void *data, void *buffer,
*/
int
command_window (void *data, void *buffer,
command_window (void *data, struct t_gui_buffer *buffer,
int argc, char **argv, char **argv_eol)
{
struct t_gui_window *ptr_win;

531
src/core/wee-config-file.c
View File

@ -40,6 +40,9 @@
struct t_config_file *config_files = NULL;
struct t_config_file *last_config_file = NULL;
char *config_boolean_true[] = { "on", "yes", "y", "true", "t", "1", NULL };
char *config_boolean_false[] = { "off", "no", "n", "false", "f", "0", NULL };
/*
* config_file_search: search a configuration file
@ -66,7 +69,7 @@ config_file_search (char *filename)
*/
struct t_config_file *
config_file_new (void *plugin, char *filename)
config_file_new (struct t_weechat_plugin *plugin, char *filename)
{
struct t_config_file *new_config_file;
@ -105,7 +108,8 @@ config_file_new (void *plugin, char *filename)
*/
int
config_file_valid_for_plugin (void *plugin, struct t_config_file *config_file)
config_file_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_file *config_file)
{
struct t_config_file *ptr_config;
@ -113,7 +117,7 @@ config_file_valid_for_plugin (void *plugin, struct t_config_file *config_file)
ptr_config = ptr_config->next_config)
{
if ((ptr_config == config_file)
&& (ptr_config->plugin == (struct t_weechat_plugin *)plugin))
&& (ptr_config->plugin == plugin))
return 1;
}
@ -127,9 +131,12 @@ config_file_valid_for_plugin (void *plugin, struct t_config_file *config_file)
struct t_config_section *
config_file_new_section (struct t_config_file *config_file, char *name,
void (*callback_read)(void *, char *, char *),
void (*callback_write)(void *, char *),
void (*callback_write_default)(void *, char *))
void (*callback_read)(struct t_config_file *config_file,
char *option_name, char *value),
void (*callback_write)(struct t_config_file *config_file,
char *section_name),
void (*callback_write_default)(struct t_config_file *,
char *section_name))
{
struct t_config_section *new_section;
@ -186,7 +193,7 @@ config_file_search_section (struct t_config_file *config_file,
*/
int
config_file_section_valid_for_plugin (void *plugin,
config_file_section_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_section *section)
{
struct t_config_file *ptr_config;
@ -195,7 +202,7 @@ config_file_section_valid_for_plugin (void *plugin,
for (ptr_config = config_files; ptr_config;
ptr_config = ptr_config->next_config)
{
if (ptr_config->plugin == (struct t_weechat_plugin *)plugin)
if (ptr_config->plugin == plugin)
{
for (ptr_section = ptr_config->sections; ptr_section;
ptr_section = ptr_section->next_section)
@ -259,8 +266,7 @@ config_file_new_option (struct t_config_section *section, char *name,
new_option->string_values = NULL;
new_option->min = CONFIG_BOOLEAN_FALSE;
new_option->max = CONFIG_BOOLEAN_TRUE;
int_value = (config_file_string_to_boolean (default_value) == CONFIG_BOOLEAN_TRUE) ?
CONFIG_BOOLEAN_TRUE : CONFIG_BOOLEAN_FALSE;
int_value = config_file_string_to_boolean (default_value);
new_option->default_value = malloc (sizeof (int));
*((int *)new_option->default_value) = int_value;
new_option->value = malloc (sizeof (int));
@ -386,7 +392,7 @@ config_file_search_option (struct t_config_file *config_file,
*/
int
config_file_option_valid_for_plugin (void *plugin,
config_file_option_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_option *option)
{
struct t_config_file *ptr_config;
@ -396,7 +402,7 @@ config_file_option_valid_for_plugin (void *plugin,
for (ptr_config = config_files; ptr_config;
ptr_config = ptr_config->next_config)
{
if (ptr_config->plugin == (struct t_weechat_plugin *)plugin)
if (ptr_config->plugin == plugin)
{
for (ptr_section = ptr_config->sections; ptr_section;
ptr_section = ptr_section->next_section)
@ -415,32 +421,48 @@ config_file_option_valid_for_plugin (void *plugin,
return 0;
}
/*
* config_file_string_boolean_is_valid: return 1 if boolean is valid, otherwise 0
*/
int
config_file_string_boolean_is_valid (char *text)
{
int i;
for (i = 0; config_boolean_true[i]; i++)
{
if (string_strcasecmp (text, config_boolean_true[i]) == 0)
return 1;
}
for (i = 0; config_boolean_false[i]; i++)
{
if (string_strcasecmp (text, config_boolean_false[i]) == 0)
return 1;
}
/* text is not a boolean */
return 0;
}
/*
* config_file_string_to_boolean: return boolean value of string
* return -1 if error
* (1 for true, 0 for false)
*/
int
config_file_string_to_boolean (char *text)
{
if ((string_strcasecmp (text, "on") == 0)
|| (string_strcasecmp (text, "yes") == 0)
|| (string_strcasecmp (text, "y") == 0)
|| (string_strcasecmp (text, "true") == 0)
|| (string_strcasecmp (text, "t") == 0)
|| (string_strcasecmp (text, "1") == 0))
return CONFIG_BOOLEAN_TRUE;
int i;
if ((string_strcasecmp (text, "off") == 0)
|| (string_strcasecmp (text, "no") == 0)
|| (string_strcasecmp (text, "n") == 0)
|| (string_strcasecmp (text, "false") == 0)
|| (string_strcasecmp (text, "f") == 0)
|| (string_strcasecmp (text, "0") == 0))
return CONFIG_BOOLEAN_FALSE;
for (i = 0; config_boolean_true[i]; i++)
{
if (string_strcasecmp (text, config_boolean_true[i]) == 0)
return CONFIG_BOOLEAN_TRUE;
}
/* invalid text */
return -1;
return CONFIG_BOOLEAN_FALSE;
}
/*
@ -451,7 +473,8 @@ config_file_string_to_boolean (char *text)
*/
int
config_file_option_set (struct t_config_option *option, char *new_value)
config_file_option_set (struct t_config_option *option, char *new_value,
int run_callback)
{
int new_value_int, i, rc;
long number;
@ -465,12 +488,14 @@ config_file_option_set (struct t_config_option *option, char *new_value)
case CONFIG_OPTION_BOOLEAN:
if (!new_value)
return 0;
new_value_int = config_file_string_to_boolean (new_value);
if (new_value_int < 0)
if (!config_file_string_boolean_is_valid (new_value))
return 0;
new_value_int = config_file_string_to_boolean (new_value);
if (new_value_int == *((int *)option->value))
return 1;
*((int *)option->value) = new_value_int;
if (run_callback && option->callback_change)
(void) (option->callback_change) ();
return 2;
case CONFIG_OPTION_INTEGER:
if (!new_value)
@ -492,6 +517,8 @@ config_file_option_set (struct t_config_option *option, char *new_value)
if (new_value_int == *((int *)option->value))
return 1;
*((int *)option->value) = new_value_int;
if (run_callback && option->callback_change)
(void) (option->callback_change) ();
return 2;
}
else
@ -503,6 +530,8 @@ config_file_option_set (struct t_config_option *option, char *new_value)
if (number == *((int *)option->value))
return 1;
*((int *)option->value) = number;
if (run_callback && option->callback_change)
(void) (option->callback_change) ();
return 2;
}
}
@ -523,6 +552,8 @@ config_file_option_set (struct t_config_option *option, char *new_value)
}
else
option->value = NULL;
if (run_callback && (rc == 2) && option->callback_change)
(void) (option->callback_change) ();
return rc;
case CONFIG_OPTION_COLOR:
if (!gui_color_assign (&new_value_int, new_value))
@ -530,6 +561,8 @@ config_file_option_set (struct t_config_option *option, char *new_value)
if (new_value_int == *((int *)option->value))
return 1;
*((int *)option->value) = new_value_int;
if (run_callback && option->callback_change)
(void) (option->callback_change) ();
return 2;
}
@ -591,6 +624,259 @@ config_file_option_reset (struct t_config_option *option)
return 0;
}
/*
* config_file_option_boolean: return boolean value of an option
*/
int
config_file_option_boolean (struct t_config_option *option)
{
if (option->type == CONFIG_OPTION_BOOLEAN)
return CONFIG_BOOLEAN(option);
else
return 0;
}
/*
* config_file_option_integer: return integer value of an option
*/
int
config_file_option_integer (struct t_config_option *option)
{
switch (option->type)
{
case CONFIG_OPTION_BOOLEAN:
if (CONFIG_BOOLEAN(option) == CONFIG_BOOLEAN_TRUE)
return 1;
else
return 0;
case CONFIG_OPTION_INTEGER:
case CONFIG_OPTION_COLOR:
return CONFIG_INTEGER(option);
case CONFIG_OPTION_STRING:
return 0;
}
return 0;
}
/*
* config_file_option_string: return string value of an option
*/
char *
config_file_option_string (struct t_config_option *option)
{
switch (option->type)
{
case CONFIG_OPTION_STRING:
return CONFIG_STRING(option);
case CONFIG_OPTION_INTEGER:
if (option->string_values)
return option->string_values[CONFIG_INTEGER(option)];
return NULL;
default:
return NULL;
}
return NULL;
}
/*
* config_file_option_color: return color value of an option
*/
int
config_file_option_color (struct t_config_option *option)
{
if (option->type == CONFIG_OPTION_COLOR)
return CONFIG_COLOR(option);
else
return 0;
}
/*
* config_file_write_option: write an option in a config file
*/
void
config_file_write_option (struct t_config_file *config_file,
struct t_config_option *option,
int default_value)
{
void *value;
if (!config_file || !config_file->file || !option)
return;
value = (default_value) ? option->default_value : option->value;
switch (option->type)
{
case CONFIG_OPTION_BOOLEAN:
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
(*((int *)value)) == CONFIG_BOOLEAN_TRUE ?
"on" : "off");
break;
case CONFIG_OPTION_INTEGER:
if (option->string_values)
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
option->string_values[*((int *)value)]);
else
string_iconv_fprintf (config_file->file, "%s = %d\n",
option->name,
*((int *)value));
break;
case CONFIG_OPTION_STRING:
string_iconv_fprintf (config_file->file, "%s = \"%s\"\n",
option->name,
(char *)value);
break;
case CONFIG_OPTION_COLOR:
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
gui_color_get_name (*((int *)value)));
break;
}
}
/*
* config_file_write_line: write a line in a config file
* if value is NULL, then write a section with [ ] around
*/
void
config_file_write_line (struct t_config_file *config_file,
char *option_name, char *value, ...)
{
char buf[4096];
va_list argptr;
va_start (argptr, value);
vsnprintf (buf, sizeof (buf) - 1, value, argptr);
va_end (argptr);
if (!buf[0])
string_iconv_fprintf (config_file->file, "\n[%s]\n",
option_name);
else
{
string_iconv_fprintf (config_file->file, "%s = %s\n",
option_name, buf);
}
}
/*
* config_file_write_internal: write a configuration file
* (should not be called directly)
* return: 0 if ok
* -1 if error writing file
* -2 if not enough memory
*/
int
config_file_write_internal (struct t_config_file *config_file, int default_options)
{
int filename_length, rc;
char *filename, *filename2;
time_t current_time;
struct t_config_section *ptr_section;
struct t_config_option *ptr_option;
if (!config_file)
return -1;
filename_length = strlen (weechat_home) +
strlen (config_file->filename) + 2;
filename =
(char *)malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s%s",
weechat_home, DIR_SEPARATOR, config_file->filename);
filename2 = (char *)malloc ((filename_length + 32) * sizeof (char));
if (!filename2)
{
free (filename);
return -2;
}
snprintf (filename2, filename_length + 32, "%s.weechattmp", filename);
if ((config_file->file = fopen (filename2, "w")) == NULL)
{
gui_chat_printf (NULL,
_("Error: cannot create file \"%s\"\n"),
filename2);
free (filename);
free (filename2);
return -1;
}
current_time = time (NULL);
string_iconv_fprintf (config_file->file,
_("#\n# %s configuration file, created by "
"%s v%s on %s"),
PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION,
ctime (&current_time));
string_iconv_fprintf (config_file->file,
_("# WARNING! Be careful when editing this file, "
"WeeChat may write it at any time.\n#\n"));
for (ptr_section = config_file->sections; ptr_section;
ptr_section = ptr_section->next_section)
{
/* call write callback if defined for section */
if (default_options && ptr_section->callback_write_default)
{
(void) (ptr_section->callback_write_default) (config_file,
ptr_section->name);
}
else if (!default_options && ptr_section->callback_write)
{
(void) (ptr_section->callback_write) (config_file,
ptr_section->name);
}
else
{
/* write all options for section */
string_iconv_fprintf (config_file->file,
"\n[%s]\n", ptr_section->name);
for (ptr_option = ptr_section->options; ptr_option;
ptr_option = ptr_option->next_option)
{
config_file_write_option (config_file, ptr_option,
default_options);
}
}
}
fclose (config_file->file);
config_file->file = NULL;
chmod (filename2, 0600);
unlink (filename);
rc = rename (filename2, filename);
free (filename);
free (filename2);
if (rc != 0)
return -1;
return 0;
}
/*
* config_file_write: write a configuration file
* return: 0 if ok
* -1 if error writing file
* -2 if not enough memory
*/
int
config_file_write (struct t_config_file *config_file)
{
return config_file_write_internal (config_file, 0);
}
/*
* config_file_read: read a configuration file
* return: 0 = successful
@ -611,14 +897,14 @@ config_file_read (struct t_config_file *config_file)
return -1;
filename_length = strlen (weechat_home) + strlen (config_file->filename) + 2;
filename = (char *) malloc (filename_length * sizeof (char));
filename = (char *)malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s%s",
weechat_home, DIR_SEPARATOR, config_file->filename);
if ((config_file->file = fopen (filename, "r")) == NULL)
{
config_file_write (config_file, 1);
config_file_write_internal (config_file, 1);
if ((config_file->file = fopen (filename, "r")) == NULL)
{
gui_chat_printf (NULL,
@ -760,7 +1046,7 @@ config_file_read (struct t_config_file *config_file)
line);
if (ptr_option)
{
rc = config_file_option_set (ptr_option, pos);
rc = config_file_option_set (ptr_option, pos, 1);
ptr_option->loaded = 1;
}
}
@ -791,10 +1077,6 @@ config_file_read (struct t_config_file *config_file)
"\"%s\"\n"),
filename, line_number, line);
break;
case 2:
if (ptr_option && ptr_option->callback_change)
(void) (ptr_option->callback_change) ();
break;
}
}
}
@ -864,175 +1146,6 @@ config_file_reload (struct t_config_file *config_file)
return rc;
}
/*
* config_file_write_option: write an option in a config file
*/
void
config_file_write_option (struct t_config_file *config_file,
struct t_config_option *option,
int default_value)
{
void *value;
if (!config_file || !config_file->file || !option)
return;
value = (default_value) ? option->default_value : option->value;
switch (option->type)
{
case CONFIG_OPTION_BOOLEAN:
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
(*((int *)value)) == CONFIG_BOOLEAN_TRUE ?
"on" : "off");
break;
case CONFIG_OPTION_INTEGER:
if (option->string_values)
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
option->string_values[*((int *)value)]);
else
string_iconv_fprintf (config_file->file, "%s = %d\n",
option->name,
*((int *)value));
break;
case CONFIG_OPTION_STRING:
string_iconv_fprintf (config_file->file, "%s = \"%s\"\n",
option->name,
(char *)value);
break;
case CONFIG_OPTION_COLOR:
string_iconv_fprintf (config_file->file, "%s = %s\n",
option->name,
gui_color_get_name (*((int *)value)));
break;
}
}
/*
* config_file_write_line: write a line in a config file
* if value is NULL, then write a section with [ ] around
*/
void
config_file_write_line (struct t_config_file *config_file,
char *option_name, char *value, ...)
{
char buf[4096];
va_list argptr;
va_start (argptr, value);
vsnprintf (buf, sizeof (buf) - 1, value, argptr);
va_end (argptr);
if (!buf[0])
string_iconv_fprintf (config_file->file, "\n[%s]\n",
option_name);
else
{
string_iconv_fprintf (config_file->file, "%s = %s\n",
option_name, buf);
}
}
/*
* config_file_write: write a configuration file
* return: 0 if ok
* -1 if error writing file
* -2 if not enough memory
*/
int
config_file_write (struct t_config_file *config_file, int default_options)
{
int filename_length, rc;
char *filename, *filename2;
time_t current_time;
struct t_config_section *ptr_section;
struct t_config_option *ptr_option;
if (!config_file)
return -1;
filename_length = strlen (weechat_home) +
strlen (config_file->filename) + 2;
filename =
(char *) malloc (filename_length * sizeof (char));
if (!filename)
return -2;
snprintf (filename, filename_length, "%s%s%s",
weechat_home, DIR_SEPARATOR, config_file->filename);
filename2 = (char *) malloc ((filename_length + 32) * sizeof (char));
if (!filename2)
{
free (filename);
return -2;
}
snprintf (filename2, filename_length + 32, "%s.weechattmp", filename);
if ((config_file->file = fopen (filename2, "w")) == NULL)
{
gui_chat_printf (NULL,
_("Error: cannot create file \"%s\"\n"),
filename2);
free (filename);
free (filename2);
return -1;
}
current_time = time (NULL);
string_iconv_fprintf (config_file->file,
_("#\n# %s configuration file, created by "
"%s v%s on %s"),
PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION,
ctime (&current_time));
string_iconv_fprintf (config_file->file,
_("# WARNING! Be careful when editing this file, "
"WeeChat may write it at any time.\n#\n"));
for (ptr_section = config_file->sections; ptr_section;
ptr_section = ptr_section->next_section)
{
/* call write callback if defined for section */
if (default_options && ptr_section->callback_write_default)
{
(void) (ptr_section->callback_write_default) (config_file,
ptr_section->name);
}
else if (!default_options && ptr_section->callback_write)
{
(void) (ptr_section->callback_write) (config_file,
ptr_section->name);
}
else
{
/* write all options for section */
string_iconv_fprintf (config_file->file,
"\n[%s]\n", ptr_section->name);
for (ptr_option = ptr_section->options; ptr_option;
ptr_option = ptr_option->next_option)
{
config_file_write_option (config_file, ptr_option,
default_options);
}
}
}
fclose (config_file->file);
config_file->file = NULL;
chmod (filename2, 0600);
unlink (filename);
rc = rename (filename2, filename);
free (filename);
free (filename2);
if (rc != 0)
return -1;
return 0;
}
/*
* config_file_option_free: free an option
*/
@ -1159,7 +1272,7 @@ config_file_free_all ()
*/
void
config_file_free_all_plugin (void *plugin)
config_file_free_all_plugin (struct t_weechat_plugin *plugin)
{
struct t_config_file *ptr_config, *next_config;

90
src/core/wee-config-file.h
View File

@ -50,11 +50,14 @@ struct t_config_section
{
char *name; /* section name */
void (*callback_read) /* called when unknown option */
(void *, char *, char *); /* is read from config file */
(struct t_config_file *config_file, /* is read from config file */
char *option_name, char *value);
void (*callback_write) /* called to write special */
(void *, char *); /* options in config file */
(struct t_config_file *config_file, /* options in config file */
char *section_name);
void (*callback_write_default) /* called to write default */
(void *, char *); /* options in config file */
(struct t_config_file *config_file, /* options in config file */
char *section_name);
struct t_config_option *options; /* options in section */
struct t_config_option *last_option; /* last option in section */
struct t_config_section *prev_section; /* link to previous section */
@ -84,40 +87,57 @@ struct t_config_option
struct t_config_option *next_option; /* link to next option */
};
extern struct t_config_file *config_file_new (void *, char *);
extern int config_file_valid_for_plugin (void *, struct t_config_file *);
extern struct t_config_section *config_file_new_section (struct t_config_file *,
char *,
void (*)(void *, char *, char *),
void (*)(void *, char *),
void (*)(void *, char *));
extern struct t_config_section *config_file_search_section (struct t_config_file *,
char *);
extern int config_file_section_valid_for_plugin (void *, struct t_config_section *);
extern struct t_config_option *config_file_new_option (struct t_config_section *,
char *, char *, char *,
char *, int, int,
char *, void (*)());
extern struct t_config_option *config_file_search_option (struct t_config_file *,
struct t_config_section *,
char *);
extern int config_file_option_valid_for_plugin (void *, struct t_config_option *);
extern int config_file_string_to_boolean (char *);
extern int config_file_option_set (struct t_config_option *, char *);
extern int config_file_option_reset (struct t_config_option *);
extern struct t_config_file *config_file_new (struct t_weechat_plugin *plugin,
char *filename);
extern int config_file_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_file *config_file);
extern struct t_config_section *config_file_new_section (struct t_config_file *config_file,
char *name,
void (*callback_read)(struct t_config_file *config_file,
char *option_name,
char *value),
void (*callback_write)(struct t_config_file *config_file,
char *section_name),
void (*callback_write_default)(struct t_config_file *config_file,
char *section_name));
extern struct t_config_section *config_file_search_section (struct t_config_file *config_file,
char *section_name);
extern int config_file_section_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_section *);
extern struct t_config_option *config_file_new_option (struct t_config_section *section,
char *name, char *type,
char *description,
char *string_values,
int min, int max,
char *default_value,
void (*callback_change)());
extern struct t_config_option *config_file_search_option (struct t_config_file *config_file,
struct t_config_section *section,
char *option_name);
extern int config_file_option_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_config_option *option);
extern int config_file_string_to_boolean (char *text);
extern int config_file_option_set (struct t_config_option *option,
char *new_value, int run_callback);
extern int config_file_option_reset (struct t_config_option *option);
extern int config_file_option_boolean (struct t_config_option *option);
extern int config_file_option_integer (struct t_config_option *option);
extern char *config_file_option_string (struct t_config_option *option);
extern int config_file_option_color (struct t_config_option *option);
extern int config_file_read (struct t_config_file *);
extern int config_file_reload (struct t_config_file *);
extern void config_file_write_line (struct t_config_file *, char *, char *, ...);
extern int config_file_write (struct t_config_file *, int);
extern void config_file_option_free (struct t_config_section *,
struct t_config_option *);
extern void config_file_section_free (struct t_config_file *,
struct t_config_section *);
extern void config_file_free (struct t_config_file *);
extern void config_file_write_line (struct t_config_file *config_file,
char *option_name, char *value, ...);
extern int config_file_write (struct t_config_file *config_files);
extern int config_file_read (struct t_config_file *config_file);
extern int config_file_reload (struct t_config_file *config_file);
extern void config_file_option_free (struct t_config_section *section,
struct t_config_option *option);
extern void config_file_section_free (struct t_config_file *config_file,
struct t_config_section *section);
extern void config_file_free (struct t_config_file *config_file);
extern void config_file_free_all ();
extern void config_file_free_all_plugin (void *);
extern void config_file_print_stdout (struct t_config_file *);
extern void config_file_free_all_plugin (struct t_weechat_plugin *plugin);
extern void config_file_print_stdout (struct t_config_file *config_file);
extern void config_file_print_log ();
#endif /* wee-config-file.h */

9
src/core/wee-config.c
View File

@ -41,11 +41,13 @@
#include "wee-util.h"
#include "wee-list.h"
#include "wee-string.h"
#include "../gui/gui-buffer.h"
#include "../gui/gui-chat.h"
#include "../gui/gui-color.h"
#include "../gui/gui-hotlist.h"
#include "../gui/gui-infobar.h"
#include "../gui/gui-keyboard.h"
#include "../gui/gui-nicklist.h"
#include "../gui/gui-status.h"
#include "../gui/gui-window.h"
#include "../plugins/plugin.h"
@ -415,7 +417,7 @@ config_change_day_change ()
*/
void
config_weechat_read_key (void *config_file,
config_weechat_read_key (struct t_config_file *config_file,
char *option_name, char *value)
{
/* make C compiler happy */
@ -443,7 +445,8 @@ config_weechat_read_key (void *config_file,
*/
void
config_weechat_write_keys (void *config_file, char *section_name)
config_weechat_write_keys (struct t_config_file *config_file,
char *section_name)
{
t_gui_key *ptr_key;
char *expanded_name, *function_name;
@ -1177,5 +1180,5 @@ int
config_weechat_write ()
{
log_printf (_("Saving WeeChat configuration to disk"));
return config_file_write (weechat_config_file, 0);
return config_file_write (weechat_config_file);
}

12
src/core/wee-config.h
View File

@ -164,18 +164,6 @@ extern struct t_config_option *config_plugins_path;
extern struct t_config_option *config_plugins_autoload;
extern struct t_config_option *config_plugins_extension;
extern void config_change_noop ();
extern void config_change_save_on_exit ();
extern void config_change_title ();
extern void config_change_buffers ();
extern void config_change_buffer_content ();
extern void config_change_buffer_time_format ();
extern void config_change_hotlist ();
extern void config_change_read_marker ();
extern void config_change_prefix ();
extern void config_change_color ();
extern void config_change_nicks_colors ();
extern int config_weechat_init ();
extern int config_weechat_read ();
extern int config_weechat_reload ();

107
src/core/wee-hook.c
View File

@ -188,7 +188,8 @@ hook_remove_deleted ()
*/
void
hook_init_data (struct t_hook *hook, void *plugin, int type, void *callback_data)
hook_init_data (struct t_hook *hook, struct t_weechat_plugin *plugin,
int type, void *callback_data)
{
hook->plugin = plugin;
hook->type = type;
@ -231,7 +232,7 @@ hook_valid (struct t_hook *hook)
*/
int
hook_valid_for_plugin (void *plugin, struct t_hook *hook)
hook_valid_for_plugin (struct t_weechat_plugin *plugin, struct t_hook *hook)
{
int type;
struct t_hook *ptr_hook;
@ -242,7 +243,7 @@ hook_valid_for_plugin (void *plugin, struct t_hook *hook)
ptr_hook = ptr_hook->next_hook)
{
if (!ptr_hook->deleted && (ptr_hook == hook)
&& (ptr_hook->plugin == (struct t_weechat_plugin *)plugin))
&& (ptr_hook->plugin == plugin))
return 1;
}
}
@ -277,10 +278,9 @@ hook_search_command (char *command)
*/
struct t_hook *
hook_command (void *plugin, char *command, char *description,
hook_command (struct t_weechat_plugin *plugin, char *command, char *description,
char *args, char *args_description, char *completion,
t_hook_callback_command *callback,
void *callback_data)
t_hook_callback_command *callback, void *callback_data)
{
struct t_hook *ptr_hook,*new_hook;
struct t_hook_command *new_hook_command;
@ -341,7 +341,7 @@ hook_command (void *plugin, char *command, char *description,
*/
int
hook_command_exec (void *buffer, char *string, int only_builtin)
hook_command_exec (struct t_gui_buffer *buffer, char *string, int only_builtin)
{
struct t_hook *ptr_hook, *next_hook;
char **argv, **argv_eol;
@ -369,9 +369,9 @@ hook_command_exec (void *buffer, char *string, int only_builtin)
&& !ptr_hook->running
&& (HOOK_COMMAND(ptr_hook, level) == 0)
&& (!only_builtin || !ptr_hook->plugin)
&& (!ptr_hook->plugin
|| !((struct t_gui_buffer *)buffer)->plugin
|| (((struct t_gui_buffer *)buffer)->plugin == ptr_hook->plugin))
/*&& (!ptr_hook->plugin
|| !buffer->plugin
|| (buffer->plugin == ptr_hook->plugin))*/
&& (string_strcasecmp (argv[0] + 1,
HOOK_COMMAND(ptr_hook, command)) == 0))
{
@ -410,8 +410,9 @@ hook_command_exec (void *buffer, char *string, int only_builtin)
*/
struct t_hook *
hook_timer (void *plugin, long interval, int align_second, int max_calls,
t_hook_callback_timer *callback, void *callback_data)
hook_timer (struct t_weechat_plugin *plugin, long interval, int align_second,
int max_calls, t_hook_callback_timer *callback,
void *callback_data)
{
struct t_hook *new_hook;
struct t_hook_timer *new_hook_timer;
@ -462,7 +463,7 @@ hook_timer (void *plugin, long interval, int align_second, int max_calls,
*/
int
hook_timer_time_to_next (struct timeval *tv_time)
hook_timer_time_to_next (struct timeval *tv_timeout)
{
struct t_hook *ptr_hook;
int found;
@ -470,19 +471,19 @@ hook_timer_time_to_next (struct timeval *tv_time)
long diff_usec;
found = 0;
tv_time->tv_sec = 0;
tv_time->tv_usec = 0;
tv_timeout->tv_sec = 0;
tv_timeout->tv_usec = 0;
for (ptr_hook = weechat_hooks[HOOK_TYPE_TIMER]; ptr_hook;
ptr_hook = ptr_hook->next_hook)
{
if (!ptr_hook->deleted
&& (!found
|| (util_timeval_cmp (&HOOK_TIMER(ptr_hook, next_exec), tv_time) < 0)))
|| (util_timeval_cmp (&HOOK_TIMER(ptr_hook, next_exec), tv_timeout) < 0)))
{
found = 1;
tv_time->tv_sec = HOOK_TIMER(ptr_hook, next_exec).tv_sec;
tv_time->tv_usec = HOOK_TIMER(ptr_hook, next_exec).tv_usec;
tv_timeout->tv_sec = HOOK_TIMER(ptr_hook, next_exec).tv_sec;
tv_timeout->tv_usec = HOOK_TIMER(ptr_hook, next_exec).tv_usec;
}
}
@ -493,21 +494,21 @@ hook_timer_time_to_next (struct timeval *tv_time)
gettimeofday (&tv_now, NULL);
/* next timeout is past date! */
if (util_timeval_cmp (tv_time, &tv_now) < 0)
if (util_timeval_cmp (tv_timeout, &tv_now) < 0)
{
tv_time->tv_sec = 0;
tv_time->tv_usec = 0;
tv_timeout->tv_sec = 0;
tv_timeout->tv_usec = 0;
return 1;
}
tv_time->tv_sec = tv_time->tv_sec - tv_now.tv_sec;
diff_usec = tv_time->tv_usec - tv_now.tv_usec;
tv_timeout->tv_sec = tv_timeout->tv_sec - tv_now.tv_sec;
diff_usec = tv_timeout->tv_usec - tv_now.tv_usec;
if (diff_usec >= 0)
tv_time->tv_usec = diff_usec;
tv_timeout->tv_usec = diff_usec;
else
{
tv_time->tv_sec--;
tv_time->tv_usec = 1000000 + diff_usec;
tv_timeout->tv_sec--;
tv_timeout->tv_usec = 1000000 + diff_usec;
}
return 1;
@ -593,13 +594,14 @@ hook_search_fd (int fd)
*/
struct t_hook *
hook_fd (void *plugin, int fd, int flags,
hook_fd (struct t_weechat_plugin *plugin, int fd, int flag_read,
int flag_write, int flag_exception,
t_hook_callback_fd *callback, void *callback_data)
{
struct t_hook *new_hook;
struct t_hook_fd *new_hook_fd;
if (hook_search_fd (fd))
if ((fd < 0) || hook_search_fd (fd))
return NULL;
new_hook = (struct t_hook *)malloc (sizeof (struct t_hook));
@ -617,7 +619,13 @@ hook_fd (void *plugin, int fd, int flags,
new_hook->hook_data = new_hook_fd;
new_hook_fd->callback = callback;
new_hook_fd->fd = fd;
new_hook_fd->flags = flags;
new_hook_fd->flags = 0;
if (flag_read)
new_hook_fd->flags |= HOOK_FD_FLAG_READ;
if (flag_write)
new_hook_fd->flags |= HOOK_FD_FLAG_WRITE;
if (flag_exception)
new_hook_fd->flags |= HOOK_FD_FLAG_EXCEPTION;
hook_add_to_list (new_hook);
@ -629,14 +637,10 @@ hook_fd (void *plugin, int fd, int flags,
*/
void
hook_fd_set (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
hook_fd_set (fd_set *read_fds, fd_set *write_fds, fd_set *exception_fds)
{
struct t_hook *ptr_hook;
FD_ZERO (read_fds);
FD_ZERO (write_fds);
FD_ZERO (except_fds);
for (ptr_hook = weechat_hooks[HOOK_TYPE_FD]; ptr_hook;
ptr_hook = ptr_hook->next_hook)
{
@ -647,7 +651,7 @@ hook_fd_set (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
if (HOOK_FD(ptr_hook, flags) & HOOK_FD_FLAG_WRITE)
FD_SET (HOOK_FD(ptr_hook, fd), write_fds);
if (HOOK_FD(ptr_hook, flags) & HOOK_FD_FLAG_EXCEPTION)
FD_SET (HOOK_FD(ptr_hook, fd), except_fds);
FD_SET (HOOK_FD(ptr_hook, fd), exception_fds);
}
}
}
@ -657,7 +661,7 @@ hook_fd_set (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
*/
void
hook_fd_exec (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
hook_fd_exec (fd_set *read_fds, fd_set *write_fds, fd_set *exception_fds)
{
struct t_hook *ptr_hook, *next_hook;
@ -675,7 +679,7 @@ hook_fd_exec (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
|| ((HOOK_FD(ptr_hook, flags) & HOOK_FD_FLAG_WRITE)
&& (FD_ISSET(HOOK_FD(ptr_hook, fd), write_fds)))
|| ((HOOK_FD(ptr_hook, flags) & HOOK_FD_FLAG_EXCEPTION)
&& (FD_ISSET(HOOK_FD(ptr_hook, fd), except_fds)))))
&& (FD_ISSET(HOOK_FD(ptr_hook, fd), exception_fds)))))
{
ptr_hook->running = 1;
(HOOK_FD(ptr_hook, callback)) (ptr_hook->callback_data);
@ -697,8 +701,9 @@ hook_fd_exec (fd_set *read_fds, fd_set *write_fds, fd_set *except_fds)
*/
struct t_hook *
hook_print (void *plugin, void *buffer, char *message, int strip_colors,
t_hook_callback_print *callback, void *callback_data)
hook_print (struct t_weechat_plugin *plugin, struct t_gui_buffer *buffer,
char *message, int strip_colors, t_hook_callback_print *callback,
void *callback_data)
{
struct t_hook *new_hook;
struct t_hook_print *new_hook_print;
@ -717,7 +722,7 @@ hook_print (void *plugin, void *buffer, char *message, int strip_colors,
new_hook->hook_data = new_hook_print;
new_hook_print->callback = callback;
new_hook_print->buffer = (struct t_gui_buffer *)buffer;
new_hook_print->buffer = buffer;
new_hook_print->message = (message) ? strdup (message) : NULL;
new_hook_print->strip_colors = strip_colors;
@ -731,7 +736,8 @@ hook_print (void *plugin, void *buffer, char *message, int strip_colors,
*/
void
hook_print_exec (void *buffer, time_t date, char *prefix, char *message)
hook_print_exec (struct t_gui_buffer *buffer, time_t date, char *prefix,
char *message)
{
struct t_hook *ptr_hook, *next_hook;
char *prefix_no_color, *message_no_color;
@ -759,7 +765,7 @@ hook_print_exec (void *buffer, time_t date, char *prefix, char *message)
if (!ptr_hook->deleted
&& !ptr_hook->running
&& (!HOOK_PRINT(ptr_hook, buffer)
|| ((struct t_gui_buffer *)buffer == HOOK_PRINT(ptr_hook, buffer)))
|| (buffer == HOOK_PRINT(ptr_hook, buffer)))
&& (!HOOK_PRINT(ptr_hook, message)
|| string_strcasestr (prefix_no_color, HOOK_PRINT(ptr_hook, message))
|| string_strcasestr (message_no_color, HOOK_PRINT(ptr_hook, message))))
@ -787,7 +793,7 @@ hook_print_exec (void *buffer, time_t date, char *prefix, char *message)
*/
struct t_hook *
hook_signal (void *plugin, char *signal,
hook_signal (struct t_weechat_plugin *plugin, char *signal,
t_hook_callback_signal *callback, void *callback_data)
{
struct t_hook *new_hook;
@ -818,11 +824,11 @@ hook_signal (void *plugin, char *signal,
}
/*
* hook_signal_exec: execute signal hook
* hook_signal_send: send a signal
*/
void
hook_signal_exec (char *signal, void *pointer)
hook_signal_send (char *signal, void *signal_data)
{
struct t_hook *ptr_hook, *next_hook;
@ -840,7 +846,7 @@ hook_signal_exec (char *signal, void *pointer)
{
ptr_hook->running = 1;
(void) (HOOK_SIGNAL(ptr_hook, callback))
(ptr_hook->callback_data, signal, pointer);
(ptr_hook->callback_data, signal, signal_data);
ptr_hook->running = 0;
}
@ -859,7 +865,7 @@ hook_signal_exec (char *signal, void *pointer)
*/
struct t_hook *
hook_config (void *plugin, char *type, char *option,
hook_config (struct t_weechat_plugin *plugin, char *type, char *option,
t_hook_callback_config *callback, void *callback_data)
{
struct t_hook *new_hook;
@ -933,7 +939,7 @@ hook_config_exec (char *type, char *option, char *value)
*/
struct t_hook *
hook_completion (void *plugin, char *completion,
hook_completion (struct t_weechat_plugin *plugin, char *completion,
t_hook_callback_completion *callback, void *callback_data)
{
struct t_hook *new_hook;
@ -968,7 +974,8 @@ hook_completion (void *plugin, char *completion,
*/
void
hook_completion_exec (void *plugin, char *completion, void *buffer, void *list)
hook_completion_exec (struct t_weechat_plugin *plugin, char *completion,
struct t_gui_buffer *buffer, struct t_weelist *list)
{
struct t_hook *ptr_hook, *next_hook;
@ -1102,7 +1109,7 @@ unhook (struct t_hook *hook)
*/
void
unhook_all_plugin (void *plugin)
unhook_all_plugin (struct t_weechat_plugin *plugin)
{
int type;
struct t_hook *ptr_hook, *next_hook;

103
src/core/wee-hook.h
View File

@ -20,6 +20,9 @@
#ifndef __WEECHAT_HOOK_H
#define __WEECHAT_HOOK_H 1
struct t_gui_buffer;
struct t_weelist;
/* hook types */
enum t_hook_type
@ -63,7 +66,8 @@ struct t_hook
struct t_hook *next_hook; /* link to next hook */
};
typedef int (t_hook_callback_command)(void *, void *, int, char **, char **);
typedef int (t_hook_callback_command)(void *data, struct t_gui_buffer *,
int argc, char **argv, char **argv_eol);
struct t_hook_command
{
@ -77,7 +81,7 @@ struct t_hook_command
char *completion; /* template for completion */
};
typedef int (t_hook_callback_timer)(void *);
typedef int (t_hook_callback_timer)(void *data);
struct t_hook_timer
{
@ -88,7 +92,7 @@ struct t_hook_timer
struct timeval next_exec; /* next scheduled execution */
};
typedef int (t_hook_callback_fd)(void *);
typedef int (t_hook_callback_fd)(void *data);
struct t_hook_fd
{
@ -97,7 +101,8 @@ struct t_hook_fd
int flags; /* fd flags (read,write,..) */
};
typedef int (t_hook_callback_print)(void *, void *, time_t, char *, char *);
typedef int (t_hook_callback_print)(void *data, struct t_gui_buffer *buffer,
time_t date, char *prefix, char *message);
struct t_hook_print
{
@ -107,7 +112,8 @@ struct t_hook_print
int strip_colors; /* strip colors in msg for callback? */
};
typedef int (t_hook_callback_signal)(void *, char *, void *);
typedef int (t_hook_callback_signal)(void *data, char *signal,
void *signal_data);
struct t_hook_signal
{
@ -115,7 +121,8 @@ struct t_hook_signal
char *signal; /* signal selected ("*" = any signal)*/
};
typedef int (t_hook_callback_config)(void *, char *, char *, char *);
typedef int (t_hook_callback_config)(void *data, char *type, char *option,
char *value);
struct t_hook_config
{
@ -125,7 +132,9 @@ struct t_hook_config
/* (NULL = hook for all options) */
};
typedef int (t_hook_callback_completion)(void *, char *, void *, void *);
typedef int (t_hook_callback_completion)(void *data, char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list);
struct t_hook_completion
{
@ -141,34 +150,60 @@ extern struct t_hook *last_weechat_hook[];
/* hook functions */
extern void hook_init ();
extern int hook_valid (struct t_hook *);
extern int hook_valid_for_plugin (void *, struct t_hook *);
extern struct t_hook *hook_command (void *, char *, char *, char *, char *,
char *, t_hook_callback_command *, void *);
extern int hook_command_exec (void *, char *, int);
extern struct t_hook *hook_timer (void *, long, int, int,
t_hook_callback_timer *, void *);
extern int hook_timer_time_to_next (struct timeval *);
extern int hook_valid (struct t_hook *hook);
extern int hook_valid_for_plugin (struct t_weechat_plugin *plugin,
struct t_hook *hook);
extern struct t_hook *hook_command (struct t_weechat_plugin *plugin,
char *command, char *description,
char *args, char *args_description,
char *completion,
t_hook_callback_command *callback,
void *callback_data);
extern int hook_command_exec (struct t_gui_buffer *buffer, char *string,
int only_builtin);
extern struct t_hook *hook_timer (struct t_weechat_plugin *plugin,
long interval, int align_second,
int max_calls,
t_hook_callback_timer *callback,
void *callback_data);
extern int hook_timer_time_to_next (struct timeval *tv_timeout);
extern void hook_timer_exec ();
extern struct t_hook *hook_fd (void *, int, int, t_hook_callback_fd *,void *);
extern void hook_fd_set (fd_set *, fd_set *, fd_set *);
extern void hook_fd_exec (fd_set *, fd_set *, fd_set *);
extern struct t_hook *hook_print (void *, void *, char *, int,
t_hook_callback_print *, void *);
extern void hook_print_exec (void *, time_t, char *, char *);
extern struct t_hook *hook_signal (void *, char *,
t_hook_callback_signal *, void *);
extern void hook_signal_exec (char *, void *);
extern struct t_hook *hook_config (void *, char *, char *,
t_hook_callback_config *, void *);
extern void hook_config_exec (char *, char *, char *);
extern struct t_hook *hook_completion (void *, char *,
t_hook_callback_completion *, void *);
extern void hook_completion_exec (void *, char *, void *, void *);
extern void unhook (struct t_hook *);
extern void unhook_all_plugin (void *);
extern struct t_hook *hook_fd (struct t_weechat_plugin *plugin, int fd,
int flag_read, int flag_write,
int flag_exception,
t_hook_callback_fd * callback,
void *callback_data);
extern void hook_fd_set (fd_set *read_fds, fd_set *write_fds,
fd_set *exception_fds);
extern void hook_fd_exec (fd_set *read_fds, fd_set *write_fds,
fd_set *exception_fds);
extern struct t_hook *hook_print (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer,
char *message, int strip_colors,
t_hook_callback_print *callback,
void *callback_data);
extern void hook_print_exec (struct t_gui_buffer *buffer,
time_t date, char *prefix, char *message);
extern struct t_hook *hook_signal (struct t_weechat_plugin *plugin,
char *signal,
t_hook_callback_signal *callback,
void *callback_data);
extern void hook_signal_send (char *signal, void *signal_date);
extern struct t_hook *hook_config (struct t_weechat_plugin *, char *type,
char *option,
t_hook_callback_config *callback,
void *callback_data);
extern void hook_config_exec (char *type, char *option, char *value);
extern struct t_hook *hook_completion (struct t_weechat_plugin *plugin,
char *completion,
t_hook_callback_completion *callback,
void *callback_data);
extern void hook_completion_exec (struct t_weechat_plugin *plugin,
char *completion,
struct t_gui_buffer *buffer,
struct t_weelist *list);
extern void unhook (struct t_hook *hook);
extern void unhook_all_plugin (struct t_weechat_plugin *plugin);
extern void unhook_all ();
extern void hook_print_log ();

1
src/core/wee-input.c
View File

@ -31,6 +31,7 @@
#include "wee-config.h"
#include "wee-hook.h"
#include "wee-string.h"
#include "../gui/gui-buffer.h"
#include "../gui/gui-chat.h"
#include "../plugins/plugin.h"

5
src/core/wee-input.h
View File

@ -20,8 +20,9 @@
#ifndef __WEECHAT_INPUT_H
#define __WEECHAT_INPUT_H 1
#include "../gui/gui-buffer.h"
struct t_gui_buffer;
extern void input_data (struct t_gui_buffer *, char *, int);
extern void input_data (struct t_gui_buffer *buffer, char *data,
int only_builtin);
#endif /* wee-input.h */

68
src/core/wee-list.c
View File

@ -78,7 +78,7 @@ weelist_find_pos (struct t_weelist *weelist, char *data)
void
weelist_insert (struct t_weelist *weelist, struct t_weelist_item *item,
int position)
char *where)
{
struct t_weelist_item *pos_item;
@ -97,18 +97,12 @@ weelist_insert (struct t_weelist *weelist, struct t_weelist_item *item,
{
/* search position for new element, according to pos asked */
pos_item = NULL;
switch (position)
{
case WEELIST_POS_SORT:
pos_item = weelist_find_pos (weelist, item->data);
break;
case WEELIST_POS_BEGINNING:
pos_item = weelist->items;
break;
case WEELIST_POS_END:
pos_item = NULL;
break;
}
if (string_strcasecmp (where, WEELIST_POS_BEGINNING) == 0)
pos_item = weelist->items;
else if (string_strcasecmp (where, WEELIST_POS_END) == 0)
pos_item = NULL;
else
pos_item = weelist_find_pos (weelist, item->data);
if (pos_item)
{
@ -144,17 +138,17 @@ weelist_insert (struct t_weelist *weelist, struct t_weelist_item *item,
*/
struct t_weelist_item *
weelist_add (struct t_weelist *weelist, char *data, int position)
weelist_add (struct t_weelist *weelist, char *data, char *where)
{
struct t_weelist_item *new_item;
if (!weelist || !data || (!data[0]))
if (!weelist || !data || !data[0] || !where || !where[0])
return NULL;
if ((new_item = ((struct t_weelist_item *) malloc (sizeof (struct t_weelist_item)))))
if ((new_item = ((struct t_weelist_item *)malloc (sizeof (struct t_weelist_item)))))
{
new_item->data = strdup (data);
weelist_insert (weelist, new_item, position);
weelist_insert (weelist, new_item, where);
weelist->size++;
}
return new_item;
@ -230,6 +224,46 @@ weelist_get (struct t_weelist *weelist, int position)
return NULL;
}
/*
* weelist_next: get next item
*/
struct t_weelist_item *
weelist_next (struct t_weelist_item *item)
{
return item->next_item;
}
/*
* weelist_prev: get previous item
*/
struct t_weelist_item *
weelist_prev (struct t_weelist_item *item)
{
return item->prev_item;
}
/*
* weelist_string: get string pointer to item data
*/
char *
weelist_string (struct t_weelist_item *item)
{
return item->data;
}
/*
* weelist_size: return size of weelist
*/
int
weelist_size (struct t_weelist *weelist)
{
return weelist->size;
}
/*
* weelist_remove: remove an item from a list
*/

31
src/core/wee-list.h
View File

@ -20,9 +20,9 @@
#ifndef __WEECHAT_LIST_H
#define __WEECHAT_LIST_H 1
#define WEELIST_POS_SORT 0
#define WEELIST_POS_BEGINNING 1
#define WEELIST_POS_END 2
#define WEELIST_POS_SORT "sort"
#define WEELIST_POS_BEGINNING "beginning"
#define WEELIST_POS_END "end"
struct t_weelist_item
{
@ -39,13 +39,22 @@ struct t_weelist
};
extern struct t_weelist *weelist_new ();
extern struct t_weelist_item *weelist_add (struct t_weelist *, char *, int);
extern struct t_weelist_item *weelist_search (struct t_weelist *, char *);
extern struct t_weelist_item *weelist_casesearch (struct t_weelist *, char *);
extern struct t_weelist_item *weelist_get (struct t_weelist *, int);
extern void weelist_remove (struct t_weelist *, struct t_weelist_item *);
extern void weelist_remove_all (struct t_weelist *);
extern void weelist_free (struct t_weelist *);
extern void weelist_print_log (struct t_weelist *, char *);
extern struct t_weelist_item *weelist_add (struct t_weelist *weelist,
char *data, char *where);
extern struct t_weelist_item *weelist_search (struct t_weelist *weelist,
char *data);
extern struct t_weelist_item *weelist_casesearch (struct t_weelist *weelist,
char *data);
extern struct t_weelist_item *weelist_get (struct t_weelist *weelist,
int position);
extern struct t_weelist_item *weelist_next (struct t_weelist_item *item);
extern struct t_weelist_item *weelist_prev (struct t_weelist_item *item);
extern char *weelist_string (struct t_weelist_item *item);
extern int weelist_size (struct t_weelist *weelist);
extern void weelist_remove (struct t_weelist *weelist,
struct t_weelist_item *item);
extern void weelist_remove_all (struct t_weelist *weelist);
extern void weelist_free (struct t_weelist *weelist);
extern void weelist_print_log (struct t_weelist *weelist, char *name);
#endif /* wee-list.h */

4
src/core/wee-log.c
View File

@ -64,7 +64,7 @@ log_open (char *filename, char *mode)
{
filename_length = strlen (weechat_home) + 64;
weechat_log_filename =
(char *) malloc (filename_length * sizeof (char));
(char *)malloc (filename_length * sizeof (char));
snprintf (weechat_log_filename, filename_length,
"%s/%s", weechat_home, WEECHAT_LOG_NAME);
}
@ -204,7 +204,7 @@ log_crash_rename ()
log_close ();
length = strlen (weechat_home) + 128;
new_name = (char *) malloc (length);
new_name = (char *)malloc (length);
if (new_name)
{
time_now = time (NULL);

2
src/core/wee-log.h
View File

@ -25,7 +25,7 @@ extern FILE *weechat_log_file;
extern void log_init ();
extern void log_close ();
extern void log_printf (char *, ...);
extern void log_printf (char *message, ...);
extern int log_crash_rename ();
#endif /* wee-log.h */

36
src/core/wee-string.c
View File

@ -377,7 +377,7 @@ string_explode (char *string, char *separators, int keep_eol,
if (num_items != NULL)
*num_items = 0;
if (!string || !string[0])
if (!string || !string[0] || !separators || !separators[0])
return NULL;
/* calculate number of items */
@ -395,7 +395,7 @@ string_explode (char *string, char *separators, int keep_eol,
n_items = num_items_max;
array =
(char **) malloc ((n_items + 1) * sizeof (char *));
(char **)malloc ((n_items + 1) * sizeof (char *));
ptr1 = string;
ptr2 = string;
@ -422,7 +422,7 @@ string_explode (char *string, char *separators, int keep_eol,
else
{
array[i] =
(char *) malloc ((ptr2 - ptr1 + 1) * sizeof (char));
(char *)malloc ((ptr2 - ptr1 + 1) * sizeof (char));
array[i] = strncpy (array[i], ptr1, ptr2 - ptr1);
array[i][ptr2 - ptr1] = '\0';
}
@ -468,28 +468,28 @@ string_free_exploded (char **exploded_string)
*/
char **
string_split_command (char *command, char sep)
string_split_command (char *command, char separator)
{
int nb_substr, arr_idx, str_idx, type;
char **array;
char *buffer, *ptr, *p;
if (command == NULL)
if (!command || !command[0])
return NULL;
nb_substr = 1;
ptr = command;
while ( (p = strchr(ptr, sep)) != NULL)
while ( (p = strchr(ptr, separator)) != NULL)
{
nb_substr++;
ptr = ++p;
}
array = (char **) malloc ((nb_substr + 1) * sizeof(char *));
array = (char **)malloc ((nb_substr + 1) * sizeof(char *));
if (!array)
return NULL;
buffer = (char *) malloc ( (strlen(command) + 1) * sizeof (char));
buffer = (char *)malloc ( (strlen(command) + 1) * sizeof (char));
if (!buffer)
{
free (array);
@ -539,7 +539,7 @@ string_split_command (char *command, char sep)
free (buffer);
array = (char **) realloc (array, (arr_idx + 1) * sizeof(char *));
array = (char **)realloc (array, (arr_idx + 1) * sizeof(char *));
return array;
}
@ -550,15 +550,15 @@ string_split_command (char *command, char sep)
*/
void
string_free_splitted_command (char **commands)
string_free_splitted_command (char **splitted_command)
{
int i;
if (commands)
if (splitted_command)
{
for (i = 0; commands[i]; i++)
free (commands[i]);
free (commands);
for (i = 0; splitted_command[i]; i++)
free (splitted_command[i]);
free (splitted_command);
}
}
@ -590,7 +590,7 @@ string_iconv (int from_utf8, char *from_code, char *to_code, char *string)
ptr_inbuf = inbuf;
inbytesleft = strlen (inbuf);
outbytesleft = inbytesleft * 4;
outbuf = (char *) malloc (outbytesleft + 2);
outbuf = (char *)malloc (outbytesleft + 2);
ptr_outbuf = outbuf;
ptr_inbuf_shift = NULL;
done = 0;
@ -676,6 +676,9 @@ string_iconv_to_internal (char *charset, char *string)
{
char *input, *output;
if (!string)
return NULL;
input = strdup (string);
/* optimize for UTF-8: if charset is NULL => we use term charset =>
@ -710,6 +713,9 @@ string_iconv_from_internal (char *charset, char *string)
{
char *input, *output;
if (!string)
return NULL;
input = strdup (string);
/* optimize for UTF-8: if charset is NULL => we use term charset =>

36
src/core/wee-string.h
View File

@ -21,23 +21,25 @@
#define __WEECHAT_STRING_H 1
#ifndef HAVE_STRNDUP
extern char *strndup (char *, int);
extern char *strndup (char *string, int length);
#endif
extern void string_tolower (char *);
extern void string_toupper (char *);
extern int string_strcasecmp (char *, char *);
extern int string_strncasecmp (char *, char *, int);
extern char *string_strcasestr (char *, char *);
extern char *string_replace (char *, char *, char *);
extern char *string_remove_quotes (char *, char *);
extern char *string_convert_hex_chars (char *);
extern char **string_explode (char *, char *, int, int, int *);
extern void string_free_exploded (char **);
extern char **string_split_command (char *, char);
extern void string_free_splitted_command (char **);
extern char *string_iconv (int, char *, char *, char *);
extern char *string_iconv_to_internal (char *, char *);
extern char *string_iconv_from_internal (char *, char *);
extern void string_iconv_fprintf (FILE *, char *, ...);
extern void string_tolower (char *string);
extern void string_toupper (char *string);
extern int string_strcasecmp (char *string1, char *string2);
extern int string_strncasecmp (char *string1, char *string2, int max);
extern char *string_strcasestr (char *string, char *search);
extern char *string_replace (char *string, char *search, char *replace);
extern char *string_remove_quotes (char *string, char *quotes);
extern char *string_convert_hex_chars (char *string);
extern char **string_explode (char *string, char *separators, int keep_eol,
int num_items_max, int *num_items);
extern void string_free_exploded (char **exploded_string);
extern char **string_split_command (char *command, char separator);
extern void string_free_splitted_command (char **splitted_command);
extern char *string_iconv (int from_utf8, char *from_code, char *to_code,
char *string);
extern char *string_iconv_to_internal (char *charset, char *string);
extern char *string_iconv_from_internal (char *charset, char *string);
extern void string_iconv_fprintf (FILE *file, char *data, ...);
#endif /* wee-string.h */

2
src/core/wee-upgrade.c
View File

@ -600,7 +600,7 @@ session_read_str (FILE *file, char **string)
if (string)
{
(*string) = (char *) malloc (length + 1);
(*string) = (char *)malloc (length + 1);
if (!(*string))
return 0;

8
src/core/wee-utf8.c
View File

@ -300,7 +300,7 @@ utf8_strlen_screen (char *string)
return utf8_strlen (string);
num_char = mbstowcs (NULL, string, 0) + 1;
wstring = (wchar_t *) malloc ((num_char + 1) * sizeof (wchar_t));
wstring = (wchar_t *)malloc ((num_char + 1) * sizeof (wchar_t));
if (!wstring)
return utf8_strlen (string);
@ -351,13 +351,13 @@ utf8_charcasecmp (char *string1, char *string2)
return diff;
i++;
}
// string1 == string2 ?
/* string1 == string2 ? */
if ((i == length1) && (i == length2))
return 0;
// string1 < string2 ?
/* string1 < string2 ? */
if (i == length1)
return 1;
// string1 > string2
/* string1 > string2 */
return -1;
}

28
src/core/wee-utf8.h
View File

@ -33,19 +33,19 @@
extern int local_utf8;
extern void utf8_init ();
extern int utf8_has_8bits (char *);
extern int utf8_is_valid (char *, char **);
extern void utf8_normalize (char *, char);
extern char *utf8_prev_char (char *, char *);
extern char *utf8_next_char (char *);
extern int utf8_char_size (char *);
extern int utf8_strlen (char *);
extern int utf8_strnlen (char *, int);
extern int utf8_strlen_screen (char *);
extern int utf8_charcasecmp (char *, char *);
extern int utf8_char_size_screen (char *);
extern char *utf8_add_offset (char *, int);
extern int utf8_real_pos (char *, int);
extern int utf8_pos (char *, int);
extern int utf8_has_8bits (char *string);
extern int utf8_is_valid (char *string, char **error);
extern void utf8_normalize (char *string, char replacement);
extern char *utf8_prev_char (char *string_start, char *string);
extern char *utf8_next_char (char *string);
extern int utf8_char_size (char *string);
extern int utf8_strlen (char *string);
extern int utf8_strnlen (char *string, int bytes);
extern int utf8_strlen_screen (char *string);
extern int utf8_charcasecmp (char *string1, char *string2);
extern int utf8_char_size_screen (char *string);
extern char *utf8_add_offset (char *string, int offset);
extern int utf8_real_pos (char *string, int pos);
extern int utf8_pos (char *string, int real_pos);
#endif /* wee-utf8.h */

8
src/core/wee-util.c
View File

@ -152,13 +152,17 @@ util_create_dir (char *directory, int permissions)
*/
void
util_exec_on_files (char *directory, int (*callback)(char *))
util_exec_on_files (char *directory, void *data,
int (*callback)(void *data, char *filename))
{
char complete_filename[1024];
DIR *dir;
struct dirent *entry;
struct stat statbuf;
if (!directory || !callback)
return;
dir = opendir (directory);
if (dir)
{
@ -169,7 +173,7 @@ util_exec_on_files (char *directory, int (*callback)(char *))
lstat (complete_filename, &statbuf);
if (!S_ISDIR(statbuf.st_mode))
{
(int) (*callback) (complete_filename);
(int) (*callback) (data, complete_filename);
}
}
closedir (dir);

15
src/core/wee-util.h
View File

@ -20,12 +20,13 @@
#ifndef __WEECHAT_UTIL_H
#define __WEECHAT_UTIL_H 1
extern int util_timeval_cmp (struct timeval *, struct timeval *);
extern long util_timeval_diff (struct timeval *, struct timeval *);
extern void util_timeval_add (struct timeval *, long);
extern int util_get_time_length (char *);
extern int util_create_dir (char *, int);
extern void util_exec_on_files (char *, int (*)(char *));
extern char *util_search_full_lib_name (char *, char *);
extern int util_timeval_cmp (struct timeval *tv1, struct timeval *tv2);
extern long util_timeval_diff (struct timeval *tv1, struct timeval *tv2);
extern void util_timeval_add (struct timeval *tv, long interval);
extern int util_get_time_length (char *time_format);
extern int util_create_dir (char *directory, int permissions);
extern void util_exec_on_files (char *directory, void *data,
int (*callback)(void *data, char *filename));
extern char *util_search_full_lib_name (char *filename, char *sys_directory);
#endif /* wee-util.h */

4
src/core/weechat.c
View File

@ -362,7 +362,7 @@ weechat_create_home_dirs ()
}
dir_length = strlen (ptr_home) + 10;
weechat_home =
(char *) malloc (dir_length * sizeof (char));
(char *)malloc (dir_length * sizeof (char));
if (!weechat_home)
{
string_iconv_fprintf (stderr,
@ -521,7 +521,7 @@ weechat_dump (int crash)
plugin_print_log ();
hook_signal_exec ("dump_data", NULL);
hook_signal_send ("dump_data", NULL);
log_printf ("");
log_printf ("****** End of WeeChat dump ******");

4
src/core/weechat.h
View File

@ -108,7 +108,7 @@ extern int quit_weechat;
extern char *weechat_home;
extern char *local_charset;
extern void weechat_dump (int);
extern void weechat_shutdown (int, int);
extern void weechat_dump (int crash);
extern void weechat_shutdown (int return_code, int crash);
#endif /* weechat.h */

10
src/gui/curses/gui-curses-chat.c
View File

@ -31,6 +31,7 @@
#include "../../core/wee-config.h"
#include "../../core/wee-string.h"
#include "../../core/wee-utf8.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-color.h"
#include "../gui-main.h"
@ -849,13 +850,14 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
}
/*
* gui_chat_calculate_line_diff: returns pointer to line & offset for a difference
* with given line
* gui_chat_calculate_line_diff: returns pointer to line & offset for a
* difference with given line
*/
void
gui_chat_calculate_line_diff (struct t_gui_window *window, struct t_gui_line **line,
int *line_pos, int difference)
gui_chat_calculate_line_diff (struct t_gui_window *window,
struct t_gui_line **line, int *line_pos,
int difference)
{
int backward, current_size;

1
src/gui/curses/gui-curses-input.c
View File

@ -32,6 +32,7 @@
#include "../../core/wee-utf8.h"
#include "../../plugins/plugin.h"
#include "../gui-input.h"
#include "../gui-buffer.h"
#include "../gui-color.h"
#include "../gui-keyboard.h"
#include "../gui-main.h"

1
src/gui/curses/gui-curses-keyboard.c
View File

@ -31,6 +31,7 @@
#include "../../core/wee-utf8.h"
#include "../../core/wee-string.h"
#include "../gui-keyboard.h"
#include "../gui-buffer.h"
#include "../gui-color.h"
#include "../gui-input.h"
#include "../gui-completion.h"

3
src/gui/curses/gui-curses-main.c
View File

@ -37,6 +37,7 @@
#include "../../core/wee-util.h"
#include "../../plugins/plugin.h"
#include "../gui-main.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-color.h"
#include "../gui-infobar.h"
@ -198,7 +199,7 @@ gui_main_end ()
/* delete all buffers */
while (gui_buffers)
gui_buffer_free (gui_buffers, 0);
gui_buffer_close (gui_buffers, 0);
/* delete global history */
gui_history_global_free ();

1
src/gui/curses/gui-curses-nicklist.c
View File

@ -30,6 +30,7 @@
#include "../../core/wee-string.h"
#include "../../core/wee-utf8.h"
#include "../gui-nicklist.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-color.h"
#include "../gui-main.h"

1
src/gui/curses/gui-curses-status.c
View File

@ -31,6 +31,7 @@
#include "../../core/wee-utf8.h"
#include "../../plugins/plugin.h"
#include "../gui-status.h"
#include "../gui-buffer.h"
#include "../gui-color.h"
#include "../gui-main.h"
#include "../gui-hotlist.h"

3
src/gui/curses/gui-curses-window.c
View File

@ -34,6 +34,7 @@
#include "../../core/wee-log.h"
#include "../../core/wee-string.h"
#include "../gui-window.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-color.h"
#include "../gui-hotlist.h"
@ -77,7 +78,7 @@ gui_window_objects_init (struct t_gui_window *window)
{
struct t_gui_curses_objects *new_objects;
if ((new_objects = (struct t_gui_curses_objects *) malloc (sizeof (struct t_gui_curses_objects))))
if ((new_objects = (struct t_gui_curses_objects *)malloc (sizeof (struct t_gui_curses_objects))))
{
window->gui_objects = new_objects;
GUI_CURSES(window)->win_title = NULL;

13
src/gui/curses/gui-curses.h
View File

@ -50,12 +50,13 @@ extern struct t_gui_color gui_weechat_colors[];
extern int gui_refresh_screen_needed;
/* color functions */
extern int gui_color_get_pair (int);
extern int gui_color_get_pair (int num_color);
extern void gui_color_init ();
/* chat functions */
extern void gui_chat_calculate_line_diff (struct t_gui_window *,
struct t_gui_line **, int *, int);
extern void gui_chat_calculate_line_diff (struct t_gui_window *window,
struct t_gui_line **line,
int *line_pos, int difference);
/* keyboard functions */
extern void gui_keyboard_default_bindings ();
@ -63,9 +64,9 @@ extern void gui_keyboard_read ();
extern void gui_keyboard_flush ();
/* window functions */
extern void gui_window_wprintw (WINDOW *, char *, ...);
extern void gui_window_curses_clear (WINDOW *, int);
extern void gui_window_set_weechat_color (WINDOW *, int);
extern void gui_window_wprintw (WINDOW *window, char *data, ...);
extern void gui_window_curses_clear (WINDOW *window, int num_color);
extern void gui_window_set_weechat_color (WINDOW *window, int num_color);
extern void gui_window_refresh_screen_sigwinch ();
extern void gui_window_title_set ();
extern void gui_window_title_reset ();

1
src/gui/gtk/gui-gtk-chat.c
View File

@ -30,6 +30,7 @@
#include "../../core/weechat.h"
#include "../../core/wee-config.h"
#include "../../core/wee-utf8.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-color.h"
#include "../gui-main.h"

3
src/gui/gtk/gui-gtk-main.c
View File

@ -34,6 +34,7 @@
#include "../../core/wee-utf8.h"
#include "../../plugins/plugin.h"
#include "../gui-main.h"
#include "../gui-buffer.h"
#include "../gui-history.h"
#include "../gui-infobar.h"
#include "../gui-input.h"
@ -211,7 +212,7 @@ gui_main_end ()
/* delete all buffers */
while (gui_buffers)
gui_buffer_free (gui_buffers, 0);
gui_buffer_close (gui_buffers, 0);
/* delete all windows */
while (gui_windows)

3
src/gui/gtk/gui-gtk-window.c
View File

@ -30,6 +30,7 @@
#include "../../core/wee-config.h"
#include "../../core/wee-log.h"
#include "../gui-window.h"
#include "../gui-buffer.h"
#include "../gui-chat.h"
#include "../gui-hotlist.h"
#include "../gui-nicklist.h"
@ -67,7 +68,7 @@ gui_window_objects_init (struct t_gui_window *window)
{
struct t_gui_gtk_objects *new_objects;
if ((new_objects = (struct t_gui_gtk_objects *) malloc (sizeof (struct t_gui_gtk_objects))))
if ((new_objects = (struct t_gui_gtk_objects *)malloc (sizeof (struct t_gui_gtk_objects))))
{
window->gui_objects = new_objects;
GUI_GTK(window)->textview_chat = NULL;

14
src/gui/gtk/gui-gtk.h
View File

@ -22,6 +22,9 @@
#include <gtk/gtk.h>
struct t_gui_window;
struct t_gui_line;
/* TODO: remove these temporary defines */
#define A_BOLD 1
@ -78,12 +81,13 @@ extern GtkWidget *gui_gtk_entry_input;
extern GtkWidget *gui_gtk_label1;
/* color functions */
extern int gui_color_get_pair (int);
extern int gui_color_get_pair (int num_color);
extern void gui_color_init ();
/* chat functions */
extern void gui_chat_calculate_line_diff (struct t_gui_window *,
struct t_gui_line **, int *, int);
extern void gui_chat_calculate_line_diff (struct t_gui_window *window,
struct t_gui_line **line,
int *line_pos, int difference);
/* keyboard functions */
extern void gui_keyboard_default_bindings ();
@ -91,7 +95,7 @@ extern void gui_keyboard_read ();
extern void gui_keyboard_flush ();
/* window functions */
extern void gui_window_set_title ();
extern void gui_window_reset_title ();
extern void gui_window_title_set ();
extern void gui_window_title_reset ();
#endif /* gui-gtk.h */

3
src/gui/gui-action.c
View File

@ -37,6 +37,7 @@
#include "../core/wee-log.h"
#include "../core/wee-string.h"
#include "../core/wee-utf8.h"
#include "gui-action.h"
#include "gui-buffer.h"
#include "gui-chat.h"
#include "gui-completion.h"
@ -62,7 +63,7 @@ gui_action_clipboard_copy (char *buffer, int size)
if (gui_input_clipboard != NULL)
free (gui_input_clipboard);
gui_input_clipboard = (char *) malloc( (size + 1) * sizeof(*gui_input_clipboard));
gui_input_clipboard = (char *)malloc( (size + 1) * sizeof(*gui_input_clipboard));
if (gui_input_clipboard)
{

106
src/gui/gui-action.h
View File

@ -22,58 +22,58 @@
/* action functions */
extern void gui_action_clipboard_copy (char *, int);
extern void gui_action_clipboard_paste (char *);
extern void gui_action_return (char *);
extern void gui_action_tab (char *);
extern void gui_action_tab_previous (char *);
extern void gui_action_backspace (char *);
extern void gui_action_delete (char *);
extern void gui_action_delete_previous_word (char *);
extern void gui_action_delete_next_word (char *);
extern void gui_action_delete_begin_of_line (char *);
extern void gui_action_delete_end_of_line (char *);
extern void gui_action_delete_line (char *);
extern void gui_action_transpose_chars (char *);
extern void gui_action_home (char *);
extern void gui_action_end (char *);
extern void gui_action_left (char *);
extern void gui_action_previous_word (char *);
extern void gui_action_right (char *);
extern void gui_action_next_word (char *);
extern void gui_action_up (char *);
extern void gui_action_up_global (char *);
extern void gui_action_down (char *);
extern void gui_action_down_global (char *);
extern void gui_action_page_up (char *);
extern void gui_action_page_down (char *);
extern void gui_action_scroll_up (char *);
extern void gui_action_scroll_down (char *);
extern void gui_action_scroll_top (char *);
extern void gui_action_scroll_bottom (char *);
extern void gui_action_scroll_topic_left (char *);
extern void gui_action_scroll_topic_right (char *);
extern void gui_action_nick_beginning (char *);
extern void gui_action_nick_end (char *);
extern void gui_action_nick_page_up (char *);
extern void gui_action_nick_page_down (char *);
extern void gui_action_jump_smart (char *);
extern void gui_action_jump_dcc (char *);
extern void gui_action_jump_raw_data (char *);
extern void gui_action_jump_last_buffer (char *);
extern void gui_action_jump_previous_buffer (char *);
extern void gui_action_jump_server (char *);
extern void gui_action_jump_next_server (char *);
extern void gui_action_switch_server (char *);
extern void gui_action_scroll_previous_highlight (char *);
extern void gui_action_scroll_next_highlight (char *);
extern void gui_action_scroll_unread (char *);
extern void gui_action_set_unread (char *);
extern void gui_action_hotlist_clear (char *);
extern void gui_action_infobar_clear (char *);
extern void gui_action_refresh_screen (char *);
extern void gui_action_grab_key (char *);
extern void gui_action_insert_string (char *);
extern void gui_action_search_text (char *);
extern void gui_action_clipboard_copy (char *buffer, int size);
extern void gui_action_clipboard_paste (char *args);
extern void gui_action_return (char *args);
extern void gui_action_tab (char *args);
extern void gui_action_tab_previous (char *args);
extern void gui_action_backspace (char *args);
extern void gui_action_delete (char *args);
extern void gui_action_delete_previous_word (char *args);
extern void gui_action_delete_next_word (char *args);
extern void gui_action_delete_begin_of_line (char *args);
extern void gui_action_delete_end_of_line (char *args);
extern void gui_action_delete_line (char *args);
extern void gui_action_transpose_chars (char *args);
extern void gui_action_home (char *args);
extern void gui_action_end (char *args);
extern void gui_action_left (char *args);
extern void gui_action_previous_word (char *args);
extern void gui_action_right (char *args);
extern void gui_action_next_word (char *args);
extern void gui_action_up (char *args);
extern void gui_action_up_global (char *args);
extern void gui_action_down (char *args);
extern void gui_action_down_global (char *args);
extern void gui_action_page_up (char *args);
extern void gui_action_page_down (char *args);
extern void gui_action_scroll_up (char *args);
extern void gui_action_scroll_down (char *args);
extern void gui_action_scroll_top (char *args);
extern void gui_action_scroll_bottom (char *args);
extern void gui_action_scroll_topic_left (char *args);
extern void gui_action_scroll_topic_right (char *args);
extern void gui_action_nick_beginning (char *args);
extern void gui_action_nick_end (char *args);
extern void gui_action_nick_page_up (char *args);
extern void gui_action_nick_page_down (char *args);
extern void gui_action_jump_smart (char *args);
extern void gui_action_jump_dcc (char *args);
extern void gui_action_jump_raw_data (char *args);
extern void gui_action_jump_last_buffer (char *args);
extern void gui_action_jump_previous_buffer (char *args);
extern void gui_action_jump_server (char *args);
extern void gui_action_jump_next_server (char *args);
extern void gui_action_switch_server (char *args);
extern void gui_action_scroll_previous_highlight (char *args);
extern void gui_action_scroll_next_highlight (char *args);
extern void gui_action_scroll_unread (char *args);
extern void gui_action_set_unread (char *args);
extern void gui_action_hotlist_clear (char *args);
extern void gui_action_infobar_clear (char *args);
extern void gui_action_refresh_screen (char *args);
extern void gui_action_grab_key (char *args);
extern void gui_action_insert_string (char *args);
extern void gui_action_search_text (char *args);
#endif /* gui-action.h */

18
src/gui/gui-buffer.c
View File

@ -65,8 +65,8 @@ struct t_gui_buffer *gui_buffer_before_raw_data = NULL; /* buf. before raw */
*/
struct t_gui_buffer *
gui_buffer_new (void *plugin, char *category, char *name,
void (*input_data_cb)(struct t_gui_buffer *, char *))
gui_buffer_new (struct t_weechat_plugin *plugin, char *category, char *name,
void (*callback_input_data)(struct t_gui_buffer *buffer, char *data))
{
struct t_gui_buffer *new_buffer;
struct t_gui_completion *new_completion;
@ -121,11 +121,11 @@ gui_buffer_new (void *plugin, char *category, char *name,
/* input */
new_buffer->input = 1;
new_buffer->input_data_cb = input_data_cb;
new_buffer->input_data_cb = callback_input_data;
new_buffer->input_nick = NULL;
new_buffer->input_buffer_alloc = GUI_BUFFER_INPUT_BLOCK_SIZE;
new_buffer->input_buffer = (char *) malloc (GUI_BUFFER_INPUT_BLOCK_SIZE);
new_buffer->input_buffer_color_mask = (char *) malloc (GUI_BUFFER_INPUT_BLOCK_SIZE);
new_buffer->input_buffer = (char *)malloc (GUI_BUFFER_INPUT_BLOCK_SIZE);
new_buffer->input_buffer_color_mask = (char *)malloc (GUI_BUFFER_INPUT_BLOCK_SIZE);
new_buffer->input_buffer[0] = '\0';
new_buffer->input_buffer_color_mask[0] = '\0';
new_buffer->input_buffer_size = 0;
@ -174,7 +174,7 @@ gui_buffer_new (void *plugin, char *category, char *name,
gui_window_redraw_buffer (new_buffer);
}
hook_signal_exec ("buffer_open", new_buffer);
hook_signal_send ("buffer_open", new_buffer);
}
else
return NULL;
@ -572,17 +572,17 @@ gui_buffer_clear_all ()
}
/*
* gui_buffer_free: delete a buffer
* gui_buffer_close: close a buffer
*/
void
gui_buffer_free (struct t_gui_buffer *buffer, int switch_to_another)
gui_buffer_close (struct t_gui_buffer *buffer, int switch_to_another)
{
struct t_gui_window *ptr_window;
struct t_gui_buffer *ptr_buffer;
struct t_gui_line *ptr_line;
hook_signal_exec ("buffer_close", buffer);
hook_signal_send ("buffer_close", buffer);
if (switch_to_another)
{

75
src/gui/gui-buffer.h
View File

@ -50,17 +50,6 @@ struct t_gui_line
struct t_gui_line *next_line; /* link to next line */
};
struct t_gui_nick
{
char *nick; /* nickname */
int sort_index; /* index to force sort */
int color_nick; /* color for nick in nicklist */
char prefix; /* prefix for nick (for admins, ..) */
int color_prefix; /* color for prefix */
struct t_gui_nick *prev_nick; /* link to previous nick in nicklist */
struct t_gui_nick *next_nick; /* link to next nick in nicklist */
};
struct t_gui_buffer
{
struct t_weechat_plugin *plugin; /* plugin which created this buffer */
@ -96,7 +85,7 @@ struct t_gui_buffer
/* inupt */
int input; /* = 1 if input is enabled */
void (*input_data_cb)(struct t_gui_buffer *, char *);
void (*input_data_cb)(struct t_gui_buffer *buffer, char *data);
/* called when user send data */
/* to this buffer */
char *input_nick; /* self nick */
@ -139,38 +128,40 @@ extern struct t_gui_buffer *gui_buffer_before_raw_data;
/* buffer functions */
extern struct t_gui_buffer *gui_buffer_new (void *, char *, char *,
void (*)(struct t_gui_buffer *, char *));
extern int gui_buffer_valid (struct t_gui_buffer *);
extern void *gui_buffer_get (struct t_gui_buffer *, char *);
extern void gui_buffer_set_category (struct t_gui_buffer *, char *);
extern void gui_buffer_set_name (struct t_gui_buffer *, char *);
extern void gui_buffer_set_log (struct t_gui_buffer *, char *);
extern void gui_buffer_set_title (struct t_gui_buffer *, char *);
extern void gui_buffer_set_nick_case_sensitive (struct t_gui_buffer *, int);
extern void gui_buffer_set_nick (struct t_gui_buffer *, char *);
extern void gui_buffer_set (struct t_gui_buffer *, char *, char *);
extern struct t_gui_buffer *gui_buffer_new (struct t_weechat_plugin *plugin,
char *category, char *name,
void (*input_data_cb)(struct t_gui_buffer *buffer,
char *data));
extern int gui_buffer_valid (struct t_gui_buffer *buffer);
extern void *gui_buffer_get (struct t_gui_buffer *buffer, char *property);
extern void gui_buffer_set_category (struct t_gui_buffer *buffer,
char *category);
extern void gui_buffer_set_name (struct t_gui_buffer *buffer, char *name);
extern void gui_buffer_set_title (struct t_gui_buffer *buffer, char *new_title);
extern void gui_buffer_set_nicklist (struct t_gui_buffer *buffer, int nicklist);
extern void gui_buffer_set_nick_case_sensitive (struct t_gui_buffer * buffer,
int nick_case_sensitive);
extern void gui_buffer_set_nick (struct t_gui_buffer *buffer, char *new_nick);
extern void gui_buffer_set (struct t_gui_buffer *buffer, char *property,
char *value);
extern struct t_gui_buffer *gui_buffer_search_main ();
extern struct t_gui_buffer *gui_buffer_search_by_category_name (char *,
char *);
extern struct t_gui_buffer *gui_buffer_search_by_number (int);
extern struct t_gui_window *gui_buffer_find_window (struct t_gui_buffer *);
extern void gui_buffer_find_context (void *, void *,
struct t_gui_window **,
struct t_gui_buffer **);
extern int gui_buffer_is_scrolled (struct t_gui_buffer *);
extern struct t_gui_buffer *gui_buffer_get_dcc (struct t_gui_window *);
extern void gui_buffer_clear (struct t_gui_buffer *);
extern struct t_gui_buffer *gui_buffer_search_by_category_name (char *category,
char *name);
extern struct t_gui_buffer *gui_buffer_search_by_number (int number);
extern struct t_gui_window *gui_buffer_find_window (struct t_gui_buffer *buffer);
extern int gui_buffer_is_scrolled (struct t_gui_buffer *buffer);
extern struct t_gui_buffer *gui_buffer_get_dcc (struct t_gui_window *window);
extern void gui_buffer_clear (struct t_gui_buffer *buffer);
extern void gui_buffer_clear_all ();
extern void gui_buffer_free (struct t_gui_buffer *, int);
extern void gui_buffer_switch_previous (struct t_gui_window *);
extern void gui_buffer_switch_next (struct t_gui_window *);
extern void gui_buffer_switch_dcc (struct t_gui_window *);
extern void gui_buffer_switch_raw_data (struct t_gui_window *);
extern struct t_gui_buffer *gui_buffer_switch_by_number (struct t_gui_window *,
int);
extern void gui_buffer_move_to_number (struct t_gui_buffer *, int);
extern void gui_buffer_dump_hexa (struct t_gui_buffer *);
extern void gui_buffer_close (struct t_gui_buffer *buffer, int switch_to_another);
extern void gui_buffer_switch_previous (struct t_gui_window *window);
extern void gui_buffer_switch_next (struct t_gui_window *window);
extern void gui_buffer_switch_dcc (struct t_gui_window *window);
extern void gui_buffer_switch_raw_data (struct t_gui_window *window);
extern struct t_gui_buffer *gui_buffer_switch_by_number (struct t_gui_window *window,
int number);
extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number);
extern void gui_buffer_dump_hexa (struct t_gui_buffer *buffer);
extern void gui_buffer_print_log ();
#endif /* gui-buffer.h */

3
src/gui/gui-chat.c
View File

@ -35,6 +35,7 @@
#include "../core/wee-string.h"
#include "../core/wee-utf8.h"
#include "gui-chat.h"
#include "gui-buffer.h"
#include "gui-color.h"
#include "gui-hotlist.h"
#include "gui-main.h"
@ -409,7 +410,7 @@ gui_chat_line_add (struct t_gui_buffer *buffer, time_t date,
{
struct t_gui_line *new_line, *ptr_line;
new_line = (struct t_gui_line *) malloc (sizeof (struct t_gui_line));
new_line = (struct t_gui_line *)malloc (sizeof (struct t_gui_line));
if (!new_line)
{
log_printf (_("Not enough memory for new line"));

43
src/gui/gui-chat.h
View File

@ -20,7 +20,9 @@
#ifndef __WEECHAT_GUI_CHAT_H
#define __WEECHAT_GUI_CHAT_H 1
#include "gui-buffer.h"
struct t_gui_window;
struct t_gui_buffer;
struct t_gui_line;
#define gui_chat_printf(buffer, argz...) \
gui_chat_printf_date(buffer, 0, ##argz) \
@ -44,24 +46,33 @@ extern int gui_chat_time_length;
/* chat functions */
extern void gui_chat_prefix_build ();
extern int gui_chat_strlen_screen (char *);
extern int gui_chat_string_real_pos (char *, int);
extern void gui_chat_get_word_info (struct t_gui_window *,
char *, int *, int *, int *, int *);
extern int gui_chat_strlen_screen (char *string);
extern int gui_chat_string_real_pos (char *string, int pos);
extern void gui_chat_get_word_info (struct t_gui_window *window,
char *data, int *word_start_offset,
int *word_end_offset,
int *word_length_with_spaces,
int *word_length);
extern void gui_chat_change_time_format ();
extern int gui_chat_get_line_align (struct t_gui_buffer *,
struct t_gui_line *, int);
extern int gui_chat_line_search (struct t_gui_line *, char *, int);
extern void gui_chat_line_free (struct t_gui_line *);
extern void gui_chat_printf_date (struct t_gui_buffer *, time_t, char *, ...);
extern void gui_chat_printf_raw_data (void *, int, int, char *);
extern int gui_chat_get_line_align (struct t_gui_buffer *buffer,
struct t_gui_line *line,
int with_suffix);
extern int gui_chat_line_search (struct t_gui_line *line, char *text,
int case_sensitive);
extern void gui_chat_line_free (struct t_gui_line *line);
extern void gui_chat_printf_date (struct t_gui_buffer *buffer, time_t date,
char *message, ...);
extern void gui_chat_printf_raw_data (void *server, int send, int modified,
char *message);
/* chat functions (GUI dependent) */
extern void gui_chat_draw_title (struct t_gui_buffer *, int);
extern char *gui_chat_string_next_char (struct t_gui_window *, unsigned char *,
int);
extern void gui_chat_draw (struct t_gui_buffer *, int);
extern void gui_chat_draw_line (struct t_gui_buffer *, struct t_gui_line *);
extern void gui_chat_draw_title (struct t_gui_buffer *buffer, int erase);
extern char *gui_chat_string_next_char (struct t_gui_window *window,
unsigned char *string,
int apply_style);
extern void gui_chat_draw (struct t_gui_buffer *buffer, int erase);
extern void gui_chat_draw_line (struct t_gui_buffer *buffer,
struct t_gui_line *line);
#endif /* gui-chat.h */

8
src/gui/gui-color.h
View File

@ -142,13 +142,13 @@ extern struct t_gui_color *gui_color[GUI_NUM_COLORS];
/* color functions */
extern int gui_color_search_config (char *);
extern unsigned char *gui_color_decode (unsigned char *);
extern int gui_color_search_config (char *color_name);
extern unsigned char *gui_color_decode (unsigned char *string);
/* color functions (GUI dependent) */
extern int gui_color_assign (int *, char *);
extern char *gui_color_get_name (int);
extern int gui_color_assign (int *color, char *color_name);
extern char *gui_color_get_name (int num_color);
extern void gui_color_init_pairs ();
extern void gui_color_rebuild_weechat ();

11
src/gui/gui-completion.c
View File

@ -228,7 +228,7 @@ gui_completion_nickncmp (char *base_word, char *nick, int max)
void
gui_completion_list_add (struct t_gui_completion *completion, char *word,
int nick_completion, int position)
int nick_completion, char *where)
{
if (!word || !word[0])
return;
@ -239,8 +239,7 @@ gui_completion_list_add (struct t_gui_completion *completion, char *word,
|| (!nick_completion && (string_strncasecmp (completion->base_word, word,
strlen (completion->base_word)) == 0)))
{
weelist_add (completion->completion_list,
word, position);
weelist_add (completion->completion_list, word, where);
}
}
@ -296,7 +295,7 @@ gui_completion_list_add_filename (struct t_gui_completion *completion)
char home[3] = { '~', DIR_SEPARATOR_CHAR, '\0' };
buffer_len = PATH_MAX;
buffer = (char *) malloc (buffer_len * sizeof (char));
buffer = (char *)malloc (buffer_len * sizeof (char));
if (!buffer)
return;
@ -880,7 +879,7 @@ gui_completion_find_context (struct t_gui_completion *completion, char *data,
if (pos_start <= pos_end)
{
completion->position_replace = pos_start;
completion->base_word = (char *) malloc (pos_end - pos_start + 2);
completion->base_word = (char *)malloc (pos_end - pos_start + 2);
for (i = pos_start; i <= pos_end; i++)
completion->base_word[i - pos_start] = data[i];
completion->base_word[pos_end - pos_start + 1] = '\0';
@ -905,7 +904,7 @@ gui_completion_find_context (struct t_gui_completion *completion, char *data,
if (data[pos_end] == ' ')
pos_end--;
completion->base_command = (char *) malloc (pos_end - pos_start + 2);
completion->base_command = (char *)malloc (pos_end - pos_start + 2);
for (i = pos_start; i <= pos_end; i++)
completion->base_command[i - pos_start] = data[i];
completion->base_command[pos_end - pos_start + 1] = '\0';

11
src/gui/gui-completion.h
View File

@ -53,9 +53,12 @@ struct t_gui_completion
/* completion functions */
extern void gui_completion_init (struct t_gui_completion *, struct t_gui_buffer *);
extern void gui_completion_free (struct t_gui_completion *);
extern void gui_completion_search (struct t_gui_completion *, int, char *, int, int);
extern void gui_completion_print_log (struct t_gui_completion *);
extern void gui_completion_init (struct t_gui_completion *completion,
struct t_gui_buffer *buffer);
extern void gui_completion_free (struct t_gui_completion *completion);
extern void gui_completion_search (struct t_gui_completion *completion,
int direction, char *data, int size,
int pos);
extern void gui_completion_print_log (struct t_gui_completion *completion);
#endif /* gui-completion.h */

68
src/gui/gui-history.c
View File

@ -44,19 +44,16 @@ int num_history_global = 0;
*/
void
gui_history_buffer_add (void *buffer, char *string)
gui_history_buffer_add (struct t_gui_buffer *buffer, char *string)
{
struct t_gui_buffer *ptr_buffer;
struct t_gui_history *new_history, *ptr_history;
ptr_buffer = (struct t_gui_buffer *)buffer;
if (!string)
return;
if (!ptr_buffer->history
|| (ptr_buffer->history
&& (strcmp (ptr_buffer->history->text, string) != 0)))
if (!buffer->history
|| (buffer->history
&& (strcmp (buffer->history->text, string) != 0)))
{
new_history = (struct t_gui_history *)malloc (sizeof (struct t_gui_history));
if (new_history)
@ -65,28 +62,28 @@ gui_history_buffer_add (void *buffer, char *string)
/*if (config_log_hide_nickserv_pwd)
irc_display_hide_password (new_history->text, 1);*/
if (ptr_buffer->history)
ptr_buffer->history->prev_history = new_history;
if (buffer->history)
buffer->history->prev_history = new_history;
else
ptr_buffer->last_history = new_history;
new_history->next_history = ptr_buffer->history;
buffer->last_history = new_history;
new_history->next_history = buffer->history;
new_history->prev_history = NULL;
ptr_buffer->history = new_history;
ptr_buffer->num_history++;
buffer->history = new_history;
buffer->num_history++;
/* remove one command if necessary */
if ((CONFIG_INTEGER(config_history_max_commands) > 0)
&& (ptr_buffer->num_history > CONFIG_INTEGER(config_history_max_commands)))
&& (buffer->num_history > CONFIG_INTEGER(config_history_max_commands)))
{
ptr_history = ptr_buffer->last_history->prev_history;
if (ptr_buffer->ptr_history == ptr_buffer->last_history)
ptr_buffer->ptr_history = ptr_history;
ptr_buffer->last_history->prev_history->next_history = NULL;
if (ptr_buffer->last_history->text)
free (ptr_buffer->last_history->text);
free (ptr_buffer->last_history);
ptr_buffer->last_history = ptr_history;
ptr_buffer->num_history++;
ptr_history = buffer->last_history->prev_history;
if (buffer->ptr_history == buffer->last_history)
buffer->ptr_history = ptr_history;
buffer->last_history->prev_history->next_history = NULL;
if (buffer->last_history->text)
free (buffer->last_history->text);
free (buffer->last_history);
buffer->last_history = ptr_history;
buffer->num_history++;
}
}
}
@ -171,23 +168,20 @@ gui_history_global_free ()
*/
void
gui_history_buffer_free (void *buffer)
gui_history_buffer_free (struct t_gui_buffer *buffer)
{
struct t_gui_buffer *ptr_buffer;
struct t_gui_history *ptr_history;
ptr_buffer = (struct t_gui_buffer *)buffer;
while (ptr_buffer->history)
while (buffer->history)
{
ptr_history = ptr_buffer->history->next_history;
if (ptr_buffer->history->text)
free (ptr_buffer->history->text);
free (ptr_buffer->history);
ptr_buffer->history = ptr_history;
ptr_history = buffer->history->next_history;
if (buffer->history->text)
free (buffer->history->text);
free (buffer->history);
buffer->history = ptr_history;
}
ptr_buffer->history = NULL;
ptr_buffer->last_history = NULL;
ptr_buffer->ptr_history = NULL;
ptr_buffer->num_history = 0;
buffer->history = NULL;
buffer->last_history = NULL;
buffer->ptr_history = NULL;
buffer->num_history = 0;
}

8
src/gui/gui-history.h
View File

@ -20,6 +20,8 @@
#ifndef __WEECHAT_GUI_HISTORY_H
#define __WEECHAT_GUI_HISTORY_H 1
struct t_gui_buffer;
struct t_gui_history
{
char *text; /* text or command (entered by user) */
@ -32,9 +34,9 @@ extern struct t_gui_history *history_global_last;
extern struct t_gui_history *history_global_ptr;
/* history functions (gui-history.c) */
extern void gui_history_buffer_add (void *, char *);
extern void gui_history_global_add (char *);
extern void gui_history_buffer_add (struct t_gui_buffer *buffer, char *string);
extern void gui_history_global_add (char *string);
extern void gui_history_global_free ();
extern void gui_history_buffer_free (void *);
extern void gui_history_buffer_free (struct t_gui_buffer *buffer);
#endif /* gui-history.h */

6
src/gui/gui-hotlist.c
View File

@ -207,7 +207,8 @@ gui_hotlist_add (struct t_gui_buffer *buffer, int priority,
gui_hotlist_free (&gui_hotlist, &last_gui_hotlist, ptr_hotlist);
}
if ((new_hotlist = (struct t_gui_hotlist *) malloc (sizeof (struct t_gui_hotlist))) == NULL)
new_hotlist = (struct t_gui_hotlist *)malloc (sizeof (struct t_gui_hotlist));
if (!new_hotlist)
{
log_printf (_("Error: not enough memory to add a buffer to "
"hotlist"));
@ -236,7 +237,8 @@ gui_hotlist_dup (struct t_gui_hotlist *hotlist)
{
struct t_gui_hotlist *new_hotlist;
if ((new_hotlist = (struct t_gui_hotlist *) malloc (sizeof (struct t_gui_hotlist))))
new_hotlist = (struct t_gui_hotlist *)malloc (sizeof (struct t_gui_hotlist));
if (new_hotlist)
{
new_hotlist->priority = hotlist->priority;
memcpy (&(new_hotlist->creation_time), &(hotlist->creation_time),

15
src/gui/gui-hotlist.h
View File

@ -44,13 +44,16 @@ extern int gui_add_hotlist;
/* hotlist functions */
extern void gui_hotlist_add (struct t_gui_buffer *, int, struct timeval *, int);
extern void gui_hotlist_add (struct t_gui_buffer *buffer, int priority,
struct timeval *creation_time,
int allow_current_buffer);
extern void gui_hotlist_resort ();
extern void gui_hotlist_free (struct t_gui_hotlist **, struct t_gui_hotlist **,
struct t_gui_hotlist *);
extern void gui_hotlist_free_all (struct t_gui_hotlist **,
struct t_gui_hotlist **);
extern void gui_hotlist_remove_buffer (struct t_gui_buffer *);
extern void gui_hotlist_free (struct t_gui_hotlist **hotlist,
struct t_gui_hotlist **last_hotlist,
struct t_gui_hotlist *ptr_hotlist);
extern void gui_hotlist_free_all (struct t_gui_hotlist **hotlist,
struct t_gui_hotlist **last_hotlist);
extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer);
extern void gui_hotlist_print_log ();
#endif /* gui-hotlist.h */

4
src/gui/gui-infobar.c
View File

@ -45,7 +45,7 @@ struct t_hook *gui_infobar_highlight_timer = NULL; /* highlight timer */
*/
void
gui_infobar_printf (int time_displayed, int color, char *message, ...)
gui_infobar_printf (int delay, int color, char *message, ...)
{
static char buf[1024];
va_list argptr;
@ -70,7 +70,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
pos = strchr (ptr_infobar->text, '\n');
if (pos)
pos[0] = '\0';
ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
ptr_infobar->remaining_time = (delay <= 0) ? -1 : delay;
ptr_infobar->next_infobar = gui_infobar;
gui_infobar = ptr_infobar;
gui_infobar_draw (gui_current_window->buffer, 1);

12
src/gui/gui-infobar.h
View File

@ -20,8 +20,6 @@
#ifndef __WEECHAT_GUI_INFOBAR_H
#define __WEECHAT_GUI_INFOBAR_H 1
#include "gui-buffer.h"
struct t_gui_infobar
{
int color; /* text color */
@ -40,15 +38,15 @@ extern struct t_hook *gui_infobar_highlight_timer;
/* infobar functions */
extern void gui_infobar_printf (int, int, char *, ...);
extern void gui_infobar_printf (int delay, int color, char *message, ...);
extern void gui_infobar_remove ();
extern void gui_infobar_remove_all ();
/* infobar functions (GUI dependent) */
extern void gui_infobar_draw_time (struct t_gui_buffer *);
extern void gui_infobar_draw (struct t_gui_buffer *, int);
extern int gui_infobar_refresh_timer_cb (void *);
extern int gui_infobar_highlight_timer_cb (void *);
extern void gui_infobar_draw_time (struct t_gui_buffer *buffer);
extern void gui_infobar_draw (struct t_gui_buffer *buffer, int erase);
extern int gui_infobar_refresh_timer_cb (void *data);
extern int gui_infobar_highlight_timer_cb (void *data);
#endif /* gui-infobar.h */

12
src/gui/gui-input.c
View File

@ -31,11 +31,12 @@
#include "../core/wee-utf8.h"
#include "../plugins/plugin.h"
#include "gui-input.h"
#include "gui-buffer.h"
#include "gui-completion.h"
#include "gui-window.h"
char *gui_input_clipboard = NULL; /* clipboard content */
char *gui_input_clipboard = NULL; /* clipboard content */
/*
@ -84,7 +85,8 @@ gui_input_init_color_mask (struct t_gui_buffer *buffer)
*/
void
gui_input_move (struct t_gui_buffer *buffer, char *target, char *source, int size)
gui_input_move (struct t_gui_buffer *buffer, char *target, char *source,
int size)
{
int pos_source, pos_target;
@ -148,7 +150,7 @@ gui_input_insert_string (struct t_gui_buffer *buffer, char *string, int pos)
buffer->input_buffer_pos += length;
string2 = (char *) malloc (size + 2);
string2 = (char *)malloc (size + 2);
if (string2)
{
snprintf (string2, size + 2, "*%s", string);
@ -510,10 +512,10 @@ gui_exec_action_raw_data (struct t_gui_window *window, char *actions)
gui_window_switch_to_buffer (ptr_win,
gui_buffer_before_raw_data);
}
gui_buffer_free (ptr_buffer, 0);
gui_buffer_close (ptr_buffer, 0);
}
else
gui_buffer_free (window->buffer, 1);
gui_buffer_close (window->buffer, 1);
gui_window_redraw_buffer (window->buffer);
return;
break;

20
src/gui/gui-input.h
View File

@ -20,7 +20,7 @@
#ifndef __WEECHAT_GUI_INPUT_H
#define __WEECHAT_GUI_INPUT_H 1
#include "gui-buffer.h"
struct t_gui_buffer;
/* input variables */
@ -28,16 +28,18 @@ extern char *gui_input_clipboard;
/* input functions */
extern void gui_input_optimize_size (struct t_gui_buffer *);
extern void gui_input_init_color_mask (struct t_gui_buffer *);
extern void gui_input_move (struct t_gui_buffer *, char *, char *, int );
extern int gui_input_insert_string (struct t_gui_buffer *, char *, int);
extern void gui_input_complete (struct t_gui_buffer *);
extern void gui_input_delete_line (struct t_gui_buffer *);
extern int gui_input_get_prompt_length (struct t_gui_buffer *);
extern void gui_input_optimize_size (struct t_gui_buffer *buffer);
extern void gui_input_init_color_mask (struct t_gui_buffer *buffer);
extern void gui_input_move (struct t_gui_buffer *buffer, char *target,
char *source, int size);
extern int gui_input_insert_string (struct t_gui_buffer *buffer, char *string,
int pos);
extern void gui_input_complete (struct t_gui_buffer *buffer);
extern void gui_input_delete_line (struct t_gui_buffer *buffer);
extern int gui_input_get_prompt_length (struct t_gui_buffer *buffer);
/* input functions (GUI dependent) */
extern void gui_input_draw (struct t_gui_buffer *, int);
extern void gui_input_draw (struct t_gui_buffer *buffer, int erase);
#endif /* gui-input.h */

9
src/gui/gui-keyboard.c
View File

@ -34,6 +34,7 @@
#include "../plugins/plugin.h"
#include "gui-keyboard.h"
#include "gui-action.h"
#include "gui-buffer.h"
#include "gui-completion.h"
#include "gui-input.h"
#include "gui-window.h"
@ -244,7 +245,7 @@ gui_keyboard_get_internal_code (char *key)
{
char *result;
if ((result = (char *) malloc (strlen (key) + 1)))
if ((result = (char *)malloc (strlen (key) + 1)))
{
result[0] = '\0';
while (key[0])
@ -287,7 +288,7 @@ gui_keyboard_get_expanded_name (char *key)
{
char *result;
if ((result = (char *) malloc ((strlen (key) * 5) + 1)))
if ((result = (char *)malloc ((strlen (key) * 5) + 1)))
{
result[0] = '\0';
while (key[0])
@ -390,7 +391,7 @@ gui_keyboard_new (char *key, char *command, t_gui_key_func *function, char *args
char *internal_code;
int length;
if ((new_key = (t_gui_key *) malloc (sizeof (t_gui_key))))
if ((new_key = (t_gui_key *)malloc (sizeof (t_gui_key))))
{
internal_code = gui_keyboard_get_internal_code (key);
new_key->key = (internal_code) ? strdup (internal_code) : strdup (key);
@ -750,7 +751,7 @@ gui_keyboard_buffer_reset ()
{
gui_keyboard_buffer_alloc = GUI_KEYBOARD_BUFFER_BLOCK_SIZE;
gui_keyboard_buffer_size = 0;
gui_keyboard_buffer = (int *) malloc (gui_keyboard_buffer_alloc);
gui_keyboard_buffer = (int *)malloc (gui_keyboard_buffer_alloc);
}
else
{

24
src/gui/gui-keyboard.h
View File

@ -24,7 +24,7 @@
/* keyboard structures */
typedef void (t_gui_key_func)(char *);
typedef void (t_gui_key_func)(char *args);
typedef struct t_gui_key t_gui_key;
@ -52,7 +52,7 @@ struct t_gui_key_function
extern t_gui_key *gui_keys;
extern t_gui_key *last_gui_key;
extern t_gui_key_function gui_key_functions[];
extern char gui_key_combo_buffer[128];
extern char gui_key_combo_buffer[];
extern int gui_key_grab;
extern int gui_key_grab_count;
extern int *gui_keyboard_buffer;
@ -65,18 +65,18 @@ extern time_t gui_keyboard_last_activity_time;
extern void gui_keyboard_init ();
extern void gui_keyboard_grab_init ();
extern void gui_keyboard_grab_end ();
extern char *gui_keyboard_get_internal_code (char *);
extern char *gui_keyboard_get_expanded_name (char *);
extern t_gui_key *gui_keyboard_search (char *);
extern t_gui_key_func *gui_keyboard_function_search_by_name (char *);
extern char *gui_keyboard_function_search_by_ptr (t_gui_key_func *);
extern t_gui_key *gui_keyboard_bind (char *, char *);
extern int gui_keyboard_unbind (char *);
extern int gui_keyboard_pressed (char *);
extern void gui_keyboard_free (t_gui_key *);
extern char *gui_keyboard_get_internal_code (char *key);
extern char *gui_keyboard_get_expanded_name (char *key);
extern t_gui_key *gui_keyboard_search (char *key);
extern t_gui_key_func *gui_keyboard_function_search_by_name (char *name);
extern char *gui_keyboard_function_search_by_ptr (t_gui_key_func *function);
extern t_gui_key *gui_keyboard_bind (char *key, char *command);
extern int gui_keyboard_unbind (char *key);
extern int gui_keyboard_pressed (char *key_str);
extern void gui_keyboard_free (t_gui_key *key);
extern void gui_keyboard_free_all ();
extern void gui_keyboard_buffer_reset ();
extern void gui_keyboard_buffer_add (int);
extern void gui_keyboard_buffer_add (int key);
extern int gui_keyboard_get_paste_lines ();
extern void gui_keyboard_paste_accept ();
extern void gui_keyboard_paste_cancel ();

2
src/gui/gui-main.h
View File

@ -23,7 +23,7 @@
/* main functions (GUI dependent) */
extern void gui_main_loop ();
extern void gui_main_pre_init (int *, char **[]);
extern void gui_main_pre_init (int *argc, char **argv[]);
extern void gui_main_init ();
extern void gui_main_end ();

33
src/gui/gui-nicklist.c
View File

@ -36,6 +36,8 @@
#include "../core/wee-string.h"
#include "../core/wee-utf8.h"
#include "gui-nicklist.h"
#include "gui-buffer.h"
#include "gui-color.h"
/*
@ -171,9 +173,10 @@ gui_nicklist_search (struct t_gui_buffer *buffer, char *nick)
struct t_gui_nick *
gui_nicklist_add (struct t_gui_buffer *buffer, char *nick, int sort_index,
int color_nick, char prefix, int color_prefix)
char *color_nick, char prefix, char *color_prefix)
{
struct t_gui_nick *new_nick;
int num_color_nick, num_color_prefix;
if (!nick || gui_nicklist_search (buffer, nick))
return NULL;
@ -182,11 +185,19 @@ gui_nicklist_add (struct t_gui_buffer *buffer, char *nick, int sort_index,
if (!new_nick)
return NULL;
num_color_nick = gui_color_search_config (color_nick);
if (num_color_nick < 0)
num_color_nick = GUI_COLOR_NICKLIST;
num_color_prefix = gui_color_search_config (color_prefix);
if (num_color_prefix < 0)
num_color_prefix = GUI_COLOR_NICKLIST;
new_nick->nick = strdup (nick);
new_nick->sort_index = sort_index;
new_nick->color_nick = color_nick;
new_nick->color_nick = num_color_nick;
new_nick->prefix = prefix;
new_nick->color_prefix = color_prefix;
new_nick->color_prefix = num_color_prefix;
gui_nicklist_insert_sorted (buffer, new_nick);
@ -202,20 +213,30 @@ gui_nicklist_add (struct t_gui_buffer *buffer, char *nick, int sort_index,
void
gui_nicklist_update (struct t_gui_buffer *buffer, struct t_gui_nick *nick,
char *new_nick, int sort_index,
int color_nick, char prefix, int color_prefix)
char *color_nick, char prefix, char *color_prefix)
{
int num_color_nick, num_color_prefix;
if (!nick)
return;
num_color_nick = gui_color_search_config (color_nick);
if (num_color_nick < 0)
num_color_nick = GUI_COLOR_NICKLIST;
num_color_prefix = gui_color_search_config (color_prefix);
if (num_color_prefix < 0)
num_color_prefix = GUI_COLOR_NICKLIST;
if (new_nick)
{
free (nick->nick);
nick->nick = strdup (new_nick);
}
nick->sort_index = sort_index;
nick->color_nick = color_nick;
nick->color_nick = num_color_nick;
nick->prefix = prefix;
nick->color_prefix = color_prefix;
nick->color_prefix = num_color_prefix;
gui_nicklist_resort (buffer, nick);
}

40
src/gui/gui-nicklist.h
View File

@ -20,22 +20,40 @@
#ifndef __WEECHAT_GUI_NICKLIST_H
#define __WEECHAT_GUI_NICKLIST_H 1
#include "gui-buffer.h"
struct t_gui_buffer;
struct t_gui_nick
{
char *nick; /* nickname */
int sort_index; /* index to force sort */
int color_nick; /* color for nick in nicklist */
char prefix; /* prefix for nick (for admins, ..) */
int color_prefix; /* color for prefix */
struct t_gui_nick *prev_nick; /* link to previous nick in nicklist */
struct t_gui_nick *next_nick; /* link to next nick in nicklist */
};
/* nicklist functions */
extern struct t_gui_nick *gui_nicklist_search (struct t_gui_buffer *, char *);
extern struct t_gui_nick *gui_nicklist_add (struct t_gui_buffer *, char *,
int, int, char, int);
extern void gui_nicklist_update (struct t_gui_buffer *, struct t_gui_nick *,
char *, int, int, char, int);
extern void gui_nicklist_free (struct t_gui_buffer *, struct t_gui_nick *);
extern void gui_nicklist_free_all (struct t_gui_buffer *);
extern int gui_nicklist_remove (struct t_gui_buffer *, char *);
extern int gui_nicklist_get_max_length (struct t_gui_buffer *);
extern struct t_gui_nick *gui_nicklist_search (struct t_gui_buffer *buffer,
char *nick);
extern struct t_gui_nick *gui_nicklist_add (struct t_gui_buffer *buffer,
char *nick,
int sort_index, char *color_nick,
char prefix, char *color_prefix);
extern void gui_nicklist_update (struct t_gui_buffer *buffer,
struct t_gui_nick *nick,
char *new_nick, int sort_index,
char *color_nick, char prefix,
char *color_prefix);
extern void gui_nicklist_free (struct t_gui_buffer *buffer,
struct t_gui_nick *nick);
extern void gui_nicklist_free_all (struct t_gui_buffer *buffer);
extern int gui_nicklist_remove (struct t_gui_buffer *buffer, char *nick);
extern int gui_nicklist_get_max_length (struct t_gui_buffer *buffer);
/* nicklist functions (GUI dependent) */
extern void gui_nicklist_draw (struct t_gui_buffer *, int);
extern void gui_nicklist_draw (struct t_gui_buffer *buffer, int erase);
#endif /* gui-nicklist.h */

4
src/gui/gui-status.h
View File

@ -20,10 +20,10 @@
#ifndef __WEECHAT_GUI_STATUS_H
#define __WEECHAT_GUI_STATUS_H 1
#include "gui-buffer.h"
struct t_gui_buffer;
/* statusbar functions (GUI dependent) */
extern void gui_status_draw (struct t_gui_buffer *, int);
extern void gui_status_draw (struct t_gui_buffer *buffer, int erase);
#endif /* gui-status.h */

1
src/gui/gui-window.c
View File

@ -37,6 +37,7 @@
#include "../core/wee-log.h"
#include "../core/wee-utf8.h"
#include "gui-window.h"
#include "gui-buffer.h"
#include "gui-chat.h"
#include "gui-input.h"
#include "gui-hotlist.h"

97
src/gui/gui-window.h
View File

@ -123,61 +123,68 @@ extern struct t_gui_window *gui_current_window;
extern struct t_gui_window_tree *gui_windows_tree;
/* window functions */
extern int gui_window_tree_init (struct t_gui_window *);
extern void gui_window_tree_node_to_leaf (struct t_gui_window_tree *,
struct t_gui_window *);
extern void gui_window_tree_free (struct t_gui_window_tree **);
extern struct t_gui_window *gui_window_new (struct t_gui_window *, int, int,
int, int, int, int);
extern void gui_window_free (struct t_gui_window *);
extern struct t_gui_window *gui_window_search_by_buffer (struct t_gui_buffer *);
extern void gui_window_switch_server (struct t_gui_window *);
extern void gui_window_switch_previous (struct t_gui_window *);
extern void gui_window_switch_next (struct t_gui_window *);
extern void gui_window_switch_by_buffer (struct t_gui_window *, int);
extern void gui_window_scroll (struct t_gui_window *, char *);
extern void gui_window_search_start (struct t_gui_window *);
extern void gui_window_search_restart (struct t_gui_window *);
extern void gui_window_search_stop (struct t_gui_window *);
extern int gui_window_search_text (struct t_gui_window *);
extern int gui_window_tree_init (struct t_gui_window *window);
extern void gui_window_tree_node_to_leaf (struct t_gui_window_tree *node,
struct t_gui_window *window);
extern void gui_window_tree_free (struct t_gui_window_tree **tree);
extern struct t_gui_window *gui_window_new (struct t_gui_window *parent,
int x, int y, int width, int height,
int width_pct, int height_pct);
extern void gui_window_free (struct t_gui_window *window);
extern struct t_gui_window *gui_window_search_by_buffer (struct t_gui_buffer *buffer);
extern void gui_window_switch_server (struct t_gui_window *window);
extern void gui_window_switch_previous (struct t_gui_window *window);
extern void gui_window_switch_next (struct t_gui_window *window);
extern void gui_window_switch_by_buffer (struct t_gui_window *window,
int buffer_number);
extern void gui_window_scroll (struct t_gui_window *window, char *scroll);
extern void gui_window_search_start (struct t_gui_window *window);
extern void gui_window_search_restart (struct t_gui_window *window);
extern void gui_window_search_stop (struct t_gui_window *window);
extern int gui_window_search_text (struct t_gui_window *window);
extern void gui_window_print_log ();
/* window functions (GUI dependent) */
extern int gui_window_get_width ();
extern int gui_window_get_height ();
extern int gui_window_objects_init (struct t_gui_window *);
extern void gui_window_objects_free (struct t_gui_window *, int);
extern int gui_window_calculate_pos_size (struct t_gui_window *, int);
extern void gui_window_redraw_buffer (struct t_gui_buffer *);
extern int gui_window_objects_init (struct t_gui_window *window);
extern void gui_window_objects_free (struct t_gui_window *window,
int free_separator);
extern int gui_window_calculate_pos_size (struct t_gui_window *window,
int force_calculate);
extern void gui_window_redraw_buffer (struct t_gui_buffer *buffer);
extern void gui_window_redraw_all_buffers ();
extern void gui_window_switch_to_buffer (struct t_gui_window *, struct t_gui_buffer *);
extern void gui_window_page_up (struct t_gui_window *);
extern void gui_window_page_down (struct t_gui_window *);
extern void gui_window_scroll_up (struct t_gui_window *);
extern void gui_window_scroll_down (struct t_gui_window *);
extern void gui_window_scroll_top (struct t_gui_window *);
extern void gui_window_scroll_bottom (struct t_gui_window *);
extern void gui_window_scroll_topic_left (struct t_gui_window *);
extern void gui_window_scroll_topic_right (struct t_gui_window *);
extern void gui_window_nick_beginning (struct t_gui_window *);
extern void gui_window_nick_end (struct t_gui_window *);
extern void gui_window_nick_page_up (struct t_gui_window *);
extern void gui_window_nick_page_down (struct t_gui_window *);
extern void gui_window_init_subwindows (struct t_gui_window *);
extern void gui_window_switch_to_buffer (struct t_gui_window *window,
struct t_gui_buffer *buffer);
extern void gui_window_page_up (struct t_gui_window *window);
extern void gui_window_page_down (struct t_gui_window *window);
extern void gui_window_scroll_up (struct t_gui_window *window);
extern void gui_window_scroll_down (struct t_gui_window *window);
extern void gui_window_scroll_top (struct t_gui_window *window);
extern void gui_window_scroll_bottom (struct t_gui_window *window);
extern void gui_window_scroll_topic_left (struct t_gui_window *window);
extern void gui_window_scroll_topic_right (struct t_gui_window *window);
extern void gui_window_nick_beginning (struct t_gui_window *window);
extern void gui_window_nick_end (struct t_gui_window *window);
extern void gui_window_nick_page_up (struct t_gui_window *window);
extern void gui_window_nick_page_down (struct t_gui_window *window);
extern void gui_window_init_subwindows (struct t_gui_window *window);
extern void gui_window_refresh_windows ();
extern void gui_window_split_horiz (struct t_gui_window *, int);
extern void gui_window_split_vertic (struct t_gui_window *, int);
extern void gui_window_resize (struct t_gui_window *, int);
extern int gui_window_merge (struct t_gui_window *);
extern void gui_window_merge_all (struct t_gui_window *);
extern void gui_window_switch_up (struct t_gui_window *);
extern void gui_window_switch_down (struct t_gui_window *);
extern void gui_window_switch_left (struct t_gui_window *);
extern void gui_window_switch_right (struct t_gui_window *);
extern void gui_window_split_horiz (struct t_gui_window *window,
int pourcentage);
extern void gui_window_split_vertic (struct t_gui_window *window,
int pourcentage);
extern void gui_window_resize (struct t_gui_window *window, int pourcentage);
extern int gui_window_merge (struct t_gui_window *window);
extern void gui_window_merge_all (struct t_gui_window *window);
extern void gui_window_switch_up (struct t_gui_window *window);
extern void gui_window_switch_down (struct t_gui_window *window);
extern void gui_window_switch_left (struct t_gui_window *window);
extern void gui_window_switch_right (struct t_gui_window *window);
extern void gui_window_refresh_screen ();
extern void gui_window_title_set ();
extern void gui_window_title_reset ();
extern void gui_window_objects_print_log (struct t_gui_window *);
extern void gui_window_objects_print_log (struct t_gui_window *window);
#endif /* gui-window.h */

36
src/plugins/alias/alias.c
View File

@ -79,7 +79,7 @@ alias_add_word (char **alias, int *length, char *word)
if (*alias == NULL)
{
*alias = (char *) malloc (length_word + 1);
*alias = (char *)malloc (length_word + 1);
strcpy (*alias, word);
}
else
@ -174,7 +174,7 @@ alias_replace_args (char *alias_args, char *user_args)
*/
int
alias_cb (void *data, void *buffer, int argc, char **argv,
alias_cb (void *data, struct t_gui_buffer *buffer, int argc, char **argv,
char **argv_eol)
{
struct t_alias *ptr_alias;
@ -219,7 +219,7 @@ alias_cb (void *data, void *buffer, int argc, char **argv,
weechat_command (buffer, args_replaced);
else
{
alias_command = (char *) malloc (1 + strlen(args_replaced) + 1);
alias_command = (char *)malloc (1 + strlen(args_replaced) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
@ -239,7 +239,7 @@ alias_cb (void *data, void *buffer, int argc, char **argv,
length1 = strlen (*ptr_cmd);
length2 = strlen (argv_eol[1]);
alias_command = (char *) malloc ( 1 + length1 + 1 + length2 + 1);
alias_command = (char *)malloc ( 1 + length1 + 1 + length2 + 1);
if (alias_command)
{
if (*ptr_cmd[0] != '/')
@ -261,7 +261,7 @@ alias_cb (void *data, void *buffer, int argc, char **argv,
(void) weechat_command(buffer, *ptr_cmd);
else
{
alias_command = (char *) malloc (1 + strlen (*ptr_cmd) + 1);
alias_command = (char *)malloc (1 + strlen (*ptr_cmd) + 1);
if (alias_command)
{
strcpy (alias_command, "/");
@ -307,7 +307,7 @@ alias_new (char *name, char *command)
return ptr_alias;
}
if ((new_alias = ((struct t_alias *) malloc (sizeof (struct t_alias)))))
if ((new_alias = ((struct t_alias *)malloc (sizeof (struct t_alias)))))
{
new_hook = weechat_hook_command (name, "[alias]", NULL, NULL, NULL,
alias_cb, new_alias);
@ -419,7 +419,8 @@ alias_free_all ()
*/
void
alias_config_read_line (void *config_file, char *option_name, char *value)
alias_config_read_line (struct t_config_file *config_file, char *option_name,
char *value)
{
/* make C compiler happy */
(void) config_file;
@ -444,7 +445,8 @@ alias_config_read_line (void *config_file, char *option_name, char *value)
*/
void
alias_config_write_section (void *config_file, char *section_name)
alias_config_write_section (struct t_config_file *config_file,
char *section_name)
{
struct t_alias *ptr_alias;
@ -465,7 +467,8 @@ alias_config_write_section (void *config_file, char *section_name)
*/
void
alias_config_write_default_aliases (void *config_file, char *section_name)
alias_config_write_default_aliases (struct t_config_file *config_file,
char *section_name)
{
weechat_config_write_line (config_file, section_name, NULL);
@ -537,12 +540,12 @@ alias_config_read ()
*/
int
alias_config_reload_signal_cb (void *data, char *signal, void *pointer)
alias_config_reload_signal_cb (void *data, char *signal, void *signal_data)
{
/* make C compiler happy */
(void) data;
(void) signal;
(void) pointer;
(void) signal_data;
alias_free_all ();
if (weechat_config_reload (alias_config_file) == 0)
@ -574,8 +577,8 @@ alias_config_write ()
*/
int
alias_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *alias_name;
struct t_alias *ptr_alias;
@ -655,8 +658,8 @@ alias_command_cb (void *data, void *buffer, int argc, char **argv,
*/
int
unalias_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char *alias_name;
struct t_alias *ptr_alias;
@ -692,7 +695,8 @@ unalias_command_cb (void *data, void *buffer, int argc, char **argv,
*/
int
alias_completion_cb (void *data, char *completion, void *buffer, void *list)
alias_completion_cb (void *data, char *completion, struct t_gui_buffer *buffer,
struct t_weelist *list)
{
struct t_alias *ptr_alias;

18
src/plugins/aspell/aspell.c
View File

@ -48,7 +48,7 @@ weechat_aspell_new_speller (void)
{
aspell_speller_t *s;
s = (aspell_speller_t *) malloc (sizeof (aspell_speller_t));
s = (aspell_speller_t *)malloc (sizeof (aspell_speller_t));
if (!s)
{
weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL,
@ -203,7 +203,7 @@ weechat_aspell_new_config (void)
{
aspell_config_t *c;
c = (aspell_config_t *) malloc (sizeof (aspell_config_t));
c = (aspell_config_t *)malloc (sizeof (aspell_config_t));
if (!c)
{
weechat_aspell_plugin->print (weechat_aspell_plugin, NULL, NULL,
@ -828,7 +828,7 @@ weechat_aspell_config_save (void)
if (found == 0)
{
n = strlen (servers) + strlen (p->server) + 2;
servers = (char *) realloc (servers, n * sizeof (char));
servers = (char *)realloc (servers, n * sizeof (char));
strcat (servers, " ");
strcat (servers, p->server);
weechat_aspell_plugin->set_plugin_config (weechat_aspell_plugin, "servers", servers);
@ -848,13 +848,13 @@ weechat_aspell_config_save (void)
else
{
n = strlen (channels) + strlen (q->channel) + 2;
channels = (char *) realloc (channels, n * sizeof (char));
channels = (char *)realloc (channels, n * sizeof (char));
strcat (channels, " ");
strcat (channels, q->channel);
}
n = 7 + strlen (p->server) + strlen (q->channel);
option = (char *) malloc ( n * sizeof (char));
option = (char *)malloc (n * sizeof (char));
snprintf (option, n, "lang_%s_%s", p->server, q->channel);
weechat_aspell_plugin->set_plugin_config (weechat_aspell_plugin, option, q->speller->lang);
free (option);
@ -864,7 +864,7 @@ weechat_aspell_config_save (void)
if (channels)
{
n = 10 + strlen (p->server);
option = (char *) malloc ( n * sizeof (char));
option = (char *)malloc (n * sizeof (char));
snprintf (option, n, "channels_%s", p->server);
weechat_aspell_plugin->set_plugin_config (weechat_aspell_plugin, option, channels);
free (option);
@ -899,7 +899,7 @@ weechat_aspell_config_load(void)
for (i=0; i<s; i++)
{
n = 10 + strlen (servers_list[i]);
option_s = (char *) malloc (n * sizeof (char));
option_s = (char *)malloc (n * sizeof (char));
snprintf (option_s, n, "channels_%s", servers_list[i]);
channels = weechat_aspell_plugin->get_plugin_config (weechat_aspell_plugin, option_s);
@ -911,7 +911,7 @@ weechat_aspell_config_load(void)
for (j=0; j<c; j++)
{
n = 7 + strlen (servers_list[i]) + strlen (channels_list[j]);
option_l = (char *) malloc (n * sizeof (char));
option_l = (char *)malloc (n * sizeof (char));
snprintf (option_l, n, "lang_%s_%s", servers_list[i], channels_list[j]);
lang = weechat_aspell_plugin->get_plugin_config (weechat_aspell_plugin, option_l);
@ -1174,7 +1174,7 @@ weechat_aspell_clean_word (char *word, int *offset)
return NULL;
}
w = (char *) malloc ((len+1) * sizeof(char));
w = (char *)malloc ((len+1) * sizeof(char));
if (w) {
memcpy (w, buffer + *offset, len);

6
src/plugins/aspell/aspell.h
View File

@ -18,8 +18,8 @@
/* weechat-aspell.h: Aspell plugin support for WeeChat */
#ifndef WEECHAT_ASPELL__H
#define WEECHAT_ASPELL__H 1
#ifndef __WEECHAT_ASPELL_H
#define __WEECHAT_ASPELL_H 1
#include <aspell.h>
@ -192,4 +192,4 @@ cmds_keep_t cmd_tokeep[] =
{ NULL, 0}
};
#endif /* WEECHAT_ASPELL__H */
#endif /* aspell.h */

29
src/plugins/demo/demo.c
View File

@ -48,8 +48,8 @@ struct t_weechat_plugin *weechat_demo_plugin = NULL;
*/
int
demo_printf_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
demo_printf_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
/* make C compiler happy */
(void) data;
@ -86,8 +86,8 @@ demo_printf_command_cb (void *data, void *buffer, int argc, char **argv,
*/
int
demo_infobar_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
demo_infobar_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
/* make C compiler happy */
(void) data;
@ -116,8 +116,8 @@ demo_buffer_input_data_cb (struct t_gui_buffer *buffer, char *data)
*/
int
demo_buffer_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
demo_buffer_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
struct t_gui_buffer *new_buffer;
@ -132,6 +132,7 @@ demo_buffer_command_cb (void *data, void *buffer, int argc, char **argv,
demo_buffer_input_data_cb);
if (new_buffer)
weechat_buffer_set (new_buffer, "display", "1");
weechat_hook_signal_send ("logger_backlog", new_buffer);
}
return WEECHAT_RC_OK;
@ -142,7 +143,7 @@ demo_buffer_command_cb (void *data, void *buffer, int argc, char **argv,
*/
void
demo_infolist_print (void *infolist, char *item_name)
demo_infolist_print (struct t_plugin_infolist *infolist, char *item_name)
{
char *fields, **argv;
int i, j, argc;
@ -202,8 +203,8 @@ demo_infolist_print (void *infolist, char *item_name)
*/
int
demo_infolist_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
demo_infolist_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
struct t_plugin_infolist *infolist;
@ -250,8 +251,8 @@ demo_infolist_command_cb (void *data, void *buffer, int argc, char **argv,
*/
int
demo_info_command_cb (void *data, void *buffer, int argc, char **argv,
char **argv_eol)
demo_info_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
/* make C compiler happy */
(void) data;
@ -278,14 +279,14 @@ demo_info_command_cb (void *data, void *buffer, int argc, char **argv,
*/
int
demo_signal_cb (void *data, char *signal, void *pointer)
demo_signal_cb (void *data, char *signal, void *signal_data)
{
/* make C compiler happy */
(void) data;
weechat_printf (NULL,
_("demo_signal: signal: %s, pointer: %X"),
signal, pointer);
_("demo_signal: signal: %s, signal_data: %X"),
signal, signal_data);
return WEECHAT_RC_OK;
}

52
src/plugins/fifo/fifo.c
View File

@ -49,19 +49,23 @@ char *fifo_unterminated = NULL;
/*
* fifo_create: create FIFO pipe for remote control
* return: 1 if ok
* 0 if error
*/
void
int
fifo_create ()
{
int filename_length;
int rc, filename_length;
char *fifo_option, *weechat_home;
fifo_option = weechat_plugin_config_get ("fifo");
rc = 0;
fifo_option = weechat_config_get_plugin ("fifo");
if (!fifo_option)
{
weechat_plugin_config_set ("fifo", "on");
fifo_option = weechat_plugin_config_get ("fifo");
weechat_config_set_plugin ("fifo", "on");
fifo_option = weechat_config_get_plugin ("fifo");
}
weechat_home = weechat_info_get ("weechat_dir");
@ -75,8 +79,8 @@ fifo_create ()
if (!fifo_filename)
{
filename_length = strlen (weechat_home) + 64;
fifo_filename = (char *) malloc (filename_length *
sizeof (char));
fifo_filename = (char *)malloc (filename_length *
sizeof (char));
snprintf (fifo_filename, filename_length,
"%s/weechat_fifo_%d",
weechat_home, (int) getpid());
@ -90,9 +94,12 @@ fifo_create ()
/* open FIFO pipe in read-only, non blockingmode */
if ((fifo_fd = open (fifo_filename,
O_RDONLY | O_NONBLOCK)) != -1)
{
weechat_printf (NULL,
_("%sFifo: pipe is open\n"),
weechat_prefix ("info"));
rc = 1;
}
else
weechat_printf (NULL,
_("%sFifo: unable to open pipe (%s) for "
@ -108,10 +115,10 @@ fifo_create ()
fifo_filename);
}
}
if (fifo_option)
free (fifo_option);
if (weechat_home)
free (weechat_home);
return rc;
}
/*
@ -168,6 +175,8 @@ fifo_exec (char *text)
{
pos_msg = text + 1;
ptr_buffer = weechat_buffer_search (NULL, NULL);
if (!ptr_buffer)
ptr_buffer = weechat_current_buffer;
}
else
{
@ -198,6 +207,8 @@ fifo_exec (char *text)
}
else
ptr_buffer = weechat_buffer_search (NULL, text);
if (!ptr_buffer)
ptr_buffer = weechat_current_buffer;
}
}
@ -232,8 +243,8 @@ fifo_read ()
ptr_buf = buffer;
if (fifo_unterminated)
{
buf2 = (char *) malloc (strlen (fifo_unterminated) +
strlen (buffer) + 1);
buf2 = (char *)malloc (strlen (fifo_unterminated) +
strlen (buffer) + 1);
if (buf2)
{
strcpy (buf2, fifo_unterminated);
@ -292,7 +303,16 @@ fifo_read ()
weechat_unhook (fifo_fd_hook);
close (fifo_fd);
fifo_fd = open (fifo_filename, O_RDONLY | O_NONBLOCK);
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0, fifo_read, NULL);
if (fifo_fd < 0)
{
weechat_printf (NULL,
_("%sFifo: error opening file, closing it"),
weechat_prefix ("error"));
fifo_remove ();
}
else
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0,
&fifo_read, NULL);
}
}
@ -334,9 +354,9 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
{
weechat_plugin = plugin;
fifo_create ();
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0, &fifo_read, NULL);
if (fifo_create ())
fifo_fd_hook = weechat_hook_fd (fifo_fd, 1, 0, 0,
&fifo_read, NULL);
weechat_hook_config ("plugin", "fifo.fifo", &fifo_config_cb, NULL);

8
src/plugins/irc/irc-buffer.h
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 */

18
src/plugins/irc/irc-channel.c
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);

88
src/plugins/irc/irc-channel.h
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 */

3
src/plugins/irc/irc-color.c
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;

8
src/plugins/irc/irc-color.h
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 */

249
src/plugins/irc/irc-command.c
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)

14
src/plugins/irc/irc-command.h
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 */

64
src/plugins/irc/irc-completion.c
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);
}

11
src/plugins/irc/irc-completion.h
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 */

11
src/plugins/irc/irc-config.c
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;

5
src/plugins/irc/irc-config.h
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 ();

515
src/plugins/irc/irc-dcc.c
View File

File diff suppressed because it is too large Load Diff

32
src/plugins/irc/irc-dcc.h
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 ();

18
src/plugins/irc/irc-display.h
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 */

10
src/plugins/irc/irc-mode.c
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);
}

9
src/plugins/irc/irc-mode.h
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 */

5
src/plugins/irc/irc-nick.c
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

39
src/plugins/irc/irc-nick.h
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 */

16
src/plugins/irc/irc-protocol.c
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,

125
src/plugins/irc/irc-protocol.h
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 */

117
src/plugins/irc/irc-server.c
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
*/

98
src/plugins/irc/irc-server.h
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 */

14
src/plugins/irc/irc.c
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);

3
src/plugins/logger/CMakeLists.txt
View File

@ -14,7 +14,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
ADD_LIBRARY(logger MODULE logger.c logger-buffer.c logger-buffer.h)
ADD_LIBRARY(logger MODULE logger.c logger.h logger-buffer.c logger-buffer.h
logger-tail.c logger-tail.h)
SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(logger)

7
src/plugins/logger/Makefile.am
View File

@ -20,6 +20,11 @@ libdir = ${weechat_libdir}/plugins
lib_LTLIBRARIES = logger.la
logger_la_SOURCES = logger.c logger-buffer.c logger-buffer.h
logger_la_SOURCES = logger.c \
logger.h \
logger-buffer.c \
logger-buffer.h \
logger-tail.c \
logger-tail.h
logger_la_LDFLAGS = -module
logger_la_LIBADD = $(LOGGER_LFLAGS)

25
src/plugins/logger/logger-buffer.c
View File

@ -39,7 +39,7 @@ struct t_logger_buffer *last_logger_buffer = NULL;
*/
struct t_logger_buffer *
logger_buffer_add (void *buffer, char *log_filename)
logger_buffer_add (struct t_gui_buffer *buffer, char *log_filename)
{
struct t_logger_buffer *new_logger_buffer;
@ -52,6 +52,7 @@ logger_buffer_add (void *buffer, char *log_filename)
new_logger_buffer->buffer = buffer;
new_logger_buffer->log_filename = strdup (log_filename);
new_logger_buffer->log_file = NULL;
new_logger_buffer->log_enabled = 1;
new_logger_buffer->prev_buffer = last_logger_buffer;
new_logger_buffer->next_buffer = NULL;
@ -70,14 +71,14 @@ logger_buffer_add (void *buffer, char *log_filename)
*/
struct t_logger_buffer *
logger_buffer_search (void *buffer)
logger_buffer_search (struct t_gui_buffer *buffer)
{
struct t_logger_buffer *ptr_logger_buffer;
for (ptr_logger_buffer = logger_buffers; ptr_logger_buffer;
ptr_logger_buffer = ptr_logger_buffer->next_buffer)
{
if (ptr_logger_buffer->buffer == (struct t_gui_buffer *)buffer)
if (ptr_logger_buffer->buffer == buffer)
return ptr_logger_buffer;
}
@ -116,25 +117,11 @@ logger_buffer_free (struct t_logger_buffer *logger_buffer)
}
/*
* logger_buffer_remove: remove a buffer from list
* logger_buffer_free_all: remove all buffers from list
*/
void
logger_buffer_remove (void *buffer)
{
struct t_logger_buffer *ptr_logger_buffer;
ptr_logger_buffer = logger_buffer_search (buffer);
if (ptr_logger_buffer)
logger_buffer_free (ptr_logger_buffer);
}
/*
* logger_buffer_remove_all: remove all buffers from list
*/
void
logger_buffer_remove_all ()
logger_buffer_free_all ()
{
while (logger_buffers)
{

10
src/plugins/logger/logger-buffer.h
View File

@ -25,6 +25,7 @@ struct t_logger_buffer
struct t_gui_buffer *buffer; /* pointer to buffer */
char *log_filename; /* log filename */
FILE *log_file; /* log file */
int log_enabled; /* log enabled ? */
struct t_logger_buffer *prev_buffer; /* link to previous buffer */
struct t_logger_buffer *next_buffer; /* link to next buffer */
};
@ -32,9 +33,10 @@ struct t_logger_buffer
extern struct t_logger_buffer *logger_buffers;
extern struct t_logger_buffer *last_logger_buffer;
extern struct t_logger_buffer *logger_buffer_add (void *, char *);
extern struct t_logger_buffer *logger_buffer_search (void *);
extern void logger_buffer_remove (void *);
extern void logger_buffer_remove_all ();
extern struct t_logger_buffer *logger_buffer_add (struct t_gui_buffer *,
char *log_filename);
extern struct t_logger_buffer *logger_buffer_search (struct t_gui_buffer *buffer);
extern void logger_buffer_free (struct t_logger_buffer *logger_buffer);
extern void logger_buffer_free_all ();
#endif /* logger-buffer.h */

223
src/plugins/logger/logger-tail.c Normal file
View File

@ -0,0 +1,223 @@
/*
* Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
* See README for License detail, AUTHORS for developers list.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* logger-tail.c: return last lines of a file */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include "logger.h"
#include "logger-tail.h"
#define LOGGER_TAIL_BUFSIZE 4096
/*
* logger_tail_last_eol: find last eol in a string
*/
char *
logger_tail_last_eol (char *string_start, char *string_ptr)
{
while (string_ptr >= string_start)
{
if ((string_ptr[0] == '\n') || (string_ptr[0] == '\r'))
return string_ptr;
string_ptr--;
}
/* no end-of-line found in string */
return NULL;
}
/*
* logger_tail_file: return last lines of a file
*/
struct t_logger_line *
logger_tail_file (char *filename, int n_lines)
{
int fd;
off_t file_length, file_pos;
size_t to_read;
ssize_t bytes_read;
char buf[LOGGER_TAIL_BUFSIZE + 1];
char *ptr_buf, *pos_eol, *part_of_line, *new_part_of_line;
struct t_logger_line *ptr_line, *new_line;
/* open file */
fd = open (filename, O_RDONLY);
if (fd == -1)
return NULL;
/* seek to the end of file */
file_length = lseek (fd, (off_t)0, SEEK_END);
if (file_length <= 0)
{
close (fd);
return NULL;
}
to_read = file_length;
file_pos = file_length - LOGGER_TAIL_BUFSIZE;
if (file_pos < 0)
file_pos = 0;
else
to_read = LOGGER_TAIL_BUFSIZE;
lseek (fd, file_pos, SEEK_SET);
/* loop until we have "n_lines" lines in list */
part_of_line = NULL;
ptr_line = NULL;
while (n_lines > 0)
{
lseek (fd, file_pos, SEEK_SET);
bytes_read = read (fd, buf, to_read);
if (bytes_read <= 0)
{
logger_tail_free (ptr_line);
close (fd);
return NULL;
}
buf[bytes_read] = '\0';
ptr_buf = buf + bytes_read - 1;
while (ptr_buf && (ptr_buf >= buf))
{
pos_eol = logger_tail_last_eol (buf, ptr_buf);
if ((pos_eol && pos_eol[1]) || (!pos_eol && (file_pos == 0)))
{
/* use data and part_of_line (if existing) to build a new line */
if (!pos_eol)
{
ptr_buf = NULL;
pos_eol = buf;
}
else
{
ptr_buf = pos_eol - 1;
pos_eol[0] = '\0';
pos_eol++;
}
new_line = (struct t_logger_line *)malloc (sizeof (struct t_logger_line));
if (!new_line)
{
logger_tail_free (ptr_line);
ptr_line = NULL;
break;
}
if (part_of_line)
{
new_line->data = (char *)malloc (strlen (pos_eol) +
strlen (part_of_line) + 1);
if (!new_line->data)
{
free (part_of_line);
logger_tail_free (ptr_line);
close (fd);
return NULL;
}
strcpy (new_line->data, pos_eol);
strcat (new_line->data, part_of_line);
free (part_of_line);
part_of_line = NULL;
}
else
{
new_line->data = strdup (pos_eol);
}
new_line->next_line = ptr_line;
ptr_line = new_line;
n_lines--;
if (n_lines <= 0)
break;
}
else if (!pos_eol)
{
/* beginning of read buffer reached without EOL, then we
add string to part_of_line, we'll use that later */
if (part_of_line)
{
new_part_of_line = (char *)malloc (strlen (buf) +
strlen (part_of_line) + 1);
if (!new_part_of_line)
{
free (part_of_line);
logger_tail_free (ptr_line);
close (fd);
return NULL;
}
strcpy (new_part_of_line, buf);
strcat (new_part_of_line, part_of_line);
free (part_of_line);
part_of_line = new_part_of_line;
}
else
{
part_of_line = (char *)malloc (strlen (buf) + 1);
strcpy (part_of_line, buf);
}
ptr_buf = NULL;
}
else
ptr_buf = pos_eol - 1;
}
if (file_pos == 0)
break;
to_read = file_pos;
file_pos -= LOGGER_TAIL_BUFSIZE;
if (file_pos < 0)
file_pos = 0;
else
to_read = LOGGER_TAIL_BUFSIZE;
}
if (part_of_line)
free (part_of_line);
close (fd);
return ptr_line;
}
/*
* logger_tail_free: free structure returned by "logger_tail_file" function
*/
void
logger_tail_free (struct t_logger_line *lines)
{
if (!lines)
return;
while (lines->next_line)
{
if (lines->data)
free (lines->data);
lines = lines->next_line;
}
free (lines);
}

32
src/plugins/logger/logger-tail.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
* See README for License detail, AUTHORS for developers list.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __WEECHAT_LOGGER_TAIL_H
#define __WEECHAT_LOGGER_TAIL_H 1
struct t_logger_line
{
char *data; /* line content */
struct t_logger_line *next_line; /* link to next line */
};
extern struct t_logger_line *logger_tail_file (char *filename, int n_lines);
extern void logger_tail_free (struct t_logger_line *lines);
#endif /* logger-tail.h */

278
src/plugins/logger/logger.c
View File

@ -34,8 +34,9 @@
#include <fcntl.h>
#include <time.h>
#include "../weechat-plugin.h"
#include "logger.h"
#include "logger-buffer.h"
#include "logger-tail.h"
char plugin_name[] = "logger";
@ -43,36 +44,74 @@ char plugin_version[] = "0.1";
char plugin_description[] = "Logger plugin for WeeChat";
struct t_weechat_plugin *weechat_logger_plugin = NULL;
#define weechat_plugin weechat_logger_plugin
char *logger_path = NULL;
char *logger_time_format = NULL;
#define LOGGER_OPTION_PATH "path"
#define LOGGER_OPTION_TIME_FORMAT "time_format"
#define LOGGER_OPTION_INFO_LINES "info_lines"
#define LOGGER_OPTION_BACKLOG "backlog"
char *logger_option_path = NULL;
char *logger_option_time_format = NULL;
int logger_option_info_lines;
int logger_option_backlog;
/*
* logger_config_read: read config options for logger plugin
* return: 1 if ok
* 0 if error
*/
void
int
logger_config_read ()
{
if (logger_path)
free (logger_path);
logger_path = weechat_plugin_config_get ("path");
if (!logger_path)
long number;
char *string, *error;
logger_option_path = weechat_config_get_plugin (LOGGER_OPTION_PATH);
if (!logger_option_path)
{
weechat_plugin_config_set ("path", "%h/logs/");
logger_path = weechat_plugin_config_get ("path");
weechat_config_set_plugin (LOGGER_OPTION_PATH, "%h/logs/");
logger_option_path = weechat_config_get_plugin ("path");
}
if (logger_time_format)
free (logger_time_format);
logger_time_format = weechat_plugin_config_get ("time_format");
if (!logger_time_format)
logger_option_time_format = weechat_config_get_plugin (LOGGER_OPTION_TIME_FORMAT);
if (!logger_option_time_format)
{
weechat_plugin_config_set ("time_format", "%Y %b %d %H:%M:%S");
logger_time_format = weechat_plugin_config_get ("time_format");
weechat_config_set_plugin (LOGGER_OPTION_TIME_FORMAT,
"%Y %b %d %H:%M:%S");
logger_option_time_format = weechat_config_get_plugin (LOGGER_OPTION_TIME_FORMAT);
}
string = weechat_config_get_plugin (LOGGER_OPTION_INFO_LINES);
if (!string)
{
weechat_config_set_plugin (LOGGER_OPTION_INFO_LINES, "off");
string = weechat_config_get_plugin (LOGGER_OPTION_INFO_LINES);
}
if (string && (weechat_config_string_to_boolean (string) > 0))
logger_option_info_lines = 1;
else
logger_option_info_lines = 0;
string = weechat_config_get_plugin (LOGGER_OPTION_BACKLOG);
if (!string)
{
weechat_config_set_plugin (LOGGER_OPTION_BACKLOG, "20");
string = weechat_config_get_plugin (LOGGER_OPTION_BACKLOG);
}
logger_option_backlog = 20;
if (string)
{
error = NULL;
number = strtol (string, &error, 10);
if (error && (error[0] == '\0'))
logger_option_backlog = number;
}
if (logger_option_path && logger_option_time_format && logger_option_backlog)
return 1;
else
return 0;
}
/*
@ -88,7 +127,7 @@ logger_create_directory ()
rc = 1;
dir1 = weechat_string_replace (logger_path, "~", getenv ("HOME"));
dir1 = weechat_string_replace (logger_option_path, "~", getenv ("HOME"));
if (dir1)
{
weechat_dir = weechat_info_get ("weechat_dir");
@ -99,7 +138,8 @@ logger_create_directory ()
{
if (mkdir (dir2, 0755) < 0)
{
if (errno != EEXIST) rc = 0;
if (errno != EEXIST)
rc = 0;
}
else
chmod (dir2, 0700);
@ -124,7 +164,7 @@ logger_create_directory ()
*/
char *
logger_get_filename (void *buffer)
logger_get_filename (struct t_gui_buffer *buffer)
{
struct t_plugin_infolist *ptr_infolist;
char *res;
@ -136,7 +176,8 @@ logger_get_filename (void *buffer)
dir_separator = weechat_info_get ("dir_separator");
weechat_dir = weechat_info_get ("weechat_dir");
log_path = weechat_string_replace (logger_path, "~", getenv ("HOME"));
log_path = weechat_string_replace (logger_option_path, "~",
getenv ("HOME"));
log_path2 = weechat_string_replace (log_path, "%h", weechat_dir);
if (dir_separator && weechat_dir && log_path && log_path2)
@ -230,22 +271,25 @@ logger_write_line (struct t_logger_buffer *logger_buffer, char *format, ...)
free (charset);
return;
}
seconds = time (NULL);
date_tmp = localtime (&seconds);
buf_time[0] = '\0';
if (date_tmp)
strftime (buf_time, sizeof (buf_time) - 1,
logger_time_format, date_tmp);
snprintf (buf, sizeof (buf) - 1,
_("**** Beginning of log %s ****"),
buf_time);
message = (charset) ?
weechat_iconv_from_internal (charset, buf) : NULL;
fprintf (logger_buffer->log_file,
"%s\n", (message) ? message : buf);
if (message)
free (message);
if (logger_option_info_lines)
{
seconds = time (NULL);
date_tmp = localtime (&seconds);
buf_time[0] = '\0';
if (date_tmp)
strftime (buf_time, sizeof (buf_time) - 1,
logger_option_time_format, date_tmp);
snprintf (buf, sizeof (buf) - 1,
_("%s\t**** Beginning of log ****"),
buf_time);
message = (charset) ?
weechat_iconv_from_internal (charset, buf) : NULL;
fprintf (logger_buffer->log_file,
"%s\n", (message) ? message : buf);
if (message)
free (message);
}
}
va_start (argptr, format);
@ -270,7 +314,7 @@ logger_write_line (struct t_logger_buffer *logger_buffer, char *format, ...)
*/
void
logger_start_buffer (void *buffer)
logger_start_buffer (struct t_gui_buffer *buffer)
{
struct t_logger_buffer *ptr_logger_buffer;
char *log_filename;
@ -333,18 +377,21 @@ logger_end (struct t_logger_buffer *logger_buffer)
if (logger_buffer->log_file)
{
seconds = time (NULL);
date_tmp = localtime (&seconds);
buf_time[0] = '\0';
if (date_tmp)
strftime (buf_time, sizeof (buf_time) - 1,
logger_time_format, date_tmp);
logger_write_line (logger_buffer,
_("**** End of log %s ****"),
buf_time);
if (logger_option_info_lines)
{
seconds = time (NULL);
date_tmp = localtime (&seconds);
buf_time[0] = '\0';
if (date_tmp)
strftime (buf_time, sizeof (buf_time) - 1,
logger_option_time_format, date_tmp);
logger_write_line (logger_buffer,
_("%s\t**** End of log ****"),
buf_time);
}
fclose (logger_buffer->log_file);
logger_buffer->log_file = NULL;
logger_buffer_remove (logger_buffer);
logger_buffer_free (logger_buffer);
}
}
@ -356,7 +403,7 @@ void
logger_end_all ()
{
struct t_logger_buffer *ptr_logger_buffer;
for (ptr_logger_buffer = logger_buffers; ptr_logger_buffer;
ptr_logger_buffer = ptr_logger_buffer->next_buffer)
{
@ -365,7 +412,7 @@ logger_end_all ()
}
/*
* logger_buffer_open_signal_cb: callback for buffer_open signal
* logger_buffer_open_signal_cb: callback for "buffer_open" signal
*/
int
@ -382,7 +429,7 @@ logger_buffer_open_signal_cb (void *data, char *signal, void *pointer)
}
/*
* logger_buffer_close_signal_cb: callback for buffer_close signal
* logger_buffer_close_signal_cb: callback for "buffer_close" signal
*/
int
@ -398,13 +445,96 @@ logger_buffer_close_signal_cb (void *data, char *signal, void *pointer)
return WEECHAT_RC_OK;
}
/*
* logger_backlog: display backlog for a buffer (by reading end of log file)
*/
void
logger_backlog (struct t_gui_buffer *buffer, char *filename, int lines)
{
struct t_logger_line *last_lines, *ptr_lines;
char *pos_message, *error;
time_t datetime;
struct tm tm_line;
int num_lines;
num_lines = 0;
last_lines = logger_tail_file (filename, lines);
ptr_lines = last_lines;
while (ptr_lines)
{
datetime = 0;
pos_message = strchr (ptr_lines->data, '\t');
if (pos_message)
{
pos_message[0] = '\0';
error = strptime (ptr_lines->data, logger_option_time_format,
&tm_line);
if (error && !error[0])
datetime = mktime (&tm_line);
pos_message[0] = '\t';
}
if (pos_message)
{
if (datetime != 0)
weechat_printf_date (buffer, datetime, pos_message + 1);
else
weechat_printf (buffer, ptr_lines->data);
}
else
{
weechat_printf (buffer, ptr_lines->data);
}
num_lines++;
ptr_lines = ptr_lines->next_line;
}
if (last_lines)
logger_tail_free (last_lines);
if (num_lines > 0)
weechat_printf (buffer,
_("===\t========== End of backlog (%d lines) =========="),
num_lines);
}
/*
* logger_backlog_signal_cb: callback for "logger_backlog" signal
*/
int
logger_backlog_signal_cb (void *data, char *signal, void *pointer)
{
struct t_logger_buffer *ptr_logger_buffer;
/* make C compiler happy */
(void) data;
(void) signal;
if (logger_option_backlog >= 0)
{
ptr_logger_buffer = logger_buffer_search (pointer);
if (ptr_logger_buffer && ptr_logger_buffer->log_filename
&& ptr_logger_buffer->log_enabled)
{
ptr_logger_buffer->log_enabled = 0;
logger_backlog (pointer,
ptr_logger_buffer->log_filename,
logger_option_backlog);
ptr_logger_buffer->log_enabled = 1;
}
}
return WEECHAT_RC_OK;
}
/*
* logger_print_cb: callback for print hook
*/
int
logger_print_cb (void *data, void *buffer, time_t date, char *prefix,
char *message)
logger_print_cb (void *data, struct t_gui_buffer *buffer, time_t date,
char *prefix, char *message)
{
struct t_logger_buffer *ptr_logger_buffer;
struct tm *date_tmp;
@ -414,26 +544,43 @@ logger_print_cb (void *data, void *buffer, time_t date, char *prefix,
(void) data;
ptr_logger_buffer = logger_buffer_search (buffer);
if (ptr_logger_buffer && ptr_logger_buffer->log_filename)
if (ptr_logger_buffer && ptr_logger_buffer->log_filename
&& ptr_logger_buffer->log_enabled)
{
date_tmp = localtime (&date);
buf_time[0] = '\0';
if (date_tmp)
strftime (buf_time, sizeof (buf_time) - 1,
logger_time_format, date_tmp);
logger_option_time_format, date_tmp);
logger_write_line (ptr_logger_buffer,
"%s%s%s%s%s",
"%s\t%s\t%s",
buf_time,
(buf_time[0]) ? " " : "",
(prefix) ? prefix : "",
(prefix && prefix[0]) ? " " : "",
message);
}
return WEECHAT_RC_OK;
}
/*
* logger_config_cb: callback for config hook
*/
int
logger_config_cb (void *data, char *type, char *option, char *value)
{
/* make C compiler happy */
(void) data;
(void) type;
(void) option;
(void) value;
logger_config_read ();
return WEECHAT_RC_OK;
}
/*
* weechat_plugin_init: initialize logger plugin
*/
@ -443,8 +590,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
{
weechat_plugin = plugin;
logger_config_read ();
if (!logger_path || !logger_time_format)
if (!logger_config_read ())
return WEECHAT_RC_ERROR;
if (!logger_create_directory ())
return WEECHAT_RC_ERROR;
@ -453,9 +599,19 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
weechat_hook_signal ("buffer_open", &logger_buffer_open_signal_cb, NULL);
weechat_hook_signal ("buffer_close", &logger_buffer_close_signal_cb, NULL);
weechat_hook_signal ("logger_backlog", &logger_backlog_signal_cb, NULL);
weechat_hook_print (NULL, NULL, 1, &logger_print_cb, NULL);
weechat_hook_config ("plugin", "logger." LOGGER_OPTION_PATH,
&logger_config_cb, NULL);
weechat_hook_config ("plugin", "logger." LOGGER_OPTION_TIME_FORMAT,
&logger_config_cb, NULL);
weechat_hook_config ("plugin", "logger." LOGGER_OPTION_INFO_LINES,
&logger_config_cb, NULL);
weechat_hook_config ("plugin", "logger." LOGGER_OPTION_BACKLOG,
&logger_config_cb, NULL);
return WEECHAT_RC_OK;
}

29
src/plugins/logger/logger.h Normal file
View File

@ -0,0 +1,29 @@
/*
* Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
* See README for License detail, AUTHORS for developers list.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __WEECHAT_LOGGER_H
#define __WEECHAT_LOGGER_H 1
#include "../weechat-plugin.h"
#define weechat_plugin weechat_logger_plugin
extern struct t_weechat_plugin *weechat_logger_plugin;
#endif /* logger.h */

1470
src/plugins/plugin-api.c
View File

File diff suppressed because it is too large Load Diff

209
src/plugins/plugin-api.h
View File

@ -21,193 +21,50 @@
#define __WEECHAT_PLUGIN_API_H 1
/* strings */
extern void plugin_api_charset_set (struct t_weechat_plugin *, char *);
extern char *plugin_api_iconv_to_internal (struct t_weechat_plugin *, char *,
char *);
extern char *plugin_api_iconv_from_internal (struct t_weechat_plugin *, char *,
char *);
extern char *plugin_api_gettext (struct t_weechat_plugin *, char *);
extern char *plugin_api_ngettext (struct t_weechat_plugin *, char *, char *,
int);
extern int plugin_api_strcasecmp (struct t_weechat_plugin *,char *, char *);
extern int plugin_api_strncasecmp (struct t_weechat_plugin *,char *, char *,
int);
extern char *plugin_api_strcasestr (struct t_weechat_plugin *,char *, char *);
extern char *plugin_api_string_replace (struct t_weechat_plugin *,char *,
char *, char *);
extern char **plugin_api_string_explode (struct t_weechat_plugin *, char *,
char *, int, int, int *);
extern void plugin_api_string_free_exploded (struct t_weechat_plugin *,
char **);
extern char **plugin_api_string_split_command (struct t_weechat_plugin *,
char *, char);
extern void plugin_api_string_free_splitted_command (struct t_weechat_plugin *,
char **);
/* UTF-8 strings */
extern int plugin_api_utf8_has_8bits (struct t_weechat_plugin *, char *);
extern int plugin_api_utf8_is_valid (struct t_weechat_plugin *, char *, char **);
extern void plugin_api_utf8_normalize (struct t_weechat_plugin *, char *, char);
extern char *plugin_api_utf8_prev_char (struct t_weechat_plugin *, char *, char *);
extern char *plugin_api_utf8_next_char (struct t_weechat_plugin *, char *);
extern int plugin_api_utf8_char_size (struct t_weechat_plugin *, char *);
extern int plugin_api_utf8_strlen (struct t_weechat_plugin *, char *);
extern int plugin_api_utf8_strnlen (struct t_weechat_plugin *, char *, int);
extern int plugin_api_utf8_strlen_screen (struct t_weechat_plugin *, char *);
extern int plugin_api_utf8_charcasecmp (struct t_weechat_plugin *, char *, char *);
extern int plugin_api_utf8_char_size_screen (struct t_weechat_plugin *, char *);
extern char *plugin_api_utf8_add_offset (struct t_weechat_plugin *, char *, int);
extern int plugin_api_utf8_real_pos (struct t_weechat_plugin *, char *, int);
extern int plugin_api_utf8_pos (struct t_weechat_plugin *, char *, int);
extern void plugin_api_charset_set (struct t_weechat_plugin *plugin,
char *charset);
extern char *plugin_api_gettext (char *string);
extern char *plugin_api_ngettext (char *single, char *plural, int count);
/* directories */
extern int plugin_api_mkdir_home (struct t_weechat_plugin *, char *, int);
extern int plugin_api_mkdir (struct t_weechat_plugin *, char *, int);
extern void plugin_api_exec_on_files (struct t_weechat_plugin *, char *,
int (*)(char *));
/* util */
extern long plugin_api_timeval_diff (struct t_weechat_plugin *, void *, void *);;
/* lists */
extern struct t_weelist *plugin_api_list_new( struct t_weechat_plugin *);
extern char *plugin_api_list_add (struct t_weechat_plugin *, void *, char *,
char *);
extern struct t_weelist_item *plugin_api_list_search (struct t_weechat_plugin *,
void *, char *);
extern struct t_weelist_item *plugin_api_list_casesearch (struct t_weechat_plugin *,
void *, char *);
extern struct t_weelist_item *plugin_api_list_get (struct t_weechat_plugin *,
void *, int);
extern struct t_weelist_item *plugin_api_list_next (struct t_weechat_plugin *,
void *);
extern struct t_weelist_item *plugin_api_list_prev (struct t_weechat_plugin *,
void *);
extern char *plugin_api_list_string (struct t_weechat_plugin *, void *);
extern int plugin_api_list_size (struct t_weechat_plugin *, void *);
extern void plugin_api_list_remove (struct t_weechat_plugin *, void *, void *);
extern void plugin_api_list_remove_all (struct t_weechat_plugin *, void *);
extern void plugin_api_list_free (struct t_weechat_plugin *, void *);
extern int plugin_api_mkdir_home (char *directory, int mode);
extern int plugin_api_mkdir (char *directory, int mode);
/* config */
extern struct t_config_file *plugin_api_config_new (struct t_weechat_plugin *,
char *);
extern struct t_config_section *plugin_api_config_new_section (struct t_weechat_plugin *,
void *, char *,
void (*)(void *, char *, char *),
void (*)(void *, char *),
void (*)(void *, char *));
extern struct t_config_section *plugin_api_config_search_section (struct t_weechat_plugin *,
void *, char *);
extern struct t_config_option *plugin_api_config_new_option (struct t_weechat_plugin *,
void *, char *,
char *, char *,
char *, int, int,
char *,
void (*)());
extern struct t_config_option *plugin_api_config_search_option (struct t_weechat_plugin *,
void *, void *,
char *);
extern int plugin_api_config_option_set (struct t_weechat_plugin *, void *,
char *);
extern char plugin_api_config_string_to_boolean (struct t_weechat_plugin *,
char *);
extern char plugin_api_config_boolean (struct t_weechat_plugin *, void *);
extern int plugin_api_config_integer (struct t_weechat_plugin *, void *);
extern char *plugin_api_config_string (struct t_weechat_plugin *, void *);
extern int plugin_api_config_color (struct t_weechat_plugin *, void *);
extern int plugin_api_config_read (struct t_weechat_plugin *, void *);
extern int plugin_api_config_reload (struct t_weechat_plugin *, void *);
extern int plugin_api_config_write (struct t_weechat_plugin *, void *);
extern void plugin_api_config_write_line (struct t_weechat_plugin *, void *,
char *, char *, ...);
extern void plugin_api_config_free (struct t_weechat_plugin *, void *);
extern struct t_config_option *plugin_api_config_get (struct t_weechat_plugin *,
char *);
extern char *plugin_api_plugin_config_get (struct t_weechat_plugin *, char *);
extern int plugin_api_plugin_config_set (struct t_weechat_plugin *, char *,
char *);
extern struct t_config_option *plugin_api_config_get_weechat (char *option_name);
extern char *plugin_api_config_get_plugin (struct t_weechat_plugin *plugin,
char *option_name);
extern int plugin_api_config_set_plugin (struct t_weechat_plugin *plugin,
char *option_name, char *value);
/* display */
extern char *plugin_api_prefix (struct t_weechat_plugin *, char *);
extern char *plugin_api_color (struct t_weechat_plugin *, char *);
extern void plugin_api_printf (struct t_weechat_plugin *, void *,
char *, ...);
extern void plugin_api_printf_date (struct t_weechat_plugin *, void *,
time_t, char *, ...);
extern void plugin_api_log_printf (struct t_weechat_plugin *, char *, ...);
extern void plugin_api_infobar_printf (struct t_weechat_plugin *, int, char *,
char *, ...);
extern void plugin_api_infobar_remove (struct t_weechat_plugin *, int);
/* hooks */
extern struct t_hook *plugin_api_hook_command (struct t_weechat_plugin *,
char *, char *, char *, char *,
char *,
int (*)(void *, void *, int, char **, char **),
void *);
extern struct t_hook *plugin_api_hook_timer (struct t_weechat_plugin *,
long, int, int,
int (*)(void *), void *);
extern struct t_hook *plugin_api_hook_fd (struct t_weechat_plugin *,
int, int, int, int,
int (*)(void *), void *);
extern struct t_hook *plugin_api_hook_print (struct t_weechat_plugin *,
void *, char *, int,
int (*)(void *, void *, time_t, char *, char *),
void *);
extern struct t_hook *plugin_api_hook_signal (struct t_weechat_plugin *, char *,
int (*)(void *, char *, void *),
void *);
extern void plugin_api_hook_signal_send (struct t_weechat_plugin *, char *,
void *);
extern struct t_hook *plugin_api_hook_config (struct t_weechat_plugin *,
char *, char *,
int (*)(void *, char *, char *, char *),
void *);
extern struct t_hook *plugin_api_hook_completion (struct t_weechat_plugin *,
char *,
int (*)(void *, char *, void *, void *),
void *);
extern void plugin_api_unhook (struct t_weechat_plugin *, void *);
extern void plugin_api_unhook_all (struct t_weechat_plugin *);
/* buffers */
extern struct t_gui_buffer *plugin_api_buffer_new (struct t_weechat_plugin *,
char *, char *,
void (*)(struct t_gui_buffer *, char *));
extern struct t_gui_buffer *plugin_api_buffer_search (struct t_weechat_plugin *,
char *, char *);
extern void plugin_api_buffer_close (struct t_weechat_plugin *, void *);
extern void *plugin_api_buffer_get (struct t_weechat_plugin *, void *, char *);
extern void plugin_api_buffer_set (struct t_weechat_plugin *, void *, char *,
char *);
extern void plugin_api_buffer_nick_add (struct t_weechat_plugin *, void *,
char *, int, char *, char, char *);
extern void plugin_api_buffer_nick_remove (struct t_weechat_plugin *, char *);
extern char *plugin_api_prefix (char *prefix);
extern char *plugin_api_color (char *color_name);
extern void plugin_api_infobar_printf (int delay, char *color_name,
char *format, ...);
extern void plugin_api_infobar_remove (int how_many);
/* command */
extern void plugin_api_command (struct t_weechat_plugin *, void *, char *);
extern void plugin_api_command (struct t_weechat_plugin *plugin,
struct t_gui_buffer *buffer, char *command);
/* infos */
extern char *plugin_api_info_get (struct t_weechat_plugin *, char *);
extern char *plugin_api_info_get (struct t_weechat_plugin *plugin, char *info);
/* infolists */
extern struct t_plugin_infolist *plugin_api_infolist_get (struct t_weechat_plugin *,
char *, void *);
extern int plugin_api_infolist_next (struct t_weechat_plugin *,
void *);
extern int plugin_api_infolist_prev (struct t_weechat_plugin *,
void *);
extern char *plugin_api_infolist_fields (struct t_weechat_plugin *, void *);
extern int plugin_api_infolist_integer (struct t_weechat_plugin *, void *, char *);
extern char *plugin_api_infolist_string (struct t_weechat_plugin *, void *, char *);
extern void *plugin_api_infolist_pointer (struct t_weechat_plugin *, void *, char *);
extern time_t plugin_api_infolist_time (struct t_weechat_plugin *, void *, char *);
extern void plugin_api_infolist_free (struct t_weechat_plugin *, void *);
/* log */
extern void plugin_api_log (struct t_weechat_plugin *, char *, char *,
char *, ...);
extern struct t_plugin_infolist *plugin_api_infolist_get (char *name,
void *pointer);
extern int plugin_api_infolist_next (struct t_plugin_infolist *infolist);
extern int plugin_api_infolist_prev (struct t_plugin_infolist *infolist);
extern char *plugin_api_infolist_fields (struct t_plugin_infolist *infolist);
extern int plugin_api_infolist_integer (struct t_plugin_infolist *infolist,
char *var);
extern char *plugin_api_infolist_string (struct t_plugin_infolist *infolist,
char *var);
extern void *plugin_api_infolist_pointer (struct t_plugin_infolist *infolist,
char *var);
extern time_t plugin_api_infolist_time (struct t_plugin_infolist *infolist,
char *var);
extern void plugin_api_infolist_free (struct t_plugin_infolist *infolist);
#endif /* plugin-api.h */

8
src/plugins/plugin-config.c
View File

@ -289,7 +289,8 @@ plugin_config_free_all ()
*/
void
plugin_config_read_option (void *config_file, char *option_name, char *value)
plugin_config_read_option (struct t_config_file *config_file,
char *option_name, char *value)
{
char *value2;
@ -311,7 +312,8 @@ plugin_config_read_option (void *config_file, char *option_name, char *value)
*/
void
plugin_config_write_options (void *config_file, char *section_name)
plugin_config_write_options (struct t_config_file *config_file,
char *section_name)
{
struct t_config_option *ptr_option;
@ -383,5 +385,5 @@ int
plugin_config_write ()
{
log_printf (_("Saving plugins configuration to disk"));
return config_file_write (plugin_config, 0);
return config_file_write (plugin_config);
}

10
src/plugins/plugin-config.h
View File

@ -25,10 +25,12 @@
extern struct t_config_file *plugin_config;
extern struct t_config_option *plugin_options;
extern struct t_config_option *plugin_config_search_internal (char *);
extern struct t_config_option *plugin_config_search (char *, char *);
extern int plugin_config_set_internal (char *, char *);
extern int plugin_config_set (char *, char *, char *);
extern struct t_config_option *plugin_config_search_internal (char *option_name);
extern struct t_config_option *plugin_config_search (char *plugin_name,
char *option_name);
extern int plugin_config_set_internal (char *option, char *value);
extern int plugin_config_set (char *plugin_name, char *option_name,
char *value);
extern void plugin_config_init ();
extern int plugin_config_read ();
extern int plugin_config_reload ();

Some files were not shown because too many files have changed in this diff Show More