Ticket #545: attempt.patch

EDIT4/ED4_search.cxx

@@ -980 +980 @@
 // --------------------------------------------------------------------------------
 
 void ED4_SearchResults::addSearchPosition(ED4_SearchPosition *pos) {
-    static int max_allowed_results = 100000;
+    // static int max_allowed_results = 100000;
+    static int max_allowed_results = 1000;
 
     if (ignore_more_results) return;
 

WINDOW/AW_dialog.cxx

@@ -51 +51 @@
 }
 
 void AW_dialog::run() {
+    LocallyModify<bool> flag(AW_root::SINGLETON->disable_callbacks, true);
+
     gtk_widget_show_all(GTK_WIDGET(prvt->dialog));
     prvt->result = gtk_dialog_run(prvt->dialog);
     gtk_widget_hide(GTK_WIDGET(prvt->dialog));

WINDOW/AW_area_management.cxx

@@ -23 +23 @@
 
 #include <iostream>
 
-//#define DUMP_EVENTS
+#if defined(DEBUG)
+#define DUMP_EVENTS
+#endif
 
 #if defined(DUMP_EVENTS)
 #  define DUMP_EVENT(type)                                              \
@@ -41 +43 @@
     
 #else
 #  define DUMP_EVENT(type)
-#endif // DEBUG
+#endif
 
 
 class AW_area_management::Pimpl : virtual Noncopyable {
@@ -91 +93 @@
     aww->event.character   = '\0';
 }
 
+static bool dont_nest_events = false;
+
 extern "C" gboolean aw_handle_configure_event(GtkWidget *, GdkEventConfigure *event, gpointer self) {
     AW_area_management* area = (AW_area_management*) self;
     AW_window* aww = area->prvt->aww;
+
+    if (dont_nest_events) {
+        DUMP_EVENT("resize (ignored)");
+        return false;
+    }
+    LocallyModify<bool> flag(dont_nest_events, true);
+
     aw_event_clear(aww);
 
     aww->event.type   = (AW_event_type) event->type;
@@ -108 +119 @@
     DUMP_EVENT("resize");
     return true; // event handled
 }
-    
+
 extern "C" gboolean aw_handle_expose_event(GtkWidget *, GdkEventExpose *event, gpointer self)  {
     AW_area_management* area = (AW_area_management*) self;
     AW_window* aww = area->prvt->aww;
+
+    if (dont_nest_events) {
+        DUMP_EVENT("expose (ignored)");
+        return false;
+    }
+    LocallyModify<bool> flag(dont_nest_events, true);
+
     aw_event_clear(aww);
+
     aww->event.type        = (AW_event_type) event->type;
     aww->event.x           = event->area.x;
     aww->event.y           = event->area.y;
@@ -123 +142 @@
     area->expose.emit();
     area->prvt->screen_device->set_cr(0);
     DUMP_EVENT("expose");
-    return false;
+    return false; // @@@ does this mean "not handled"?
 }
    
 extern "C" gboolean aw_handle_button_event(GtkWidget *, GdkEventButton *event, gpointer self) {