Changeset 10b866d for editwin.c

Timestamp:

Jul 8, 2002, 10:37:21 PM (21 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e1c4636

Parents:

8df36cc

Message:

* Fixed preservation of e->dotsend across owl_editwin_clear().

* Added history for multiline edit windows (eg, for zephyr composition).
  The M-n and M-p keys will cycle through the history ring.
  In particular, it is now possible to edit the command line
  of a zephyr being composed:  C-c it and restart it
  and then M-p to get the aborted composition back.

File:

• editwin.c (modified) (9 diffs)

editwin.c

@@ -3 +3 @@
 #include <unistd.h>
 #include <string.h>
+#include <ctype.h>
 
 static const char fileIdent[] = "$Id$";
@@ -8 +9 @@
 #define INCR 5000
 
-void owl_editwin_init(owl_editwin *e, WINDOW *win, int winlines, int wincols, int style) {
+void owl_editwin_init(owl_editwin *e, WINDOW *win, int winlines, int wincols, int style, owl_history *hist) {
   /* initialize the editwin e.
    * 'win' is an already initialzed curses window that will be used by editwin
    */
-  e->buff=owl_malloc(INCR);
+  e->buff=owl_malloc(INCR);  
   e->buff[0]='\0';
   e->bufflen=0;
+  e->hist=hist;
   e->allocated=INCR;
   e->buffx=0;
@@ -50 +52 @@
 }
 
+void owl_editwin_set_history(owl_editwin *e, owl_history *h) {
+  e->hist = h;
+}
+
+owl_history *owl_editwin_get_history(owl_editwin *e) {
+  return e->hist;
+}
+
 void owl_editwin_set_dotsend(owl_editwin *e) {
   e->dotsend=1;
@@ -85 +95 @@
 }
 
-void owl_editwin_new_style(owl_editwin *e, int newstyle) {
+void owl_editwin_new_style(owl_editwin *e, int newstyle, owl_history *h) {
   char *ptr;
-  
+
+  owl_editwin_set_history(e, h);
   if (e->style==newstyle) return;
 
@@ -111 +122 @@
   /* completly reinitialize the buffer */
   owl_free(e->buff);
-  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style);
+  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
 }
 
@@ -117 +128 @@
   /* clear all text except for locktext and put the cursor at the beginning */
   int lock;
+  int dotsend=e->dotsend;
   char *locktext=NULL;
-  
+
   lock=0;
   if (e->lock > 0) {
@@ -129 +141 @@
 
   owl_free(e->buff);
-  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style);
+  owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
 
   if (lock > 0) {
     owl_editwin_set_locktext(e, locktext);
+  }
+  if (dotsend) {
+    owl_editwin_set_dotsend(e);
   }
 
@@ -742 +757 @@
 /* returns if only whitespace remains */
 int owl_editwin_is_at_end(owl_editwin *e) {
-  int i, cur;  
-  cur=_owl_editwin_get_index_from_xy(e);
-  if (cur >= e->bufflen) return(1);
-  for (i=e->bufflen-1; i>cur; i--) {
-    if (e->buff[i] != '\r'
-        && e->buff[i] != '\n'
-        && e->buff[i] != ' ') {
-      return(0);
-    }
-  }
-  if (cur==i) return(1);
-  else return(0);
+  int cur=_owl_editwin_get_index_from_xy(e);
+  return only_whitespace(e->buff+cur);
 }
 
@@ -768 +773 @@
       return(1);
     }
-    if (e->buff[i] != '\r'
-        && e->buff[i] != '\n'
-        && e->buff[i] != ' ') {
+    if (!isspace(e->buff[i])) {
       return(0);
     }