Changeset 03ca005 for functions.c

Timestamp:

Sep 18, 2010, 5:07:39 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

61c1f19

Parents:

b3b1b05

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 13:50:19)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:39)

Message:

Create a new owl_popwin every time instead of rewiring the old one

Constantly rewiring things is weird.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -1237 +1237 @@
   owl_viewwin *v;
 
-  pw=owl_global_get_popwin(&g);
   v=owl_global_get_viewwin(&g);
 
-  if (owl_popwin_up(pw) != 0) {
+  if (owl_global_get_popwin(&g)) {
     owl_function_error("Popwin already in use.");
     return;
   }
+  pw = owl_popwin_new();
+  owl_global_set_popwin(&g, pw);
+  owl_popwin_up(pw);
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), text);
@@ -1253 +1255 @@
   owl_viewwin *v;
 
-  pw=owl_global_get_popwin(&g);
   v=owl_global_get_viewwin(&g);
 
-  if (owl_popwin_up(pw) != 0) {
+  if (owl_global_get_popwin(&g)) {
     owl_function_error("Popwin already in use.");
     return;
   }
+  pw = owl_popwin_new();
+  owl_global_set_popwin(&g, pw);
+  owl_popwin_up(pw);
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_fmtext(v, owl_popwin_get_content(pw), fm);