Changeset 20310

Timestamp:

Jun 27, 2006, 11:48:39 PM (18 years ago)

Author:

hamish

Message:

fix octals, allow both backspace and DEL

Location:

grass/trunk

Files:

• display/d.colors/curses.c (modified) (2 diffs)
• imagery/i.class/curses.c (modified) (2 diffs)
• imagery/i.points/curses.c (modified) (2 diffs)
• imagery/i.vpoints/curses.c (modified) (2 diffs)

grass/trunk/display/d.colors/curses.c

@@ -246 +246 @@
         newchar = wgetch(MENU_WIN) & 0177 ;
 
-        if ((newchar > 037) && (newchar < 0177))
-        {
+        if ((newchar > '\037') && (newchar < '\177'))
+        {   /* octal codes: accept space to '~' */
             *(pointer++) = newchar ;
             *pointer = 000 ;
@@ -253 +253 @@
             wrefresh(MENU_WIN) ;
         }
-        else if (newchar == 010)
-        {
+        else if (newchar == '\b' || newchar == '\177')
+        {   /* backspace or DEL */
             if (pointer > answer)
             {

grass/trunk/imagery/i.class/curses.c

@@ -213 +213 @@
 
         getyx (stdscr, y, x);
-        if (c > 037 && c < 0177)
+        if (c > '\037' && c < '\177') /* octal codes: accept space to '~' */
         {
             if (x < PROMPT_WINDOW->right)
@@ -224 +224 @@
             continue;
         }
-        if (c == '\b')
+        if (c == '\b' || c == '\177') /* backspace or DEL (decimal 8,127) */
         {
             if (n > 0)

grass/trunk/imagery/i.points/curses.c

@@ -208 +208 @@
 
         getyx (stdscr, y, x);
-        if (c > 037 && c < 0177)
+        if (c > '\037' && c < '\177') /* octal codes: accept space to '~' */
         {
             if (x < PROMPT_WINDOW->right)
@@ -219 +219 @@
             continue;
         }
-        if (c == '\b')
+        if (c == '\b' || c == '\177') /* backspace or DEL (decimal 8,127) */
         {
             if (n > 0)

grass/trunk/imagery/i.vpoints/curses.c

@@ -200 +200 @@
         refresh ();
         c = Curses_getch(0) ;
+
         if (c == '\n' || c == '\r')
             break;
 
         getyx (stdscr, y, x);
-        if (c > 037 && c < 0177)
+
+        if (c > '\037' && c < '\177') /* octal codes: accept space to '~' */
         {
             if (x < PROMPT_WINDOW->right)
@@ -215 +217 @@
             continue;
         }
-        if (c == '\b')
+
+        if (c == '\b' || c == '\177') /* backspace or DEL (decimal 8,127) */
         {
             if (n > 0)