Changeset 7a6e6c7 for popwin.c

Timestamp:

Jun 1, 2010, 1:27:14 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

05ca0d8

Parents:

7a70e26

Message:

Use signals for redraw and resize

File:

• popwin.c (modified) (4 diffs)

popwin.c

@@ -11 +11 @@
   pw->border = owl_window_new(NULL);
   pw->content = owl_window_new(pw->border);
-  owl_window_set_redraw_cb(pw->border, owl_popwin_draw_border, pw, 0);
-  owl_window_set_size_cb(pw->border, owl_popwin_size_border, 0, 0);
-  owl_window_set_size_cb(pw->content, owl_popwin_size_content, 0, 0);
+  g_signal_connect(pw->border, "redraw", G_CALLBACK(owl_popwin_draw_border), 0);
+  pw->screen_resize_id = g_signal_connect_object(owl_window_get_screen(), "resized", G_CALLBACK(owl_popwin_size_border), pw->border, 0);
+  g_signal_connect_object(pw->border, "resized", G_CALLBACK(owl_popwin_size_content), pw->content, 0);
+
+  /* bootstrap sizing */
+  owl_popwin_size_border(owl_window_get_screen(), pw->border);
+
   owl_window_show_all(pw->border);
 
@@ -20 +24 @@
 }
 
-void owl_popwin_size_border(owl_window *border, void *user_data)
+void owl_popwin_size_border(owl_window *parent, void *user_data)
 {
   int lines, cols, startline, startcol;
   int glines, gcols;
-  owl_window *parent = owl_window_get_parent(border);
+  owl_window *border = user_data;
 
   owl_window_get_position(parent, &glines, &gcols, 0, 0);
@@ -36 +40 @@
 }
 
-void owl_popwin_size_content(owl_window *content, void *user_data)
+void owl_popwin_size_content(owl_window *parent, void *user_data)
 {
   int lines, cols;
-  owl_window *parent = owl_window_get_parent(content);
+  owl_window *content = user_data;
   owl_window_get_position(parent, &lines, &cols, 0, 0);
   owl_window_set_position(content, lines-2, cols-2, 1, 1);
@@ -68 +72 @@
   g_object_unref(pw->border);
   g_object_unref(pw->content);
+
+  /* See comment on g_signal_connect_object; it only prevents the closure from
+   * being invoked. The signal handler itself still gets leaked. The other
+   * signal is okay, since we delete both at the same time. */
+  if (g_signal_handler_is_connected(owl_window_get_screen(), pw->screen_resize_id))
+      g_signal_handler_disconnect(owl_window_get_screen(), pw->screen_resize_id);
+
   pw->border = 0;
   pw->content = 0;