Changeset 8306

Timestamp:

14/12/11 11:33:42 (5 months ago)

Author:

westram

Message:

• fixed '(re)load config'
  • explicitely remove all callbacks before destroying old hierarchy
  • implemented missing ED4_foldable::delete_folding_line
  • when destroying terminal, check in all windows whether it contains the cursor
  • clear_whole_background (moved into ED4_main_manager; act on all windows)

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (5 diffs)
• ED4_manager.cxx (modified) (1 diff)
• ED4_no_class.cxx (modified) (5 diffs)
• ED4_terminal.cxx (modified) (1 diff)
• ED4_window.cxx (modified) (1 diff)
• ed4_class.hxx (modified) (5 diffs)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -1271 +1271 @@
 }
 
-ED4_returncode ED4_base::clear_whole_background() {
+void ED4_main_manager::clear_whole_background() {
     // clear AW_MIDDLE_AREA
-    if (current_device()) { // @@@ should clear be done for all windows?
-        current_device()->push_clip_scale();
-        current_device()->clear(AW_ALL_DEVICES);
-        current_device()->pop_clip_scale();
-    }
-
-    return (ED4_R_OK);
+    for (ED4_window *window = ED4_ROOT->first_window; window; window=window->next) {
+        AW_device *device = window->get_device();
+        if (device) {
+            device->push_clip_scale();
+            device->clear(AW_ALL_DEVICES);
+            device->pop_clip_scale();
+        }
+    }
 }
 
@@ -1325 +1326 @@
 
 
-ED4_base::~ED4_base() // before calling this function the first time, parent has to be set NULL
-{
-    ED4_base *object;
-    ED4_base *sequence_terminal = NULL;
-    ED4_list_elem *list_elem, *old_elem;
-    ED4_window *ed4w;
-
+ED4_base::~ED4_base() {
+    // before calling this function the first time, parent has to be set NULL
     e4_assert(!parent); // unlink from parent first!
 
-    list_elem = linked_objects.first();
+    ED4_list_elem *list_elem = linked_objects.first();
     while (list_elem) {
-        object = (ED4_base *) list_elem->elem();
+        ED4_base *object = (ED4_base *) list_elem->elem();
         if (object->width_link == this) {
             object->width_link->linked_objects.delete_elem((void *) this);              // delete link and
@@ -1347 +1343 @@
         }
 
-        old_elem = list_elem;
+        ED4_list_elem *old_elem = list_elem;
         list_elem = list_elem->next();
         linked_objects.delete_elem(old_elem->elem());
@@ -1356 +1352 @@
         if (ED4_ROOT->main_manager)
         {
-            sequence_terminal = ED4_ROOT->main_manager->search_spec_child_rek(ED4_L_SEQUENCE_STRING);
+            ED4_base *sequence_terminal = ED4_ROOT->main_manager->search_spec_child_rek(ED4_L_SEQUENCE_STRING);
 
             if (sequence_terminal)
@@ -1364 +1360 @@
             ED4_ROOT->scroll_links.link_for_hor_slider = sequence_terminal;
 
-            ed4w = current_ed4w();
+            ED4_window *ed4w = ED4_ROOT->first_window;
             while (ed4w != NULL) {
                 ed4w->scrolled_rect.replace_x_width_link_to(this, sequence_terminal);

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -1833 +1833 @@
 }
 
+static ARB_ERROR removeAllCallbacks(ED4_base *base) {
+    if (base->is_species_manager()) {
+        base->to_species_manager()->remove_all_callbacks();
+    }
+    return NULL;
+}
+
+void ED4_root::remove_all_callbacks() {
+    root_group_man->route_down_hierarchy(removeAllCallbacks).expect_no_error();
+}
 
 // ------------------------

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -831 +831 @@
 
 void ED4_quit_editor(AW_window *aww, AW_CL /* cd1 */, AW_CL /* cd2 */) {
-    ED4_LocalWinContext uses(aww);
+    ED4_LocalWinContext uses(aww); // @@@ dont use context here
 
     if (ED4_ROOT->first_window == current_ed4w()) { // quit button has been pressed in first window
@@ -1279 +1279 @@
 }
 
-void ED4_load_new_config(char *string)
-{
-    char *config_data_top    = NULL;
-    char *config_data_middle = NULL;
-
-    ED4_window     *window;
-    GB_transaction  dummy(GLOBAL_gb_main);
-
+void ED4_load_new_config(char *string) {
+    GB_transaction ta(GLOBAL_gb_main);
 
     ED4_ROOT->main_manager->clear_whole_background();
@@ -1295 +1289 @@
     ED4_init_notFoundMessage();
 
-
     if (ED4_ROOT->selected_objects.no_of_entries() > 0) {
         ED4_ROOT->deselect_all();
     }
+
+    ED4_ROOT->remove_all_callbacks();
 
     ED4_ROOT->scroll_picture.scroll         = 0;
@@ -1306 +1301 @@
     ED4_ROOT->ref_terminals.clear();
 
-    for (window=ED4_ROOT->first_window; window; window=window->next) {
+    for (ED4_window *window = ED4_ROOT->first_window; window; window=window->next) {
         window->cursor.init();
         window->aww->set_horizontal_scrollbar_position (0);
@@ -1312 +1307 @@
     }
 
-    ED4_ROOT->scroll_links.link_for_hor_slider  = NULL;
-    ED4_ROOT->scroll_links.link_for_ver_slider  = NULL;
-    ED4_ROOT->middle_area_man           = NULL;
-    ED4_ROOT->top_area_man              = NULL;
+    ED4_ROOT->scroll_links.link_for_hor_slider = NULL;
+    ED4_ROOT->scroll_links.link_for_ver_slider = NULL;
+    ED4_ROOT->middle_area_man                  = NULL;
+    ED4_ROOT->top_area_man                     = NULL;
+
+    
 
     delete ED4_ROOT->main_manager;
-    ED4_ROOT->main_manager              = NULL;
+    ED4_ROOT->main_manager = NULL;
     delete ED4_ROOT->ecoli_ref;
+
+    char *config_data_top    = NULL;
+    char *config_data_middle = NULL;
     {
         GB_push_transaction(GLOBAL_gb_main);

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -764 +764 @@
 ED4_terminal::~ED4_terminal() {
     delete selection_info;
-    ED4_cursor& cursor = current_cursor();
-    if (this == cursor.owner_of_cursor) {
-        cursor.init();
+    for (ED4_window *window = ED4_ROOT->first_window; window; window=window->next) {
+        ED4_cursor& cursor = window->cursor;
+        if (this == cursor.owner_of_cursor) {
+            cursor.init();
+        }
     }
 }

branches/e4fix/EDIT4/ED4_window.cxx

@@ -119 +119 @@
 
 
-ED4_returncode ED4_foldable::delete_folding_line(ED4_folding_line */*fl*/, ED4_properties /*prop*/) {
-    e4_assert(0); // not implement - cause it's unused
-    return ED4_R_OK;
+void ED4_foldable::delete_folding_line(ED4_folding_line *fl, ED4_properties prop) {
+    if (prop == ED4_P_HORIZONTAL) {
+        horizontal_fl = horizontal_fl->delete_member(fl);
+    }
+    else {
+        e4_assert(prop == ED4_P_VERTICAL);
+        vertical_fl = vertical_fl->delete_member(fl);
+    }
 }
 

branches/e4fix/EDIT4/ed4_class.hxx

@@ -306 +306 @@
     }
 
+    ED4_folding_line *delete_member(ED4_folding_line *fl) {
+        ED4_folding_line *result = this;
+        if (this == fl) {
+            result = next;
+            next   = NULL;
+            delete this;
+        }
+        return result;
+    }
+
     AW_pos get_dimension() const { return dimension; }
     const ED4_folding_line *get_next() const { return next; }
@@ -357 +367 @@
 
     ED4_folding_line *insert_folding_line(AW_pos pos, AW_pos dimension, ED4_properties prop);
-    ED4_returncode  delete_folding_line(ED4_folding_line *fl, ED4_properties prop);
+    void              delete_folding_line(ED4_folding_line *fl, ED4_properties prop);
 };
 
@@ -1050 +1060 @@
     ED4_returncode  clear_background(int color=0);
 
-    ED4_returncode clear_whole_background();       // clear AW_MIDDLE_AREA
     bool is_visible(ED4_window *in_ed4w, AW_pos x, AW_pos y, ED4_direction direction);
     bool is_visible(ED4_window *in_ed4w, AW_pos x1, AW_pos y1, AW_pos x2, AW_pos y2, ED4_direction direction);
@@ -1509 +1518 @@
     ED4_index pixel2pos(AW_pos click_x);
 
+    void remove_all_callbacks();
+    
     ED4_root();
     ~ED4_root();
@@ -1570 +1581 @@
     virtual ED4_returncode Show(int refresh_all=0, int is_cleared=0);
     virtual ED4_returncode resize_requested_by_parent();
+    
+    void clear_whole_background();
 };