Changeset c9334b1

Timestamp:

Jun 30, 2003, 5:19:35 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

cf83b7a

Parents:

6a87084

Message:

Reformatted editwin.c and added capability of doing password echoing

Files:

• ChangeLog (modified) (1 diff)
• editwin.c (modified) (38 diffs)
• owl.h (modified) (1 diff)

ChangeLog

@@ -6 +6 @@
         Bug fix to make zwrite -m work with -c/-i
         Fix in autoconf for des425
+        Reformatted editwin.c and added capability of doing password
+           echoing
         
 2.0.5

editwin.c

@@ -9 +9 @@
 #define INCR 5000
 
-void owl_editwin_init(owl_editwin *e, WINDOW *win, int winlines, int wincols, int style, owl_history *hist) {
+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
@@ -35 +36 @@
   e->lock=0;
   e->dotsend=0;
+  e->echochar='\0';
   if (win) werase(win);
 }
 
-void owl_editwin_set_curswin(owl_editwin *e, WINDOW *w, int winlines, int wincols) {
+void owl_editwin_set_curswin(owl_editwin *e, WINDOW *w, int winlines, int wincols)
+{
   e->curswin=w;
   e->winlines=winlines;
@@ -48 +51 @@
 }
 
-WINDOW *owl_editwin_get_curswin(owl_editwin *e) {
+/* echo the character 'ch' for each normal character keystroke,
+ * excepting locktext.  This is useful for entering passwords etc.  If
+ * ch=='\0' characters are echo'd normally
+ */
+void owl_editwin_set_echochar(owl_editwin *e, int ch)
+{
+  e->echochar=ch;
+}
+
+WINDOW *owl_editwin_get_curswin(owl_editwin *e)
+{
   return(e->curswin);
 }
 
-void owl_editwin_set_history(owl_editwin *e, owl_history *h) {
+void owl_editwin_set_history(owl_editwin *e, owl_history *h)
+{
   e->hist=h;
 }
 
-owl_history *owl_editwin_get_history(owl_editwin *e) {
+owl_history *owl_editwin_get_history(owl_editwin *e)
+{
   return(e->hist);
 }
 
-void owl_editwin_set_dotsend(owl_editwin *e) {
+void owl_editwin_set_dotsend(owl_editwin *e)
+{
   e->dotsend=1;
 }
 
-int owl_editwin_limit_maxcols(int v, int maxv) {
+int owl_editwin_limit_maxcols(int v, int maxv)
+{
   if (maxv > 5 && v > maxv) {
     return(maxv);
@@ -72 +89 @@
 }
 
-void owl_editwin_set_locktext(owl_editwin *e, char *text) {
-  /* set text to be 'locked in' at the beginning of the buffer, any
-     previous text (including locked text) will be overwritten */
+/* set text to be 'locked in' at the beginning of the buffer, any
+ * previous text (including locked text) will be overwritten
+ */
+void owl_editwin_set_locktext(owl_editwin *e, char *text)
+{
   
   int x, y;
@@ -91 +110 @@
 }
 
-int owl_editwin_get_style(owl_editwin *e) {
+int owl_editwin_get_style(owl_editwin *e)
+{
   return(e->style);
 }
 
-void owl_editwin_new_style(owl_editwin *e, int newstyle, owl_history *h) {
+void owl_editwin_new_style(owl_editwin *e, int newstyle, owl_history *h)
+{
   char *ptr;
 
@@ -119 +140 @@
 }
 
-void owl_editwin_fullclear(owl_editwin *e) {
-  /* completly reinitialize the buffer */
+/* completly reinitialize the buffer */
+void owl_editwin_fullclear(owl_editwin *e)
+{
   owl_free(e->buff);
   owl_editwin_init(e, e->curswin, e->winlines, e->wincols, e->style, e->hist);
 }
 
-void owl_editwin_clear(owl_editwin *e) {
-  /* clear all text except for locktext and put the cursor at the beginning */
+/* clear all text except for locktext and put the cursor at the
+ * beginning
+ */
+void owl_editwin_clear(owl_editwin *e)
+{
+
   int lock;
   int dotsend=e->dotsend;
@@ -155 +181 @@
 
 
-void _owl_editwin_addspace(owl_editwin *e) {
-  /* malloc more space for the buffer */
+/* malloc more space for the buffer */
+void _owl_editwin_addspace(owl_editwin *e)
+{
   e->buff=owl_realloc(e->buff, e->allocated+INCR);
   if (!e->buff) {
@@ -165 +192 @@
 }
 
-void owl_editwin_recenter(owl_editwin *e) {
+void owl_editwin_recenter(owl_editwin *e)
+{
   e->topline=e->buffy-(e->winlines/2);
   if (e->topline<0) e->topline=0;
@@ -171 +199 @@
 }
 
-void owl_editwin_redisplay(owl_editwin *e, int update) {
-  /* regenerate the text on the curses window */
-  /* if update == 1 then do a doupdate(), otherwise do not */
+/* regenerate the text on the curses window */
+/* if update == 1 then do a doupdate(), otherwise do not */
+void owl_editwin_redisplay(owl_editwin *e, int update)
+{
   
   char *ptr1, *ptr2, *ptr3, *buff;
-  int i;
+  int i, j;
 
   werase(e->curswin);
@@ -212 +241 @@
   strncpy(buff, ptr1, ptr3-ptr1);
   buff[ptr3-ptr1]='\0';
-  waddstr(e->curswin, buff);
+  if (e->echochar=='\0') {
+    waddstr(e->curswin, buff);
+  } else {
+    /* translate to echochar, *except* for the locktext */
+    int len;
+    int dolocklen=e->lock-(ptr1-e->buff);
+
+    for (i=0; i<dolocklen; i++) {
+      waddch(e->curswin, buff[i]);
+    }
+    len=strlen(buff);
+    for (i=0; i<len-dolocklen; i++) {
+      waddch(e->curswin, e->echochar);
+    }
+  }
   wmove(e->curswin, e->buffy-e->topline, e->buffx);
   wnoutrefresh(e->curswin);
@@ -222 +265 @@
 
 
-int _owl_editwin_linewrap_word(owl_editwin *e) {
-  /* linewrap the word just before the cursor.
-   * returns 0 on success
-   * returns -1 if we could not wrap.
-   */
-
+/* linewrap the word just before the cursor.
+ * returns 0 on success
+ * returns -1 if we could not wrap.
+ */
+int _owl_editwin_linewrap_word(owl_editwin *e)
+{
   int i, z;
 
@@ -250 +293 @@
 }
 
-void owl_editwin_insert_char(owl_editwin *e, char c) {
-  /* insert a character at the current point (shift later
-   * characters over) */
+/* insert a character at the current point (shift later
+ * characters over)
+ */
+void owl_editwin_insert_char(owl_editwin *e, char c)
+{
   
   int z, i, ret;
@@ -306 +351 @@
 }
 
-void owl_editwin_overwrite_char(owl_editwin *e, char c) {
-  /* overwrite the character at the current point with 'c' */
+/* overwrite the character at the current point with 'c' */
+void owl_editwin_overwrite_char(owl_editwin *e, char c)
+{
   int z;
   
@@ -348 +394 @@
 }
 
-void owl_editwin_delete_char(owl_editwin *e) {
-  /* delete the character at the current point, following chars
-   * shift left.
-   */ 
+/* delete the character at the current point, following chars
+ * shift left.
+ */ 
+void owl_editwin_delete_char(owl_editwin *e)
+{
   int z, i;
 
@@ -368 +415 @@
 }
 
-void owl_editwin_transpose_chars(owl_editwin *e) {
-  /* Swap the character at point with the character at point-1 and
-   * advance the pointer.  If point is at beginning of buffer do
-   * nothing.  If point is after the last character swap point-1 with
-   * point-2.  (Behaves as observed in tcsh and emacs).  
-   */
-
+/* Swap the character at point with the character at point-1 and
+ * advance the pointer.  If point is at beginning of buffer do
+ * nothing.  If point is after the last character swap point-1 with
+ * point-2.  (Behaves as observed in tcsh and emacs).  
+ */
+void owl_editwin_transpose_chars(owl_editwin *e)
+{
   int z;
   char tmp;
@@ -399 +446 @@
 }
 
-void owl_editwin_insert_string(owl_editwin *e, char *string) {
-  /* insert 'string' at the current point, later text is shifted
-   * right
-   */
+/* insert 'string' at the current point, later text is shifted
+ * right
+ */
+void owl_editwin_insert_string(owl_editwin *e, char *string)
+{
   int i, j;
 
@@ -411 +459 @@
 }
 
-void owl_editwin_overwrite_string(owl_editwin *e, char *string) {
+/* write 'string' at the current point, overwriting text that is
+ * already there
+ */
+
+void owl_editwin_overwrite_string(owl_editwin *e, char *string)
+{
   int i, j;
-  /* write 'string' at the current point, overwriting text that is
-   * already there
-   */
 
   j=strlen(string);
@@ -423 +473 @@
 }
 
-int _owl_editwin_get_index_from_xy(owl_editwin *e) {
-  /* get the index into e->buff for the current cursor
-   * position.
-   */
+/* get the index into e->buff for the current cursor
+ * position.
+ */
+int _owl_editwin_get_index_from_xy(owl_editwin *e)
+{
   int i;
   char *ptr1, *ptr2;
@@ -459 +510 @@
 }
 
-void _owl_editwin_set_xy_by_index(owl_editwin *e, int index) {
+void _owl_editwin_set_xy_by_index(owl_editwin *e, int index)
+{
   int z, i;
 
@@ -474 +526 @@
 }
 
-void owl_editwin_adjust_for_locktext(owl_editwin *e) {
+void owl_editwin_adjust_for_locktext(owl_editwin *e)
+{
   /* if we happen to have the cursor over locked text
    * move it to be out of the locktext region */
@@ -482 +535 @@
 }
 
-void owl_editwin_backspace(owl_editwin *e) {
+void owl_editwin_backspace(owl_editwin *e)
+{
   /* delete the char before the current one
    * and shift later chars left
@@ -493 +547 @@
 }
 
-void owl_editwin_key_up(owl_editwin *e) {
+void owl_editwin_key_up(owl_editwin *e)
+{
   if (e->buffy > 0) e->buffy--;
   if (e->buffx >= owl_editwin_get_numchars_on_line(e, e->buffy)) {
@@ -507 +562 @@
 }
 
-void owl_editwin_key_down(owl_editwin *e) {
+void owl_editwin_key_down(owl_editwin *e)
+{
   /* move down if we can */
   if (e->buffy+1 < owl_editwin_get_numlines(e)) e->buffy++;
@@ -525 +581 @@
 }
 
-void owl_editwin_key_left(owl_editwin *e) {
+void owl_editwin_key_left(owl_editwin *e)
+{
   /* move left if we can, and maybe up a line */
   if (e->buffx>0) {
@@ -543 +600 @@
 }
 
-void owl_editwin_key_right(owl_editwin *e) {
+void owl_editwin_key_right(owl_editwin *e)
+{
   int i;
 
@@ -564 +622 @@
 }
 
-void owl_editwin_move_to_nextword(owl_editwin *e) {
+void owl_editwin_move_to_nextword(owl_editwin *e)
+{
   int i, x;
 
@@ -600 +659 @@
 }
 
-void owl_editwin_move_to_previousword(owl_editwin *e) {
-  /* go backwards to the last non-space character */
+/* go backwards to the last non-space character
+ */
+void owl_editwin_move_to_previousword(owl_editwin *e)
+{
   int i, x;
 
@@ -635 +696 @@
 
 
-void owl_editwin_delete_nextword(owl_editwin *e) {
+void owl_editwin_delete_nextword(owl_editwin *e)
+{
   int z;
 
@@ -660 +722 @@
 }
 
-void owl_editwin_delete_previousword(owl_editwin *e) {
+void owl_editwin_delete_previousword(owl_editwin *e)
+{
   /* go backwards to the last non-space character, then delete chars */
   int i, startpos, endpos;
@@ -672 +735 @@
 }
 
-void owl_editwin_delete_to_endofline(owl_editwin *e) {
+void owl_editwin_delete_to_endofline(owl_editwin *e)
+{
   int i;
 
@@ -694 +758 @@
 }
 
-void owl_editwin_move_to_line_end(owl_editwin *e) {
+void owl_editwin_move_to_line_end(owl_editwin *e)
+{
   e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
 }
 
-void owl_editwin_move_to_line_start(owl_editwin *e) {
+void owl_editwin_move_to_line_start(owl_editwin *e)
+{
   e->buffx=0;
   owl_editwin_adjust_for_locktext(e);
 }
 
-void owl_editwin_move_to_end(owl_editwin *e) {
+void owl_editwin_move_to_end(owl_editwin *e)
+{
   /* go to last char */
   e->buffy=owl_editwin_get_numlines(e)-1;
@@ -715 +782 @@
 }
 
-void owl_editwin_move_to_top(owl_editwin *e) {
+void owl_editwin_move_to_top(owl_editwin *e)
+{
   _owl_editwin_set_xy_by_index(e, 0);
 
@@ -724 +792 @@
 }
 
-void owl_editwin_fill_paragraph(owl_editwin *e) {
+void owl_editwin_fill_paragraph(owl_editwin *e)
+{
   int i, save;
 
@@ -787 +856 @@
 
 /* returns if only whitespace remains */
-int owl_editwin_is_at_end(owl_editwin *e) {
+int owl_editwin_is_at_end(owl_editwin *e)
+{
   int cur=_owl_editwin_get_index_from_xy(e);
-  return only_whitespace(e->buff+cur);
-}
-
-int owl_editwin_check_dotsend(owl_editwin *e) {
+  return (only_whitespace(e->buff+cur));
+}
+
+int owl_editwin_check_dotsend(owl_editwin *e)
+{
   int i;
 
@@ -811 +882 @@
 }
 
-void owl_editwin_post_process_char(owl_editwin *e, int j) {
+void owl_editwin_post_process_char(owl_editwin *e, int j)
+{
   /* check if we need to scroll down */
   if (e->buffy-e->topline >= e->winlines) {
@@ -823 +895 @@
 }
 
-void owl_editwin_process_char(owl_editwin *e, int j) {
+void owl_editwin_process_char(owl_editwin *e, int j)
+{
   if (j == ERR) return;
   if (j>127 || ((j<32) && (j!=10) && (j!=13))) {
@@ -832 +905 @@
 }
 
-char *owl_editwin_get_text(owl_editwin *e) {
+char *owl_editwin_get_text(owl_editwin *e)
+{
   return(e->buff+e->lock);
 }
 
-int owl_editwin_get_numchars_on_line(owl_editwin *e, int line) {
+int owl_editwin_get_numchars_on_line(owl_editwin *e, int line)
+{
   int i;
   char *ptr1, *ptr2;
@@ -861 +936 @@
 }
 
-int owl_editwin_get_numlines(owl_editwin *e) {
+int owl_editwin_get_numlines(owl_editwin *e)
+{
   return(owl_text_num_lines(e->buff));
 }

owl.h

@@ -349 +349 @@
   int lock;
   int dotsend;
+  int echochar;
 } owl_editwin;