More work.

diff --git a/funcs.c b/funcs.c
index 87e0d505a7a847bec6d66ccca3a2b4e863d2e815..f298d7a41497952d5f797f45782a0bd560a7a5ed 100644 (file)
--- a/funcs.c
+++ b/funcs.c
@@ -74,6 +74,32 @@ void enter(void)
 }      
 
 
+/* Find if a number is in a given range. */ 
+int range(int rstart, int rend, int i)
+{
+   if ( (rstart <= i) && (i <= rend) ) return 1;
+   else return 0;      
+       
+}      
+
+
+/* Assign a type depending on the range that a  */ 
+/* number is in.                                */ 
+int type(int i)
+{ 
+   int ret; 
+   
+        if ( range(0, 9, i) == 1 )       ret = 1; 
+   else if ( range(10, 10, i) == 1 )     ret = 2; 
+   else if ( range(27, 27, i) == 1 )     ret = 3; 
+   else if ( range(32, 126, i) == 1 )    ret = 4;         
+   else if ( range(127, 127, i) == 1 )   ret = 5;
+   else ret = 6;          
+    
+   return ret; 
+   
+}     
+       
 
 /*  Function for special key combinations  */ 
 /*  (Ctrl, Alt, function keys.             */ 

diff --git a/keyhandler.c b/keyhandler.c
index 6d8ca52d2f4b37c2c3289a362a566078321aa40e..2fc6ee5dd974f2dae10f8ebdcb9400d5505726b9 100644 (file)
--- a/keyhandler.c
+++ b/keyhandler.c
@@ -21,7 +21,8 @@
 static struct termios old, new;
 
 /* Initialize new terminal i/o settings */
-void initTermios(int echo) {
+void initTermios(int echo) 
+{
     tcgetattr(0, &old); /* grab old terminal i/o settings */
     new = old; /* make new settings same as old settings */
     new.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -31,7 +32,8 @@ void initTermios(int echo) {
 
 
 /* Restore old terminal i/o settings */
-void resetTermios(void) {
+void resetTermios(void) 
+{
     tcsetattr(0, TCSANOW, &old);
 }
 
@@ -63,47 +65,34 @@ char getche(void) {
 /*  Alt keys are just esc then key (e.g. Alt-g is esc g ).  */   
 /*  Ctrl (then letter) keys are just Dec 1 to Dec 26        */ 
 
+/* TO DO: Use the helper function range                     */  
+/*  (  range(rstart, rend, val).  )                         */ 
+/* to handle entire ranges at once.                         */        
+
+
 void keyhandler(buf b) 
 { 
     
   int i = getch(); 
   
-  switch(i)
+  int t = type(i); 
+    
+  switch(t)
   { 
+         
        case (1):   break;     /*  Ctrl a  */   
        case (2):   break;     /*  Ctrl b  */   
        case (3):   break;     /*  Ctrl c  */     
-         
-       case (10):  enter();     /* Enter    */   
-         
-    case (27):  spec(i);   break;   /*  esc  */ 
-    
-    case (32):  printf("%c", i);  break;      /*  Printable chars.  */    
-    case (33):  printf("%c", i);  break;      /*  Printable chars.  */    
-    case (34):  printf("%c", i);  break;      /*  Printable chars.  */    
-    
-    case (65):  printf("%c", i);  break;      /*  "A"  */    
-    case (66):  printf("%c", i);  break;      /*  "B"  */    
-    case (67):  printf("%c", i);  break;      /*  "C"  */   
-    case (68):  printf("%c", i);  break;      /*  "D"  */    
-    case (69):  printf("%c", i);  break;      /*  "E"  */    
-    case (70):  printf("%c", i);  break;      /*  "F"  */    
-      
-    case (97):  printf("%c", i);  break;       /*  "a"  */    
-    case (98):  printf("%c", i);  break;       /*  "b"  */    
-    case (99):  printf("%c", i);  break;       /*  "c"  */    
-    case (100):  printf("%c", i);  break;      /*  "d"  */    
-    case (101):  printf("%c", i);  break;      /*  "e"  */    
-    case (102):  printf("%c", i);  break;      /*  "f"  */    
-            
-    case (126):  printf("%c", i);  break;      /*  "~"  */    
-    
-    case (127):  delch(b);  break;  
-   
-    default:   break;                 /*  stuff();         */ 
+       case (4):   printf("%c", i);  break;    /*  Printable chars.  */    
+       case (5):   delch(b);  break;  
+       case (6):   break;  
+       default:    break; 
+                    
   }   
   
-} 
+}    
+
+
 
 
 

diff --git a/pd_readline.h b/pd_readline.h
index 497564e725517f0b94aa2831da9965b06ac6669f..67f844c3f26b6dd49b85e6ae577d508443265efd 100644 (file)
--- a/pd_readline.h
+++ b/pd_readline.h
@@ -23,6 +23,9 @@ buf right(buf b);
 buf delch(buf b); 
 buf insch(buf b); 
 void enter(void);  
+int range(int rstart, int rend, int i);
+int type(int i); 
+
 
 /*  Escape-key handling.  */ 
 int spec(int i); 

diff --git a/range.c b/range.c
new file mode 100644 (file)
index 0000000..ddb7ce0
--- /dev/null
+++ b/range.c
@@ -0,0 +1,54 @@
+
+
+/*  range.c  */  
+
+/*  See if an int is in a given range.  */ 
+
+
+
+#include <string.h>   
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+
+/* Find if a number is in a given range. */ 
+int range(int rstart, int rend, int i)
+{
+   if ( (rstart <= i) && (i <= rend) ) return 1;
+   else return 0;      
+       
+}      
+
+
+
+int main() 
+{ 
+
+/* Within the range. */ 
+int a = range(0, 9, 5); 
+int b = range(0, 9, 0);
+int c = range(0, 9, 9);  
+int d = range(20, 40, 32); 
+
+
+/* Outside the range. */ 
+int e = range(0, 9, -15); 
+int f = range(20, 40, 75); 
+int g = range(50, 80, 91); 
+
+printf("%d %d %d %d %d %d %d \n", a, b, c, d, e, f, g);   
+
+
+return 0; 
+
+
+} 
+
+
+
+
+
+
+
+