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

api: allow update for some variables of hdata, add new functions hdata_update and hdata_set

Browse Source
This commit is contained in:
Sebastien Helleu
2012-08-27 09:47:46 +02:00
parent e767346a19
commit df80aa5fc9
54 changed files with 2953 additions and 1713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-bar-item.c
+8 -7
View File
@@ -1852,15 +1852,16 @@ gui_bar_item_hdata_bar_item_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item");
hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_bar_item, plugin, POINTER, NULL, "plugin");
HDATA_VAR(struct t_gui_bar_item, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, build_callback, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, build_callback_data, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, prev_item, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_item, next_item, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_item, plugin, POINTER, 0, NULL, "plugin");
HDATA_VAR(struct t_gui_bar_item, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, build_callback, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, build_callback_data, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_item, prev_item, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_item, next_item, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_bar_items);
HDATA_LIST(last_gui_bar_item);
}
src/gui/gui-bar-window.c
+23 -22
View File
@@ -1404,30 +1404,31 @@ gui_bar_window_hdata_bar_window_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_bar_window", "next_bar_window");
hdata = hdata_new (NULL, hdata_name, "prev_bar_window", "next_bar_window",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_bar_window, bar, POINTER, NULL, "bar");
HDATA_VAR(struct t_gui_bar_window, x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, width, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, height, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, scroll_x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, scroll_y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, cursor_x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, cursor_y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, current_size, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_subcount, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_content, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_num_lines, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_refresh_needed, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, screen_col_size, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, coords_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, coords, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, gui_objects, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, prev_bar_window, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_window, next_bar_window, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_window, bar, POINTER, 0, NULL, "bar");
HDATA_VAR(struct t_gui_bar_window, x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, width, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, height, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, scroll_x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, scroll_y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, cursor_x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, cursor_y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, current_size, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_subcount, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_content, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_num_lines, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, items_refresh_needed, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, screen_col_size, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, coords_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, coords, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, gui_objects, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar_window, prev_bar_window, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar_window, next_bar_window, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
src/gui/gui-bar.c
+16 -15
View File
@@ -2243,23 +2243,24 @@ gui_bar_hdata_bar_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_bar", "next_bar");
hdata = hdata_new (NULL, hdata_name, "prev_bar", "next_bar",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_bar, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_bar, options, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, conditions_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, conditions_array, STRING, "conditions_count", NULL);
HDATA_VAR(struct t_gui_bar, items_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_subcount, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_array, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_prefix, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_name, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_suffix, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, bar_window, POINTER, NULL, "bar_window");
HDATA_VAR(struct t_gui_bar, bar_refresh_needed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_bar, prev_bar, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar, next_bar, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, options, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, conditions_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, conditions_array, STRING, 0, "conditions_count", NULL);
HDATA_VAR(struct t_gui_bar, items_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_subcount, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_array, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_prefix, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_name, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, items_suffix, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, bar_window, POINTER, 0, NULL, "bar_window");
HDATA_VAR(struct t_gui_bar, bar_refresh_needed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_bar, prev_bar, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_bar, next_bar, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_bars);
HDATA_LIST(last_gui_bar);
}
src/gui/gui-buffer.c
+79 -76
View File
@@ -3125,75 +3125,76 @@ gui_buffer_hdata_buffer_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer");
hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_buffer, plugin, POINTER, NULL, "plugin");
HDATA_VAR(struct t_gui_buffer, plugin_name_for_upgrade, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, number, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, layout_number, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, layout_number_merge_order, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, full_name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, short_name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, type, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, notify, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, num_displayed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, active, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, print_hooks_enabled, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, close_callback, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, close_callback_data, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, title, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, own_lines, POINTER, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, mixed_lines, POINTER, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, lines, POINTER, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, time_for_each_line, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, chat_refresh_needed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_case_sensitive, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_root, POINTER, NULL, "nick_group");
HDATA_VAR(struct t_gui_buffer, nicklist_max_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_display_groups, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_visible_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nickcmp_callback, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nickcmp_callback_data, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_callback, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_callback_data, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_get_unknown_commands, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_alloc, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_size, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_pos, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_1st_display, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_undo_snap, POINTER, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, input_undo, POINTER, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, last_input_undo, POINTER, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, ptr_input_undo, POINTER, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, input_undo_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, completion, POINTER, NULL, "completion");
HDATA_VAR(struct t_gui_buffer, history, POINTER, NULL, "history");
HDATA_VAR(struct t_gui_buffer, last_history, POINTER, NULL, "history");
HDATA_VAR(struct t_gui_buffer, ptr_history, POINTER, NULL, "history");
HDATA_VAR(struct t_gui_buffer, num_history, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_exact, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_found, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_input, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_words, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_regex, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_regex_compiled, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags_array, STRING, "highlight_tags_count", NULL);
HDATA_VAR(struct t_gui_buffer, hotlist_max_level_nicks, HASHTABLE, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, keys, POINTER, NULL, "key");
HDATA_VAR(struct t_gui_buffer, last_key, POINTER, NULL, "key");
HDATA_VAR(struct t_gui_buffer, keys_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, local_variables, HASHTABLE, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, prev_buffer, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer, next_buffer, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer, plugin, POINTER, 0, NULL, "plugin");
HDATA_VAR(struct t_gui_buffer, plugin_name_for_upgrade, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, number, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, layout_number, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, layout_number_merge_order, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, full_name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, short_name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, type, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, notify, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, num_displayed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, active, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, print_hooks_enabled, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, close_callback, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, close_callback_data, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, title, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, own_lines, POINTER, 0, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, mixed_lines, POINTER, 0, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, lines, POINTER, 0, NULL, "lines");
HDATA_VAR(struct t_gui_buffer, time_for_each_line, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, chat_refresh_needed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_case_sensitive, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_root, POINTER, 0, NULL, "nick_group");
HDATA_VAR(struct t_gui_buffer, nicklist_max_length, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_display_groups, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nicklist_visible_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nickcmp_callback, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, nickcmp_callback_data, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_callback, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_callback_data, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_get_unknown_commands, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_alloc, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_size, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_length, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_pos, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_buffer_1st_display, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, input_undo_snap, POINTER, 0, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, input_undo, POINTER, 0, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, last_input_undo, POINTER, 0, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, ptr_input_undo, POINTER, 0, NULL, "input_undo");
HDATA_VAR(struct t_gui_buffer, input_undo_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, completion, POINTER, 0, NULL, "completion");
HDATA_VAR(struct t_gui_buffer, history, POINTER, 0, NULL, "history");
HDATA_VAR(struct t_gui_buffer, last_history, POINTER, 0, NULL, "history");
HDATA_VAR(struct t_gui_buffer, ptr_history, POINTER, 0, NULL, "history");
HDATA_VAR(struct t_gui_buffer, num_history, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_exact, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_found, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, text_search_input, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_words, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_regex, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_regex_compiled, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, highlight_tags_array, STRING, 0, "highlight_tags_count", NULL);
HDATA_VAR(struct t_gui_buffer, hotlist_max_level_nicks, HASHTABLE, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, keys, POINTER, 0, NULL, "key");
HDATA_VAR(struct t_gui_buffer, last_key, POINTER, 0, NULL, "key");
HDATA_VAR(struct t_gui_buffer, keys_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, local_variables, HASHTABLE, 0, NULL, NULL);
HDATA_VAR(struct t_gui_buffer, prev_buffer, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer, next_buffer, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_buffers);
HDATA_LIST(last_gui_buffer);
HDATA_LIST(gui_buffer_last_displayed);
@@ -3213,13 +3214,14 @@ gui_buffer_hdata_input_undo_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_undo", "next_undo");
hdata = hdata_new (NULL, hdata_name, "prev_undo", "next_undo",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_input_undo, data, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_input_undo, pos, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_input_undo, prev_undo, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_input_undo, next_undo, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_input_undo, data, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_input_undo, pos, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_input_undo, prev_undo, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_input_undo, next_undo, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
@@ -3236,12 +3238,13 @@ gui_buffer_hdata_buffer_visited_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer");
hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_buffer_visited, buffer, POINTER, NULL, "buffer");
HDATA_VAR(struct t_gui_buffer_visited, prev_buffer, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer_visited, next_buffer, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer_visited, buffer, POINTER, 0, NULL, "buffer");
HDATA_VAR(struct t_gui_buffer_visited, prev_buffer, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_buffer_visited, next_buffer, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_buffers_visited);
HDATA_LIST(last_gui_buffer_visited);
}
src/gui/gui-chat.c
+3
View File
@@ -339,6 +339,9 @@ gui_chat_get_time_string (time_t date)
int i, time_first_digit, time_last_digit, last_color;
struct tm *local_time;
if (date == 0)
return NULL;
if (!CONFIG_STRING(config_look_buffer_time_format)
|| !CONFIG_STRING(config_look_buffer_time_format)[0])
return NULL;
src/gui/gui-completion.c
+27 -25
View File
@@ -1214,28 +1214,29 @@ gui_completion_hdata_completion_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, NULL, NULL);
hdata = hdata_new (NULL, hdata_name, NULL, NULL,
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_completion, buffer, POINTER, NULL, "buffer");
HDATA_VAR(struct t_gui_completion, context, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_command, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_command_arg_index, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_word, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_word_pos, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, position, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, args, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_completion, direction, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, add_space, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, force_partial_completion, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, completion_list, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, word_found, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_completion, word_found_is_nick, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, position_replace, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, diff_size, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, diff_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion, partial_completion_list, POINTER, NULL, "completion_partial");
HDATA_VAR(struct t_gui_completion, last_partial_completion, POINTER, NULL, "completion_partial");
HDATA_VAR(struct t_gui_completion, buffer, POINTER, 0, NULL, "buffer");
HDATA_VAR(struct t_gui_completion, context, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_command, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_command_arg_index, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_word, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, base_word_pos, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, position, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, args, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, direction, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, add_space, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, force_partial_completion, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, completion_list, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, word_found, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, word_found_is_nick, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, position_replace, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, diff_size, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, diff_length, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion, partial_completion_list, POINTER, 0, NULL, "completion_partial");
HDATA_VAR(struct t_gui_completion, last_partial_completion, POINTER, 0, NULL, "completion_partial");
}
return hdata;
}
@@ -1253,13 +1254,14 @@ gui_completion_hdata_completion_partial_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item");
hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_completion_partial, word, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_completion_partial, count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_completion_partial, prev_item, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_completion_partial, next_item, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_completion_partial, word, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion_partial, count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_completion_partial, prev_item, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_completion_partial, next_item, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
src/gui/gui-filter.c
+15 -14
View File
@@ -449,22 +449,23 @@ gui_filter_hdata_filter_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_filter", "next_filter");
hdata = hdata_new (NULL, hdata_name, "prev_filter", "next_filter",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_filter, enabled, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_filter, buffer_name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_filter, num_buffers, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, buffers, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags_array, STRING, "tags_count", NULL);
HDATA_VAR(struct t_gui_filter, regex, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_filter, regex_prefix, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, regex_message, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_filter, prev_filter, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_filter, next_filter, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_filter, enabled, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, buffer_name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, num_buffers, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, buffers, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, tags_array, STRING, 0, "tags_count", NULL);
HDATA_VAR(struct t_gui_filter, regex, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, regex_prefix, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, regex_message, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_filter, prev_filter, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_filter, next_filter, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_filters);
HDATA_LIST(last_gui_filter);
}
src/gui/gui-history.c
+5 -4
View File
@@ -227,12 +227,13 @@ gui_history_hdata_history_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_history", "next_history");
hdata = hdata_new (NULL, hdata_name, "prev_history", "next_history",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_history, text, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_history, prev_history, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_history, next_history, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_history, text, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_history, prev_history, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_history, next_history, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
src/gui/gui-hotlist.c
+9 -8
View File
@@ -474,16 +474,17 @@ gui_hotlist_hdata_hotlist_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_hotlist", "next_hotlist");
hdata = hdata_new (NULL, hdata_name, "prev_hotlist", "next_hotlist",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_hotlist, priority, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, creation_time.tv_sec, TIME, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, creation_time.tv_usec, LONG, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, buffer, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, count, INTEGER, GUI_HOTLIST_NUM_PRIORITIES_STR, NULL);
HDATA_VAR(struct t_gui_hotlist, prev_hotlist, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_hotlist, next_hotlist, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_hotlist, priority, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, creation_time.tv_sec, TIME, 0, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, creation_time.tv_usec, LONG, 0, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, buffer, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_hotlist, count, INTEGER, 0, GUI_HOTLIST_NUM_PRIORITIES_STR, NULL);
HDATA_VAR(struct t_gui_hotlist, prev_hotlist, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_hotlist, next_hotlist, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_hotlist);
HDATA_LIST(last_gui_hotlist);
}
src/gui/gui-key.c
+10 -9
View File
@@ -1715,17 +1715,18 @@ gui_key_hdata_key_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_key", "next_key");
hdata = hdata_new (NULL, hdata_name, "prev_key", "next_key",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_key, key, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_type, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_name, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_key, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_key, command, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_key, score, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_key, prev_key, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_key, next_key, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_key, key, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_type, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_name, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, area_key, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, command, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, score, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_key, prev_key, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_key, next_key, POINTER, 0, NULL, hdata_name);
for (i = 0; i < GUI_KEY_NUM_CONTEXTS; i++)
{
snprintf (str_list, sizeof (str_list),
src/gui/gui-line.c
+114 -29
View File
@@ -1012,8 +1012,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
new_line->data->y = -1;
new_line->data->date = date;
new_line->data->date_printed = date_printed;
new_line->data->str_time = (date == 0) ?
NULL : gui_chat_get_time_string (date);
new_line->data->str_time = gui_chat_get_time_string (date);
if (tags)
{
new_line->data->tags_array = string_split (tags, ",", 0, 0,
@@ -1355,17 +1354,17 @@ gui_line_hdata_lines_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, NULL, NULL);
hdata = hdata_new (NULL, hdata_name, NULL, NULL, 0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_lines, first_line, POINTER, NULL, "line");
HDATA_VAR(struct t_gui_lines, last_line, POINTER, NULL, "line");
HDATA_VAR(struct t_gui_lines, last_read_line, POINTER, NULL, "line");
HDATA_VAR(struct t_gui_lines, lines_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_lines, first_line_not_read, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_lines, lines_hidden, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_lines, buffer_max_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_lines, prefix_max_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_lines, first_line, POINTER, 0, NULL, "line");
HDATA_VAR(struct t_gui_lines, last_line, POINTER, 0, NULL, "line");
HDATA_VAR(struct t_gui_lines, last_read_line, POINTER, 0, NULL, "line");
HDATA_VAR(struct t_gui_lines, lines_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_lines, first_line_not_read, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_lines, lines_hidden, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_lines, buffer_max_length, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_lines, prefix_max_length, INTEGER, 0, NULL, NULL);
}
return hdata;
}
@@ -1382,16 +1381,101 @@ gui_line_hdata_line_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_line", "next_line");
hdata = hdata_new (NULL, hdata_name, "prev_line", "next_line",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_line, data, POINTER, NULL, "line_data");
HDATA_VAR(struct t_gui_line, prev_line, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_line, next_line, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_line, data, POINTER, 0, NULL, "line_data");
HDATA_VAR(struct t_gui_line, prev_line, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_line, next_line, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
/*
* gui_line_hdata_line_data_update_cb: callback for updating data of a line
*/
int
gui_line_hdata_line_data_update_cb (void *data,
struct t_hdata *hdata,
void *pointer,
struct t_hashtable *hashtable)
{
const char *value;
struct t_gui_line_data *line_data;
int rc;
/* make C compiler happy */
(void) data;
line_data = (struct t_gui_line_data *)pointer;
rc = 0;
if (hashtable_has_key (hashtable, "date"))
{
value = hashtable_get (hashtable, "date");
if (value)
{
hdata_set (hdata, pointer, "date", value);
if (line_data->str_time)
free (line_data->str_time);
line_data->str_time = gui_chat_get_time_string (line_data->date);
rc++;
}
}
if (hashtable_has_key (hashtable, "date_printed"))
{
value = hashtable_get (hashtable, "date_printed");
if (value)
{
hdata_set (hdata, pointer, "date_printed", value);
rc++;
}
}
if (hashtable_has_key (hashtable, "tags_array"))
{
value = hashtable_get (hashtable, "tags_array");
if (line_data->tags_array)
string_free_split (line_data->tags_array);
if (value)
{
line_data->tags_array = string_split (value, ",", 0, 0,
&line_data->tags_count);
}
else
{
line_data->tags_count = 0;
line_data->tags_array = NULL;
}
rc++;
}
if (hashtable_has_key (hashtable, "prefix"))
{
value = hashtable_get (hashtable, "prefix");
hdata_set (hdata, pointer, "prefix", value);
line_data->prefix_length = (line_data->prefix) ?
gui_chat_strlen_screen (line_data->prefix) : 0;
gui_line_compute_prefix_max_length (line_data->buffer->lines);
rc++;
}
if (hashtable_has_key (hashtable, "message"))
{
value = hashtable_get (hashtable, "message");
hdata_set (hdata, pointer, "message", value);
rc++;
}
gui_buffer_ask_chat_refresh (line_data->buffer, 1);
return rc;
}
/*
* gui_line_hdata_line_data_cb: return hdata for line data
*/
@@ -1404,22 +1488,23 @@ gui_line_hdata_line_data_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, NULL, NULL);
hdata = hdata_new (NULL, hdata_name, NULL, NULL,
0, &gui_line_hdata_line_data_update_cb, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_line_data, buffer, POINTER, NULL, "buffer");
HDATA_VAR(struct t_gui_line_data, y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, date, TIME, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, date_printed, TIME, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, str_time, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, tags_count, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, tags_array, STRING, "tags_count", NULL);
HDATA_VAR(struct t_gui_line_data, displayed, CHAR, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, highlight, CHAR, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, refresh_needed, CHAR, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, prefix, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, prefix_length, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, message, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, buffer, POINTER, 0, NULL, "buffer");
HDATA_VAR(struct t_gui_line_data, y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, date, TIME, 1, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, date_printed, TIME, 1, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, str_time, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, tags_count, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, tags_array, STRING, 1, "tags_count", NULL);
HDATA_VAR(struct t_gui_line_data, displayed, CHAR, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, highlight, CHAR, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, refresh_needed, CHAR, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, prefix, STRING, 1, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, prefix_length, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_line_data, message, STRING, 1, NULL, NULL);
}
return hdata;
}
src/gui/gui-nicklist.c
+23 -21
View File
@@ -971,20 +971,21 @@ gui_nicklist_hdata_nick_group_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_group", "next_group");
hdata = hdata_new (NULL, hdata_name, "prev_group", "next_group",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_nick_group, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, color, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, visible, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, level, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, parent, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, children, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, last_child, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, nicks, POINTER, NULL, "nick");
HDATA_VAR(struct t_gui_nick_group, last_nick, POINTER, NULL, "nick");
HDATA_VAR(struct t_gui_nick_group, prev_group, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, next_group, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, color, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, visible, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, level, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick_group, parent, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, children, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, last_child, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, nicks, POINTER, 0, NULL, "nick");
HDATA_VAR(struct t_gui_nick_group, last_nick, POINTER, 0, NULL, "nick");
HDATA_VAR(struct t_gui_nick_group, prev_group, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick_group, next_group, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
@@ -1001,17 +1002,18 @@ gui_nicklist_hdata_nick_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_nick", "next_nick");
hdata = hdata_new (NULL, hdata_name, "prev_nick", "next_nick",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_nick, group, POINTER, NULL, "nick_group");
HDATA_VAR(struct t_gui_nick, name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick, color, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prefix, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prefix_color, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_nick, visible, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prev_nick, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick, next_nick, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick, group, POINTER, 0, NULL, "nick_group");
HDATA_VAR(struct t_gui_nick, name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick, color, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prefix, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prefix_color, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick, visible, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_nick, prev_nick, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_nick, next_nick, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
src/gui/gui-window.c
+45 -43
View File
@@ -1609,33 +1609,34 @@ gui_window_hdata_window_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_window", "next_window");
hdata = hdata_new (NULL, hdata_name, "prev_window", "next_window",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_window, number, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_width, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_height, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_width_pct, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_height_pct, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_width, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_height, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_cursor_x, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_cursor_y, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, bar_windows, POINTER, NULL, "bar_window");
HDATA_VAR(struct t_gui_window, last_bar_window, POINTER, NULL, "bar_window");
HDATA_VAR(struct t_gui_window, refresh_needed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window, gui_objects, POINTER, NULL, NULL);
HDATA_VAR(struct t_gui_window, buffer, POINTER, NULL, "buffer");
HDATA_VAR(struct t_gui_window, layout_plugin_name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_window, layout_buffer_name, STRING, NULL, NULL);
HDATA_VAR(struct t_gui_window, scroll, POINTER, NULL, "window_scroll");
HDATA_VAR(struct t_gui_window, ptr_tree, POINTER, NULL, "window_tree");
HDATA_VAR(struct t_gui_window, prev_window, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window, next_window, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window, number, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_width, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_height, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_width_pct, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_height_pct, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_width, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_height, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_cursor_x, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, win_chat_cursor_y, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, bar_windows, POINTER, 0, NULL, "bar_window");
HDATA_VAR(struct t_gui_window, last_bar_window, POINTER, 0, NULL, "bar_window");
HDATA_VAR(struct t_gui_window, refresh_needed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, gui_objects, POINTER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, buffer, POINTER, 0, NULL, "buffer");
HDATA_VAR(struct t_gui_window, layout_plugin_name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, layout_buffer_name, STRING, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window, scroll, POINTER, 0, NULL, "window_scroll");
HDATA_VAR(struct t_gui_window, ptr_tree, POINTER, 0, NULL, "window_tree");
HDATA_VAR(struct t_gui_window, prev_window, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_window, next_window, POINTER, 0, NULL, hdata_name);
HDATA_LIST(gui_windows);
HDATA_LIST(last_gui_window);
HDATA_LIST(gui_current_window);
@@ -1655,19 +1656,20 @@ gui_window_hdata_window_scroll_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, "prev_scroll", "next_scroll");
hdata = hdata_new (NULL, hdata_name, "prev_scroll", "next_scroll",
0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_window_scroll, buffer, POINTER, NULL, "buffer");
HDATA_VAR(struct t_gui_window_scroll, first_line_displayed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, start_line, POINTER, NULL, "line");
HDATA_VAR(struct t_gui_window_scroll, start_line_pos, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, scrolling, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, start_col, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, lines_after, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, reset_allowed, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, prev_scroll, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_scroll, next_scroll, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_scroll, buffer, POINTER, 0, NULL, "buffer");
HDATA_VAR(struct t_gui_window_scroll, first_line_displayed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, start_line, POINTER, 0, NULL, "line");
HDATA_VAR(struct t_gui_window_scroll, start_line_pos, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, scrolling, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, start_col, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, lines_after, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, reset_allowed, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_scroll, prev_scroll, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_scroll, next_scroll, POINTER, 0, NULL, hdata_name);
}
return hdata;
}
@@ -1684,15 +1686,15 @@ gui_window_hdata_window_tree_cb (void *data, const char *hdata_name)
/* make C compiler happy */
(void) data;
hdata = hdata_new (NULL, hdata_name, NULL, NULL);
hdata = hdata_new (NULL, hdata_name, NULL, NULL, 0, NULL, NULL);
if (hdata)
{
HDATA_VAR(struct t_gui_window_tree, parent_node, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, split_pct, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_tree, split_horizontal, INTEGER, NULL, NULL);
HDATA_VAR(struct t_gui_window_tree, child1, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, child2, POINTER, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, window, POINTER, NULL, "window");
HDATA_VAR(struct t_gui_window_tree, parent_node, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, split_pct, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_tree, split_horizontal, INTEGER, 0, NULL, NULL);
HDATA_VAR(struct t_gui_window_tree, child1, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, child2, POINTER, 0, NULL, hdata_name);
HDATA_VAR(struct t_gui_window_tree, window, POINTER, 0, NULL, "window");
HDATA_LIST(gui_windows_tree);
}
return hdata;