Changeset 8bba1ae

Timestamp:

Jul 14, 2010, 1:32:46 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:

63d9de9

Parents:

3f11c00

Message:

Rename owl_global_get_curs_typwin to owl_global_get_typwin_window

This is more consistent with us no longer exporting raw WINDOWs.

Files:

• functions.c (modified) (4 diffs)
• global.c (modified) (3 diffs)

functions.c

@@ -292 +292 @@
   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_curs_typwin(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti", owl_global_get_typwin_window(&g));
 }
 
@@ -1902 +1902 @@
   owl_editwin_insert_string(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_global_get_curs_typwin(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline", owl_global_get_typwin_window(&g));
   owl_editwin_set_callback(tw, owl_callback_command);
 }
@@ -1914 +1914 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_curs_typwin(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
   return tw;
 }
@@ -1928 +1928 @@
   owl_editwin_set_locktext(tw, line);
 
-  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_curs_typwin(&g));
+  owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse", owl_global_get_typwin_window(&g));
   return tw;
 }

global.c

@@ -298 +298 @@
 }
 
-/* curses windows */
-
-owl_window *owl_global_get_curs_typwin(const owl_global *g) {
+/* underlying owl_windows */
+
+owl_window *owl_global_get_typwin_window(const owl_global *g) {
   return g->mainpanel.typwin;
 }
@@ -342 +342 @@
 
   if (g->typwin_erase_id) {
-    g_signal_handler_disconnect(owl_global_get_curs_typwin(g), g->typwin_erase_id);
+    g_signal_handler_disconnect(owl_global_get_typwin_window(g), g->typwin_erase_id);
     g->typwin_erase_id = 0;
   }
 
-  g->tw = owl_editwin_new(owl_global_get_curs_typwin(g),
+  g->tw = owl_editwin_new(owl_global_get_typwin_window(g),
                           owl_global_get_typwin_lines(g),
                           g->cols,
@@ -361 +361 @@
   if (!g->typwin_erase_id) {
     g->typwin_erase_id =
-      g_signal_connect(owl_global_get_curs_typwin(g), "redraw", G_CALLBACK(owl_window_erase_cb), NULL);
-  }
-  owl_window_dirty(owl_global_get_curs_typwin(g));
+      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->tw = NULL;