Changeset 6666 for trunk

Timestamp:

21/05/10 19:44:17 (21 months ago)

Author:

westram

Message:

• AW_root
  • ctor initializes AWAR subsystem
  • made more clear that AW_root is a singleton
  • call dtor atexit; unlink AWARs from prop-DB and free memory (AW_window instances and releated mem still remain)
  • close properties DB
  • renamed some functions
• AW_awar
  • added dtor
• added AWT_create_root (necessary to add properties DB to DB-browser)
• removed AWT_open_properties (done inside AW_root-ctor now)
• EDIT properties
  • detect existing properties before constructing AW_root
• removed AW_config_struct

Location:

trunk

Files:

• AWT/AWT_db_browser.cxx (modified) (1 diff)
• AWT/awt.hxx (modified) (1 diff)
• DIST/DI_main.cxx (modified) (2 diffs)
• DIST/DI_matr.cxx (modified) (2 diffs)
• EDIT4/ED4_main.cxx (modified) (4 diffs)
• EDIT4/ED4_naligner.cxx (modified) (3 diffs)
• EDIT4/ED4_root.cxx (modified) (5 diffs)
• EDIT4/ed4_class.hxx (modified) (1 diff)
• GENOM/GEN_map.cxx (modified) (1 diff)
• MERGE/MG_main.cxx (modified) (2 diffs)
• NTREE/NT_extern.cxx (modified) (3 diffs)
• NTREE/NT_main.cxx (modified) (3 diffs)
• PARSIMONY/PARS_main.cxx (modified) (3 diffs)
• PHYLO/PH_main.cxx (modified) (3 diffs)
• PROBE_DESIGN/probe_design.cxx (modified) (1 diff)
• SECEDIT/SEC_main.cxx (modified) (1 diff)
• SL/GUI_ALIVIEW/AWT_filter.cxx (modified) (1 diff)
• WETC/WETC_main.cxx (modified) (1 diff)
• WINDOW/AW_advice.cxx (modified) (2 diffs)
• WINDOW/AW_modal.cxx (modified) (6 diffs)
• WINDOW/AW_nawar.cxx (modified) (6 diffs)
• WINDOW/AW_preset.cxx (modified) (1 diff)
• WINDOW/AW_status.cxx (modified) (3 diffs)
• WINDOW/AW_window.cxx (modified) (12 diffs)
• WINDOW/aw_advice.hxx (modified) (1 diff)
• WINDOW/aw_awars.hxx (modified) (1 diff)
• WINDOW/aw_preset.hxx (modified) (1 diff)
• WINDOW/aw_root.hxx (modified) (7 diffs)
• WINDOW/aw_window_Xm.hxx (modified) (3 diffs)

trunk/AWT/AWT_db_browser.cxx

@@ -955 +955 @@
 #endif // DEBUG
 
-AW_default AWT_open_properties(AW_root *aw_root, const char *default_name) {
-    AW_default aw_def = aw_root->open_default(default_name);
+AW_root *AWT_create_root(const char *properties, const char *program) {
+    AW_root *aw_root = new AW_root(properties, program, false);
 #if defined(DEBUG)
-    if (aw_def) AWT_announce_properties_to_browser(aw_def, default_name);
+    AWT_announce_properties_to_browser(AW_ROOT_DEFAULT, properties);
 #endif // DEBUG
-    return aw_def;
-}
-
+    return aw_root;
+}
 
 // ------------------------

trunk/AWT/awt.hxx

@@ -198 +198 @@
 #endif // DEBUG
 
-AW_default AWT_open_properties(AW_root *aw_root, const char *default_name);
+AW_root *AWT_create_root(const char *properties, const char *program);
 
 void AWT_install_cb_guards();

trunk/DIST/DI_main.cxx

@@ -51 +51 @@
     aw_initstatus();
 
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/dist.arb");
-
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_DIST", false);
+    AW_root *aw_root = AWT_create_root(".arb_prop/dist.arb", "ARB_DIST");
 
     {
@@ -75 +71 @@
     }
 
-    DI_create_matrix_variables(aw_root, aw_default, GLOBAL_gb_main);
+    DI_create_matrix_variables(aw_root, AW_ROOT_DEFAULT, GLOBAL_gb_main);
 #ifdef FINDCORR
-    bc_create_bc_variables(aw_root, aw_default);
+    bc_create_bc_variables(aw_root, AW_ROOT_DEFAULT);
 #endif
-    ARB_init_global_awars(aw_root, aw_default, GLOBAL_gb_main);
+    ARB_init_global_awars(aw_root, AW_ROOT_DEFAULT, GLOBAL_gb_main);
 
-    AWT_graphic *awd = (AWT_graphic *)0;
-    AW_window   *aww = DI_create_matrix_window(aw_root);
+    AW_window *aww = DI_create_matrix_window(aw_root);
     aww->show();
 

trunk/DIST/DI_matr.cxx

@@ -110 +110 @@
     aw_root->awar_int(AWAR_DIST_MATRIX_DNA_ENABLED, 0)->add_callback(delete_matrix_cb); // user matrix disabled by default
     {
-        GBDATA *gbd = GB_search((GBDATA *)aw_root->application_database, AWAR_DIST_MATRIX_DNA_BASE, GB_FIND);
+        GBDATA *gbd = GB_search(AW_ROOT_DEFAULT, AWAR_DIST_MATRIX_DNA_BASE, GB_FIND);
         GB_add_callback(gbd, GB_CB_CHANGED, (GB_CB)delete_matrix_cb, 0);
     }
@@ -1522 +1522 @@
     aws->create_menu("Properties", "P", AWM_ALL);
     aws->insert_menu_topic("frame_props", "Frame ...",                                 "F", "props_frame.hlp", AWM_ALL, AW_POPUP, (AW_CL)AW_preset_window, 0);
-    aws->insert_menu_topic("save_props",  "Save Properties (in ~/.arb_prop/dist.arb)", "S", "savedef.hlp",     AWM_ALL, (AW_CB)AW_save_defaults, 0, 0);
+    aws->insert_menu_topic("save_props",  "Save Properties (in ~/.arb_prop/dist.arb)", "S", "savedef.hlp",     AWM_ALL, (AW_CB)AW_save_properties, 0, 0);
 
     aws->insert_help_topic("help ...", "h", "dist.hlp", AWM_ALL, (AW_CB)AW_POPUP_HELP, (AW_CL)"dist.hlp", 0);

trunk/EDIT4/ED4_main.cxx

@@ -482 +482 @@
 }
 
-
-static void openProperties() {
-    for (int mode = 0; mode <= 2; ++mode) { // search for defaults-database
-        const char *name  = ED4_propertyName(mode);
-        AW_default  found = ED4_ROOT->aw_root->open_default(name, mode == 2); // if mode == 2 -> create if missing
-
-        if (found) {
-            ED4_ROOT->props_db = found;
-            ED4_ROOT->db_name  = strdup(name);
-            break;
-        }
-    }
-
-    GB_informationf("Using properties from '%s'", ED4_ROOT->db_name);
-#if defined(DEBUG)
-    AWT_announce_properties_to_browser(ED4_ROOT->props_db, ED4_ROOT->db_name);
-#endif // DEBUG
-    ED4_ROOT->aw_root->init_variables(ED4_ROOT->props_db); // pass defaults
-}
-
 int main(int argc, char **argv)
 {
@@ -542 +522 @@
     }
 
+    aw_initstatus();
+
     GLOBAL_gb_main = GB_open(data_path, "rwt");
     if (!GLOBAL_gb_main)
@@ -552 +534 @@
     AWT_announce_db_to_browser(GLOBAL_gb_main, GBS_global_string("ARB database (%s)", data_path));
 #endif // DEBUG
+
     ED4_ROOT = new ED4_root;
-
-    openProperties(); // open properties database
-
-    ED4_ROOT->aw_root->init_root("ARB_EDIT4", false); // initialize window-system
 
     ED4_ROOT->database = new EDB_root_bact;
@@ -563 +542 @@
 
     ED4_ROOT->st_ml = STAT_create_ST_ML(GLOBAL_gb_main);
-    ED4_ROOT->sequence_colors = new AWT_seq_colors((GBDATA *)ED4_ROOT->aw_root->application_database, (int)ED4_G_SEQUENCES, ED4_refresh_window, 0, 0);
+    ED4_ROOT->sequence_colors = new AWT_seq_colors(AW_ROOT_DEFAULT, ED4_G_SEQUENCES, ED4_refresh_window, 0, 0);
 
     ED4_ROOT->edk = new ed_key;

trunk/EDIT4/ED4_naligner.cxx

@@ -151 +151 @@
 }
 
-void ed_nalign_save(AW_window *aww)
-{
-    AW_root *root = aww->get_root();
-    root->save_default("naligner/aa");
-}
-
 AW_window *create_expert_naligner_window(AW_root *root)
 {
@@ -168 +162 @@
     aws->create_button("CLOSE", "CLOSE", "C");
 
-    aws->at("save");
-    aws->callback(ed_nalign_save);
-    aws->create_button("SAVE", "SAVE", "S");
-
     aws->at("minw"); aws->create_input_field("naligner/minw", mwidth);
     aws->at("maxew"); aws->create_input_field("naligner/maxew", mwidth);
@@ -228 +218 @@
     aws->create_button("EXPERT_OPTIONS", "EXPERT2", "E");
 
-    aws->at("save");
-    aws->callback(ed_nalign_save);
-    aws->create_button("SAAVE", "SAVE", "S");
-
     return (AW_window *)aws;
 }

trunk/EDIT4/ED4_root.cxx

@@ -1281 +1281 @@
 }
 
-static void ED4_save_defaults(AW_window *aw, AW_CL cl_mode, AW_CL) {
+static void ED4_save_properties(AW_window *aw, AW_CL cl_mode, AW_CL) {
     int mode = (int)cl_mode;
 
-    AW_save_specific_defaults(aw, ED4_propertyName(mode));
+    AW_save_specific_properties(aw, ED4_propertyName(mode));
 }
 
@@ -1589 +1589 @@
 
         const char *entry = GBS_global_string("Save loaded Properties (~/%s)", db_name);
-        awmm->insert_menu_topic("save_loaded_props", entry, "l", "e4_defaults.hlp", AWM_ALL, ED4_save_defaults, (AW_CL)default_mode, 0);
+        awmm->insert_menu_topic("save_loaded_props", entry, "l", "e4_defaults.hlp", AWM_ALL, ED4_save_properties, (AW_CL)default_mode, 0);
         SEP________________________SEP;
 
@@ -1596 +1596 @@
             hotkey[0]     = "Pta"[mode];
             entry         = GBS_global_string("Save %sProperties (~/%s)", entry_type[mode], ED4_propertyName(mode));
-            awmm->insert_menu_topic(tag[mode], entry, hotkey, "e4_defaults.hlp", AWM_ALL, ED4_save_defaults, (AW_CL)mode, 0);
+            awmm->insert_menu_topic(tag[mode], entry, hotkey, "e4_defaults.hlp", AWM_ALL, ED4_save_properties, (AW_CL)mode, 0);
         }
     }
@@ -1887 +1887 @@
 }
 
-ED4_root::ED4_root()
-{
+static char *detectProperties() {
+    char *propname = NULL;
+
+    for (int mode = 0; !propname && mode <= 2; ++mode) { // search for properties-database
+        const char *fullprop = AW_root::property_DB_fullname(ED4_propertyName(mode));
+        if (mode == 2 || GB_is_regularfile(fullprop)) {
+            freedup(propname, fullprop);
+        }
+    }
+
+    GB_informationf("Using properties from '%s'", propname);
+    return propname;
+}
+
+ED4_root::ED4_root() {
     memset((char *)this, 0, sizeof(*this));
 
-    aw_root      = new AW_root;
-    first_window = NULL;
-    main_manager = NULL;
-    database     = NULL;
-    tmp_ed4w     = NULL;
-    tmp_aww      = NULL;
-    tmp_device   = NULL;
-    temp_gc      = 0;
-
-    scroll_links.link_for_hor_slider = NULL;
-    scroll_links.link_for_ver_slider = NULL;
-
-    folding_action = 0;
-
-    species_mode            = ED4_SM_MOVE;
-    scroll_picture.scroll   = 0;
-    scroll_picture.old_x    = 0;
-    scroll_picture.old_y    = 0;
-    middle_area_man         = NULL;
-    top_area_man            = NULL;
-    root_group_man          = NULL;
-    ecoli_ref               = NULL;
-    protstruct              = NULL;
-    protstruct_len          = 0;
-    column_stat_activated   = 0;
-    column_stat_initialized = 0;
-    visualizeSAI            = 0;
-    visualizeSAI_allSpecies = 0;
-
-    aw_initstatus();
-}
-
-
-ED4_root::~ED4_root()
-{
+    db_name  = detectProperties();
+    aw_root  = AWT_create_root(db_name, "ARB_EDIT4");
+    props_db = AW_ROOT_DEFAULT;
+
+    species_mode = ED4_SM_MOVE;
+}
+
+
+ED4_root::~ED4_root() {
     delete aw_root;
     delete first_window;
@@ -1933 +1920 @@
     delete database;
     delete ecoli_ref;
-    if (protstruct) free(protstruct);
-}
+
+    free(protstruct);
+    free(db_name);
+}

trunk/EDIT4/ed4_class.hxx

@@ -1040 +1040 @@
     AW_root                 *aw_root;               // Points to 'AW-Window-Controller'
     AW_default               props_db;              // Default Properties database
-    const char              *db_name;               // name of Default Properties database
+    char                    *db_name;               // name of Default Properties database
     ED4_window              *first_window;          // Points to List of Main Windows of ED4
     ED4_main_manager        *main_manager;          // Points to Main manager of ED4

trunk/GENOM/GEN_map.cxx

@@ -1632 +1632 @@
     insert_menu_topic("gene_options",      "Options",  "O", "gene_options.hlp", AWM_ALL, AW_POPUP, (AW_CL)GEN_create_options_window, 0);
     insert_menu_topic("gene_nds",          "NDS ( Select Gene Information ) ...",      "N", "props_nds.hlp",   AWM_ALL, AW_POPUP, (AW_CL)GEN_open_nds_window, (AW_CL)gb_main);
-    insert_menu_topic("gene_save_props",   "Save Defaults (in ~/.arb_prop/ntree.arb)", "D", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_defaults, 0, 0);
+    insert_menu_topic("gene_save_props",   "Save Defaults (in ~/.arb_prop/ntree.arb)", "D", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_properties, 0, 0);
 
     // ---------------------

trunk/MERGE/MG_main.cxx

@@ -228 +228 @@
         }
 
-        awm->insert_menu_topic("save_props", "Save properties (to ~/.arb_prop/ntree.arb)",              "p", "savedef.hlp", AWM_ALL,      (AW_CB)AW_save_defaults, 0, 0);
+        awm->insert_menu_topic("save_props", "Save properties (to ~/.arb_prop/ntree.arb)",              "p", "savedef.hlp", AWM_ALL,      (AW_CB)AW_save_properties, 0, 0);
 
         awm->button_length(30);
@@ -418 +418 @@
 }
 
-AW_window *create_MG_main_window(AW_root *aw_root)
-{
+AW_window *create_MG_main_window(AW_root *aw_root) {
     MG_create_all_awars(aw_root, AW_ROOT_DEFAULT);
     AW_window *aww=create_merge_init_window(aw_root);

trunk/NTREE/NT_extern.cxx

@@ -399 +399 @@
 void NT_save_as_cb(AW_window *aww) {
     char *filename = aww->get_root()->awar(AWAR_DB_PATH)->read_string();
-    char *filetype = aww->get_root()->awar(AWAR_DB"type")->read_string();
+    char *filetype = aww->get_root()->awar(AWAR_DB_TYPE)->read_string();
 
     GB_ERROR error = GB_save(GLOBAL_gb_main, filename, filetype);
@@ -431 +431 @@
     aws->at("type");
     aws->label("Type ");
-    aws->create_option_menu(AWAR_DB"type");
+    aws->create_option_menu(AWAR_DB_TYPE);
     aws->insert_option("Binary", "B", "b");
     aws->insert_option("Bin (with FastLoad File)", "f", "bm");
@@ -1538 +1538 @@
             AWMIMT("!toggle_expert", "Toggle expert mode",                          "x", 0,           AWM_ALL, NT_toggle_expert_mode, 0, 0);
             SEP________________________SEP();
-            AWMIMT("save_props",     "Save properties (in ~/.arb_prop/ntree.arb)",  "S", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_defaults, 0, 0);
+            AWMIMT("save_props",     "Save properties (in ~/.arb_prop/ntree.arb)",  "S", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_properties, 0, 0);
         }
     }

trunk/NTREE/NT_main.cxx

@@ -248 +248 @@
             }
             else {
-                aww->get_root()->awar(AWAR_DB"filter")->touch();
+                aww->get_root()->awar(AWAR_DB_FILTER)->touch();
             }
         }
@@ -389 +389 @@
     GB_set_verbose();
 
-    AW_root *aw_root = new AW_root;
-    GLOBAL_NT.awr    = aw_root;
+    AW_root *aw_root = AWT_create_root(".arb_prop/ntree.arb", "ARB_NT");
+
+    GLOBAL_NT.awr = aw_root;
     MapViewer_set_default_root(aw_root);            // set default for launch_MapViewer_cb (as long as no info-box was opened)
-
-    AW_default aw_default = AWT_open_properties(aw_root, ".arb_prop/ntree.arb");
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_NT", false);
 
     // create some early awars
     // Note: normally you don't like to add your awar-init-function here, but into nt_create_all_awars()
 
-    AW_create_fileselection_awars(aw_root, AWAR_DB, "", ".arb", "noname.arb", aw_default);
-    aw_root->awar_string(AWAR_DB"type", "b", aw_default);
-
-    aw_root->awar_int(AWAR_EXPERT, 0, aw_default);
-
-    aw_root->awar_string(AWAR_DB_NAME, "noname.arb", aw_default);
+    AW_create_fileselection_awars(aw_root, AWAR_DB, "", ".arb", "noname.arb");
+    aw_root->awar_string(AWAR_DB_TYPE, "b");
+    aw_root->awar_string(AWAR_DB_NAME, "noname.arb");
     aw_root->awar(AWAR_DB_PATH)->add_callback(AWAR_DB_PATH_changed_cb);
 
-    init_Advisor(aw_root, aw_default);
+    aw_root->awar_int(AWAR_EXPERT, 0);
+    
+    init_Advisor(aw_root);
     AWT_install_cb_guards();
 
     if (argc==3) {                                  // looks like merge
         if (argv[1][0] != '-') { // not if first argument is a switch
-            MG_create_all_awars(aw_root, aw_default, argv[1], argv[2]);
+            MG_create_all_awars(aw_root, AW_ROOT_DEFAULT, argv[1], argv[2]);
             nt_intro_start_merge(0, aw_root);
             aw_root->main_loop();
@@ -454 +450 @@
 
         if (strcmp(argv[1], "-export")==0) {
-            MG_create_all_awars(aw_root, aw_default, ":", "noname.arb");
+            MG_create_all_awars(aw_root, AW_ROOT_DEFAULT, ":", "noname.arb");
             GLOBAL_gb_merge = GBT_open(":", "rw", 0);
             if (!GLOBAL_gb_merge) {

trunk/PARSIMONY/PARS_main.cxx

@@ -1436 +1436 @@
         awm->insert_menu_topic("props_tree2", "Tree: Settings ...",                      "T", "nt_tree_settings.hlp", AWM_ALL, AW_POPUP, (AW_CL)NT_create_tree_setting, (AW_CL)ntw);
         awm->insert_menu_topic("props_kl",    "KERN. LIN ...",                           "K", "kernlin.hlp",          AWM_ALL, AW_POPUP, (AW_CL)create_kernighan_window, 0);
-        awm->insert_menu_topic("save_props",  "Save Defaults (in ~/.arb_prop/pars.arb)", "D", "savedef.hlp",          AWM_ALL, (AW_CB)AW_save_defaults, 0, 0);
+        awm->insert_menu_topic("save_props",  "Save Defaults (in ~/.arb_prop/pars.arb)", "D", "savedef.hlp",          AWM_ALL, (AW_CB)AW_save_properties, 0, 0);
     }
     awm->button_length(5);
@@ -1707 +1707 @@
     aw_initstatus();
 
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/pars.arb");
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_PARS", false);
-
+    AW_root *aw_root      = AWT_create_root(".arb_prop/pars.arb", "ARB_PARS");
     AD_map_viewer_aw_root = aw_root;
 
@@ -1759 +1755 @@
 #endif // DEBUG
 
-    pars_create_all_awars(aw_root, aw_default);
+    pars_create_all_awars(aw_root, AW_ROOT_DEFAULT);
 
     AW_window *aww = create_pars_init_window(aw_root, &cmds);

trunk/PHYLO/PH_main.cxx

@@ -483 +483 @@
     awm->insert_menu_topic("props_menu", "Menu: Colors and Fonts ...",                 "M", "props_frame.hlp",   AWM_ALL, AW_POPUP, (AW_CL)AW_preset_window,   0);
     awm->insert_menu_topic("props_data", "Data: Colors and Fonts ...",                 "D", "ph_props_data.hlp", AWM_ALL, AW_POPUP, (AW_CL)AW_create_gc_window, (AW_CL)gcmiddle);
-    awm->insert_menu_topic("save_props", "Save Properties (in ~/.arb_prop/phylo.arb)", "S", "savedef.hlp",       AWM_ALL,          (AW_CB)AW_save_defaults,    0, 0);
+    awm->insert_menu_topic("save_props", "Save Properties (in ~/.arb_prop/phylo.arb)", "S", "savedef.hlp",       AWM_ALL,          (AW_CB)AW_save_properties,    0, 0);
 
 
@@ -555 +555 @@
     aw_initstatus();
 
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/phylo.arb");
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_PHYLO", false);
-
-
+    AW_root  *aw_root = AWT_create_root(".arb_prop/phylo.arb", "ARB_PHYLO");
     PH_root  *ph_root = new PH_root;
     GB_ERROR  error   = ph_root->open(db_server);
@@ -569 +564 @@
 
     // create arb_phylo awars :
-    PH_create_filter_variables(aw_root, aw_default);
-    PH_create_matrix_variables(aw_root, aw_default);
-    ARB_init_global_awars(aw_root, aw_default, GLOBAL_gb_main);
+    PH_create_filter_variables(aw_root, AW_ROOT_DEFAULT);
+    PH_create_matrix_variables(aw_root, AW_ROOT_DEFAULT);
+    ARB_init_global_awars(aw_root, AW_ROOT_DEFAULT, GLOBAL_gb_main);
 #if defined(DEBUG)
-    AWT_create_db_browser_awars(aw_root, aw_default);
+    AWT_create_db_browser_awars(aw_root, AW_ROOT_DEFAULT);
 #endif // DEBUG
 

trunk/PROBE_DESIGN/probe_design.cxx

@@ -1223 +1223 @@
 }
 
-void probe_design_save_default(AW_window *aw, AW_default aw_def)
-{
-    AW_root *aw_root = aw->get_root();
-    aw_root->save_default(aw_def, 0);
-}
-
-
 AW_window *create_probe_design_window(AW_root *root, AW_CL cl_gb_main) {
     AW_window_simple *aws     = new AW_window_simple;

trunk/SECEDIT/SEC_main.cxx

@@ -704 +704 @@
 }
 
-static void SEC_exit(GBDATA *gb_main, void *cl_sec_root) {
+#if defined(DEVEL_RALF)
+#warning use popdown callback for SEC_exit and valgrind open/close/open secedit 
+#endif // DEVEL_RALF
+
+static void SEC_exit(GBDATA *, void *cl_sec_root) {
     SEC_root *sec_root = static_cast<SEC_root*>(cl_sec_root);
 
     delete sec_root;
+    sec_root = NULL;
 }
 

trunk/SL/GUI_ALIVIEW/AWT_filter.cxx

@@ -194 +194 @@
     struct adfiltercbstruct *acbs   = new adfiltercbstruct;
     acbs->gb_main                   = gb_main;
+    AW_default               aw_def = AW_ROOT_DEFAULT;
+
     GB_push_transaction(acbs->gb_main);
-    AW_default               aw_def = aw_root->get_default(def_name);
 
 #if defined(DEBUG)

trunk/WETC/WETC_main.cxx

@@ -16 +16 @@
 
 int main(int argc, char **argv) {
-    if (argc <1) {
-        GB_export_error("Syntax: arb_wetc [-fileedit]");
-        GB_print_error();
-        exit(-1);
+    GB_ERROR error = NULL;
+
+    if (argc != 3) {
+        error = "Missing arguments";
+    }
+    else {
+        const char *com  = argv[1];
+        const char *file = argv[2];
+
+        if (strcmp(com, "-fileedit") != 0) {
+            error = GBS_global_string("Unexpected parameter '%s'", com);
+        }
+        else {
+            AW_root *aw_root = AWT_create_root(".arb_prop/ntree.arb", "ARB_WETC");
+
+            AWT_show_file(aw_root, file);
+            aw_root->window_hide();
+            AWT_install_cb_guards();
+            aw_root->main_loop();
+
+        }
     }
 
-    const char *com        = argv[1];
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/ntree.arb");
-    
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_WETC", false);
-
-    if (!strcmp(com, "-fileedit")) {
-        AWT_show_file(aw_root, argv[2]);
+    if (error) {
+        fprintf(stderr,
+                "Syntax: arb_wetc -fileedit filename\n"
+                "Error: %s\n",
+                error);
+        return EXIT_FAILURE;
     }
-    else {
-        GB_export_error("wrong parameter, allowed: [-fileedit] file");
-        GB_print_error();
-        exit(-1);
-    }
-    aw_root->window_hide();
-    AWT_install_cb_guards();
-    aw_root->main_loop();
-    return 0;
+    return EXIT_SUCCESS;
 }
 

trunk/WINDOW/AW_advice.cxx

@@ -31 +31 @@
 // -------------------------
 
-static bool        initialized  = false;
-static AW_root    *advice_root  = 0;
-static AW_default  advice_props = 0;
+static bool     initialized = false;
+static AW_root *advice_root = 0;
 
 // --------------------------------------------------------
 
-void init_Advisor(AW_root *awr, AW_default def)
-{
+void init_Advisor(AW_root *awr) {
     aw_assert(!initialized);   // can't init twice
 
     advice_root  = awr;
-    advice_props = def;
 
-    advice_root->awar_string(AWAR_ADVICE_TEXT, "<no advice>", advice_props);
-    advice_root->awar_int(AWAR_ADVICE_UNDERSTOOD, 0, advice_props);
+    advice_root->awar_string(AWAR_ADVICE_TEXT, "<no advice>");
+    advice_root->awar_int(AWAR_ADVICE_UNDERSTOOD, 0);
 
     initialized = true;
@@ -55 +52 @@
 
 static AW_awar *get_disabled_advices() {
-    return advice_root->awar_string(AWAR_ADVICE_DISABLED, "", advice_props);
+    return advice_root->awar_string(AWAR_ADVICE_DISABLED, "");
 }
 

trunk/WINDOW/AW_modal.cxx

@@ -69 +69 @@
     aw_assert(buttons);
 
-    AW_root *root = AW_root::THIS;
+    AW_root *root = AW_root::SINGLETON;
 
     AW_window_message *aw_msg;
@@ -448 +448 @@
     static AW_window_message *aw_msg = 0;
 
-    AW_root *root = AW_root::THIS;
+    AW_root *root = AW_root::SINGLETON;
     if (!aw_msg) create_input_awars(root); // first call -> create awars
 
@@ -491 +491 @@
 
 char *aw_input2awar(const char *title, const char *prompt, const char *awar_name) {
-    AW_root *aw_root       = AW_root::THIS;
+    AW_root *aw_root       = AW_root::SINGLETON;
     AW_awar *awar          = aw_root->awar(awar_name);
     char    *default_value = awar->read_string();
@@ -542 +542 @@
     AW_selection_list *& sel    = sd->sel;
 
-    AW_root *root = AW_root::THIS;
+    AW_root *root = AW_root::SINGLETON;
     if (!aw_msg) create_input_awars(root); // first call -> create awars
 
@@ -633 +633 @@
     // default_value is taken from and result is written back to awar 'awar_name'
 
-    AW_root *aw_root       = AW_root::THIS;
+    AW_root *aw_root       = AW_root::SINGLETON;
     AW_awar *awar          = aw_root->awar(awar_name);
     char    *default_value = awar->read_string();
@@ -648 +648 @@
 
 char *aw_file_selection(const char *title, const char *dir, const char *def_name, const char *suffix) {
-    AW_root *root = AW_root::THIS;
+    AW_root *root = AW_root::SINGLETON;
 
     static AW_window_simple *aw_msg = 0;

trunk/WINDOW/AW_nawar.cxx

@@ -153 +153 @@
 }
 
-AW_default aw_main_root_default = (AW_default) "this is a dummy text asfasf asfd";
-
-AW_default aw_check_default_file(AW_default root_default, AW_default default_file, const char *varname)
-{
-    if (default_file == aw_main_root_default)  return root_default;
-    if (default_file == NULL) {
-        AW_ERROR("Creating variable '%s' with zero default file\n", varname);
-        return root_default;
-    }
-    return default_file;
-}
-
-
 // for string
 AW_awar *AW_root::awar_string(const char *var_name, const char *default_value, AW_default default_file) {
     AW_awar *vs = (AW_awar *)GBS_read_hash(hash_table_for_variables, (char *)var_name);
     if (!vs) {
-        default_file = aw_check_default_file(this->application_database, default_file, var_name);
+        default_file = check_properties(default_file);
         vs           = new AW_awar(AW_STRING, var_name, default_value, 0, default_file, this);
         GBS_write_hash(hash_table_for_variables, (char *)var_name, (long)vs);
@@ -182 +169 @@
     AW_awar *vs = (AW_awar *)GBS_read_hash(hash_table_for_variables, (char *)var_name);
     if (!vs) {
-        default_file = aw_check_default_file(this->application_database, default_file, var_name);
+        default_file = check_properties(default_file);
         vs           = new AW_awar(AW_INT, var_name, (char *)default_value, 0, default_file, this);
         GBS_write_hash(hash_table_for_variables, (char *)var_name, (long)vs);
@@ -194 +181 @@
     AW_awar *vs = (AW_awar *)GBS_read_hash(hash_table_for_variables, (char *)var_name);
     if (!vs) {
-        default_file = aw_check_default_file(this->application_database, default_file, var_name);
+        default_file = check_properties(default_file);
         vs           = new AW_awar(AW_FLOAT, var_name, "", (double)default_value, default_file, this);
         GBS_write_hash(hash_table_for_variables, (char *)var_name, (long)vs);
@@ -204 +191 @@
     AW_awar *vs = (AW_awar *)GBS_read_hash(hash_table_for_variables, (char *)var_name);
     if (!vs) {
-        default_file = aw_check_default_file(this->application_database, default_file, var_name);
+        default_file = check_properties(default_file);
         vs           = new AW_awar(AW_POINTER, var_name, (const char *)default_value, NULL, default_file, this);
         GBS_write_hash(hash_table_for_variables, (char *)var_name, (long)vs);
@@ -641 +628 @@
 }
 
-
-
-AW_default AW_root::open_default(const char *default_name, bool create_if_missing)
-{
-    if (!create_if_missing) { // used to check for existing specific properties
-        const char *home   = GB_getenvHOME();
-        char       *buffer = (char *)GB_calloc(sizeof(char), strlen(home) + strlen(default_name) + 2);
-
-        sprintf(buffer, "%s/%s", home, default_name);
-
-        struct stat st;
-        bool        found = stat(buffer, &st) == 0;
-
-        free(buffer);
-
-        if (!found) return 0;
-    }
-
-#if defined(DEVEL_RALF)
-#warning gb_default is never closed
-    // close it somewhere and call AWT_browser_forget_db as well
-#endif // DEVEL_RALF
-
+AW_awar::~AW_awar() {
+    remove_all_target_vars();
+    unlink();
+    free(awar_name);
+}
+
+const char *AW_root::property_DB_fullname(const char *default_name) {
+    const char *home = GB_getenvHOME();
+    return GBS_global_string("%s/%s", home, default_name);
+}
+
+bool AW_root::property_DB_exists(const char *default_name) {
+    return GB_is_regularfile(property_DB_fullname(default_name));
+}
+
+AW_default AW_root::load_properties(const char *default_name) {
     GBDATA *gb_default = GB_open(default_name, "rwcD");
 
@@ -682 +662 @@
 }
 
-
-AW_error *AW_root::save_default(const char *var_name) {
-    return save_default(var_name, NULL);
-}
-
-AW_error *AW_root::save_default(const char *var_name, const char *file_name) {
-    AW_awar *vs;
-    if ((vs = this->awar(var_name))) {
-        AW_root::save_default((AW_default)vs->gb_var, file_name);
-        return 0;
-    }
-    else {
-        AW_ERROR("AW_root::save_default: Variable %s not defined", var_name);
-    }
-    return 0;
-
-}
-
-AW_error *AW_root::save_default(AW_default aw_default, const char *file_name)
-{
-    GBDATA *gb_main = GB_get_root((GBDATA *)aw_default);
-    GB_push_transaction(gb_main);
-    aw_update_awar_window_geometry(this);
-    GB_pop_transaction(gb_main);
-    GB_save_in_home(gb_main, file_name, "a");
-    return 0;
-}
-
-AW_default AW_root::get_default(const char *varname) {
-    GBDATA      *gbd;
-    AW_awar *vs;
-    if ((vs = this->awar(varname))) {
-        gbd = vs->gb_var;
-        return (AW_default)GB_get_root(gbd);
-    }
-    else {
-        AW_ERROR("AW_root::get_default: Variable %s not defined", varname);
-    }
-    return 0;
-}
+GB_ERROR AW_root::save_properties(const char *filename) {
+    GB_ERROR  error   = NULL;
+    GBDATA   *gb_main = application_database;
+
+    if (!gb_main) {
+        error = "No properties loaded - won't save";
+    }
+    else {
+        error = GB_push_transaction(gb_main);
+        if (!error) {
+            aw_update_awar_window_geometry(this);
+            error = GB_pop_transaction(gb_main);
+            if (!error) error = GB_save_in_home(gb_main, filename, "a");
+        }
+    }
+
+    return error;
+}
+
 
 AW_default AW_root::get_gbdata(const char *varname) {

trunk/WINDOW/AW_preset.cxx

@@ -22 +22 @@
 #include <cstdarg>
 
-void AW_save_defaults(AW_window *aw) {
-    aw->get_root()->save_default("window/font");
-}
-
-void AW_save_specific_defaults(AW_window *aw, const char *filename) {  // special version for EDIT4
-    aw->get_root()->save_default("window/font", filename);
-}
+void AW_save_specific_properties(AW_window *aw, const char *filename) {  // special version for EDIT4
+    GB_ERROR error = aw->get_root()->save_properties(filename);
+    if (error) aw_message(error);
+}
+void AW_save_properties(AW_window *aw) {
+    AW_save_specific_properties(aw, NULL);
+}
+
 
 void aw_message_reload(AW_root *) {

trunk/WINDOW/AW_status.cxx

@@ -740 +740 @@
 }
 
-void aw_initstatus()
-{
-    int error;
-
-    aw_assert(aw_stg.pid == 0); // do not init status twice!
-
-    error = pipe(aw_stg.fd_to);
+static void create_status_awars(AW_root *aw_root) {
+    aw_root->awar_string(AWAR_STATUS_TITLE,   "------------------------------------");
+    aw_root->awar_string(AWAR_STATUS_TEXT,    "");
+    aw_root->awar_string(AWAR_STATUS_GAUGE,   "------------------------------------");
+    aw_root->awar_string(AWAR_STATUS_ELAPSED, "");
+    aw_root->awar_string(AWAR_ERROR_MESSAGES, "");
+}
+
+void aw_initstatus() {
+    aw_assert(aw_stg.pid == 0);                     // do not init status twice!
+    aw_assert(!AW_root::SINGLETON);                 // aw_initstatus has to be called before constructing AW_root
+    aw_assert(GB_open_DBs() == 0);                  // aw_initstatus has to be called before opening the first ARB-DB
+
+    int error = pipe(aw_stg.fd_to);
     if (error) {
         printf("Cannot create socketpair\n");
@@ -776 +783 @@
         aw_stg.is_child = true; // mark as child
 
-        AW_root *aw_root;
-        aw_root = new AW_root;
-
-
-        AW_default aw_default = aw_root->open_default(".arb_prop/status.arb");
-        aw_root->init_variables(aw_default);
-        aw_root->awar_string(AWAR_STATUS_TITLE, "------------------------------------", aw_default);
-        aw_root->awar_string(AWAR_STATUS_TEXT, "", aw_default);
-        aw_root->awar_string(AWAR_STATUS_GAUGE, "------------------------------------", aw_default);
-        aw_root->awar_string(AWAR_STATUS_ELAPSED, "", aw_default);
-        aw_root->awar_string(AWAR_ERROR_MESSAGES, "", aw_default);
-        aw_root->init_root("ARB_STATUS", true);
+        AW_root *aw_root = new AW_root(".arb_prop/status.arb", "ARB_STATUS", true);
+        create_status_awars(aw_root);
 
         AW_window_simple *aws = new AW_window_simple;
@@ -924 +921 @@
 #endif // DEBUG
     if (aw_stg.local_message) {
-        aw_insert_message_in_tmp_message(AW_root::THIS, msg);
+        aw_insert_message_in_tmp_message(AW_root::SINGLETON, msg);
     }
     else {

trunk/WINDOW/AW_window.cxx

@@ -50 +50 @@
 #include <unistd.h>
 
-AW_root *AW_root::THIS = NULL;
+AW_root *AW_root::SINGLETON = NULL;
 
 AW_cb_struct::AW_cb_struct(AW_window *awi, void (*g)(AW_window*, AW_CL, AW_CL), AW_CL cd1i, AW_CL cd2i,
@@ -127 +127 @@
     return removed;
 }
-
-AW_config_struct::AW_config_struct(const char *idi, AW_active maski, Widget w,
-                                   const char *variable_namei, const char *variable_valuei,
-                                   AW_config_struct *nexti)
-{
-    aw_assert(legal_mask(maski));
-
-    id             = strdup(idi);
-    mask           = maski;
-    widget         = w;
-    variable_name  = strdup(variable_namei);
-    variable_value = strdup(variable_valuei);
-    next           = nexti;
-}
-
 
 AW_option_struct::AW_option_struct(const char *variable_valuei,
@@ -269 +254 @@
 }
 
-AW_root::AW_root() {
+static void destroy_AW_root() {
+    delete AW_root::SINGLETON;
+}
+
+AW_root::AW_root(const char *propertyFile, const char *program, bool no_exit) {
+    aw_assert(!AW_root::SINGLETON);                 // only one instance allowed
+    AW_root::SINGLETON = this;
+
     memset((char *)this, 0, sizeof(AW_root));
-    this->THIS = this;
-    this->prvt = (AW_root_Motif *)GB_calloc(sizeof(AW_root_Motif), 1);
+
+    prvt = new AW_root_Motif;
+
+    init_variables(load_properties(propertyFile));
+    init_root(program, no_exit);
+
+    atexit(destroy_AW_root); // do not call this before opening properties DB!
 }
 
 AW_root::~AW_root() {
+    exit_variables();
+    aw_assert(this == AW_root::SINGLETON);
+
+    
     delete prvt;
+
+    free(program_name);
+
+    AW_root::SINGLETON = NULL;
 }
 
@@ -814 +819 @@
 }
 
+AW_root_Motif::AW_root_Motif() {
+    memset((char*)this, 0, sizeof(*this));
+}
+
+AW_root_Motif::~AW_root_Motif() {
+    GBS_free_hash(action_hash);
+    XmFontListFree(fontlist);
+}
+
 void AW_root_Motif::set_cursor(Display *d, Window w, Cursor c) {
     XSetWindowAttributes attrs;
@@ -1267 +1281 @@
 
 static struct fallbacks aw_fb[] = {
-// fallback awarname    init
-
-        { "FontList", "window/font", "8x13bold" }, { "background",
-                "window/background", "grey" }, { "foreground",
-                "window/foreground", "Black", }
-, { 0, "window/color_1", "red", }
-, { 0, "window/color_2", "green", }
-, { 0, "window/color_3", "blue", }
-, { 0, 0, 0 }
+    // Name         fallback awarname    default value
+    { "FontList",   "window/font",       "8x13bold" },
+    { "background", "window/background", "grey" },
+    { "foreground", "window/foreground", "Black", },
+    { 0,            "window/color_1",    "red", },
+    { 0,            "window/color_2",    "green", },
+    { 0,            "window/color_3",    "blue", },
+    { 0,            0,                   0 }
 };
 
-static const char *aw_awar_2_color[] = { "window/background",
-        "window/foreground", "window/color_1", "window/color_2",
-        "window/color_3", 0 };
+static const char *aw_awar_2_color[] = {
+    "window/background",
+    "window/foreground",
+    "window/color_1",
+    "window/color_2",
+    "window/color_3",
+    0
+};
+
 
 void AW_root::init_variables(AW_default database) {
-    application_database = database;
-
+    application_database     = database;
     hash_table_for_variables = GBS_create_hash(1000, GB_MIND_CASE);
     hash_for_windows         = GBS_create_hash(100, GB_MIND_CASE);
     prvt->action_hash        = GBS_create_hash(1000, GB_MIND_CASE);
-    int i;
-    for (i=0; i<1000; i++) {
-        if (aw_fb[i].awar == 0)
-            break;
+
+    for (int i=0; aw_fb[i].awar; ++i) {
         awar_string(aw_fb[i].awar, aw_fb[i].init, application_database);
+    }
+}
+
+static long destroy_awar(const char *, long val, void *) {
+    AW_awar *awar = (AW_awar*)val;
+    delete   awar;
+    return 0; // remove from hash
+}
+
+void AW_root::exit_variables() {
+    if (hash_table_for_variables) {
+        GBS_hash_do_loop(hash_table_for_variables, destroy_awar, NULL);
+        GBS_free_hash(hash_table_for_variables);
+        hash_table_for_variables = NULL;
+    }
+
+    if (hash_for_windows) {
+        GBS_free_hash(hash_for_windows);
+        hash_for_windows = NULL;
+    }
+
+    if (application_database) {
+        GBDATA *prop_main    = application_database;
+        application_database = NULL;
+        GB_close(prop_main);
     }
 }
@@ -1313 +1354 @@
     int i;
     XColor xcolor_returned, xcolor_exakt;
-    GBDATA *gbd = (GBDATA*)root->application_database;
+    GBDATA *gbd = root->check_properties(NULL);
     p_global->color_table = (unsigned long *)GB_calloc(sizeof(unsigned long), AW_COLOR_MAX);
 
@@ -1424 +1465 @@
     p_r->button_list = 0;
 
-    p_r->config_list = new AW_config_struct("", AWM_ALL, NULL, "Programmer Name", "SH", NULL);
-    p_r->last_config = p_r->config_list;
-
     p_r->last_option_menu = p_r->current_option_menu = p_r->option_menu_list = NULL;
     p_r->last_toggle_field = p_r->toggle_field_list = NULL;
@@ -1512 +1550 @@
     memset(buffer, 0, 200);
     sprintf(buffer, "window/%s/horizontal_page_increment", window_defaults_name);
-    get_root()->awar_int(buffer, 50, get_root()->application_database);
+    get_root()->awar_int(buffer, 50);
     get_root()->awar(buffer)->add_callback(
             (AW_RCB)horizontal_scrollbar_redefinition_cb, (AW_CL)this,
@@ -1518 +1556 @@
 
     sprintf(buffer, "window/%s/vertical_page_increment", window_defaults_name);
-    get_root()->awar_int(buffer, 50, get_root()->application_database);
+    get_root()->awar_int(buffer, 50);
     get_root()->awar(buffer)->add_callback((AW_RCB)vertical_scrollbar_redefinition_cb,
             (AW_CL)this, (AW_CL)p_w->scroll_bar_vertical);
 
     sprintf(buffer, "window/%s/scroll_delay_vertical", window_defaults_name);
-    get_root()->awar_int(buffer, 20, get_root()->application_database);
+    get_root()->awar_int(buffer, 20);
     get_root()->awar(buffer)->add_callback((AW_RCB)vertical_scrollbar_redefinition_cb,
             (AW_CL)this, (AW_CL)p_w->scroll_bar_vertical);
 
     sprintf(buffer, "window/%s/scroll_delay_horizontal", window_defaults_name);
-    get_root()->awar_int(buffer, 20, get_root()->application_database);
+    get_root()->awar_int(buffer, 20);
     get_root()->awar(buffer)->add_callback(
             (AW_RCB)horizontal_scrollbar_redefinition_cb, (AW_CL)this,
@@ -1534 +1572 @@
 
     sprintf(buffer, "window/%s/scroll_width_horizontal", window_defaults_name);
-    get_root()->awar_int(buffer, 9, get_root()->application_database);
+    get_root()->awar_int(buffer, 9);
     get_root()->awar(buffer)->add_callback(
             (AW_RCB)horizontal_scrollbar_redefinition_cb, (AW_CL)this,
@@ -1540 +1578 @@
 
     sprintf(buffer, "window/%s/scroll_width_vertical", window_defaults_name);
-    get_root()->awar_int(buffer, 20, get_root()->application_database);
+    get_root()->awar_int(buffer, 20);
     get_root()->awar(buffer)->add_callback((AW_RCB)vertical_scrollbar_redefinition_cb,
             (AW_CL)this, (AW_CL)p_w->scroll_bar_vertical);
@@ -3459 +3497 @@
 {
 
-    AW_root *root = AW_root::THIS;
+    AW_root *root = AW_root::SINGLETON;
     char buffer[10000];
     {

trunk/WINDOW/aw_advice.hxx

@@ -33 +33 @@
 
 //! has to be called one time (before calling AW_advice)
-void init_Advisor(AW_root *awr, AW_default def);
+void init_Advisor(AW_root *awr);
 
 /*! @brief Show a message box with an advice for the user

trunk/WINDOW/aw_awars.hxx

@@ -2 +2 @@
 #define AW_AWARS_HXX
 
-#define AWAR_DB                "tmp/nt/arbdb/"
-#define AWAR_DB_PATH           AWAR_DB "file_name"
-#define AWAR_DB_NAME           AWAR_DB_PATH "_without_path" //  awar is automatically updated when AWAR_DB_PATH changes
+#define AWAR_DB        "tmp/nt/arbdb/"
+#define AWAR_DB_PATH   AWAR_DB "file_name"
+#define AWAR_DB_TYPE   AWAR_DB "type"
+#define AWAR_DB_FILTER AWAR_DB "filter"
+#define AWAR_DB_NAME   AWAR_DB_PATH "_without_path" //  awar is automatically updated when AWAR_DB_PATH changes
+
 #define AWAR_DEFAULT_ALIGNMENT "presets/use"
 

trunk/WINDOW/aw_preset.hxx

@@ -21 +21 @@
 #define AWP_FONTSIZE_TEMPLATE "GCS/%s/MANAGE_GCS/%s/size"
 
-void AW_save_defaults(AW_window *aw);   // use this if you're unsure
-void AW_save_specific_defaults(AW_window *aw, const char *filename);
+void AW_save_properties(AW_window *aw);   // use this if you're unsure
+void AW_save_specific_properties(AW_window *aw, const char *filename);
 
 AW_window *AW_preset_window(AW_root *root);

trunk/WINDOW/aw_root.hxx

@@ -16 +16 @@
 #endif
 
-
-#define AW_ROOT_DEFAULT (aw_main_root_default)
+#define AW_ROOT_DEFAULT AW_root::SINGLETON->check_properties(NULL)
+
 class        AW_root;
 class        AW_window;
-typedef long AW_CL;             // generic client data type (void *)
+typedef long AW_CL;                                 // generic client data type (void *)
 
 typedef void (*AW_RCB)(AW_root*, AW_CL, AW_CL);
@@ -36 +36 @@
 typedef int         AW_font;
 
-extern AW_default aw_main_root_default;
-
 typedef struct _WidgetRec *Widget;
 
-// #define AWUSE(variable) variable = variable
 #if defined(DEBUG) && defined(DEVEL_RALF) && 0
 #define AWUSE(variable) (void)variable; int DONT_USE_AWUSE_FOR_##variable
@@ -180 +177 @@
 
 class AW_root {
+    AW_default application_database;
+    
+    void init_variables(AW_default database);
+    void exit_variables();
+
+    void init_root(const char *programname, bool no_exit);
+    AW_default load_properties(const char *default_name);
+
 public:
-    static  AW_root *THIS;
-    AW_root_Motif   *prvt;                          // Do not use !!!
-    bool             value_changed;
-    long             changer_of_variable;
-    int              y_correction_for_input_labels;
-    AW_active        global_mask;
-    GB_HASH         *hash_table_for_variables;
-    bool             variable_set_by_toggle_field;
-    int              number_of_toggle_fields;
-    int              number_of_option_menus;
-    char            *program_name;
+    static AW_root *SINGLETON;
+
+    AW_root_Motif *prvt;                            // Do not use !!!
+    bool           value_changed;
+    long           changer_of_variable;
+    int            y_correction_for_input_labels;
+    AW_active      global_mask;
+    GB_HASH       *hash_table_for_variables;
+    bool           variable_set_by_toggle_field;
+    int            number_of_toggle_fields;
+    int            number_of_option_menus;
+    char          *program_name;
 
     void            *get_aw_var_struct(char *awar);
@@ -204 +210 @@
 
     // the read only public section:
-    AW_default  application_database;
     short       font_width;
     short       font_height;
@@ -211 +216 @@
 
     // the real public section:
-    AW_root();
+    AW_root(const char *properties, const char *program, bool no_exit);
     ~AW_root();
+
     enum { AW_MONO_COLOR, AW_RGB_COLOR }    color_mode;
 
-    void init_variables(AW_default database);
-    void init_root(const char *programname, bool no_exit);
     void main_loop();
-    void process_events();     // might block
-    void process_pending_events();     // non-blocking
+    
+    void                process_events();           // might block
+    void                process_pending_events();   // non-blocking
     AW_ProcessEventType peek_key_event(AW_window *);
 
@@ -245 +250 @@
     void unlink_awars_from_DB(GBDATA *gb_main);     // use before calling GB_close for 'gb_main', if you have AWARs in DB
 
-    AW_default  open_default(const char *default_name, bool create_if_missing = true);
-    AW_error   *save_default(const char *awar_name);
-    AW_error   *save_default(const char *awar_name, const char *file_name);
-    AW_error   *save_default(AW_default aw_default, const char *file_name);
-    AW_default  get_default(const char *varname);
-    AW_default  get_gbdata(const char *varname);
+    static const char *property_DB_fullname(const char *default_name);
+    static bool        property_DB_exists(const char *default_name);
+
+    AW_default check_properties(AW_default aw_props) {
+        return aw_props ? aw_props : application_database;
+    }
+
+    GB_ERROR save_properties(const char *filename = NULL) __ATTR__USERESULT;
+
+    AW_default get_gbdata(const char *varname) __ATTR__DEPRECATED; // replace by awar + gb_var
+
 
     // Control sensitivity of buttons etc.:
@@ -330 +340 @@
 
     AW_awar(AW_VARIABLE_TYPE var_type, const char *var_name, const char *var_value, double var_double_value, AW_default default_file, AW_root *root);
+    ~AW_awar();
 
     AW_awar *add_callback(Awar_CB2 f, AW_CL cd1, AW_CL cd2);

trunk/WINDOW/aw_window_Xm.hxx

@@ -74 +74 @@
     AW_buttons_struct *next;
 };
-
-struct AW_config_struct {
-    AW_config_struct(const char *idi, AW_active maski, Widget w, const char *variable_namei, const char *variable_valuei, AW_config_struct *nexti);
-
-    const char       *id;
-    AW_active         mask;
-    Widget            widget;
-    const char       *variable_name;
-    const char       *variable_value;
-    AW_config_struct *next;
-};
-
 
 struct AW_option_struct {
@@ -248 +236 @@
     AW_buttons_struct *button_list;
 
-    AW_config_struct *config_list;
-    AW_config_struct *last_config;
-
     AW_option_menu_struct *option_menu_list;
     AW_option_menu_struct *last_option_menu;
@@ -279 +264 @@
     GB_HASH *action_hash;
 
-    AW_root_Motif() {};
-    ~AW_root_Motif() {};
+    AW_root_Motif();
+    ~AW_root_Motif();
 
     Widget get_last_widget() const { return last_widget; }