Changeset f6fae8d

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. :-)

Files:

• commands.c (modified) (3 diffs)
• editwin.c (modified) (19 diffs)
• functions.c (modified) (4 diffs)
• global.c (modified) (8 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• variable.c (modified) (1 diff)

commands.c

@@ -2731 +2731 @@
     owl_editwin_clear(e);
     owl_editwin_insert_string(e, ptr);
-    owl_editwin_redisplay(e);
   } else {
     owl_function_beep();
@@ -2747 +2746 @@
     owl_editwin_clear(e);
     owl_editwin_insert_string(e, ptr);
-    owl_editwin_redisplay(e);
   } else {
     owl_function_beep();
@@ -2757 +2755 @@
   buff = skiptokens(buff, 1);
   owl_editwin_insert_string(e, buff);
-  owl_editwin_redisplay(e);
   return NULL;
 }

editwin.c

@@ -28 +28 @@
   int cursorx;
   int winlines, wincols, fillcol, wrapcol;
-  WINDOW *curswin;
+  owl_window *win;
+  gulong repaint_id;
+  gulong resized_id;
   int style;
   int lock;
@@ -40 +42 @@
 };
 
+static void oe_set_curswin(owl_editwin *e, owl_window *w, int winlines, int wincols);
+static void oe_redisplay(owl_window *win, WINDOW *curswin, void *user_data);
 static void oe_reframe(owl_editwin *e);
 static void oe_save_excursion(owl_editwin *e, oe_excursion *x);
@@ -58 +62 @@
 static char *oe_chunk(owl_editwin *e, int start, int end);
 static void oe_destroy_cbdata(owl_editwin *e);
+static void oe_dirty(owl_editwin *e);
+static void oe_window_resized(owl_window *w, owl_editwin *e);
 
 #define INCR 4096
@@ -73 +79 @@
 void owl_editwin_delete(owl_editwin *e)
 {
+  if (e->win) {
+    g_signal_handler_disconnect(e->win, e->repaint_id);
+    g_signal_handler_disconnect(e->win, e->resized_id);
+  }
   owl_free(e->buff);
   owl_free(e->killbuf);
@@ -91 +101 @@
   }
   e->index = index;
+  oe_dirty(e);
 }
 
@@ -105 +116 @@
 
 static void _owl_editwin_init(owl_editwin *e,
-                              WINDOW *win,
                               int winlines,
                               int wincols,
@@ -130 +140 @@
     e->style=OWL_EDITWIN_STYLE_MULTILINE;
   }
-  owl_editwin_set_curswin(e, win, winlines, wincols);
   e->lock=0;
   e->dotsend=0;
   e->echochar='\0';
-
-  if (win) werase(win);
-}
-
-owl_editwin *owl_editwin_new(WINDOW *win, int winlines, int wincols, int style, owl_history *hist)
+}
+
+owl_editwin *owl_editwin_new(owl_window *win, int winlines, int wincols, int style, owl_history *hist)
 {
   owl_editwin *e = owl_editwin_allocate();
 
-  _owl_editwin_init(e, win, winlines, wincols, style, hist);
+  _owl_editwin_init(e, winlines, wincols, style, hist);
+  oe_set_curswin(e, win, winlines, wincols);
   return e;
 }
 
-void owl_editwin_set_curswin(owl_editwin *e, WINDOW *w, int winlines, int wincols)
-{
-  e->curswin=w;
+static void oe_window_resized(owl_window *w, owl_editwin *e)
+{
+  /* update the sizes */
+  owl_window_get_position(w, &e->winlines, &e->wincols, NULL, NULL);
+}
+
+static void oe_set_curswin(owl_editwin *e, owl_window *w, int winlines, int wincols)
+{
+  e->win=w;
   e->winlines=winlines;
   e->wincols=wincols;
@@ -156 +170 @@
   else
     e->wrapcol = 0;
+  if (e->win) {
+    e->repaint_id = g_signal_connect(w, "redraw", G_CALLBACK(oe_redisplay), e);
+    e->resized_id = g_signal_connect(w, "resized", G_CALLBACK(oe_window_resized), e);
+    owl_window_dirty(e->win);
+  }
 }
 
@@ -165 +184 @@
 {
   e->echochar=ch;
-}
-
-WINDOW *owl_editwin_get_curswin(owl_editwin *e)
-{
-  return(e->curswin);
+  oe_dirty(e);
 }
 
@@ -239 +254 @@
   e->lock=e->bufflen;
   oe_set_index(e, e->lock);
-  owl_editwin_redisplay(e);
+  oe_dirty(e);
 }
 
@@ -265 +280 @@
 
   owl_free(e->buff);
-  _owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
+  _owl_editwin_init(e, e->winlines, e->wincols, e->style, e->hist);
 
   if (lock > 0) {
@@ -286 +301 @@
 {
   e->topindex = -1;
+  oe_dirty(e);
 }
 
@@ -467 +483 @@
 
   oe_restore_excursion(e, &x);
-}
-
-static void oe_addnec(owl_editwin *e, int count)
+  oe_dirty(e);
+}
+
+static void oe_addnec(owl_editwin *e, WINDOW *curswin, int count)
 {
   int i;
 
   for (i = 0; i < count; i++)
-    waddch(e->curswin, e->echochar);
-}
-
-static void oe_mvaddnec(owl_editwin *e, int y, int x, int count)
-{
-  wmove(e->curswin, y, x);
-  oe_addnec(e, count);
+    waddch(curswin, e->echochar);
+}
+
+static void oe_mvaddnec(owl_editwin *e, WINDOW *curswin, int y, int x, int count)
+{
+  wmove(curswin, y, x);
+  oe_addnec(e, curswin, count);
 }
 
 /* regenerate the text on the curses window */
-void owl_editwin_redisplay(owl_editwin *e)
+static void oe_redisplay(owl_window *win, WINDOW *curswin, void *user_data)
 {
   int x = -1, y = -1, t, hard;
   int line, index, lineindex, times = 0;
+  owl_editwin *e = user_data;
 
   do {
-    werase(e->curswin);
+    werase(curswin);
 
     if (e->topindex == -1 || e->index < e->topindex)
@@ -505 +523 @@
       if (index - lineindex) {
         if (!e->echochar)
-          mvwaddnstr(e->curswin, line, 0,
+          mvwaddnstr(curswin, line, 0,
                      e->buff + lineindex,
                      index - lineindex);
         else {
           if(lineindex < e->lock) {
-            mvwaddnstr(e->curswin, line, 0,
+            mvwaddnstr(curswin, line, 0,
                        e->buff + lineindex,
                        MIN(index - lineindex,
                            e->lock - lineindex));
             if (e->lock < index)
-              oe_addnec(e,
+              oe_addnec(e, curswin,
                         oe_region_width(e, e->lock, index,
                                         oe_region_width(e, lineindex, e->lock, 0)));
           } else
-            oe_mvaddnec(e, line, 0, oe_region_width(e, lineindex, index, 0));
+            oe_mvaddnec(e, curswin, line, 0, oe_region_width(e, lineindex, index, 0));
         }
         if (!hard)
-          waddch(e->curswin, '\\');
+          waddch(curswin, '\\');
       }
       line++;
@@ -531 +549 @@
   } while(x == -1 && times < 3);
 
-  wmove(e->curswin, y, x);
+  wmove(curswin, y, x);
   e->cursorx = x;
-  owl_global_set_needrefresh(&g);
 }
 
@@ -625 +642 @@
   if (start <= e->topindex)
     owl_editwin_recenter(e);
+
+  oe_dirty(e);
 
   return change;
@@ -858 +877 @@
 
   e->goal_column = goal_column;
+  oe_dirty(e);
 
   return distance;
@@ -1212 +1232 @@
     return;
   }
-  owl_editwin_redisplay(e);
 }
 
@@ -1347 +1366 @@
 }
 
+static void oe_dirty(owl_editwin *e)
+{
+  if (e->win) owl_window_dirty(e->win);
+}
+
 
 

functions.c

@@ -1262 +1262 @@
   touchwin(owl_global_get_curs_recwin(&g));
   touchwin(owl_global_get_curs_sepwin(&g));
-  touchwin(owl_global_get_curs_typwin(&g));
   touchwin(owl_global_get_curs_msgwin(&g));
 
@@ -1559 +1558 @@
 {
   owl_global_set_typwin_lines(&g, newsize);
-  owl_global_set_relayout_pending(&g);
+  owl_mainpanel_layout_contents(&g.mainpanel);
 }
 
@@ -1914 +1913 @@
 
   owl_editwin_insert_string(tw, line);
-  owl_editwin_redisplay(tw);
 
   owl_global_push_context(&g, OWL_CTX_EDITLINE, tw, "editline");
@@ -1941 +1939 @@
 
   owl_editwin_set_locktext(tw, line);
-
-  owl_editwin_redisplay(tw);
 
   owl_global_push_context(&g, OWL_CTX_EDITRESPONSE, tw, "editresponse");

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();

owl.c

@@ -468 +468 @@
     /* these are here in case a relayout changes the windows */
     WINDOW *sepwin = owl_global_get_curs_sepwin(&g);
-    owl_window *typwin = owl_global_get_curs_typwin(&g);
-
-    /* leave the cursor in the appropriate window */
+
+    /* move the cursor to unmanaged window if necessary */
     if (!owl_popwin_is_active(owl_global_get_popwin(&g))
         && owl_global_get_typwin(&g)) {
-      owl_function_set_cursor(typwin);
+      /* owl_function_set_cursor(typwin); */
     } else {
       owl_function_set_cursor(sepwin);

owl.h

@@ -576 +576 @@
   WINDOW *input_pad;
   owl_mainpanel mainpanel;
-  PANEL *recpan, *seppan, *msgpan, *typpan;
+  gulong typwin_erase_id;
+  PANEL *recpan, *seppan, *msgpan;
   int needrefresh;
   int rightshift;

variable.c

@@ -400 +400 @@
   int rv;
   rv = owl_variable_int_set_default(v, newval);
-  if (0 == rv) owl_global_set_relayout_pending(&g);
+  if (0 == rv) owl_mainpanel_layout_contents(&g.mainpanel);
   return(rv);
 }