Changeset d15ea5f

Timestamp:

Jun 2, 2010, 10:06:53 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

f041595

Parents:

f91767d

Message:

Punt the moving optimization since begx and begy are wrong

File:

• window.c (modified) (4 diffs)

window.c

@@ -415 +415 @@
 void owl_window_move(owl_window *w, int begin_y, int begin_x)
 {
+  owl_window_set_position(w, w->nlines, w->ncols, begin_y, begin_x);
+#if 0
+  /* This routine tries to move a window efficiently, but begy and begx are
+   * then wrong. Currently, this only effects the wnoutrefresh to move cursor.
+   * TODO: fix that and reinstate this code if it's worth the trouble */
   if (w->is_screen) return; /* can't move the screen */
   if (w->begin_y == begin_y && w->begin_x == begin_x) return;
@@ -440 +445 @@
     _owl_window_realize(w);
   }
+#endif
 }
 
@@ -449 +455 @@
   }
 
-  if (w->nlines == nlines && w->ncols == ncols) {
-    /* moving is easier */
-    owl_window_move(w, begin_y, begin_x);
-    return;
-  }
-
-  /* window is shown, we must try to have a window at the end */
-  if (w->shown) {
-    /* resizing in ncurses is hard: give up do a unrealize/realize */
-    _owl_window_unrealize(w);
-  }
+  if (w->nlines == nlines && w->ncols == ncols
+      && w->begin_y == begin_y && w->begin_x == begin_x) {
+    return;
+  }
+
+  _owl_window_unrealize(w);
   w->begin_y = begin_y;
   w->begin_x = begin_x;
@@ -466 +467 @@
   g_signal_emit(w, window_signals[RESIZED], 0);
   if (w->shown) {
+    /* ncurses is screwy: give up and recreate windows at the right place */
     _owl_window_realize(w);
   }