add keyboard debug messages when we change keyboard modes. remove kh

* src/vte.c: add keyboard debug messages when we change keyboard modes.
* termcaps/xterm: remove kh definition.

diff --git a/ChangeLog b/ChangeLog
index 51c24d5..55a52ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-25  nalin
+       * src/vte.c: add keyboard debug messages when we change keyboard modes.
+       * termcaps/xterm: remove kh definition.
+
 2002-11-25  nalin
        * src/keymap.c: make keypad arrow keys follow cursor mode (#98604).
 

diff --git a/src/vte.c b/src/vte.c
index 0e00463..a7a4fb2 100644 (file)
--- a/src/vte.c
+++ b/src/vte.c
@@ -4258,6 +4258,17 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
 
        /* Do whatever's necessary when the setting changes. */
        switch (setting) {
+       case 1:
+#ifdef VTE_DEBUG
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
+                               fprintf(stderr, "Entering application cursor mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving application cursor mode.\n");
+                       }
+               }
+#endif
+               break;
        case 3:
                vte_terminal_emit_resize_window(terminal,
                                                (set ? 132 : 80) *
@@ -4309,45 +4320,60 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
                /* Make the pointer visible. */
                vte_terminal_set_pointer_visible(terminal, TRUE);
                break;
+       case 66:
+#ifdef VTE_DEBUG
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
+                               fprintf(stderr, "Entering application keypad mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving application keypad mode.\n");
+                       }
+               }
+#endif
+               break;
        case 1051:
-               /* Sun mode? Make it mutually-exclusive. */
-               if (set) {
 #ifdef VTE_DEBUG
-                       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
                                fprintf(stderr, "Entering Sun fkey mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving Sun fkey mode.\n");
                        }
-#endif
                }
+#endif
                break;
        case 1052:
-               /* HP mode? Make it mutually-exclusive. */
-               if (set) {
 #ifdef VTE_DEBUG
-                       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
                                fprintf(stderr, "Entering HP fkey mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving HP fkey mode.\n");
                        }
-#endif
                }
+#endif
                break;
        case 1060:
-               /* Legacy mode? Make it mutually-exclusive. */
-               if (set) {
 #ifdef VTE_DEBUG
-                       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
                                fprintf(stderr, "Entering Legacy fkey mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving Legacy fkey mode.\n");
                        }
-#endif
                }
+#endif
                break;
        case 1061:
-               /* VT220 mode? Make it mutually-exclusive. */
-               if (set) {
 #ifdef VTE_DEBUG
-                       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+                       if (set) {
                                fprintf(stderr, "Entering VT220 fkey mode.\n");
+                       } else {
+                               fprintf(stderr, "Leaving VT220 fkey mode.\n");
                        }
-#endif
                }
+#endif
                break;
        default:
                break;
@@ -4367,6 +4393,11 @@ vte_sequence_handler_application_keypad(VteTerminal *terminal,
                                        GQuark match_quark,
                                        GValueArray *params)
 {
+#ifdef VTE_DEBUG
+       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               fprintf(stderr, "Entering application keypad mode.\n");
+       }
+#endif
        terminal->pvt->keypad_mode = VTE_KEYMODE_APPLICATION;
 }
 
@@ -4376,6 +4407,11 @@ vte_sequence_handler_normal_keypad(VteTerminal *terminal,
                                   GQuark match_quark,
                                   GValueArray *params)
 {
+#ifdef VTE_DEBUG
+       if (_vte_debug_on(VTE_DEBUG_KEYBOARD)) {
+               fprintf(stderr, "Leaving application keypad mode.\n");
+       }
+#endif
        terminal->pvt->keypad_mode = VTE_KEYMODE_NORMAL;
 }
 

diff --git a/termcaps/xterm b/termcaps/xterm
index 4e70960..7c742ab 100644 (file)
--- a/termcaps/xterm
+++ b/termcaps/xterm
@@ -15,7 +15,7 @@ xterm-xfree86|xterm-new|xterm terminal emulator (XFree86):\
        :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
        :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\
        :kD=\177:\
-       :kb=^H:ke=\E[?1l\E>:kh=\E[1~:\
+       :kb=^H:ke=\E[?1l\E>:\
        :ks=\E[?1h\E=:le=^H:mb=\E[5m:md=\E[1m:\
        :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
        :sf=^J:so=\E[7m:sr=\EM:st=\EH:te=\E[?1047l\E[?1048l:\