pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 05:46:38 +02:00
Code Activity

Added input_data callback argument to gui_buffer_new() function

Browse Source
This commit is contained in:
Sebastien Helleu
2007-11-26 14:27:53 +00:00
parent 7cc78f4172
commit f5d026a775
8 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/curses/gui-curses-main.c
+1 -1
View File
@@ -93,7 +93,7 @@ gui_main_init ()
if (gui_window_new (NULL, 0, 0, COLS, LINES, 100, 100))
{
gui_current_window = gui_windows;
ptr_buffer = gui_buffer_new (NULL, "weechat", "weechat");
ptr_buffer = gui_buffer_new (NULL, "weechat", "weechat", NULL);
if (ptr_buffer)
{
gui_init_ok = 1;
src/gui/gtk/gui-gtk-main.c
+1 -1
View File
@@ -162,7 +162,7 @@ gui_main_init ()
if (gui_window_new (NULL, 0, 0, 0, 0, 100, 100))
{
gui_current_window = gui_windows;
ptr_buffer = gui_buffer_new (NULL, "weechat", "weechat");
ptr_buffer = gui_buffer_new (NULL, "weechat", "weechat", NULL);
if (ptr_buffer)
{
gui_init_ok = 1;
src/gui/gui-buffer.c
+3 -2
View File
@@ -63,7 +63,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)
gui_buffer_new (void *plugin, char *category, char *name,
void (*input_data_cb)(struct t_gui_buffer *, char *))
{
struct t_gui_buffer *new_buffer;
struct t_gui_completion *new_completion;
@@ -118,7 +119,7 @@ gui_buffer_new (void *plugin, char *category, char *name)
/* input */
new_buffer->input = 1;
new_buffer->input_data_cb = NULL;
new_buffer->input_data_cb = input_data_cb;
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);
src/gui/gui-buffer.h
+2 -1
View File
@@ -139,7 +139,8 @@ extern struct t_gui_buffer *gui_buffer_before_raw_data;
/* buffer functions */
extern struct t_gui_buffer *gui_buffer_new (void *, char *, char *);
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_set_category (struct t_gui_buffer *, char *);
extern void gui_buffer_set_name (struct t_gui_buffer *, char *);
src/plugins/demo/demo.c
+18 -8
View File
@@ -49,23 +49,22 @@ demo_printf_command_cb (void *data, void *buffer, int argc, char **argv,
{
/* make C compiler happy */
(void) data;
(void) buffer;
(void) argv;
if (argc > 1)
weechat_printf (weechat_current_buffer,
"demo_printf: %s", argv_eol[1]);
weechat_printf (buffer,
"demo_printf: '%s'", argv_eol[1]);
else
{
weechat_printf (weechat_current_buffer,
weechat_printf (buffer,
"demo message without prefix");
weechat_printf (weechat_current_buffer,
weechat_printf (buffer,
"%sdemo message with info prefix",
weechat_prefix ("info"));
weechat_printf (weechat_current_buffer,
weechat_printf (buffer,
"%sdemo message with error prefix",
weechat_prefix ("error"));
weechat_printf (weechat_current_buffer,
weechat_printf (buffer,
"colors: %s buffer %s nick1 %s nick2 %s nick3 "
"%s nick4",
weechat_color ("col_chat_buffer"),
@@ -78,6 +77,16 @@ demo_printf_command_cb (void *data, void *buffer, int argc, char **argv,
return PLUGIN_RC_SUCCESS;
}
/*
* demo_buffer_input_data_cb: callback for input data on buffer
*/
static void
demo_buffer_input_data_cb (struct t_gui_buffer *buffer, char *data)
{
weechat_printf (buffer, "buffer input_data_cb: data = '%s'", data);
}
/*
* demo_buffer_command_cb: demo command for creatig new buffer
*/
@@ -95,7 +104,8 @@ demo_buffer_command_cb (void *data, void *buffer, int argc, char **argv,
if (argc > 2)
{
new_buffer = weechat_buffer_new (argv[1], argv[2]);
new_buffer = weechat_buffer_new (argv[1], argv[2],
demo_buffer_input_data_cb);
if (new_buffer)
weechat_buffer_set (new_buffer, "display", "1");
}
src/plugins/plugin-api.c
+3 -2
View File
@@ -554,10 +554,11 @@ plugin_api_unhook_all (struct t_weechat_plugin *plugin)
struct t_gui_buffer *
plugin_api_buffer_new (struct t_weechat_plugin *plugin, char *category,
char *name)
char *name,
void (*input_data_cb)(struct t_gui_buffer *, char *))
{
if (plugin && name && name[0])
return gui_buffer_new (plugin, category, name);
return gui_buffer_new (plugin, category, name, input_data_cb);
return NULL;
}
src/plugins/plugin-api.h
+2 -1
View File
@@ -84,7 +84,8 @@ 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 *);
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 *);
src/plugins/weechat-plugin.h
+5 -3
View File
@@ -106,7 +106,8 @@ struct t_weechat_plugin
/* buffers */
struct t_gui_buffer *(*buffer_new) (struct t_weechat_plugin *,
char *, char *);
char *, char *,
void (*)(struct t_gui_buffer *, char *));
struct t_gui_buffer *(*buffer_search) (struct t_weechat_plugin *,
char *, char *);
void (*buffer_close) (struct t_weechat_plugin *, void *);
@@ -210,8 +211,9 @@ struct t_weechat_plugin
#define weechat_unhook_all() \
weechat_plugin->unhook(weechat_plugin)
#define weechat_buffer_new(category, name) \
weechat_plugin->buffer_new(weechat_plugin, category, name)
#define weechat_buffer_new(category, name, input_data_cb) \
weechat_plugin->buffer_new(weechat_plugin, category, name, \
input_data_cb)
#define weechat_buffer_search(category, name) \
weechat_plugin->buffer_search(weechat_plugin, category, name)
#define weechat_current_buffer \