Changeset 03ca005 for popwin.c

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.

File:

• popwin.c (modified) (4 diffs)

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);
 }