Changeset 03ca005

Timestamp:

Sep 18, 2010, 5:07:39 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:

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.

Files:

• functions.c (modified) (2 diffs)
• global.c (modified) (3 diffs)
• owl.h (modified) (2 diffs)
• popexec.c (modified) (2 diffs)
• popwin.c (modified) (4 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);

global.c

@@ -48 +48 @@
   g->rightshift=0;
 
+  g->pw = NULL;
   g->tw = NULL;
 
@@ -126 +127 @@
   /* Create the widgets */
   owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
-  owl_popwin_init(&(g->pw));
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
   owl_sepbar_init(g->mainpanel.sepwin);
@@ -255 +255 @@
 
 owl_popwin *owl_global_get_popwin(owl_global *g) {
-  return(&(g->pw));
+  return g->pw;
+}
+
+void owl_global_set_popwin(owl_global *g, owl_popwin *pw) {
+  g->pw = pw;
 }
 

owl.h

@@ -410 +410 @@
   gulong sig_redraw_id;
   gulong sig_resize_id;
-  int active;
 } owl_popwin;
   
@@ -563 +562 @@
 typedef struct _owl_global {
   owl_mainwin mw;
-  owl_popwin pw;
+  owl_popwin *pw;
   owl_msgwin msgwin;
   owl_history cmdhist;          /* command history */

popexec.c

@@ -17 +17 @@
   pid_t pid;
 
+  if (owl_global_get_popwin(&g)) {
+    owl_function_error("Popwin already in use.");
+    return NULL;
+  }
+
   pe = owl_malloc(sizeof(owl_popexec));
   if (!pe) return NULL;
@@ -23 +28 @@
   pe->refcount=0;
 
-  pw=owl_global_get_popwin(&g);
   pe->vwin=v=owl_global_get_viewwin(&g);
+  pw = owl_popwin_new();
+  owl_global_set_popwin(&g, pw);
+  owl_popwin_up(pw);
 
-  if (owl_popwin_up(pw) != 0) {
-    owl_function_error("Popwin already in use.");
-    return NULL;
-  }
   owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL);
   owl_viewwin_init_text(v, owl_popwin_get_content(pw), "");

popwin.c

@@ -1 +1 @@
 #include "owl.h"
 
-int owl_popwin_init(owl_popwin *pw)
+owl_popwin *owl_popwin_new(void)
 {
-  pw->active=0;
-  return(0);
-}
+  owl_popwin *pw = owl_malloc(sizeof(owl_popwin));
+  memset(pw, 0, sizeof(*pw));
 
-int owl_popwin_up(owl_popwin *pw)
-{
-  if (pw->active)
-    return 1;
   pw->border = owl_window_new(NULL);
   pw->content = owl_window_new(pw->border);
@@ -23 +18 @@
   owl_popwin_size_border(owl_window_get_screen(), pw->border);
 
-  owl_window_show_all(pw->border);
+  owl_window_show(pw->content);
 
-  pw->active=1;
-  return(0);
+  return pw;
+}
+
+int owl_popwin_up(owl_popwin *pw)
+{
+  if (owl_window_is_shown(pw->border))
+    return 1;
+  owl_window_show(pw->border);
+  return 0;
 }
 
@@ -74 +76 @@
 int owl_popwin_close(owl_popwin *pw)
 {
-  if (!pw->active)
+  if (!owl_window_is_shown(pw->border))
     return 1;
+  owl_window_hide(pw->border);
+  return 0;
+}
+
+void owl_popwin_delete(owl_popwin *pw)
+{
+  owl_popwin_close(pw);
+
+  /* Remove everything that references us. */
   g_signal_handler_disconnect(pw->border, pw->sig_resize_id);
   g_signal_handler_disconnect(pw->border, pw->sig_redraw_id);
@@ -82 +93 @@
   g_object_unref(pw->content);
 
-  pw->border = 0;
-  pw->content = 0;
-  pw->active=0;
-  return(0);
+  owl_free(pw);
 }
 
 int owl_popwin_is_active(const owl_popwin *pw)
 {
-  return pw->active;
+  return owl_window_is_shown(pw->border);
 }