Ticket #537: sellist_fallback_fix.patch

WINDOW/AW_awar.cxx

@@ -699 +699 @@
 
     aw_assert(is_valid());
 
+#if defined(TRACE_PROBLEMATIC_AWAR_USAGE)
+    if (gb_origin != gb_var) {
+        // detect whether this is mapped to another awar
+        const char *dbpath = GB_get_db_path(gb_var);
+
+        if      (ARB_strBeginsWith(dbpath, "/main/"))     dbpath = dbpath+6;
+        else if (ARB_strBeginsWith(dbpath, "/<gbmain>/")) dbpath = dbpath+10;
+
+        track_awar_mapping(this->get_name(), dbpath);
+    }
+#endif
+
     return this;
 }
 

WINDOW/aw_awar.hxx

@@ -166 +166 @@
 };
 
 void AW_awar_dump_changes(const char* name);
+
+// --------------------------------------------------------------------------------
+// see http://bugs.arb-home.de/ticket/520
+
+#if defined(DEBUG)
+#define TRACE_PROBLEMATIC_AWAR_USAGE
+#endif
+
+#if defined(TRACE_PROBLEMATIC_AWAR_USAGE)
+
+#include <map>
+
+enum UsedInWidget { UIW_SELLIST = 1, UIW_OTHER = 2, UIW_BOTH = 3 };
+class AW_awar;
+
+void track_problematic_awar_usage(AW_awar *awar, UsedInWidget where);
+void track_awar_mapping(std::string awarname_org, std::string awarname_mappedTo);
+
+#endif

WINDOW/AW_select.cxx

@@ -27 +27 @@
 
 #include "aw_type_checking.hxx"
 
+#include <map>
+
+#if defined(TRACE_PROBLEMATIC_AWAR_USAGE)
+
+typedef std::map<std::string, std::string>  AwarMapping;
+typedef std::map<std::string, UsedInWidget> AwarUsage;
+
+static AwarMapping amap;
+static AwarUsage   usage;
+
+static void track_awars_mapped_with(std::string awar_name);
+static void combine_awar_usage(std::string awar_name1, std::string awar_name2);
+static void track_problematic_awar_usage_byname(std::string awar_name, UsedInWidget where) {
+    aw_assert(where != UIW_BOTH);
+    fprintf(stderr, "track_problematic_awar_usage_byname('%s', %i) [start]\n", awar_name.c_str(), int(where));
+
+    AwarUsage::iterator found = usage.find(awar_name);
+    if (found == usage.end()) {
+        usage[awar_name] = where;
+        track_awars_mapped_with(awar_name);
+    }
+    else {
+        if (found->second != where) {
+            if (found->second != UIW_BOTH) {
+                // detected problematic use of awar! (used in selection list and in input field)
+                usage[awar_name] = UIW_BOTH;
+                aw_assert(0);
+            }
+        }
+    }
+    fprintf(stderr, "track_problematic_awar_usage_byname('%s', %i) [end]\n", awar_name.c_str(), int(where));
+}
+static void combine_awar_usage(std::string awar_name1, std::string awar_name2) {
+    aw_assert(awar_name1 != awar_name2);
+
+    AwarUsage::iterator found1 = usage.find(awar_name1);
+    AwarUsage::iterator found2 = usage.find(awar_name2);
+
+    fprintf(stderr, "combine_awar_usage('%s', '%s') [start]\n", awar_name1.c_str(), awar_name2.c_str());
+
+    if (found1 == usage.end()) {
+        if (found2 == usage.end()) {
+            ;
+        }
+        else { // awar_name2 already tracked
+            if (found2->second != UIW_BOTH) { // do not warn twice
+                track_problematic_awar_usage_byname(awar_name1, found2->second);
+            }
+        }
+    }
+    else {
+        if (found2 == usage.end()) { // awar_name1 already tracked
+            if (found1->second != UIW_BOTH) { // do not warn twice
+                track_problematic_awar_usage_byname(awar_name2, found1->second);
+            }
+        }
+        else { // both already tracked
+            if (found1->second != found2->second) {
+                UsedInWidget add1 = UsedInWidget(found2->second & ~found1->second);
+                UsedInWidget add2 = UsedInWidget(found1->second & ~found2->second);
+
+                if (add1>0 && add1 != UIW_BOTH) track_problematic_awar_usage_byname(awar_name1, add1);
+                if (add2>0 && add2 != UIW_BOTH) track_problematic_awar_usage_byname(awar_name2, add2);
+            }
+        }
+    }
+    fprintf(stderr, "combine_awar_usage('%s', '%s') [end]\n", awar_name1.c_str(), awar_name2.c_str());
+}
+static void combine_awar_usage(AwarMapping::iterator& m) {
+    combine_awar_usage(m->first, m->second);
+}
+
+static void track_awars_mapped_with(std::string awar_name) {
+    fprintf(stderr, "track_awars_mapped_with('%s') [start]\n", awar_name.c_str());
+    for (AwarMapping::iterator i = amap.begin(); i != amap.end(); ++i) {
+        if (i->first == awar_name || i->second == awar_name) {
+            combine_awar_usage(i);
+        }
+    }
+    fprintf(stderr, "track_awars_mapped_with('%s') [end]\n", awar_name.c_str());
+}
+
+void track_problematic_awar_usage(AW_awar *awar, UsedInWidget where) {
+    track_problematic_awar_usage_byname(awar->get_name(), where);
+}
+void track_awar_mapping(std::string awarname_org, std::string awarname_mappedTo) {
+    fprintf(stderr, "track_awar_mapping('%s', '%s') [start]\n", awarname_org.c_str(), awarname_mappedTo.c_str());
+    amap[awarname_org] = awarname_mappedTo;
+    combine_awar_usage(awarname_org, awarname_mappedTo);
+    fprintf(stderr, "track_awar_mapping('%s', '%s') [end]\n", awarname_org.c_str(), awarname_mappedTo.c_str());
+}
+
+#endif
+
 static void aw_selection_list_awar_changed(AW_root*, AW_selection_list* slist) {
     slist->refresh();
 }
@@ -60 +154 @@
 {
     aw_assert(NULL != awar);
     awar->add_callback(makeRootCallback(aw_selection_list_awar_changed, this));
+
+#if defined(TRACE_PROBLEMATIC_AWAR_USAGE)
+    if (fallback2default) {
+        track_problematic_awar_usage(awar, UIW_SELLIST);
+    }
+#endif
 }
 
 AW_selection_list::~AW_selection_list() {

WINDOW/AW_window.cxx

@@ -582 +582 @@
 void AW_window::create_input_field(const char *var_name,   int columns) {
     AW_awar* awar = get_root()->awar_no_error(var_name);
     aw_return_if_fail(awar != NULL);
-    
+
+#if defined(TRACE_PROBLEMATIC_AWAR_USAGE)
+    track_problematic_awar_usage(awar, UIW_OTHER);
+#endif
+
     GtkWidget *entry;
 
     int width = columns ? columns : _at.length_of_buttons;