Changeset 053f751

Timestamp:

Jun 1, 2010, 12:25:28 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

e00355d

Parents:

4751077a

git-author:

David Benjamin <davidben@mit.edu> (06/01/10 00:24:15)

git-committer:

David Benjamin <davidben@mit.edu> (06/01/10 00:25:28)

Message:

For prototyping, use a GObject-backed owl_window

It gives us many signals and refcounting conveniences. This first
iteration doesn't use any of these features but gets it barely working
quickly.

Files:

• owl.c (modified) (1 diff)
• popwin.c (modified) (1 diff)
• window.c (modified) (8 diffs)
• window.h (modified) (2 diffs)

owl.c

@@ -502 +502 @@
   setlocale(LC_ALL, "");
 
+  g_type_init ();
+
   memset(&opts, 0, sizeof opts);
   opts.load_initial_subs = 1;

popwin.c

@@ -66 +66 @@
 {
   owl_window_unlink(pw->border);
-  owl_window_delete(pw->border);
+  g_object_unref(pw->border);
+  g_object_unref(pw->content);
   pw->border = 0;
   pw->content = 0;

window.c

@@ -4 +4 @@
 
 struct _owl_window { /*noproto*/
+  GObject object;
   /* hierarchy information */
   owl_window *parent;
@@ -32 +33 @@
 };
 
+static void owl_window_dispose(GObject *gobject);
+static void owl_window_finalize(GObject *gobject);
+
 static owl_window *_owl_window_new(owl_window *parent, int nlines, int ncols, int begin_y, int begin_x);
 
@@ -41 +45 @@
 static void _owl_window_realize(owl_window *w);
 static void _owl_window_unrealize(owl_window *w);
+
+G_DEFINE_TYPE (OwlWindow, owl_window, G_TYPE_OBJECT)
+
+static void owl_window_class_init (OwlWindowClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = owl_window_dispose;
+  object_class->finalize = owl_window_finalize;
+}
+
+static void owl_window_dispose (GObject *object)
+{
+  owl_window *w = OWL_WINDOW (object);
+
+  /* Unmap the window */
+  owl_window_hide (w);
+
+  /* Unlink and unref all children */
+  while (w->child) {
+    owl_window *child = w->child;
+    owl_window_unlink (child);
+  }
+
+  /* Clear all cbs */
+  owl_window_set_redraw_cb (w, 0, 0, 0);
+  owl_window_set_size_cb (w, 0, 0, 0);
+  owl_window_set_destroy_cb (w, 0, 0, 0);
+
+  /* Remove from hierarchy */
+  owl_window_unlink (w);
+
+  G_OBJECT_CLASS (owl_window_parent_class)->dispose (object);
+}
+
+static void owl_window_finalize (GObject *object)
+{
+  owl_window *w = OWL_WINDOW(object);
+
+  if (w->pan) {
+    del_panel(w->pan);
+    w->pan = NULL;
+  }
+
+  G_OBJECT_CLASS (owl_window_parent_class)->finalize (object);
+}
+
+static void owl_window_init (owl_window *w)
+{
+}
 
 /** singletons **/
@@ -90 +144 @@
   owl_window *w;
 
-  w = owl_malloc(sizeof(owl_window));
-  memset(w, 0, sizeof(*w));
+  w = g_object_new (OWL_TYPE_WINDOW, NULL);
+  if (w == NULL) g_error("Failed to create owl_window instance");
 
   w->nlines = nlines;
@@ -105 +159 @@
 
   return w;
-}
-
-void owl_window_delete(owl_window *w)
-{
-  /* destroy all children */
-  owl_window_children_foreach_onearg(w, owl_window_delete);
-
-  /* notify everyone of your imminent demise */
-  if (w->destroy_cb)
-    w->destroy_cb(w, w->destroy_cbdata);
-
-  /* clear all cbs */
-  owl_window_set_redraw_cb(w, 0, 0, 0);
-  owl_window_set_size_cb(w, 0, 0, 0);
-  owl_window_set_destroy_cb(w, 0, 0, 0);
-
-  /* destroy curses structures */
-  owl_window_unmap(w);
-  if (w->pan) {
-    del_panel(w->pan);
-  }
-
-  /* remove from hierarchy */
-  _owl_window_unlink(w);
-  owl_free(w);
 }
 
@@ -193 +222 @@
       w->parent->child = w->next;
     w->parent = NULL;
+    g_object_unref (w);
   }
 }
@@ -206 +236 @@
     w->next = parent->child;
     parent->child = w;
+    g_object_ref (w);
   }
 }
@@ -222 +253 @@
 void owl_window_children_foreach_onearg(owl_window *parent, void (*func)(owl_window*))
 {
-  owl_window *w;
-  for (w = parent->child;
-       w != NULL;
-       w = w->next) {
-    func(w);
-  }
+  owl_window_children_foreach(parent, (GFunc)func, NULL);
 }
 

window.h

@@ -3 +3 @@
 
 #include <glib.h>
+#include <glib-object.h>
 
-typedef struct _owl_window owl_window;
+G_BEGIN_DECLS
+
+#define OWL_TYPE_WINDOW                  (owl_window_get_type ())
+#define OWL_WINDOW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), OWL_TYPE_WINDOW, OwlWindow))
+#define OWL_IS_WINDOW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OWL_TYPE_WINDOW))
+#define OWL_WINDOW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), OWL_TYPE_WINDOW, OwlWindowClass))
+#define OWL_IS_WINDOW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), OWL_TYPE_WINDOW))
+#define OWL_WINDOW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), OWL_TYPE_WINDOW, OwlWindowClass))
+
+typedef struct _owl_window OwlWindow;
+typedef struct _OwlWindowClass OwlWindowClass;
+typedef OwlWindow owl_window; /* meh */
+
+struct _OwlWindowClass
+{
+  GObjectClass parent_class;
+};
+
+GType owl_window_get_type(void);
 
 owl_window *owl_window_get_screen(void);
 
 owl_window *owl_window_new(owl_window *parent);
-void owl_window_delete(owl_window *w);
 void owl_window_unlink(owl_window *w);
 
@@ -43 +61 @@
 void owl_window_erase_cb(owl_window *w, WINDOW *win, void *user_data);
 
+G_END_DECLS
+
 #endif /* __BARNOWL_WINDOW_H__ */