First shot at actually scrolling the line when input exceeds tty_cols.

This is not very useful atm though.  It works, kind of, but is still
very much on the rough side.

TODO

@@ -1,7 +1,6 @@
 TODO
 
 * Port "fileman" example from BSD libedit, http://www.thrysoee.dk/editline/
-* Instead of supporting multiline input, try the Emacs approach, line scrolling.
 * Add support for rl_bind_key(), currently only en editline specific el_bind_key() exists.
 * Add support for inhibiting completion: rl_inhibit_completion
 * Make "char *rl_prompt" globally visible.

examples/Makefile.am

@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-noinst_PROGRAMS  = testit cli fileman
+noinst_PROGRAMS  = testit cli
 LDADD            = $(top_builddir)/src/libeditline.la $(TERMLIBS)
 AM_CFLAGS        = -I$(top_srcdir)/src -I$(top_srcdir)/include
 AM_LDFLAGS       = -static

examples/Makefile.in

@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = testit$(EXEEXT) cli$(EXEEXT) fileman$(EXEEXT)
+noinst_PROGRAMS = testit$(EXEEXT) cli$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -58,11 +58,6 @@ cli_DEPENDENCIES = $(top_builddir)/src/libeditline.la \
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-fileman_SOURCES = fileman.c
-fileman_OBJECTS = fileman.$(OBJEXT)
-fileman_LDADD = $(LDADD)
-fileman_DEPENDENCIES = $(top_builddir)/src/libeditline.la \
-	$(am__DEPENDENCIES_1)
 testit_SOURCES = testit.c
 testit_OBJECTS = testit.$(OBJEXT)
 testit_LDADD = $(LDADD)
@@ -94,8 +89,8 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = cli.c fileman.c testit.c
-DIST_SOURCES = cli.c fileman.c testit.c
+SOURCES = cli.c testit.c
+DIST_SOURCES = cli.c testit.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -262,9 +257,6 @@ clean-noinstPROGRAMS:
 cli$(EXEEXT): $(cli_OBJECTS) $(cli_DEPENDENCIES) 
 	@rm -f cli$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cli_OBJECTS) $(cli_LDADD) $(LIBS)
-fileman$(EXEEXT): $(fileman_OBJECTS) $(fileman_DEPENDENCIES) 
-	@rm -f fileman$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(fileman_OBJECTS) $(fileman_LDADD) $(LIBS)
 testit$(EXEEXT): $(testit_OBJECTS) $(testit_DEPENDENCIES) 
 	@rm -f testit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(testit_OBJECTS) $(testit_LDADD) $(LIBS)
@@ -276,7 +268,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cli.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileman.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testit.Po@am__quote@
 
 .c.o:

examples/cli.c

@@ -114,6 +114,7 @@ int main(int ac __attribute__ ((unused)), char *av[] __attribute__ ((unused)))
    read_history(HISTORY);
 
    while ((line = readline(prompt)) != NULL) {
+      if (*line != '\0')
          printf("\t\t\t|%s|\n", line);
       free(line);
    }

examples/fileman.c

@@ -1,499 +0,0 @@
-/* fileman.c -- A tiny application which demonstrates how to use the
-   GNU Readline library.  This application interactively allows users
-   to manipulate files and their modes.
-
-   NOTE: this was taken from the GNU Readline documentation and ported
-   to libedit. A commad to output the history list was added.
-   
-   */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <locale.h>
-#include <time.h>
-
-/* GNU readline
-#include <readline/readline.h>
-#include <readline/history.h>
-*/
-/* NetBSD libedit
-#include <editline/readline.h>
-*/
-#include <editline.h>
-
-void * xmalloc (size_t size);
-void too_dangerous (char *caller);
-void initialize_readline ();
-int execute_line (char *line);
-int valid_argument (char *caller, char *arg);
-
-typedef int rl_icpfunc_t (char *);
-
-/* The names of functions that actually do the manipulation. */
-int com_list (char *);
-int com_view (char *);
-int com_history (char *);
-int com_rename(char *);
-int com_stat(char *);
-int com_pwd(char *);
-int com_delete(char *);
-int com_help(char *);
-int com_cd(char *);
-int com_quit(char *);
-
-/* A structure which contains information on the commands this program
-   can understand. */
-
-typedef struct {
-   char *name;                   /* User printable name of the function. */
-   rl_icpfunc_t *func;           /* Function to call to do the job. */
-   char *doc;                    /* Documentation for this function.  */
-} COMMAND;
-
-COMMAND commands[] = {
-   { "cd", com_cd, "Change to directory DIR" },
-   { "delete", com_delete, "Delete FILE" },
-   { "help", com_help, "Display this text" },
-   { "?", com_help, "Synonym for `help'" },
-   { "list", com_list, "List files in DIR" },
-   { "ls", com_list, "Synonym for `list'" },
-   { "pwd", com_pwd, "Print the current working directory" },
-   { "quit", com_quit, "Quit using Fileman" },
-   { "rename", com_rename, "Rename FILE to NEWNAME" },
-   { "stat", com_stat, "Print out statistics on FILE" },
-   { "view", com_view, "View the contents of FILE" },
-   { "history", com_history, "List editline history" },
-   { (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
-};
-
-/* Forward declarations. */
-char *stripwhite ();
-COMMAND *find_command ();
-
-/* The name of this program, as taken from argv[0]. */
-char *progname;
-
-/* When non-zero, this means the user is done using this program. */
-int done;
-
-char *
-dupstr (char* s)
-{
-   char *r;
-
-   r = xmalloc (strlen (s) + 1);
-   strcpy (r, s);
-   return (r);
-}
-
-int
-main (int argc, char **argv)
-{
-   char *line, *s;
-
-   progname = argv[0];
-
-   setlocale(LC_CTYPE, "");
-
-   initialize_readline();       /* Bind our completer. */
-
-   stifle_history(7);
-
-   /* Loop reading and executing lines until the user quits. */
-   for ( ; done == 0; )
-   {
-      line = readline ("FileMan: ");
-
-      if (!line)
-         break;
-
-      /* Remove leading and trailing whitespace from the line.
-         Then, if there is anything left, add it to the history list
-         and execute it. */
-      s = stripwhite(line);
-
-      if (*s) {
-
-         char* expansion;
-         int result;
-
-         result = history_expand(s, &expansion);
-
-         if (result < 0 || result == 2) {
-            fprintf(stderr, "%s\n", expansion);
-         } else {
-            add_history(expansion);
-            execute_line(expansion);
-         }
-         free(expansion);
-      }
-
-      free(line);
-   }
-   exit (0);
-
-   return 0;
-}
-
-/* Execute a command line. */
-int
-execute_line (char *line)
-{
-   register int i;
-   COMMAND *command;
-   char *word;
-
-   /* Isolate the command word. */
-   i = 0;
-   while (line[i] && isspace (line[i]))
-      i++;
-   word = line + i;
-
-   while (line[i] && !isspace (line[i]))
-      i++;
-
-   if (line[i])
-      line[i++] = '\0';
-
-   command = find_command (word);
-
-   if (!command)
-   {
-      fprintf (stderr, "%s: No such command for FileMan.\n", word);
-      return (-1);
-   }
-
-   /* Get argument to command, if any. */
-   while (isspace (line[i]))
-      i++;
-
-   word = line + i;
-
-   /* Call the function. */
-   return ((*(command->func)) (word));
-}
-
-/* Look up NAME as the name of a command, and return a pointer to that
-   command.  Return a NULL pointer if NAME isn't a command name. */
-COMMAND *
-find_command (char *name)
-{
-   register int i;
-
-   for (i = 0; commands[i].name; i++)
-      if (strcmp (name, commands[i].name) == 0)
-         return (&commands[i]);
-
-   return ((COMMAND *)NULL);
-}
-
-/* Strip whitespace from the start and end of STRING.  Return a pointer
-   into STRING. */
-char *
-stripwhite (char *string)
-{
-   register char *s, *t;
-
-   for (s = string; isspace (*s); s++)
-      ;
-
-   if (*s == 0)
-      return (s);
-
-   t = s + strlen (s) - 1;
-   while (t > s && isspace (*t))
-      t--;
-   *++t = '\0';
-
-   return s;
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                  Interface to Readline Completion                */
-/*                                                                  */
-/* **************************************************************** */
-
-char *command_generator(const char *, int);
-char **fileman_completion(const char *, int, int);
-
-/* Tell the GNU Readline library how to complete.  We want to try to
-   complete on command names if this is the first word in the line, or
-   on filenames if not. */
-void
-initialize_readline ()
-{
-   /* Allow conditional parsing of the ~/.inputrc file. */
-   rl_readline_name = "FileMan";
-
-   /* Tell the completer that we want a crack first. */
-   rl_attempted_completion_function = fileman_completion;
-}
-
-/* Attempt to complete on the contents of TEXT.  START and END
-   bound the region of rl_line_buffer that contains the word to
-   complete.  TEXT is the word to complete.  We can use the entire
-   contents of rl_line_buffer in case we want to do some simple
-   parsing.  Returnthe array of matches, or NULL if there aren't any. */
-char **
-fileman_completion (const char* text, int start, int end)
-{
-   char **matches;
-
-   matches = (char **)NULL;
-
-   /* If this word is at the start of the line, then it is a command
-      to complete.  Otherwise it is the name of a file in the current
-      directory. */
-   if (start == 0)
-      /* TODO */
-      matches = completion_matches (text, command_generator);
-      /* matches = rl_completion_matches (text, command_generator); */
-
-   return (matches);
-}
-
-/* Generator function for command completion.  STATE lets us
-   know whether to start from scratch; without any state
-   (i.e. STATE == 0), then we start at the top of the list. */
-char *
-command_generator (text, state)
-   const char *text;
-   int state;
-{
-   static int list_index, len;
-   char *name;
-
-   /* If this is a new word to complete, initialize now.  This
-      includes saving the length of TEXT for efficiency, and
-      initializing the index variable to 0. */
-   if (!state)
-   {
-      list_index = 0;
-      len = strlen (text);
-   }
-
-   /* Return the next name which partially matches from the
-      command list. */
-   while (name = commands[list_index].name)
-   {
-      list_index++;
-
-      if (strncmp (name, text, len) == 0)
-         return (dupstr(name));
-   }
-
-   /* If no names matched, then return NULL. */
-   return ((char *)NULL);
-}
-
-/* **************************************************************** */
-/*                                                                  */
-/*                       FileMan Commands                           */
-/*                                                                  */
-/* **************************************************************** */
-
-/* String to pass to system ().  This is for the LIST, VIEW and RENAME
-   commands. */
-static char syscom[1024];
-
-/* List the file(s) named in arg. */
-int
-com_list (char *arg)
-{
-   if (!arg)
-      arg = "";
-
-   sprintf (syscom, "ls -FClg %s", arg);
-   return (system (syscom));
-}
-
-int
-com_view (char *arg)
-{
-   if (!valid_argument ("view", arg))
-      return 1;
-
-   sprintf (syscom, "more %s", arg);
-   return (system (syscom));
-}
-
-int
-com_history(char* arg)
-{
-   HIST_ENTRY *he;
-
-   /* rewind history */
-   while (next_history())
-      ;
-
-   for (he = current_history(); he != NULL; he = previous_history()) {
-      //printf("%5d  %s\n", *((int*)he->data) - 1, he->line);
-      printf("%s\n", he->line);
-   }
-
-   return 0;
-}
-
-int
-com_rename (char *arg)
-{
-   too_dangerous ("rename");
-   return (1);
-}
-
-int
-com_stat (char *arg)
-{
-   struct stat finfo;
-
-   if (!valid_argument ("stat", arg))
-      return (1);
-
-   if (stat (arg, &finfo) == -1)
-   {
-      perror (arg);
-      return (1);
-   }
-
-   printf ("Statistics for `%s':\n", arg);
-
-   printf ("%s has %ld link%s, and is %lld byte%s in length.\n", arg,
-         (long) finfo.st_nlink,
-         (finfo.st_nlink == 1) ? "" : "s",
-         (long long) finfo.st_size,
-         (finfo.st_size == 1) ? "" : "s");
-   printf ("Inode Last Change at: %s", ctime (&finfo.st_ctime));
-   printf ("      Last access at: %s", ctime (&finfo.st_atime));
-   printf ("    Last modified at: %s", ctime (&finfo.st_mtime));
-   return (0);
-}
-
-int
-com_delete (char *arg)
-{
-   too_dangerous ("delete");
-   return (1);
-}
-
-/* Print out help for ARG, or for all of the commands if ARG is
-   not present. */
-int
-com_help (char *arg)
-{
-   register int i;
-   int printed = 0;
-
-   for (i = 0; commands[i].name; i++)
-   {
-      if (!*arg || (strcmp (arg, commands[i].name) == 0))
-      {
-         printf ("%s\t\t%s.\n", commands[i].name, commands[i].doc);
-         printed++;
-      }
-   }
-
-   if (!printed)
-   {
-      printf ("No commands match `%s'.  Possibilties are:\n", arg);
-
-      for (i = 0; commands[i].name; i++)
-      {
-         /* Print in six columns. */
-         if (printed == 6)
-         {
-            printed = 0;
-            printf ("\n");
-         }
-
-         printf ("%s\t", commands[i].name);
-         printed++;
-      }
-
-      if (printed)
-         printf ("\n");
-   }
-   return (0);
-}
-
-/* Change to the directory ARG. */
-int
-com_cd (char *arg)
-{
-   if (chdir (arg) == -1)
-   {
-      perror (arg);
-      return 1;
-   }
-
-   com_pwd ("");
-   return (0);
-}
-
-/* Print out the current working directory. */
-int
-com_pwd (char* ignore)
-{
-   char dir[1024], *s;
-
-   s = (char*)getcwd(dir, sizeof(dir) - 1);
-   if (s == 0)
-   {
-      printf ("Error getting pwd: %s\n", dir);
-      return 1;
-   }
-
-   printf ("Current directory is %s\n", dir);
-   return 0;
-}
-
-/* The user wishes to quit using this program.  Just set DONE
-   non-zero. */
-int 
-com_quit (char *arg)
-{
-   done = 1;
-   return (0);
-}
-
-/* Function which tells you that you can't do this. */
-void
-too_dangerous (char *caller)
-{
-   fprintf (stderr,
-         "%s: Too dangerous for me to distribute.\n",
-         caller);
-   fprintf (stderr, "Write it yourself.\n");
-}
-
-/* Return non-zero if ARG is a valid argument for CALLER,
-   else print an error message and return zero. */
-int
-valid_argument (char *caller, char *arg)
-{
-   if (!arg || !*arg)
-   {
-      fprintf (stderr, "%s: Argument required.\n", caller);
-      return (0);
-   }
-
-   return (1);
-}
-
-void *
-xmalloc (size_t size)
-{
-   register void *value = (void*)malloc(size);
-   if (value == 0)
-      fprintf(stderr, "virtual memory exhausted");
-   return value;
-}
-
-

include/editline.h

@@ -49,7 +49,7 @@ extern void        el_bind_key_in_metamap(int key, el_keymap_func_t function);
 extern char       *rl_complete(char *token, int *match);
 extern int         rl_list_possib(char *token, char ***av);
 
-/* For compatibility with GNU Readline. */
+/* For compatibility with FSF readline. */
 extern int         rl_point;
 extern int         rl_mark;
 extern int         rl_end;
@@ -63,24 +63,18 @@ extern int         el_hist_size; /* size of history scrollback buffer, default:
 extern void rl_initialize(void);
 extern void rl_reset_terminal(const char *terminal_name);
 
-extern void rl_prep_terminal(int meta_flag);
-extern void rl_deprep_terminal(void);
-
-extern int rl_getc(void);
-
 extern char *readline(const char *prompt);
 extern void add_history(const char *line);
 
 extern int read_history(const char *filename);
 extern int write_history(const char *filename);
 
-extern rl_complete_func_t    *rl_set_complete_func(rl_complete_func_t *func);
-extern rl_list_possib_func_t *rl_set_list_possib_func(rl_list_possib_func_t *func);
+rl_complete_func_t    *rl_set_complete_func(rl_complete_func_t *func);
+rl_list_possib_func_t *rl_set_list_possib_func(rl_list_possib_func_t *func);
 
-extern char  *(*rl_completion_entry_function)(const char *text, int state);
-extern char  *rl_filename_completion_function(const char *text, int state);
+void rl_prep_terminal(int meta_flag);
+void rl_deprep_terminal(void);
 
-extern int rl_attempted_completion_over;
-extern char **(*rl_attempted_completion_function)(const char *text, int start, int end);
+int rl_getc(void);
 
 #endif  /* __EDITLINE_H__ */

src/editline.c

@@ -1,7 +1,6 @@
 /* Main editing routines for editline library.
  *
  * Copyright (c) 1992, 1993  Simmule Turner and Rich Salz. All rights reserved.
- * Copyright (c) 1998  Alan W. Black <awb()cstr!ed.ac!uk>, for Edinburgh Speech Tools.
  *
  * This software is not subject to any license of the American Telephone
  * and Telegraph Company or of the Regents of the University of California.
@@ -150,17 +149,44 @@ static int is_alpha_num(unsigned char c)
     return 0;
 }
 
+/*
+** Returns the number of characters printed from beginning of line
+** includes the size of the prompt and and meta/ctl char expansions
+*/
+static int tty_pos(void)
+{
+    int p = strlen(rl_prompt);
+    int i;
+
+    for (i = 0; i < rl_point; i++)
+	if (rl_line_buffer[i] == DEL || ISCTL(rl_line_buffer[i]))
+	    p += 2;
+	else if (rl_meta_chars && ISMETA(rl_line_buffer[i]))
+	    p += 3;
+	else
+	    p += 1;
+
+    return p;
+}
+
 /*
 **  TTY input/output functions.
 */
 
 static void tty_flush(void)
 {
+    int i = 0;
     ssize_t res;
+    int len = (int)strlen(rl_prompt);
 
     if (ScreenCount) {
-	if (!el_no_echo)
-	    res = write(el_outfd, Screen, ScreenCount);
+	if (!el_no_echo) {
+	    if (ScreenCount >= (size_t)tty_cols) {
+		i = ScreenCount - tty_cols - len;
+		ScreenCount = tty_cols - len;
+	    }
+	    res = write(el_outfd, &Screen[i], ScreenCount);
+	}
         ScreenCount = 0;
     }
 }
@@ -315,10 +341,16 @@ void el_print_columns(int ac, char **av)
 static void reposition(void)
 {
     int i;
+    int offset = 0, pos = tty_pos();
 
-    tty_put('\r');
+    tty_puts("\r");
+    tty_puts("\e[K");
+    tty_flush();
     tty_puts(rl_prompt);
-    for (i = 0; i < rl_point; i++)
+    if (pos > tty_cols) {
+	offset = pos - tty_cols - strlen(rl_prompt);
+    }
+    for (i = offset; i < rl_point; i++)
         tty_show(rl_line_buffer[i]);
 }
 
@@ -509,9 +541,12 @@ static el_status_t insert_string(const char *p)
 
 static el_status_t redisplay(void)
 {
-    tty_puts(NEWLINE); /* XXX: Use "\r\e[K" to get really neat effect on ANSI capable terminals. */
+//    tty_puts(NEWLINE); /* XXX: Use "\r\e[K" to get really neat effect on ANSI capable terminals. */
+    tty_puts("\r\e[K");
     tty_puts(rl_prompt);
+    tty_flush();
     tty_string(rl_line_buffer);
+    tty_flush();
 
     return CSmove;
 }
@@ -997,7 +1032,10 @@ static char *editinput(void)
 	    case CSstay:
 		break;
         }
+
+	reposition();
     }
+
     return NULL;
 }