Changeset f6fae8d for global.c

Timestamp:

Jun 1, 2010, 12:14:11 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:

e294783

Parents:

84a4aca

Message:

Port the editwin to owl_window

The others are still unmanaged for now. Fortunately, they were set up as
as panels, so we can see through them to the windows we want in the
meantime. :-)

File:

• global.c (modified) (8 diffs)

global.c

@@ -158 +158 @@
 
 void _owl_global_setup_windows(owl_global *g) {
-  int cols, typwin_lines, recwinlines;
+  int cols, recwinlines;
 
   cols=g->cols;
-  typwin_lines=owl_global_get_typwin_lines(g);
 
   recwinlines = owl_global_get_recwin_lines(g);
@@ -169 +168 @@
   _owl_panel_set_window(&g->seppan, newwin(1, cols, recwinlines, 0));
   _owl_panel_set_window(&g->msgpan, newwin(1, cols, recwinlines+1, 0));
-  _owl_panel_set_window(&g->typpan, newwin(typwin_lines, cols, recwinlines+2, 0));
-
-  if (g->tw)
-      owl_editwin_set_curswin(g->tw, owl_global_get_curs_typwin(g), typwin_lines, g->cols);
-
-  wmove(owl_global_get_curs_typwin(g), 0, 0);
 }
 
@@ -306 +299 @@
 }
 
-WINDOW *owl_global_get_curs_typwin(const owl_global *g) {
-  return panel_window(g->typpan);
+owl_window *owl_global_get_curs_typwin(const owl_global *g) {
+  return g->mainpanel.typwin;
 }
 
@@ -361 +354 @@
       owl_function_resize_typwin(owl_global_get_typwin_lines(g) + d);
 
+  if (g->typwin_erase_id) {
+    g_signal_handler_disconnect(owl_global_get_curs_typwin(g), g->typwin_erase_id);
+    g->typwin_erase_id = 0;
+  }
+
   g->tw = owl_editwin_new(owl_global_get_curs_typwin(g),
                           owl_global_get_typwin_lines(g),
@@ -366 +364 @@
                           style,
                           hist);
+  owl_window_set_cursor(owl_global_get_curs_typwin(g));
   return g->tw;
 }
@@ -374 +373 @@
       owl_function_resize_typwin(owl_global_get_typwin_lines(g) - d);
 
-  werase(owl_global_get_curs_typwin(g));
+  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));
+  /* owl_window_set_cursor(owl_global_get_curs_sepwin(g)); */
+
   g->tw = NULL;
-  owl_global_set_needrefresh(g);
 }
 
@@ -494 +498 @@
 
   owl_function_debugmsg("New size is %i lines, %i cols.", g->lines, g->cols);
-  owl_global_set_relayout_pending(g);
 }
 
@@ -517 +520 @@
   owl_mainwin_redisplay(&(g->mw));
   sepbar(NULL);
-  if (g->tw)
-      owl_editwin_redisplay(g->tw);
-  else
-    werase(owl_global_get_curs_typwin(g));
 
   owl_function_full_redisplay();