From a38aef93ab2a5006c3b8cfa50aaf48fafc0eb8d4 Mon Sep 17 00:00:00 2001
From: Sean D'Epagnier <geckosenator@freedesktop.org>
Date: Sun, 27 Aug 2006 01:16:09 +0000
Subject: The colormap code is now simpler, 15bpp works where it did not
 before.

The input is fixed so that delete reports '\b' and backspace 127

The vt switching works both right and left.
---
 src/glut/fbdev/input.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/glut/fbdev/input.c')

diff --git a/src/glut/fbdev/input.c b/src/glut/fbdev/input.c
index 791466911e..b1362245f2 100644
--- a/src/glut/fbdev/input.c
+++ b/src/glut/fbdev/input.c
@@ -138,7 +138,7 @@ static void KeyboardHandler(int sig)
 
       if(labelval == K_RIGHT)
 	 if(ioctl(ConsoleFD, VT_GETSTATE, &st) >= 0)
-	    vt = st.v_active - 1;
+	    vt = st.v_active + 1;
 
       if(vt != -1) {
 	 if(Swapping)
@@ -224,7 +224,8 @@ static int ReadKey(void)
 	       specialkey = GLUT_KEY_INSERT;
 	       break; 
 	    case 51:
-	       code = '\b'; goto stdkey;
+	       code = '\b';
+	       goto stdkey;
 	    case 91:
 	       READKEY;
 	       specialkey = GLUT_KEY_F1 + code - 65;
@@ -313,8 +314,8 @@ static int ReadKey(void)
    if(KeyboardLedState & LED_SCR)
       return 0;
 
-   if(labelval >= K_F1 && labelval <= K_F12)
-      specialkey = GLUT_KEY_F1 + labelval - K_F1;
+   if(labelvalnoshift >= K_F1 && labelvalnoshift <= K_F12)
+      specialkey = GLUT_KEY_F1 + labelvalnoshift - K_F1;
    else
       switch(labelvalnoshift) {
       case K_LEFT:
@@ -335,8 +336,9 @@ static int ReadKey(void)
 	 specialkey = GLUT_KEY_END; break;
       case K_INSERT:
 	 specialkey = GLUT_KEY_INSERT; break; 
-      case 127:
-	 labelval = '\b'; break;
+      case K_REMOVE:
+	 labelval = '\b';
+	 break;
       case K_ENTER:
       case K_ENTER - 1: /* keypad enter */
 	 labelval = '\n'; break;
-- 
cgit v1.2.3