Changeset 9eb38bb for popexec.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:

d574d61

Parents:

8ee712e0

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 14:09:34)

git-committer:

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

Message:

Likewise, don't reuse a global owl_viewwin

This means we don't have to support plugging and unplugging that thing
over and over. We also can almost entirely drop the global owl_viewwin.
Most of the code gets it from the context anyway.

File:

• popexec.c (modified) (2 diffs)

popexec.c

@@ -17 +17 @@
   pid_t pid;
 
-  if (owl_global_get_popwin(&g)) {
+  if (owl_global_get_popwin(&g) || owl_global_get_viewwin(&g)) {
     owl_function_error("Popwin already in use.");
     return NULL;
@@ -28 +28 @@
   pe->refcount=0;
 
-  pe->vwin=v=owl_global_get_viewwin(&g);
   pw = owl_popwin_new();
   owl_global_set_popwin(&g, pw);
   owl_popwin_up(pw);
+  pe->vwin = v = owl_viewwin_new_text(owl_popwin_get_content(pw), "");
+  owl_global_set_viewwin(&g, v);
+  owl_viewwin_set_onclose_hook(v, owl_popexec_viewwin_onclose, pe);
 
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
-  owl_viewwin_init_text(v, owl_popwin_get_content(pw), "");
-  owl_viewwin_set_onclose_hook(v, owl_popexec_viewwin_onclose, pe);
   pe->refcount++;