Changeset b928b3a

Timestamp:

Mar 2, 2010, 9:14:44 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

8099357

Parents:

8ae2de9

git-author:

David Benjamin <davidben@mit.edu> (10/30/09 14:26:12)

git-committer:

David Benjamin <davidben@mit.edu> (03/02/10 21:14:44)

Message:

Remove popwin special-casing

Finally, we can have our cake! Now that libpanel takes care of stacking,
we can get rid of a lot of the painting logic that has to think about
and special-case window order.

Here's the first of the lobotomies.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• functions.c (modified) (2 diffs)
• global.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• popexec.c (modified) (1 diff)

functions.c

@@ -215 +215 @@
   /* redisplay etc. */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
-    owl_popwin_refresh(owl_global_get_popwin(&g));
-  }
   update_panels();
   owl_global_set_needrefresh(&g);
@@ -1268 +1265 @@
   update_panels();
 
-  if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
-    owl_popwin_refresh(owl_global_get_popwin(&g));
-  }
-  
   sepbar("");
   owl_function_makemsg("");

global.c

@@ -537 +537 @@
   owl_function_full_redisplay();
 
-  /* TODO: this should handle other forms of popwins */
-  if (owl_popwin_is_active(owl_global_get_popwin(g)) 
-      && owl_global_get_viewwin(g)) {
-    owl_popwin_refresh(owl_global_get_popwin(g));
-    owl_viewwin_redisplay(owl_global_get_viewwin(g), 0);
-  }
-
   owl_function_debugmsg("New size is %i lines, %i cols.", size.ws_row, size.ws_col);
   owl_function_makemsg("");

owl.c

@@ -303 +303 @@
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
     sepbar(NULL);
-    if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
-      owl_popwin_refresh(owl_global_get_popwin(&g));
-      /* TODO: this is a broken kludge */
-      if (owl_global_get_viewwin(&g)) {
-        owl_viewwin_redisplay(owl_global_get_viewwin(&g), 0);
-      }
-    }
     owl_global_set_needrefresh(&g);
   }
@@ -641 +634 @@
     typwin=owl_global_get_curs_typwin(&g);
 
-    /* if a popwin just came up, refresh it */
-    pw=owl_global_get_popwin(&g);
-    if (owl_popwin_is_active(pw) && owl_popwin_needs_first_refresh(pw)) {
-      owl_popwin_refresh(pw);
-      owl_popwin_no_needs_first_refresh(pw);
-      owl_global_set_needrefresh(&g);
-      /* TODO: this is a broken kludge */
-      if (owl_global_get_viewwin(&g)) {
-        owl_viewwin_redisplay(owl_global_get_viewwin(&g), 0);
-      }
-    }
-
     /* update the terminal if we need to */
     if (owl_global_is_needrefresh(&g)) {

popexec.c

@@ -31 +31 @@
                         owl_popwin_get_lines(pw), owl_popwin_get_cols(pw),
                         "");
-  owl_popwin_refresh(pw);
   owl_viewwin_redisplay(v, 0);
   owl_global_set_needrefresh(&g);