Changeset 8333

Timestamp:

19/01/12 17:26:19 (4 months ago)

Author:

westram

Message:

• when moving cursor vertically, scroll display if target terminal is only partly visible
• fixed scroll_into_view (was confused about upper/lower bounding box of terminal; compensated part of confusion by doing wrong calculations)
• moved visibility checks from ED4_base to ED4_window
  • removed ED4_D_VERTICAL_ALL (unused hack using size of ED4_base)
  • unique names
• renamed ED4_remap::is_visible -> is_shown

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (3 diffs)
• ED4_cursor.cxx (modified) (4 diffs)
• ED4_edit_string.cxx (modified) (4 diffs)
• ed4_class.hxx (modified) (4 diffs)
• ed4_defs.hxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -212 +212 @@
 // -----------------
 
-bool ED4_base::is_visible(ED4_window *in_ed4w, AW_pos x, AW_pos y, ED4_direction direction) {
-    // return true if position (world coordinates) is visible in_ed4w
-    // (tests only into direction)
-    bool        visible = true;
-    ED4_coords& coords  = in_ed4w->coords;
-
-    switch (direction)
-    {
-        case ED4_D_HORIZONTAL:
-            if ((long(x)<coords.window_left_clip_point) ||
-                (long(x)>coords.window_right_clip_point)) {
-                visible = false;
-            }
-            break;
-        case ED4_D_VERTICAL:
-            if ((long(y)<coords.window_upper_clip_point) ||
-                (long(y)>coords.window_lower_clip_point)) {
-                visible = false;
-            }
-            break;
-        case ED4_D_VERTICAL_ALL: // special case for scrolling (whole object visible)
-            if ((long(y) < coords.window_upper_clip_point) ||
-                (long(y) + extension.size[HEIGHT] > coords.window_lower_clip_point)) {
-                visible = false;
-            }
-            break;
-        case ED4_D_ALL_DIRECTION:
-            if ((long(x) < coords.window_left_clip_point)  ||
-                (long(x) > coords.window_right_clip_point) ||
-                (long(y) < coords.window_upper_clip_point) ||
-                (long(y) > coords.window_lower_clip_point)) {
-                visible = false;
-            }
-            break;
-        default:
-            visible = false;
-            e4_assert(0);
-            break;
-    }
-
-    return visible;
-}
-
-inline bool ranges_overlap(AW_pos p1, AW_pos p2, int r1, int r2) {
+inline bool ranges_overlap(int p1, int p2, int r1, int r2) {
     // return true if ranges p1..p2 and r1..r2 overlap
     e4_assert(p1 <= p2);
@@ -263 +220 @@
 }
 
-bool ED4_base::is_visible(ED4_window *in_ed4w, AW_pos x1, AW_pos y1, AW_pos x2, AW_pos y2, ED4_direction IF_ASSERTION_USED(direction)) {
+inline bool range_contained_in(int p1, int p2, int r1, int r2) {
+    // return true if range p1..p2 is contained in range r1..r2
+    e4_assert(p1 <= p2);
+    e4_assert(r1 <= r2);
+
+    return p1 >= r1 && p2 <= r2;
+}
+
+bool ED4_window::partly_shows(int x1, int y1, int x2, int y2) const {
     // return true if rectangle x1/y1/x2/y2 overlaps with clipped screen
-    e4_assert(direction == ED4_D_ALL_DIRECTION);
     e4_assert(x1 <= x2);
     e4_assert(y1 <= y2);
 
-    ED4_coords& coords  = in_ed4w->coords;
-
     bool visible = (ranges_overlap(x1, x2, coords.window_left_clip_point, coords.window_right_clip_point) &&
                     ranges_overlap(y1, y2, coords.window_upper_clip_point, coords.window_lower_clip_point));
@@ -277 +239 @@
 }
 
+bool ED4_window::completely_shows(int x1, int y1, int x2, int y2) const {
+    // return true if rectangle x1/y1/x2/y2 is contained in clipped screen
+    e4_assert(x1 <= x2);
+    e4_assert(y1 <= y2);
+
+    bool visible = (range_contained_in(x1, x2, coords.window_left_clip_point, coords.window_right_clip_point) &&
+                    range_contained_in(y1, y2, coords.window_upper_clip_point, coords.window_lower_clip_point));
+
+    return visible;
+}
 
 char *ED4_base::resolve_pointer_to_string_copy(int *) const { return NULL; }

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -955 +955 @@
     }
 
+    // @@@ move parts of the following section into function is_hidden_by_parent()
     ED4_base *temp_parent = owner_of_cursor;
     while (temp_parent->parent) {
@@ -1282 +1283 @@
 
     switch (owner_of_cursor->get_area_level(0)) {
-        case ED4_A_TOP_AREA: {
-            visible = 
-                owner_of_cursor->is_visible(win, x1, 0, ED4_D_HORIZONTAL) ||
-                owner_of_cursor->is_visible(win, x2, 0, ED4_D_HORIZONTAL);
-            break;
-        }
-        case ED4_A_MIDDLE_AREA:
-            visible = owner_of_cursor->is_visible(window(), x1, y1, x2, y2, ED4_D_ALL_DIRECTION);
-            break;
-        default:
-            break;
+        case ED4_A_TOP_AREA:    visible = win->shows_xpos(x1) || win->shows_xpos(x2); break;
+        case ED4_A_MIDDLE_AREA: visible = win->partly_shows(x1, y1, x2, y2); break;
+        default: break;
     }
 
     return visible;
 }
+
+bool ED4_cursor::is_completely_visible() const {
+    e4_assert(owner_of_cursor);
+    e4_assert(cursor_shape); // cursor is not drawn, cannot test visibility
+
+    AW_pos x, y;
+    owner_of_cursor->calc_world_coords(&x, &y);
+
+    int x1, y1, x2, y2;
+    cursor_shape->get_bounding_box(cursor_abs_x, int(y), x1, y1, x2, y2);
+
+    bool visible = false;
+
+    switch (owner_of_cursor->get_area_level(0)) {
+        case ED4_A_TOP_AREA:    visible = win->shows_xpos(x1) && win->shows_xpos(x2); break;
+        case ED4_A_MIDDLE_AREA: visible = win->completely_shows(x1, y1, x2, y2); break;
+        default: break;
+    }
+
+    return visible;
+}
+
+#if defined(DEBUG) && 0
+#define DUMP_SCROLL_INTO_VIEW
+#endif
 
 void ED4_terminal::scroll_into_view(ED4_window *ed4w) { // scroll y-position only
@@ -1312 +1330 @@
     int slider_pos_y;
 
-    AW_pos termw_y_upper = termw_y - term_height; // upper border of terminal
+    AW_pos termw_y_upper = termw_y; // upper border of terminal
+    AW_pos termw_y_lower = termw_y + term_height; // lower border of terminal
 
     if (termw_y_upper > coords->top_area_height) { // don't scroll if terminal is in top area (always visible)
         if (termw_y_upper < coords->window_upper_clip_point) {
-#if defined(DEBUG) && 0
-            printf("termw_y(%i)-term_height(%i) < window_upper_clip_point(%i)\n",
-                   int(termw_y), term_height, int(coords->window_upper_clip_point));
+#ifdef DUMP_SCROLL_INTO_VIEW
+            printf("termw_y_upper(%i) < window_upper_clip_point(%i)\n",
+                   int(termw_y_upper), int(coords->window_upper_clip_point));
 #endif // DEBUG
-            slider_pos_y = int(termw_y - coords->top_area_height - term_height);
+            slider_pos_y = int(termw_y_upper - coords->top_area_height - term_height);
             scroll       = true;
         }
-        else if (termw_y > coords->window_lower_clip_point) {
-#if defined(DEBUG) && 0
-            printf("termw_y(%i) > window_lower_clip_point(%i)\n",
-                   int(termw_y), int(coords->window_lower_clip_point));
+        else if (termw_y_lower > coords->window_lower_clip_point) {
+#ifdef DUMP_SCROLL_INTO_VIEW
+            printf("termw_y_lower(%i) > window_lower_clip_point(%i)\n",
+                   int(termw_y_lower), int(coords->window_lower_clip_point));
 #endif // DEBUG
-            slider_pos_y = int(termw_y - coords->top_area_height - win_ysize);
+            slider_pos_y = int(termw_y_upper - coords->top_area_height - win_ysize);
             scroll       = true;
         }
     }
 
-#if defined(DEBUG) && 0
+#ifdef DUMP_SCROLL_INTO_VIEW
     if (!scroll) {
-        printf("No scroll needed (termw_y=%i termw_y_upper=%i term_height=%i window_upper_clip_point=%i window_lower_clip_point=%i)\n",
-               int(termw_y), int(termw_y_upper), term_height,
+        printf("No scroll needed (termw_y_upper=%i termw_y_lower=%i term_height=%i window_upper_clip_point=%i window_lower_clip_point=%i)\n",
+               int(termw_y_upper), int(termw_y_lower), term_height,
                int(coords->window_upper_clip_point), int(coords->window_lower_clip_point));
     }
@@ -1371 +1390 @@
         show_cursor_at(terminal, scr_pos);
 
-        if (!is_partly_visible()) {
+        if (!is_completely_visible()) {
             jump_sequence_pos(seq_pos, jump_type);
         }

branches/e4fix/EDIT4/ED4_edit_string.cxx

@@ -294 +294 @@
     if (direction < 0) position--;
     for (pos = position; pos>=0 && pos < seq_len; pos += direction) {
-        if (!ADPP_IS_ALIGN_CHARACTER(seq[pos]) && remap->is_visible(pos)) {
+        if (!ADPP_IS_ALIGN_CHARACTER(seq[pos]) && remap->is_shown(pos)) {
             break;
         }
@@ -305 +305 @@
     if (direction < 0) position--;
     for (pos = position; pos >= 0 && pos < seq_len; pos += direction) {
-        if (ADPP_IS_ALIGN_CHARACTER(seq[pos]) && remap->is_visible(pos)) {
+        if (ADPP_IS_ALIGN_CHARACTER(seq[pos]) && remap->is_shown(pos)) {
             break;
         }
@@ -317 +317 @@
     if (direction < 0) position--;
     for (pos = position; pos >= 0 && pos < seq_len; pos += direction) {
-        if (remap->is_visible(pos)) {
+        if (remap->is_shown(pos)) {
             break;
         }
@@ -414 +414 @@
                                 seq_pos += direction;
                             }
-                            while (legal_curpos(seq_pos) && !remap->is_visible(seq_pos));
+                            while (legal_curpos(seq_pos) && !remap->is_shown(seq_pos));
                         }
                         break;

branches/e4fix/EDIT4/ed4_class.hxx

@@ -647 +647 @@
 
     bool is_partly_visible() const;
+    bool is_completely_visible() const;
 
     void changeType(ED4_CursorType typ);
@@ -731 +732 @@
     ED4_returncode      set_scrolled_rectangle(ED4_base *x_link, ED4_base *y_link, ED4_base *width_link, ED4_base *height_link);
 
+    bool shows_xpos(int x) const { return x >= coords.window_left_clip_point && x <= coords.window_right_clip_point; }
+    bool partly_shows(int x1, int y1, int x2, int y2) const;
+    bool completely_shows(int x1, int y1, int x2, int y2) const;
+    
     void update_window_coords();
 
@@ -1062 +1067 @@
 
     ED4_returncode  clear_background(int color=0);
-
-    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);
 
     // functions concerned with links in the hierarchy
@@ -1753 +1755 @@
     int was_changed() const { return changed; }     // mapping changed by last compile ?
 
-    int is_visible(int position) const { return sequence_to_screen(position)>=0; }
+    int is_shown(int position) const { return sequence_to_screen(position)>=0; }
 
     ExplicitRange clip_screen_range(PosRange screen_range) const { return ExplicitRange(screen_range, screen_len-1); }

branches/e4fix/EDIT4/ed4_defs.hxx

@@ -236 +236 @@
     ED4_D_HORIZONTAL,
     ED4_D_ALL_DIRECTION,
-    ED4_D_VERTICAL_ALL
 };