Changeset 08263a8

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:

9190285

Parents:

cb81570

git-author:

David Benjamin <davidben@mit.edu> (08/07/10 16:31:45)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:39)

Message:

Add owl_editwin_get_window

This removes the need for owl_global_get_typwin_window. The remaining
references within global.c may be accessed directly as its an internal
field anyway.

Files:

• editwin.c (modified) (1 diff)
• functions.c (modified) (4 diffs)
• global.c (modified) (3 diffs)

editwin.c

@@ -177 +177 @@
     owl_window_dirty(e->win);
   }
+}
+
+owl_window *owl_editwin_get_window(owl_editwin *e)
+{
+  return e->win;
 }
 

functions.c

@@ -286 +286 @@
   owl_editwin_set_cbdata(e, data, cleanup);
   owl_editwin_set_callback(e, callback);
-  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_global_get_typwin_window(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_editwin_get_window(e));
 }
 
@@ -1888 +1888 @@
   owl_editwin_insert_string(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_global_get_typwin_window(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_editwin_get_window(tw));
   owl_editwin_set_callback(tw, owl_callback_command);
 }
@@ -1900 +1900 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_editwin_get_window(tw));
   return tw;
 }
@@ -1914 +1914 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_editwin_get_window(tw));
   return tw;
 }

global.c

@@ -282 +282 @@
 }
 
-/* underlying owl_windows */
-
-owl_window *owl_global_get_typwin_window(const owl_global *g) {
-  return g->mainpanel.typwin;
-}
-
-/* typwin */
-
 /* Gets the currently active typwin out of the current context. */
 owl_editwin *owl_global_current_typwin(const owl_global *g) {
@@ -332 +324 @@
 
   if (g->typwin_erase_id) {
-    g_signal_handler_disconnect(owl_global_get_typwin_window(g), g->typwin_erase_id);
+    g_signal_handler_disconnect(g->mainpanel.typwin, g->typwin_erase_id);
     g->typwin_erase_id = 0;
   }
 
-  g->tw = owl_editwin_new(owl_global_get_typwin_window(g),
+  g->tw = owl_editwin_new(g->mainpanel.typwin,
                           owl_global_get_typwin_lines(g),
                           g->cols,
@@ -351 +343 @@
   if (!g->typwin_erase_id) {
     g->typwin_erase_id =
-      g_signal_connect(owl_global_get_typwin_window(g), "redraw", G_CALLBACK(owl_window_erase_cb), NULL);
-  }
-  owl_window_dirty(owl_global_get_typwin_window(g));
+      g_signal_connect(g->mainpanel.typwin, "redraw", G_CALLBACK(owl_window_erase_cb), NULL);
+  }
+  owl_window_dirty(g->mainpanel.typwin);
 
   g->tw = NULL;