Changeset 8295 for branches

Timestamp:

10/12/11 13:58:51 (6 months ago)

Author:

westram

Message:

• fixed ED4_compression_changed_cb
  • now updates all windows when compression changes
• made several functions context independent (as needed by above change)
  • ED4_calc_terminal_extentions uses any device (that of first window)
  • ED4_expose_recalculations no longer does update_scrolled_rectangle (now performed by caller; caller knows the context)
  • always use own context in
    • ED4_window::update_scrolled_rectangle
    • ED4_cursor::draw_cursor, ED4_cursor::get_screen_relative_pos

Location:

branches/e4fix

Files:

• EDIT4/ED4_cursor.cxx (modified) (2 diffs)
• EDIT4/ED4_no_class.cxx (modified) (5 diffs)
• EDIT4/ED4_window.cxx (modified) (1 diff)
• EDIT4/ed4_class.hxx (modified) (1 diff)
• WINDOW/aw_device.hxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -279 +279 @@
                                        !awar_edit_direction);
 
-    cursor_shape->draw(current_device(), int(x), int(y));
+    cursor_shape->draw(window()->get_device(), int(x), int(y));
 
 #if defined(DEBUG) && 0
@@ -927 +927 @@
 }
 
-int ED4_cursor::get_screen_relative_pos() {
-    ED4_coords *coords = &current_ed4w()->coords;
-    return cursor_abs_x - coords->window_left_clip_point;
+int ED4_cursor::get_screen_relative_pos() const {
+    const ED4_coords& coords = window()->coords;
+    return cursor_abs_x - coords.window_left_clip_point;
 }
 void ED4_cursor::set_screen_relative_pos(int scroll_to_relpos) {

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -35 +35 @@
 #include <limits.h>
 
+#include <vector>
+
+using namespace std;
 
 void ED4_calc_terminal_extentions() {
-    AW_device *device = current_device();
+    AW_device *device = ED4_ROOT->first_window->get_device(); // any device
 
     const AW_font_limits& seq_font_limits  = device->get_font_limits(ED4_G_SEQUENCES, 0);
@@ -121 +124 @@
         screenwidth = new_screenwidth;
     }
-
-    current_ed4w()->update_scrolled_rectangle(); // @@@ do for all windows ?
 }
 
@@ -137 +138 @@
     else {
         ED4_expose_recalculations(); // this case is needed every time, except the first
+        current_ed4w()->update_scrolled_rectangle();
     }
 
@@ -1421 +1423 @@
 }
 
+struct cursorpos {
+    ED4_cursor& cursor;
+    int screen_rel;
+    int seq;
+
+    cursorpos(ED4_window *win)
+        : cursor(win->cursor),
+          screen_rel(cursor.get_screen_relative_pos()),
+          seq(cursor.get_sequence_pos())
+    {}
+    cursorpos(const cursorpos& other)
+        : cursor(other.cursor),
+          screen_rel(other.screen_rel),
+          seq(other.seq)
+    {}
+    DECLARE_ASSIGNMENT_OPERATOR(cursorpos);
+};
+
+
 void ED4_compression_changed_cb(AW_root *awr) {
     ED4_remap_mode mode    = (ED4_remap_mode)awr->awar(ED4_AWAR_COMPRESS_SEQUENCE_TYPE)->read_int();
@@ -1427 +1448 @@
 
     if (ED4_ROOT->root_group_man) {
-        ED4_cursor& cursor  = current_cursor(); // @@@ should be done for all windows (all cursors)
-        int         rel_pos = cursor.get_screen_relative_pos();
-        int         seq_pos = cursor.get_sequence_pos();
-
-        AW_window *aww    = current_aww();
-        AW_device *device = current_device();
-
-        ED4_remap *remap = ED4_ROOT->root_group_man->remap();
-        remap->set_mode(mode, percent);
-
-        device->push_clip_scale();
-        device->set_clipall();     // draw nothing
-
-        ED4_expose_recalculations(); // @@@ do not perform for all windows
-
-        cursor.jump_sequence_pos(seq_pos, ED4_JUMP_KEEP_POSITION);
-        cursor.set_screen_relative_pos(rel_pos);
-
-        ED4_expose_cb(aww, 0, 0); // does pop_clip_scale + refresh
+        vector<cursorpos> pos;
+
+        for (ED4_window *win = ED4_ROOT->first_window; win; win = win->next) {
+            pos.push_back(cursorpos(win));
+            
+            AW_device *device = win->get_device();
+            device->push_clip_scale();
+            device->set_clipall();     // draw nothing
+        }
+
+        ED4_ROOT->root_group_man->remap()->set_mode(mode, percent);
+        ED4_expose_recalculations();
+
+        for (vector<cursorpos>::const_iterator i = pos.begin(); i != pos.end(); ++i) {
+            ED4_cursor&  cursor = const_cast<ED4_cursor&>(i->cursor);
+            ED4_window  *win    = cursor.window();
+
+            win->update_scrolled_rectangle();
+
+            cursor.jump_sequence_pos(i->seq, ED4_JUMP_KEEP_POSITION);
+            cursor.set_screen_relative_pos(i->screen_rel);
+
+            ED4_expose_cb(win->aww, 0, 0); // does pop_clip_scale + refresh
+        }
     }
 }

branches/e4fix/EDIT4/ED4_window.cxx

@@ -158 +158 @@
     }
 
-    const AW_screen_area& area_size = current_device()->get_area_size();
+    const AW_screen_area& area_size = get_device()->get_area_size();
     scrolled_rect.calc_bottomRight_folding_dimensions(area_size.r, area_size.b);
 

branches/e4fix/EDIT4/ed4_class.hxx

@@ -654 +654 @@
     void jump_base_pos(int base_pos, ED4_CursorJumpType jump_type);
 
-    int get_screen_relative_pos();
+    int get_screen_relative_pos() const;
     void set_screen_relative_pos(int scroll_to_relpos);
 

branches/e4fix/WINDOW/aw_device.hxx

@@ -440 +440 @@
     AW_bitset get_filter() const { return filter; }
 
-    void reset();
+    void reset(); // pops all clip_scales
 
     const AW_screen_area& get_area_size() const;