core: many improvements on hdata

New features:
- add optional hdata name for variables in hdata
- add plugin API functions: hdata_get_var_hdata
- use hashtable to store hdata (created by WeeChat and plugins)
- free hdata and infolists created by plugin on plugin unload
- free all hdata on exit
- add "free" option to command /debug hdata
- remove hdata for hooks

10 files changed, 249 insertions, 350 deletions

diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 3ac089f0f..c806a042c 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -1711,23 +1711,19 @@ gui_bar_item_hdata_bar_item_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_bar_item_hdata_bar_item)
-        return gui_bar_item_hdata_bar_item;
-    
-    hdata = hdata_new (hdata_name, "prev_item", "next_item");
+    hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item");
     if (hdata)
     {
-        gui_bar_item_hdata_bar_item = hdata;
-        HDATA_VAR(struct t_gui_bar_item, plugin, POINTER);
-        HDATA_VAR(struct t_gui_bar_item, name, STRING);
-        HDATA_VAR(struct t_gui_bar_item, build_callback, POINTER);
-        HDATA_VAR(struct t_gui_bar_item, build_callback_data, POINTER);
-        HDATA_VAR(struct t_gui_bar_item, prev_item, POINTER);
-        HDATA_VAR(struct t_gui_bar_item, next_item, POINTER);
+        HDATA_VAR(struct t_gui_bar_item, plugin, POINTER, "plugin");
+        HDATA_VAR(struct t_gui_bar_item, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_bar_item, build_callback, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar_item, build_callback_data, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar_item, prev_item, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_bar_item, next_item, POINTER, hdata_name);
         HDATA_LIST(gui_bar_items);
         HDATA_LIST(last_gui_bar_item);
     }
-    return gui_bar_item_hdata_bar_item;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c
index 49d0dc3d0..381f4fdcb 100644
--- a/src/gui/gui-bar.c
+++ b/src/gui/gui-bar.c
@@ -68,8 +68,6 @@ struct t_gui_bar *last_gui_bar = NULL;     /* last bar                      */
 struct t_gui_bar *gui_temp_bars = NULL;    /* bars used when reading config */
 struct t_gui_bar *last_gui_temp_bar = NULL;
 
-struct t_hdata *gui_bar_hdata_bar = NULL;
-
 
 void gui_bar_free_bar_windows (struct t_gui_bar *bar);
 
@@ -2158,28 +2156,24 @@ gui_bar_hdata_bar_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_bar_hdata_bar)
-        return gui_bar_hdata_bar;
-    
-    hdata = hdata_new (hdata_name, "prev_bar", "next_bar");
+    hdata = hdata_new (NULL, hdata_name, "prev_bar", "next_bar");
     if (hdata)
     {
-        gui_bar_hdata_bar = hdata;
-        HDATA_VAR(struct t_gui_bar, name, STRING);
-        HDATA_VAR(struct t_gui_bar, options, POINTER);
-        HDATA_VAR(struct t_gui_bar, conditions_count, INTEGER);
-        HDATA_VAR(struct t_gui_bar, conditions_array, POINTER);
-        HDATA_VAR(struct t_gui_bar, items_count, INTEGER);
-        HDATA_VAR(struct t_gui_bar, items_subcount, POINTER);
-        HDATA_VAR(struct t_gui_bar, items_array, POINTER);
-        HDATA_VAR(struct t_gui_bar, bar_window, POINTER);
-        HDATA_VAR(struct t_gui_bar, bar_refresh_needed, INTEGER);
-        HDATA_VAR(struct t_gui_bar, prev_bar, POINTER);
-        HDATA_VAR(struct t_gui_bar, next_bar, POINTER);
+        HDATA_VAR(struct t_gui_bar, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_bar, options, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar, conditions_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_bar, conditions_array, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar, items_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_bar, items_subcount, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar, items_array, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar, bar_window, POINTER, NULL);
+        HDATA_VAR(struct t_gui_bar, bar_refresh_needed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_bar, prev_bar, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_bar, next_bar, POINTER, hdata_name);
         HDATA_LIST(gui_bars);
         HDATA_LIST(last_gui_bar);
     }
-    return gui_bar_hdata_bar;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 083867bcb..8a920d27a 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -71,10 +71,6 @@ int gui_buffers_visited_index = -1;             /* index of pointer in list */
 int gui_buffers_visited_count = 0;              /* number of visited buffers*/
 int gui_buffers_visited_frozen = 0;             /* 1 to forbid list updates */
 
-struct t_hdata *gui_buffer_hdata_buffer = NULL;
-struct t_hdata *gui_buffer_hdata_input_undo = NULL;
-struct t_hdata *gui_buffer_hdata_buffer_visited = NULL;
-
 char *gui_buffer_notify_string[GUI_BUFFER_NUM_NOTIFY] =
 { "none", "highlight", "message", "all" };
 
@@ -2954,81 +2950,77 @@ gui_buffer_hdata_buffer_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_buffer_hdata_buffer)
-        return gui_buffer_hdata_buffer;
-    
-    hdata = hdata_new (hdata_name, "prev_buffer", "next_buffer");
+    hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer");
     if (hdata)
     {
-        gui_buffer_hdata_buffer = hdata;
-        HDATA_VAR(struct t_gui_buffer, plugin, POINTER);
-        HDATA_VAR(struct t_gui_buffer, plugin_name_for_upgrade, STRING);
-        HDATA_VAR(struct t_gui_buffer, merge_for_upgrade, POINTER);
-        HDATA_VAR(struct t_gui_buffer, number, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, layout_number, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, layout_applied, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, name, STRING);
-        HDATA_VAR(struct t_gui_buffer, short_name, STRING);
-        HDATA_VAR(struct t_gui_buffer, type, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, notify, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, num_displayed, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, active, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, print_hooks_enabled, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, close_callback, POINTER);
-        HDATA_VAR(struct t_gui_buffer, close_callback_data, POINTER);
-        HDATA_VAR(struct t_gui_buffer, title, STRING);
-        HDATA_VAR(struct t_gui_buffer, own_lines, POINTER);
-        HDATA_VAR(struct t_gui_buffer, mixed_lines, POINTER);
-        HDATA_VAR(struct t_gui_buffer, lines, POINTER);
-        HDATA_VAR(struct t_gui_buffer, time_for_each_line, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, chat_refresh_needed, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, nicklist, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, nicklist_case_sensitive, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, nicklist_root, POINTER);
-        HDATA_VAR(struct t_gui_buffer, nicklist_max_length, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, nicklist_display_groups, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, nicklist_visible_count, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_callback, POINTER);
-        HDATA_VAR(struct t_gui_buffer, input_callback_data, POINTER);
-        HDATA_VAR(struct t_gui_buffer, input_get_unknown_commands, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_buffer, STRING);
-        HDATA_VAR(struct t_gui_buffer, input_buffer_alloc, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_buffer_size, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_buffer_length, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_buffer_pos, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_buffer_1st_display, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, input_undo_snap, POINTER);
-        HDATA_VAR(struct t_gui_buffer, input_undo, POINTER);
-        HDATA_VAR(struct t_gui_buffer, last_input_undo, POINTER);
-        HDATA_VAR(struct t_gui_buffer, ptr_input_undo, POINTER);
-        HDATA_VAR(struct t_gui_buffer, input_undo_count, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, completion, POINTER);
-        HDATA_VAR(struct t_gui_buffer, history, POINTER);
-        HDATA_VAR(struct t_gui_buffer, last_history, POINTER);
-        HDATA_VAR(struct t_gui_buffer, ptr_history, POINTER);
-        HDATA_VAR(struct t_gui_buffer, num_history, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, text_search, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, text_search_exact, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, text_search_found, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, text_search_input, STRING);
-        HDATA_VAR(struct t_gui_buffer, highlight_words, STRING);
-        HDATA_VAR(struct t_gui_buffer, highlight_regex, STRING);
-        HDATA_VAR(struct t_gui_buffer, highlight_regex_compiled, POINTER);
-        HDATA_VAR(struct t_gui_buffer, highlight_tags, STRING);
-        HDATA_VAR(struct t_gui_buffer, highlight_tags_count, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, highlight_tags_array, POINTER);
-        HDATA_VAR(struct t_gui_buffer, hotlist_max_level_nicks, POINTER);
-        HDATA_VAR(struct t_gui_buffer, keys, POINTER);
-        HDATA_VAR(struct t_gui_buffer, last_key, POINTER);
-        HDATA_VAR(struct t_gui_buffer, keys_count, INTEGER);
-        HDATA_VAR(struct t_gui_buffer, local_variables, POINTER);
-        HDATA_VAR(struct t_gui_buffer, prev_buffer, POINTER);
-        HDATA_VAR(struct t_gui_buffer, next_buffer, POINTER);
+        HDATA_VAR(struct t_gui_buffer, plugin, POINTER, "plugin");
+        HDATA_VAR(struct t_gui_buffer, plugin_name_for_upgrade, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, merge_for_upgrade, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, number, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, layout_number, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, layout_applied, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, short_name, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, type, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, notify, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, num_displayed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, active, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, print_hooks_enabled, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, close_callback, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, close_callback_data, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, title, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, own_lines, POINTER, "lines");
+        HDATA_VAR(struct t_gui_buffer, mixed_lines, POINTER, "lines");
+        HDATA_VAR(struct t_gui_buffer, lines, POINTER, "lines");
+        HDATA_VAR(struct t_gui_buffer, time_for_each_line, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, chat_refresh_needed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, nicklist, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, nicklist_case_sensitive, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, nicklist_root, POINTER, "nick_group");
+        HDATA_VAR(struct t_gui_buffer, nicklist_max_length, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, nicklist_display_groups, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, nicklist_visible_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_callback, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_callback_data, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_get_unknown_commands, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer_alloc, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer_size, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer_length, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer_pos, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_buffer_1st_display, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, input_undo_snap, POINTER, "input_undo");
+        HDATA_VAR(struct t_gui_buffer, input_undo, POINTER, "input_undo");
+        HDATA_VAR(struct t_gui_buffer, last_input_undo, POINTER, "input_undo");
+        HDATA_VAR(struct t_gui_buffer, ptr_input_undo, POINTER, "input_undo");
+        HDATA_VAR(struct t_gui_buffer, input_undo_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, completion, POINTER, "completion");
+        HDATA_VAR(struct t_gui_buffer, history, POINTER, "history");
+        HDATA_VAR(struct t_gui_buffer, last_history, POINTER, "history");
+        HDATA_VAR(struct t_gui_buffer, ptr_history, POINTER, "history");
+        HDATA_VAR(struct t_gui_buffer, num_history, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, text_search, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, text_search_exact, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, text_search_found, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, text_search_input, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_words, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_regex, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_regex_compiled, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_tags, STRING, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_tags_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, highlight_tags_array, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, hotlist_max_level_nicks, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, keys, POINTER, "key");
+        HDATA_VAR(struct t_gui_buffer, last_key, POINTER, "key");
+        HDATA_VAR(struct t_gui_buffer, keys_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_buffer, local_variables, POINTER, NULL);
+        HDATA_VAR(struct t_gui_buffer, prev_buffer, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_buffer, next_buffer, POINTER, hdata_name);
         HDATA_LIST(gui_buffers);
         HDATA_LIST(last_gui_buffer);
     }
-    return gui_buffer_hdata_buffer;
+    return hdata;
 }
 
 /*
@@ -3043,19 +3035,15 @@ gui_buffer_hdata_input_undo_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_buffer_hdata_input_undo)
-        return gui_buffer_hdata_input_undo;
-    
-    hdata = hdata_new (hdata_name, "prev_undo", "next_undo");
+    hdata = hdata_new (NULL, hdata_name, "prev_undo", "next_undo");
     if (hdata)
     {
-        gui_buffer_hdata_input_undo = hdata;
-        HDATA_VAR(struct t_gui_input_undo, data, STRING);
-        HDATA_VAR(struct t_gui_input_undo, pos, INTEGER);
-        HDATA_VAR(struct t_gui_input_undo, prev_undo, POINTER);
-        HDATA_VAR(struct t_gui_input_undo, next_undo, POINTER);
+        HDATA_VAR(struct t_gui_input_undo, data, STRING, NULL);
+        HDATA_VAR(struct t_gui_input_undo, pos, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_input_undo, prev_undo, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_input_undo, next_undo, POINTER, hdata_name);
     }
-    return gui_buffer_hdata_input_undo;
+    return hdata;
 }
 
 /*
@@ -3070,20 +3058,16 @@ gui_buffer_hdata_buffer_visited_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_buffer_hdata_buffer_visited)
-        return gui_buffer_hdata_buffer_visited;
-    
-    hdata = hdata_new (hdata_name, "prev_buffer", "next_buffer");
+    hdata = hdata_new (NULL, hdata_name, "prev_buffer", "next_buffer");
     if (hdata)
     {
-        gui_buffer_hdata_buffer_visited = hdata;
-        HDATA_VAR(struct t_gui_buffer_visited, buffer, POINTER);
-        HDATA_VAR(struct t_gui_buffer_visited, prev_buffer, POINTER);
-        HDATA_VAR(struct t_gui_buffer_visited, next_buffer, POINTER);
+        HDATA_VAR(struct t_gui_buffer_visited, buffer, POINTER, "buffer");
+        HDATA_VAR(struct t_gui_buffer_visited, prev_buffer, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_buffer_visited, next_buffer, POINTER, hdata_name);
         HDATA_LIST(gui_buffers_visited);
         HDATA_LIST(last_gui_buffer_visited);
     }
-    return gui_buffer_hdata_buffer_visited;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index eba1d9419..fde3df9ad 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -48,10 +48,6 @@
 #include "gui-completion.h"
 
 
-struct t_hdata *gui_completion_hdata_completion = NULL;
-struct t_hdata *gui_completion_hdata_completion_partial = NULL;
-
-
 /*
  * gui_completion_buffer_init: init completion for a buffer
  */
@@ -1199,34 +1195,30 @@ gui_completion_hdata_completion_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_completion_hdata_completion)
-        return gui_completion_hdata_completion;
-    
-    hdata = hdata_new (hdata_name, NULL, NULL);
+    hdata = hdata_new (NULL, hdata_name, NULL, NULL);
     if (hdata)
     {
-        gui_completion_hdata_completion = hdata;
-        HDATA_VAR(struct t_gui_completion, buffer, POINTER);
-        HDATA_VAR(struct t_gui_completion, context, INTEGER);
-        HDATA_VAR(struct t_gui_completion, base_command, STRING);
-        HDATA_VAR(struct t_gui_completion, base_command_arg_index, INTEGER);
-        HDATA_VAR(struct t_gui_completion, base_word, STRING);
-        HDATA_VAR(struct t_gui_completion, base_word_pos, INTEGER);
-        HDATA_VAR(struct t_gui_completion, position, INTEGER);
-        HDATA_VAR(struct t_gui_completion, args, STRING);
-        HDATA_VAR(struct t_gui_completion, direction, INTEGER);
-        HDATA_VAR(struct t_gui_completion, add_space, INTEGER);
-        HDATA_VAR(struct t_gui_completion, force_partial_completion, INTEGER);
-        HDATA_VAR(struct t_gui_completion, completion_list, POINTER);
-        HDATA_VAR(struct t_gui_completion, word_found, STRING);
-        HDATA_VAR(struct t_gui_completion, word_found_is_nick, INTEGER);
-        HDATA_VAR(struct t_gui_completion, position_replace, INTEGER);
-        HDATA_VAR(struct t_gui_completion, diff_size, INTEGER);
-        HDATA_VAR(struct t_gui_completion, diff_length, INTEGER);
-        HDATA_VAR(struct t_gui_completion, partial_completion_list, POINTER);
-        HDATA_VAR(struct t_gui_completion, last_partial_completion, POINTER);
+        HDATA_VAR(struct t_gui_completion, buffer, POINTER, "buffer");
+        HDATA_VAR(struct t_gui_completion, context, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, base_command, STRING, NULL);
+        HDATA_VAR(struct t_gui_completion, base_command_arg_index, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, base_word, STRING, NULL);
+        HDATA_VAR(struct t_gui_completion, base_word_pos, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, position, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, args, STRING, NULL);
+        HDATA_VAR(struct t_gui_completion, direction, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, add_space, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, force_partial_completion, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, completion_list, POINTER, NULL);
+        HDATA_VAR(struct t_gui_completion, word_found, STRING, NULL);
+        HDATA_VAR(struct t_gui_completion, word_found_is_nick, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, position_replace, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, diff_size, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, diff_length, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion, partial_completion_list, POINTER, "completion_partial");
+        HDATA_VAR(struct t_gui_completion, last_partial_completion, POINTER, "completion_partial");
     }
-    return gui_completion_hdata_completion;
+    return hdata;
 }
 
 /*
@@ -1242,19 +1234,15 @@ gui_completion_hdata_completion_partial_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_completion_hdata_completion_partial)
-        return gui_completion_hdata_completion_partial;
-    
-    hdata = hdata_new (hdata_name, "prev_item", "next_item");
+    hdata = hdata_new (NULL, hdata_name, "prev_item", "next_item");
     if (hdata)
     {
-        gui_completion_hdata_completion_partial = hdata;
-        HDATA_VAR(struct t_gui_completion_partial, word, STRING);
-        HDATA_VAR(struct t_gui_completion_partial, count, INTEGER);
-        HDATA_VAR(struct t_gui_completion_partial, prev_item, POINTER);
-        HDATA_VAR(struct t_gui_completion_partial, next_item, POINTER);
+        HDATA_VAR(struct t_gui_completion_partial, word, STRING, NULL);
+        HDATA_VAR(struct t_gui_completion_partial, count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_completion_partial, prev_item, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_completion_partial, next_item, POINTER, hdata_name);
     }
-    return gui_completion_hdata_completion_partial;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-filter.c b/src/gui/gui-filter.c
index 104c4bc6c..15c5b055c 100644
--- a/src/gui/gui-filter.c
+++ b/src/gui/gui-filter.c
@@ -47,8 +47,6 @@ struct t_gui_filter *gui_filters = NULL;           /* first filter          */
 struct t_gui_filter *last_gui_filter = NULL;       /* last filter           */
 int gui_filters_enabled = 1;                       /* filters enabled?      */
 
-struct t_hdata *gui_filter_hdata_filter = NULL;
-
 
 /*
  * gui_filter_line_has_tag_no_filter: return 1 if line has tag "no_filter",
@@ -489,30 +487,26 @@ gui_filter_hdata_filter_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_filter_hdata_filter)
-        return gui_filter_hdata_filter;
-    
-    hdata = hdata_new (hdata_name, "prev_filter", "next_filter");
+    hdata = hdata_new (NULL, hdata_name, "prev_filter", "next_filter");
     if (hdata)
     {
-        gui_filter_hdata_filter = hdata;
-        HDATA_VAR(struct t_gui_filter, enabled, INTEGER);
-        HDATA_VAR(struct t_gui_filter, name, STRING);
-        HDATA_VAR(struct t_gui_filter, buffer_name, STRING);
-        HDATA_VAR(struct t_gui_filter, num_buffers, INTEGER);
-        HDATA_VAR(struct t_gui_filter, buffers, POINTER);
-        HDATA_VAR(struct t_gui_filter, tags, STRING);
-        HDATA_VAR(struct t_gui_filter, tags_count, INTEGER);
-        HDATA_VAR(struct t_gui_filter, tags_array, POINTER);
-        HDATA_VAR(struct t_gui_filter, regex, STRING);
-        HDATA_VAR(struct t_gui_filter, regex_prefix, POINTER);
-        HDATA_VAR(struct t_gui_filter, regex_message, POINTER);
-        HDATA_VAR(struct t_gui_filter, prev_filter, POINTER);
-        HDATA_VAR(struct t_gui_filter, next_filter, POINTER);
+        HDATA_VAR(struct t_gui_filter, enabled, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_filter, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_filter, buffer_name, STRING, NULL);
+        HDATA_VAR(struct t_gui_filter, num_buffers, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_filter, buffers, POINTER, NULL);
+        HDATA_VAR(struct t_gui_filter, tags, STRING, NULL);
+        HDATA_VAR(struct t_gui_filter, tags_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_filter, tags_array, POINTER, NULL);
+        HDATA_VAR(struct t_gui_filter, regex, STRING, NULL);
+        HDATA_VAR(struct t_gui_filter, regex_prefix, POINTER, NULL);
+        HDATA_VAR(struct t_gui_filter, regex_message, POINTER, NULL);
+        HDATA_VAR(struct t_gui_filter, prev_filter, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_filter, next_filter, POINTER, hdata_name);
         HDATA_LIST(gui_filters);
         HDATA_LIST(last_gui_filter);
     }
-    return gui_filter_hdata_filter;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-history.c b/src/gui/gui-history.c
index 1a9e11a85..343560bf1 100644
--- a/src/gui/gui-history.c
+++ b/src/gui/gui-history.c
@@ -46,8 +46,6 @@ struct t_gui_history *last_history_global = NULL;
 struct t_gui_history *history_global_ptr = NULL;
 int num_history_global = 0;
 
-struct t_hdata *gui_history_hdata_history = NULL;
-
 
 /*
  * gui_history_buffer_add: add a text/command to buffer's history
@@ -229,18 +227,14 @@ gui_history_hdata_history_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_history_hdata_history)
-        return gui_history_hdata_history;
-    
-    hdata = hdata_new (hdata_name, "prev_history", "next_history");
+    hdata = hdata_new (NULL, hdata_name, "prev_history", "next_history");
     if (hdata)
     {
-        gui_history_hdata_history = hdata;
-        HDATA_VAR(struct t_gui_history, text, STRING);
-        HDATA_VAR(struct t_gui_history, prev_history, POINTER);
-        HDATA_VAR(struct t_gui_history, next_history, POINTER);
+        HDATA_VAR(struct t_gui_history, text, STRING, NULL);
+        HDATA_VAR(struct t_gui_history, prev_history, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_history, next_history, POINTER, hdata_name);
     }
-    return gui_history_hdata_history;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c
index 309ec9d42..5ba07ab05 100644
--- a/src/gui/gui-keyboard.c
+++ b/src/gui/gui-keyboard.c
@@ -74,8 +74,6 @@ int gui_keyboard_paste_lines = 0;   /* number of lines for pending paste    */
 
 time_t gui_keyboard_last_activity_time = 0; /* last activity time (key)     */
 
-struct t_hdata *gui_keyboard_hdata_key = NULL;
-
 
 /*
  * gui_keyboard_init: init keyboard
@@ -761,23 +759,19 @@ gui_keyboard_hdata_key_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_keyboard_hdata_key)
-        return gui_keyboard_hdata_key;
-    
-    hdata = hdata_new (hdata_name, "prev_key", "next_key");
+    hdata = hdata_new (NULL, hdata_name, "prev_key", "next_key");
     if (hdata)
     {
-        gui_keyboard_hdata_key = hdata;
-        HDATA_VAR(struct t_gui_key, key, STRING);
-        HDATA_VAR(struct t_gui_key, command, STRING);
-        HDATA_VAR(struct t_gui_key, prev_key, POINTER);
-        HDATA_VAR(struct t_gui_key, next_key, POINTER);
+        HDATA_VAR(struct t_gui_key, key, STRING, NULL);
+        HDATA_VAR(struct t_gui_key, command, STRING, NULL);
+        HDATA_VAR(struct t_gui_key, prev_key, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_key, next_key, POINTER, hdata_name);
         HDATA_LIST(gui_keys);
         HDATA_LIST(last_gui_key);
         HDATA_LIST(gui_default_keys);
         HDATA_LIST(last_gui_default_key);
     }
-    return gui_keyboard_hdata_key;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index 2d0d32717..a4f5ded65 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -47,11 +47,6 @@
 #include "gui-window.h"
 
 
-struct t_hdata *gui_line_hdata_lines = NULL;
-struct t_hdata *gui_line_hdata_line = NULL;
-struct t_hdata *gui_line_hdata_line_data = NULL;
-
-
 /*
  * gui_lines_alloc: alloc structure "t_gui_lines" and initialize it
  */
@@ -1157,23 +1152,19 @@ gui_line_hdata_lines_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_line_hdata_lines)
-        return gui_line_hdata_lines;
-    
-    hdata = hdata_new (hdata_name, NULL, NULL);
+    hdata = hdata_new (NULL, hdata_name, NULL, NULL);
     if (hdata)
     {
-        gui_line_hdata_lines = hdata;
-        HDATA_VAR(struct t_gui_lines, first_line, POINTER);
-        HDATA_VAR(struct t_gui_lines, last_line, POINTER);
-        HDATA_VAR(struct t_gui_lines, last_read_line, POINTER);
-        HDATA_VAR(struct t_gui_lines, lines_count, INTEGER);
-        HDATA_VAR(struct t_gui_lines, first_line_not_read, INTEGER);
-        HDATA_VAR(struct t_gui_lines, lines_hidden, INTEGER);
-        HDATA_VAR(struct t_gui_lines, buffer_max_length, INTEGER);
-        HDATA_VAR(struct t_gui_lines, prefix_max_length, INTEGER);
+        HDATA_VAR(struct t_gui_lines, first_line, POINTER, "line");
+        HDATA_VAR(struct t_gui_lines, last_line, POINTER, "line");
+        HDATA_VAR(struct t_gui_lines, last_read_line, POINTER, "line");
+        HDATA_VAR(struct t_gui_lines, lines_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_lines, first_line_not_read, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_lines, lines_hidden, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_lines, buffer_max_length, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_lines, prefix_max_length, INTEGER, NULL);
     }
-    return gui_line_hdata_lines;
+    return hdata;
 }
 
 /*
@@ -1188,18 +1179,14 @@ gui_line_hdata_line_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_line_hdata_line)
-        return gui_line_hdata_line;
-    
-    hdata = hdata_new (hdata_name, "prev_line", "next_line");
+    hdata = hdata_new (NULL, hdata_name, "prev_line", "next_line");
     if (hdata)
     {
-        gui_line_hdata_line = hdata;
-        HDATA_VAR(struct t_gui_line, data, POINTER);
-        HDATA_VAR(struct t_gui_line, prev_line, POINTER);
-        HDATA_VAR(struct t_gui_line, next_line, POINTER);
+        HDATA_VAR(struct t_gui_line, data, POINTER, "line_data");
+        HDATA_VAR(struct t_gui_line, prev_line, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_line, next_line, POINTER, hdata_name);
     }
-    return gui_line_hdata_line;
+    return hdata;
 }
 
 /*
@@ -1214,28 +1201,24 @@ gui_line_hdata_line_data_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_line_hdata_line_data)
-        return gui_line_hdata_line_data;
-    
-    hdata = hdata_new (hdata_name, NULL, NULL);
+    hdata = hdata_new (NULL, hdata_name, NULL, NULL);
     if (hdata)
     {
-        gui_line_hdata_line_data = hdata;
-        HDATA_VAR(struct t_gui_line_data, buffer, POINTER);
-        HDATA_VAR(struct t_gui_line_data, y, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, date, TIME);
-        HDATA_VAR(struct t_gui_line_data, date_printed, TIME);
-        HDATA_VAR(struct t_gui_line_data, str_time, STRING);
-        HDATA_VAR(struct t_gui_line_data, tags_count, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, tags_array, POINTER);
-        HDATA_VAR(struct t_gui_line_data, displayed, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, highlight, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, refresh_needed, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, prefix, STRING);
-        HDATA_VAR(struct t_gui_line_data, prefix_length, INTEGER);
-        HDATA_VAR(struct t_gui_line_data, message, STRING);
+        HDATA_VAR(struct t_gui_line_data, buffer, POINTER, "buffer");
+        HDATA_VAR(struct t_gui_line_data, y, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, date, TIME, NULL);
+        HDATA_VAR(struct t_gui_line_data, date_printed, TIME, NULL);
+        HDATA_VAR(struct t_gui_line_data, str_time, STRING, NULL);
+        HDATA_VAR(struct t_gui_line_data, tags_count, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, tags_array, POINTER, NULL);
+        HDATA_VAR(struct t_gui_line_data, displayed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, highlight, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, refresh_needed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, prefix, STRING, NULL);
+        HDATA_VAR(struct t_gui_line_data, prefix_length, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_line_data, message, STRING, NULL);
     }
-    return gui_line_hdata_line_data;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-nicklist.c b/src/gui/gui-nicklist.c
index a1dc61dab..ce3c332aa 100644
--- a/src/gui/gui-nicklist.c
+++ b/src/gui/gui-nicklist.c
@@ -48,10 +48,6 @@
 #include "gui-color.h"
 
 
-struct t_hdata *gui_nicklist_hdata_nick_group = NULL;
-struct t_hdata *gui_nicklist_hdata_nick = NULL;
-
-
 /*
  * gui_nicklist_send_signal: send a signal when something has changed in
  *                           nicklist
@@ -957,26 +953,22 @@ gui_nicklist_hdata_nick_group_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_nicklist_hdata_nick_group)
-        return gui_nicklist_hdata_nick_group;
-    
-    hdata = hdata_new (hdata_name, "prev_group", "next_group");
+    hdata = hdata_new (NULL, hdata_name, "prev_group", "next_group");
     if (hdata)
     {
-        gui_nicklist_hdata_nick_group = hdata;
-        HDATA_VAR(struct t_gui_nick_group, name, STRING);
-        HDATA_VAR(struct t_gui_nick_group, color, STRING);
-        HDATA_VAR(struct t_gui_nick_group, visible, INTEGER);
-        HDATA_VAR(struct t_gui_nick_group, level, INTEGER);
-        HDATA_VAR(struct t_gui_nick_group, parent, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, childs, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, last_child, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, nicks, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, last_nick, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, prev_group, POINTER);
-        HDATA_VAR(struct t_gui_nick_group, next_group, POINTER);
+        HDATA_VAR(struct t_gui_nick_group, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick_group, color, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick_group, visible, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_nick_group, level, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_nick_group, parent, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_nick_group, childs, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_nick_group, last_child, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_nick_group, nicks, POINTER, "nick");
+        HDATA_VAR(struct t_gui_nick_group, last_nick, POINTER, "nick");
+        HDATA_VAR(struct t_gui_nick_group, prev_group, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_nick_group, next_group, POINTER, hdata_name);
     }
-    return gui_nicklist_hdata_nick_group;
+    return hdata;
 }
 
 /*
@@ -991,23 +983,19 @@ gui_nicklist_hdata_nick_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_nicklist_hdata_nick)
-        return gui_nicklist_hdata_nick;
-    
-    hdata = hdata_new (hdata_name, "prev_nick", "next_nick");
+    hdata = hdata_new (NULL, hdata_name, "prev_nick", "next_nick");
     if (hdata)
     {
-        gui_nicklist_hdata_nick = hdata;
-        HDATA_VAR(struct t_gui_nick, group, POINTER);
-        HDATA_VAR(struct t_gui_nick, name, STRING);
-        HDATA_VAR(struct t_gui_nick, color, STRING);
-        HDATA_VAR(struct t_gui_nick, prefix, STRING);
-        HDATA_VAR(struct t_gui_nick, prefix_color, STRING);
-        HDATA_VAR(struct t_gui_nick, visible, INTEGER);
-        HDATA_VAR(struct t_gui_nick, prev_nick, POINTER);
-        HDATA_VAR(struct t_gui_nick, next_nick, POINTER);
+        HDATA_VAR(struct t_gui_nick, group, POINTER, "nick_group");
+        HDATA_VAR(struct t_gui_nick, name, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick, color, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick, prefix, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick, prefix_color, STRING, NULL);
+        HDATA_VAR(struct t_gui_nick, visible, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_nick, prev_nick, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_nick, next_nick, POINTER, hdata_name);
     }
-    return gui_nicklist_hdata_nick;
+    return hdata;
 }
 
 /*
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index eb0a2b832..6108d2b0c 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -71,10 +71,6 @@ struct t_gui_layout_window *gui_window_layout_before_zoom = NULL;
 int gui_window_layout_id_current_window = -1;
                                        /* current window id before zoom     */
 
-struct t_hdata *gui_window_hdata_window = NULL;
-struct t_hdata *gui_window_hdata_window_scroll = NULL;
-struct t_hdata *gui_window_hdata_window_tree = NULL;
-
 
 /*
  * gui_window_ask_refresh: set "gui_window_refresh_needed" flag
@@ -1281,41 +1277,37 @@ gui_window_hdata_window_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_window_hdata_window)
-        return gui_window_hdata_window;
-    
-    hdata = hdata_new (hdata_name, "prev_window", "next_window");
+    hdata = hdata_new (NULL, hdata_name, "prev_window", "next_window");
     if (hdata)
     {
-        gui_window_hdata_window = hdata;
-        HDATA_VAR(struct t_gui_window, win_x, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_y, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_width, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_height, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_width_pct, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_height_pct, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_x, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_y, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_width, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_height, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_cursor_x, INTEGER);
-        HDATA_VAR(struct t_gui_window, win_chat_cursor_y, INTEGER);
-        HDATA_VAR(struct t_gui_window, bar_windows, POINTER);
-        HDATA_VAR(struct t_gui_window, last_bar_window, POINTER);
-        HDATA_VAR(struct t_gui_window, refresh_needed, INTEGER);
-        HDATA_VAR(struct t_gui_window, gui_objects, POINTER);
-        HDATA_VAR(struct t_gui_window, buffer, POINTER);
-        HDATA_VAR(struct t_gui_window, layout_plugin_name, STRING);
-        HDATA_VAR(struct t_gui_window, layout_buffer_name, STRING);
-        HDATA_VAR(struct t_gui_window, scroll, POINTER);
-        HDATA_VAR(struct t_gui_window, ptr_tree, POINTER);
-        HDATA_VAR(struct t_gui_window, prev_window, POINTER);
-        HDATA_VAR(struct t_gui_window, next_window, POINTER);
+        HDATA_VAR(struct t_gui_window, win_x, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_y, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_width, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_height, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_width_pct, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_height_pct, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_x, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_y, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_width, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_height, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_cursor_x, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, win_chat_cursor_y, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, bar_windows, POINTER, NULL);
+        HDATA_VAR(struct t_gui_window, last_bar_window, POINTER, NULL);
+        HDATA_VAR(struct t_gui_window, refresh_needed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window, gui_objects, POINTER, NULL);
+        HDATA_VAR(struct t_gui_window, buffer, POINTER, "buffer");
+        HDATA_VAR(struct t_gui_window, layout_plugin_name, STRING, NULL);
+        HDATA_VAR(struct t_gui_window, layout_buffer_name, STRING, NULL);
+        HDATA_VAR(struct t_gui_window, scroll, POINTER, "window_scroll");
+        HDATA_VAR(struct t_gui_window, ptr_tree, POINTER, "window_tree");
+        HDATA_VAR(struct t_gui_window, prev_window, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_window, next_window, POINTER, hdata_name);
         HDATA_LIST(gui_windows);
         HDATA_LIST(last_gui_window);
         HDATA_LIST(gui_current_window);
     }
-    return gui_window_hdata_window;
+    return hdata;
 }
 
 /*
@@ -1330,25 +1322,21 @@ gui_window_hdata_window_scroll_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_window_hdata_window_scroll)
-        return gui_window_hdata_window_scroll;
-    
-    hdata = hdata_new (hdata_name, "prev_scroll", "next_scroll");
+    hdata = hdata_new (NULL, hdata_name, "prev_scroll", "next_scroll");
     if (hdata)
     {
-        gui_window_hdata_window_scroll = hdata;
-        HDATA_VAR(struct t_gui_window_scroll, buffer, POINTER);
-        HDATA_VAR(struct t_gui_window_scroll, first_line_displayed, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, start_line, POINTER);
-        HDATA_VAR(struct t_gui_window_scroll, start_line_pos, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, scrolling, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, start_col, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, lines_after, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, reset_allowed, INTEGER);
-        HDATA_VAR(struct t_gui_window_scroll, prev_scroll, POINTER);
-        HDATA_VAR(struct t_gui_window_scroll, next_scroll, POINTER);
+        HDATA_VAR(struct t_gui_window_scroll, buffer, POINTER, "buffer");
+        HDATA_VAR(struct t_gui_window_scroll, first_line_displayed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, start_line, POINTER, "line");
+        HDATA_VAR(struct t_gui_window_scroll, start_line_pos, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, scrolling, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, start_col, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, lines_after, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, reset_allowed, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_scroll, prev_scroll, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_window_scroll, next_scroll, POINTER, hdata_name);
     }
-    return gui_window_hdata_window_scroll;
+    return hdata;
 }
 
 /*
@@ -1363,22 +1351,18 @@ gui_window_hdata_window_tree_cb (void *data, const char *hdata_name)
     /* make C compiler happy */
     (void) data;
     
-    if (gui_window_hdata_window_tree)
-        return gui_window_hdata_window_tree;
-    
-    hdata = hdata_new (hdata_name, NULL, NULL);
+    hdata = hdata_new (NULL, hdata_name, NULL, NULL);
     if (hdata)
     {
-        gui_window_hdata_window_tree = hdata;
-        HDATA_VAR(struct t_gui_window_tree, parent_node, POINTER);
-        HDATA_VAR(struct t_gui_window_tree, split_pct, INTEGER);
-        HDATA_VAR(struct t_gui_window_tree, split_horizontal, INTEGER);
-        HDATA_VAR(struct t_gui_window_tree, child1, POINTER);
-        HDATA_VAR(struct t_gui_window_tree, child2, POINTER);
-        HDATA_VAR(struct t_gui_window_tree, window, POINTER);
+        HDATA_VAR(struct t_gui_window_tree, parent_node, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_window_tree, split_pct, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_tree, split_horizontal, INTEGER, NULL);
+        HDATA_VAR(struct t_gui_window_tree, child1, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_window_tree, child2, POINTER, hdata_name);
+        HDATA_VAR(struct t_gui_window_tree, window, POINTER, "window");
         HDATA_LIST(gui_windows_tree);
     }
-    return gui_window_hdata_window_tree;
+    return hdata;
 }
 
 /*