Changeset 8334 for branches

Timestamp:

20/01/12 14:37:13 (4 months ago)

Author:

westram

Message:

• DRYed test for hidden terminals

Location:

branches/e4fix/EDIT4

Files:

• ED4_cursor.cxx (modified) (3 diffs)
• ed4_class.hxx (modified) (3 diffs)

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) {
-        temp_parent = temp_parent->parent;
-        if (temp_parent->flag.hidden) return; // don't move cursor if terminal is flag.hidden
-    }
+    if (owner_of_cursor->is_hidden()) return; // do not jump if cursor terminal is hidden
 
     AW_pos terminal_x, terminal_y;
@@ -1149 +1144 @@
     // move cursor up down
     ED4_cursor_move dir     = ED4_C_NONE;
-    ED4_returncode result   = ED4_R_OK;
+    ED4_returncode  result  = ED4_R_OK;
     bool            endHome = false;
 
@@ -1161 +1156 @@
 
     if (dir != ED4_C_NONE) {
-        // don't move cursor if terminal is hidden
-        {
-            ED4_base *temp_parent = owner_of_cursor->parent;
-            while (temp_parent->parent && result == ED4_R_OK) {
-                if (temp_parent->flag.hidden) { result = ED4_R_IMPOSSIBLE; }
-                temp_parent = temp_parent->parent;
-            }
-        }
+        if (owner_of_cursor->is_hidden()) result = ED4_R_IMPOSSIBLE; // don't move cursor if terminal is hidden
 
         if (result == ED4_R_OK) {

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1133 +1133 @@
 
     ED4_group_manager  *is_in_folded_group() const;
+    virtual bool is_hidden() const = 0;
+
     char *get_name_of_species();                      // go from terminal to name of species
 
@@ -1319 +1321 @@
     ED4_returncode unhide_children();
 
+    bool is_hidden() const {
+        if (flag.hidden) return true;
+        if (!parent) return false;
+        return parent->is_hidden();
+    }
+
     ED4_manager(const ED4_objspec& spec_, const char *id, AW_pos x, AW_pos y, AW_pos width, AW_pos height, ED4_manager *parent);
     virtual ~ED4_manager();
@@ -1379 +1387 @@
     void scroll_into_view(ED4_window *ed4w);
     inline bool setCursorTo(ED4_cursor *cursor, int seq_pos, bool unfoldGroups, ED4_CursorJumpType jump_type);
+
+    bool is_hidden() const { return parent && parent->is_hidden(); }
 
     ED4_terminal(const ED4_objspec& spec_, GB_CSTR id, AW_pos x, AW_pos y, AW_pos width, AW_pos height, ED4_manager *parent);