Nuke LINUX_KEYS.
authorayin <ayin>
Sat, 16 Feb 2008 15:48:36 +0000 (15:48 +0000)
committerayin <ayin>
Sat, 16 Feb 2008 15:48:36 +0000 (15:48 +0000)
src/command.C
src/command.h
src/feature.h

index a49c30348d205a85ec5663be3fcb2b97985bc441..dd175514211422dc392e848661e77abfe027e9c1 100644 (file)
@@ -378,6 +378,12 @@ map_function_key (KeySym keysym)
         case XK_Next:
           param = 6;
           break;
+        case XK_Home:
+          param = 7;
+          break;
+        case XK_End:
+          param = 8;
+          break;
 #endif
         case XK_Help:
           param = 28;
@@ -755,13 +761,6 @@ rxvt_term::key_press (XKeyEvent &ev)
                       }
                     break;
 
-                  case XK_End:
-                    strcpy (kbuf, KS_END);
-                    break;
-                  case XK_Home:
-                    strcpy (kbuf, KS_HOME);
-                    break;
-
                   default:
                     {
                       int param = map_function_key (keysym);
index 3de59128e29761642e4337e76706fe4ed5e82867..ceb7a9bcb2c53d5fe474c7ac2bd9e97daab19e81 100644 (file)
 # define SCROLLBAR_CONTINUOUS_DELAY    0.05
 #endif
 
-/*
- * key-strings: if only these keys were standardized <sigh>
- */
-#ifdef LINUX_KEYS
-# define KS_HOME       "\033[1~"       /* Home == Find */
-# define KS_END                "\033[4~"       /* End == Select */
-#else
-# define KS_HOME       "\033[7~"       /* Home */
-# define KS_END                "\033[8~"       /* End */
-#endif
-
 #ifdef SCROLL_ON_SHIFT
 # define SCROLL_SHIFTKEY (shft)
 # define NOSCROLL_SHIFTKEY 0
index 46b0b73eb4427d4699cbaa32ebb82fabe86b6a92..b9884ae86ee25d566af459bdfbf55b1f2a675231 100644 (file)
 #define DEFAULT_BACKSPACE      "DEC"           /* SPECIAL */
 #define DEFAULT_DELETE         "\033[3~"
 
-/*
- * To use
- *     Home = "\E[1~", End = "\E[4~"
- * instead of
- *     Home = "\E[7~", End = "\E[8~"   [default]
- */
-/* #define LINUX_KEYS */
-
 /*
  * Enable the keysym resource which allows you to define strings associated
  * with various KeySyms (0xFF00 - 0xFFFF).