Changeset 2f7502 in git

Timestamp:

Feb 14, 2000, 6:00:11 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

937e3a141924432fe13166e63c9681b5ef793ab2

Parents:

86b2da8a9025c680f0918d9203d53aa65fe913a4

Message:

*hannes: multiple line input


git-svn-id: file:///usr/local/Singular/svn/trunk@4145 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• febase.inc (modified) (2 diffs)
• fereadl.c (modified) (9 diffs)

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.28 1999-11-15 17:19:57 obachman Exp $ */
+/* $Id: febase.inc,v 1.29 2000-02-14 17:00:10 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -369 +369 @@
 static int fePrintEcho(char *anf, char *b)
 {
-  char *ss=strchr(anf,'\n');
+  char *ss=strrchr(anf,'\n');
   int len_s;
   if (ss==NULL)

Singular/fereadl.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: fereadl.c,v 1.11 2000-02-14 14:10:54 Singular Exp $ */
+/* $Id: fereadl.c,v 1.12 2000-02-14 17:00:11 Singular Exp $ */
 /*
 * ABSTRACT: input from ttys, simulating fgets
@@ -83 +83 @@
 int     fe_cursor_pos; /* 0..colmax-1*/
 int     fe_cursor_line; /* 0..pagelength-1*/
+int     mlinestart;
 
 #ifndef MSDOS
@@ -335 +336 @@
 {
   fe_ctrl_k(s,*i);
-  while((*i)>0)
+  while((*i)>mlinestart)
   {
     (*i)--;
@@ -487 +488 @@
     #endif
     int i=0;
+    mlinestart=0;
 
     if (fe_is_raw_tty==0)
@@ -506 +508 @@
         case feCTRL('J'):
         {
-          fe_add_hist(s);
           i=strlen(s);
-          if (i<size-1) s[i]='\n';
           fputc('\n',fe_echo);
-          if (!fe_getchar_stat())
-          {
+          if ((!fe_getchar_stat()) || (i>=size-1))
+          {
+            fe_add_hist(s);
+            if (i<size-1) s[i]='\n';
             fflush(fe_echo);
             fe_temp_reset();
             return s;
           }
+          /*if (i<size-1)*/ s[i]='\n';
+          i++;
+          mlinestart=i;
+          fe_cursor_pos=0;
+          if(fe_cursor_line!=(pagelength-1))
+            fe_cursor_line++;
+          change=1;
           break;
         }
@@ -524 +533 @@
         case 127:       /*delete the character left of the cursor*/
         {
-          if (i==0) break;
+          if (i==mlinestart) break;
           i--;
           fe_cursor_pos--;
@@ -531 +540 @@
             fe_cursor_line--;
             fe_cursor_pos=colmax-1;
-            fe_set_cursor(s,i);
+            fe_set_cursor(s,i-mlinestart);
           }
           else
@@ -615 +624 @@
         case feCTRL('B'): /* move the cursor backward one character */
         {
-          if (i>0)
+          if (i>mlinestart)
           {
             i--;
@@ -649 +658 @@
           fe_cursor_pos=strlen(pr);
           memset(s,0,size);
+          mlinestart=0;
           change=1;
           break;