Changeset ab88b05

Timestamp:

Jan 23, 2012, 5:27:42 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

219f52c

Parents:

8135737

git-author:

Jason Gross <jgross@mit.edu> (07/23/11 22:33:17)

git-committer:

Jason Gross <jgross@mit.edu> (01/23/12 17:27:42)

Message:

Allocate the mainwin on the heap

This lets us return NULL from owl_global_get_mainwin before the mainwin
has been initilized.

Since g has static duration, g.mw is automatically initialized to NULL.

Files:

• global.c (modified) (2 diffs)
• mainwin.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

global.c

@@ -109 +109 @@
 
   /* Create the widgets */
-  owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
+  g->mw = owl_mainwin_new(g->mainpanel.recwin);
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
   owl_sepbar_init(g->mainpanel.sepwin);
@@ -241 +241 @@
 /* windows */
 
-owl_mainwin *owl_global_get_mainwin(owl_global *g) {
-  return(&(g->mw));
+owl_mainwin *owl_global_get_mainwin(owl_global *g)
+{
+  return g->mw;
 }
 

mainwin.c

@@ -4 +4 @@
 static void owl_mainwin_resized(owl_window *w, void *user_data);
 
-void owl_mainwin_init(owl_mainwin *mw, owl_window *window)
+CALLER_OWN owl_mainwin *owl_mainwin_new(owl_window *window)
 {
+  owl_mainwin *mw = g_new(owl_mainwin, 1);
   mw->curtruncated=0;
   mw->lastdisplayed=-1;
@@ -16 +17 @@
   /* For now, we do not bother with connecting up dependencies; that'll be a
    * future refactor of the mainwin */
+
+  return mw;
 }
 

owl.h

@@ -533 +533 @@
 
 typedef struct _owl_global {
-  owl_mainwin mw;
+  owl_mainwin *mw;
   owl_popwin *pw;
   owl_msgwin msgwin;