Changeset f91767d for window.c

Timestamp:

Jun 2, 2010, 9:41:22 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

d15ea5f

Parents:

678a505c

Message:

untouchwin any subwin before interacting with it

subwins maintain dirtiness information that is useless. It messes up the
wnoutrefresh when setting the cursor. Also, make the wsyncup more
direct.

I think there is still a cursor bug with begy/begx and subwins and
mvderwin, but that can be fixed later.

File:

• window.c (modified) (4 diffs)

window.c

@@ -42 +42 @@
 static void _owl_window_unrealize(owl_window *w);
 
-static void _owl_window_redraw_cleanup(owl_window *w, WINDOW *win);
-
 static owl_window *cursor_owner;
 
@@ -56 +54 @@
   gobject_class->finalize = owl_window_finalize;
 
-  klass->redraw = _owl_window_redraw_cleanup;
+  klass->redraw = NULL;
   klass->resized = NULL;
 
@@ -362 +360 @@
   if (!w->dirty) return;
   if (w->win) {
+    if (!owl_window_is_toplevel(w)) {
+      /* If a subwin, we might have gotten random touched lines from wsyncup or
+       * past drawing. That information is useless, so we discard it all */
+      untouchwin(w->win);
+    }
     g_signal_emit(w, window_signals[REDRAW], 0, w->win);
+    wsyncup(w->win);
   }
   w->dirty = 0;
@@ -383 +387 @@
   _owl_window_redraw_subtree(owl_window_get_screen());
   update_panels();
-  if (cursor_owner && cursor_owner->win)
+  if (cursor_owner && cursor_owner->win) {
+    /* untouch it to avoid drawing; window should be clean now, but we must
+     * clean up in case there was junk left over on a subwin (cleaning up after
+     * subwin drawing isn't sufficient because a wsyncup messes up subwin
+     * ancestors */
+    untouchwin(cursor_owner->win);
     wnoutrefresh(cursor_owner->win);
-}
-
-static void _owl_window_redraw_cleanup(owl_window *w, WINDOW *win)
-{
-  wsyncup(win);
+  }
 }