Changeset 8342

Timestamp:

26/01/12 17:18:07 (4 months ago)

Author:

westram

Message:

• replaced ED4_refresh_window by ED4_request_full_refresh
  • some callers now request fewer refreshes
  • all callers now cause refresh of ALL windows
• ED4_cursor::ShowCursor no longer updates global AWARs when used for display only
  • conflicted with refresh of all windows (impossible to move cursor)
• ED4_update_global_cursor_awars_allowed -> bool
• refresh_window does not handle updates (it is only used to quickly draw the cursor)
  • refresh_window_simple cant no longer expect delete/update/resize requests have been handled (instead handle_update_requests() expects that)
  • renamed into special_window_refresh() to disencourage usage
• removed implicit clearing of refresh flags previously done when refresh propagated down through windows, areas and hierarchy. Instead refresh_all_windows explicitely calls clear_refresh when done.

Location:

branches/e4fix/EDIT4

Files:

• ED4_cursor.cxx (modified) (9 diffs)
• ED4_dump.cxx (modified) (1 diff)
• ED4_edit_string.cxx (modified) (1 diff)
• ED4_main.cxx (modified) (3 diffs)
• ED4_manager.cxx (modified) (6 diffs)
• ED4_no_class.cxx (modified) (3 diffs)
• ED4_root.cxx (modified) (11 diffs)
• ED4_text_terminals.cxx (modified) (1 diff)
• ed4_class.hxx (modified) (3 diffs)
• ed4_defs.hxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -361 +361 @@
 #define EXPAND_SIZE 0
     if (window()->get_device()->reduceClipBorders(ymin-EXPAND_SIZE, ymax+1+EXPAND_SIZE, xmin-EXPAND_SIZE, xmax+1+EXPAND_SIZE)) {
-        // refresh terminal
-        int old_allowed_to_draw = allowed_to_draw;
-        allowed_to_draw = 0;
-        ED4_ROOT->refresh_window(1);
-        allowed_to_draw = old_allowed_to_draw;
+        // refresh terminal to hide cursor
+        bool previous = allowed_to_draw;
+        allowed_to_draw = false;
+        ED4_ROOT->special_window_refresh();
+        allowed_to_draw = previous;
     }
     dev->pop_clip_scale();
@@ -375 +375 @@
 ED4_cursor::ED4_cursor(ED4_window *win_) : win(win_) {
     init();
-    allowed_to_draw = 1;
+    allowed_to_draw = true;
     cursor_shape    = 0;
 
@@ -801 +801 @@
 }
 
-int ED4_update_global_cursor_awars_allowed = true;
+bool ED4_update_global_cursor_awars_allowed = true;
 
 void ED4_cursor::updateAwars()
@@ -1013 +1013 @@
     delete_cursor(cursor_abs_x, owner_of_cursor);
 
-    int old_allowed_to_draw = allowed_to_draw;
+    bool previous = allowed_to_draw;
     if (scroll_new_to >= 0) {   // scroll
         int rel_x_new     = abs_x_new-coords->window_left_clip_point;
@@ -1028 +1028 @@
             printf("jump_screen_pos auto-scrolls %i\n", scroll_amount);
 #endif
-            allowed_to_draw = 0;
+            allowed_to_draw = false;
             ED4_horizontal_change_cb(aww, 0, 0);
         }
     }
 
-    allowed_to_draw = 1;
+    allowed_to_draw = true;
     if (cursor_diff >= 0) {
         ShowCursor(cursor_diff*length_of_char, ED4_C_RIGHT, ABS(cursor_diff));
@@ -1040 +1040 @@
         ShowCursor(cursor_diff*length_of_char, ED4_C_LEFT, ABS(cursor_diff));
     }
-    allowed_to_draw = old_allowed_to_draw;
+    allowed_to_draw = previous;
 }
 
@@ -1214 +1214 @@
 
 
-ED4_returncode ED4_cursor::ShowCursor(ED4_index offset_x, ED4_cursor_move move, int move_pos)
-{
+ED4_returncode ED4_cursor::ShowCursor(ED4_index offset_x, ED4_cursor_move move, int move_pos) {
     AW_pos x=0, y=0, x_help = 0, y_help;
 
     owner_of_cursor->calc_world_coords(&x, &y);
 
-    switch (move)
-    {
-        case ED4_C_RIGHT:
-            screen_position += move_pos;
-            break;
-        case ED4_C_LEFT:
-            screen_position -= move_pos;
-            break;
-        case ED4_C_NONE:
+    int old_allow = ED4_update_global_cursor_awars_allowed;
+    ED4_update_global_cursor_awars_allowed = true;
+
+    switch (move) {
+        case ED4_C_RIGHT: screen_position += move_pos; break;
+        case ED4_C_LEFT:  screen_position -= move_pos; break;
+
+        case ED4_C_NONE: // no move - only redisplay
+            ED4_update_global_cursor_awars_allowed = false; // dont update here, otherwise refresh will disable cursor movement!
             break;
         default:
@@ -1236 +1235 @@
 
     updateAwars();
+    ED4_update_global_cursor_awars_allowed = old_allow;
 
     x_help = cursor_abs_x + offset_x;
@@ -1391 +1391 @@
         owner_of_cursor->request_refresh(); // we have to refresh old owner of cursor
         owner_of_cursor = NULL;
-        ED4_ROOT->refresh_window(0);
         DRAW = 1;
     }

branches/e4fix/EDIT4/ED4_dump.cxx

@@ -261 +261 @@
     print_indented(NEXT_INDENT, GBS_global_string("refresh_horizontal_scrolling   = %u", refresh_horizontal_scrolling));
     print_indented(NEXT_INDENT, GBS_global_string("delete_requested               = %u", delete_requested));
+    print_indented(NEXT_INDENT, GBS_global_string("update_requested               = %u", update_requested));
     closeDump(indent);
 }

branches/e4fix/EDIT4/ED4_edit_string.cxx

@@ -772 +772 @@
                         }
                         case 'L': {  // CTRL-L = Refresh
-                            ED4_refresh_window(current_aww());
+                            ED4_request_full_refresh();
                             cursor_jump = ED4_JUMP_CENTERED;
                             break;

branches/e4fix/EDIT4/ED4_main.cxx

@@ -66 +66 @@
 bool         move_cursor;                           // only needed for editing in consensus
 bool         DRAW;
-bool         last_window_reached;                   // needed for refreshing all windows (if TRUE refresh/...-flags will be cleared)
 
 void ED4_config_change_cb(AW_root *)
@@ -499 +498 @@
     ED4_ROOT->announce_useraction_in(aww);
 }
+static void seq_colors_changed_cb(AW_window *) {
+    ED4_ROOT->request_refresh_for_sequence_terminals();
+}
 
 int ARB_main(int argc, const char *argv[]) {
@@ -562 +564 @@
 
     ED4_ROOT->st_ml = STAT_create_ST_ML(GLOBAL_gb_main);
-    ED4_ROOT->sequence_colors = new AWT_seq_colors(AW_ROOT_DEFAULT, ED4_G_SEQUENCES, (AW_CB)ED4_refresh_window, 0, 0);
+    ED4_ROOT->sequence_colors = new AWT_seq_colors(AW_ROOT_DEFAULT, ED4_G_SEQUENCES, (AW_CB)seq_colors_changed_cb, 0, 0);
 
     ED4_ROOT->edk = new ed_key;

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -936 +936 @@
     AW_device *device = current_device();
 
-    if (flag.hidden) {
-        if (last_window_reached && update_info.refresh) {
-            clear_refresh();
-        }
-    }
-    else if (refresh_all || update_info.refresh) {
+    if (!flag.hidden && (refresh_all || update_info.refresh)) {
         const AW_screen_area& area_rect = device->get_area_size();
 
@@ -959 +954 @@
         int x1, y1, x2, y2;
         ED4_window& win = *current_ed4w();
-        int old_last_window_reached = last_window_reached;
-
-        last_window_reached = 0;
         x1 = area_rect.l;
         for (const ED4_folding_line *flv = win.get_vertical_folding(); ; flv = flv->get_next()) {
-            int lastColumn = 0;
-
             if (flv) {
                 x2 = int(flv->get_pos()); // @@@ use AW_INT ? 
-                if (!flv->get_next() && x2==area_rect.r) {
-                    lastColumn = 1;
-                }
             }
             else {
                 x2 = area_rect.r;
-                lastColumn = 1;
-                if (x1==x2) {
-                    break; // do not draw last range, if it's only 1 pixel width
-                }
+                if (x1==x2) break; // do not draw last range, if it's only 1 pixel width
             }
 
             y1 = area_rect.t;
             for (const ED4_folding_line *flh = win.get_horizontal_folding(); ; flh = flh->get_next()) {
-                int lastRow = 0;
-
                 if (flh) {
                     y2 = int(flh->get_pos()); // @@@ use AW_INT ? 
-                    if (!flh->get_next() && y2==area_rect.b) {
-                        lastRow = 1;
-                    }
                 }
                 else {
                     y2 = area_rect.b;
-                    lastRow = 1;
-                    if (y1==y2) {
-                        break; // do not draw last range, if it's only 1 pixel high
-                    }
-                }
-
-                if (lastRow && lastColumn) {
-                    last_window_reached = old_last_window_reached;
+                    if (y1==y2) break; // do not draw last range, if it's only 1 pixel high
                 }
 
@@ -1007 +979 @@
                 }
                 device->pop_clip_scale();
-
-                if (last_window_reached) {
-                    update_info.set_refresh(0);
-                    update_info.set_clear_at_refresh(0);
-                }
 
                 if (!flh) break; // break out after drawing lowest range
@@ -1059 +1026 @@
 #endif
 
-    if (flag.hidden) {
-        if (last_window_reached && update_info.refresh) {
-            clear_refresh();
-        }
-    }
     if (!flag.hidden && (refresh_all || update_info.refresh)) {
         if (update_info.clear_at_refresh && !is_cleared) {
@@ -1183 +1145 @@
                 }
             }
-
-            if (last_window_reached) {
-                if (!flags_cleared && child->is_manager() && child->update_info.refresh) {
-                    // if we didn't show a manager we must clear its children's refresh flags
-                    child->to_manager()->clear_refresh();
-                }
-                else {
-                    child->update_info.set_refresh(0);
-                    child->update_info.set_clear_at_refresh(0);
-                }
-            }
         }
     }
@@ -1222 +1173 @@
 
     update_info.set_refresh(0);
+    update_info.set_clear_at_refresh(0);
 
     return ED4_R_OK;

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -144 +144 @@
 
     current_device()->reset();
-    ED4_ROOT->refresh_window(1);
+    ED4_ROOT->special_window_refresh();
 
     GB_pop_transaction(GLOBAL_gb_main);
@@ -851 +851 @@
 }
 
-void ED4_refresh_window(AW_window *aww) {
-    ED4_main_manager *mainman = ED4_ROOT->main_manager;
-    if (mainman) { // during startup we have no mainman
-        GB_transaction      ta(GLOBAL_gb_main);
-        ED4_LocalWinContext uses(aww);
-
-        if (mainman->update_info.delete_requested) {
-            mainman->delete_requested_children();
-        }
-
-        mainman->update_info.set_clear_at_refresh(1);
-        mainman->Show(1);
-    }
-}
+void ED4_request_full_refresh() { ED4_ROOT->main_manager->request_refresh(); }
 
 void ED4_set_reference_species(AW_window *aww, AW_CL disable, AW_CL ) {
@@ -908 +895 @@
     }
 
-    ED4_refresh_window(aww);
+    ED4_ROOT->request_refresh_for_sequence_terminals();
 }
 

branches/e4fix/EDIT4/ED4_root.cxx

@@ -90 +90 @@
 
 ED4_returncode ED4_root::refresh_window_simple(bool redraw) {
-    e4_assert(!main_manager->update_info.delete_requested);
-    e4_assert(!main_manager->update_info.update_requested);
-    e4_assert(!main_manager->update_info.resize);
-
+    // if 'redraw' -> update everything (ignoring refresh flag)
     int refresh_all = 0;
     if (redraw) {
@@ -100 +97 @@
     }
     main_manager->Show(refresh_all, 0);
+    if (redraw) {
+        main_manager->update_info.set_clear_at_refresh(0);
+    }
     return (ED4_R_OK);
 }
@@ -118 +118 @@
         redraw = true;
     }
-}
-
-ED4_returncode ED4_root::refresh_window(bool redraw) {
+
+    // make sure all update request have been handled:
+    e4_assert(!main_manager->update_info.delete_requested);
+    e4_assert(!main_manager->update_info.update_requested);
+    e4_assert(!main_manager->update_info.resize);
+}
+
+ED4_returncode ED4_root::special_window_refresh() {
     // this function should only be used for window specific updates (i.e. cursor placement)
-    handle_update_requests(redraw); // @@@ problematic (causes refresh w/o win-context, clears flags w/o handling all windows)
+    bool redraw = true; 
+    handle_update_requests(redraw); // @@@ problematic (causes refresh w/o win-context)
     return refresh_window_simple(redraw);
+    // do NOT clear_refresh_requests here!! this is no full refresh!
 }
 
 ED4_returncode ED4_root::refresh_all_windows(bool redraw) {
+    // if 'redraw' -> update everything (ignoring refresh flag)
     GB_transaction dummy(GLOBAL_gb_main);
-    last_window_reached = 0;
 
     handle_update_requests(redraw);
@@ -134 +141 @@
     ED4_window *window = first_window;
     while (window) {
-        if (!window->next) last_window_reached = 1;
         ED4_LocalWinContext uses(window);
         refresh_window_simple(redraw);
@@ -140 +146 @@
     }
 
+    if (main_manager->update_info.refresh) main_manager->clear_refresh();
+
     return (ED4_R_OK);
 }
-
 
 void ED4_foldable::win_to_world_coords(AW_pos *xPtr, AW_pos *yPtr) {
@@ -827 +834 @@
 
 
-void ED4_reload_helix_cb(AW_window *aww) {
+static void reload_helix_cb() { 
     const char *err = ED4_ROOT->helix->init(GLOBAL_gb_main);
     if (err) aw_message(err);
-    ED4_refresh_window(aww);
-}
-
-
-void ED4_reload_ecoli_cb(AW_window *aww) {
+    ED4_request_full_refresh();
+}
+
+
+static void reload_ecoli_cb() {
     const char *err = ED4_ROOT->ecoli_ref->init(GLOBAL_gb_main);
     if (err) aw_message(err);
-    ED4_refresh_window(aww);
+    ED4_request_full_refresh();
 }
 
@@ -1284 +1291 @@
     }
 
-    ED4_refresh_window(aww);
+    ED4_request_full_refresh();
 }
 
@@ -1476 +1483 @@
 
     awmm->create_menu("Edit", "E", AWM_ALL);
-    awmm->insert_menu_topic("refresh",      "Refresh [Ctrl-L]",           "f", 0, AWM_ALL, (AW_CB)ED4_refresh_window,            0, 0);
+    awmm->insert_menu_topic("refresh",      "Refresh [Ctrl-L]",           "f", 0, AWM_ALL, (AW_CB)ED4_request_full_refresh,       0, 0);
     awmm->insert_menu_topic("load_current", "Load current species [GET]", "G", 0, AWM_ALL, ED4_get_and_jump_to_current_from_menu, 0, 0);
-    awmm->insert_menu_topic("load_marked",  "Load marked species",        "m", 0, AWM_ALL, ED4_get_marked_from_menu,             0, 0);
-    SEP________________________SEP;
-    awmm->insert_menu_topic("refresh_ecoli",       "Reload Ecoli sequence",        "E", "ecoliref.hlp", AWM_ALL, (AW_CB)ED4_reload_ecoli_cb, 0, 0);
-    awmm->insert_menu_topic("refresh_helix",       "Reload Helix",                 "H", "helix.hlp",    AWM_ALL, (AW_CB)ED4_reload_helix_cb, 0, 0);
+    awmm->insert_menu_topic("load_marked",  "Load marked species",        "m", 0, AWM_ALL, ED4_get_marked_from_menu,              0, 0);
+    SEP________________________SEP;
+    awmm->insert_menu_topic("refresh_ecoli",       "Reload Ecoli sequence",        "E", "ecoliref.hlp", AWM_ALL, (AW_CB)reload_ecoli_cb, 0, 0);
+    awmm->insert_menu_topic("refresh_helix",       "Reload Helix",                 "H", "helix.hlp",    AWM_ALL, (AW_CB)reload_helix_cb, 0, 0);
     awmm->insert_menu_topic("helix_jump_opposite", "Jump helix opposite [Ctrl-J]", "J", 0,              AWM_ALL, ED4_helix_jump_opposite,    0, 0);
     SEP________________________SEP;
@@ -1935 +1942 @@
 }
 
-AW_window *ED4_root::create_new_window()                            // only the first time, other cases: generate_window
-{
+AW_window *ED4_root::create_new_window() {
+    // only the first window, other windows are generated by generate_window
     AW_device  *device     = NULL;
     ED4_window *new_window = NULL;
@@ -1946 +1953 @@
     ED4_calc_terminal_extentions();
 
-    last_window_reached     = 1;
     DRAW                    = 1;
     move_cursor             = 0;
@@ -1953 +1959 @@
     ED4_init_notFoundMessage();
 
-    return (new_window->aww);
+    return new_window->aww;
 }
 

branches/e4fix/EDIT4/ED4_text_terminals.cxx

@@ -611 +611 @@
     current_device()->pop_clip_scale();
 
+    // @@@ only request refresh of cursor and draw it at end of window-refresh ? might fix missing parts of cursor
+    // maybe do this check at top-level 
     ED4_cursor *cursor = &current_cursor();
     if (this == cursor->owner_of_cursor) {

branches/e4fix/EDIT4/ed4_class.hxx

@@ -610 +610 @@
 };
 
-extern int ED4_update_global_cursor_awars_allowed;
+extern bool ED4_update_global_cursor_awars_allowed; // update selected species/SAI/cursor position
 
 struct ED4_TerminalPredicate {
@@ -1523 +1523 @@
     ED4_returncode resize_all();
 
-    ED4_returncode refresh_window(bool redraw);
+    ED4_returncode special_window_refresh();
     ED4_returncode refresh_all_windows(bool redraw);
 
@@ -2223 +2223 @@
 
 void        ED4_quit_editor         (AW_window *aww, AW_CL cd1, AW_CL cd2);                 // Be Careful: Is this the last window?
-void        ED4_refresh_window      (AW_window *aww);
+void        ED4_request_full_refresh();
 
 void        ED4_store_curpos        (AW_window *aww, AW_CL cd1, AW_CL cd2);

branches/e4fix/EDIT4/ed4_defs.hxx

@@ -52 +52 @@
 extern bool         move_cursor;                    // only needed for editing in consensus
 extern bool         DRAW;
-extern bool         last_window_reached;            // only needed for refreshing all windows
 
 // globally used defines and flags