Mercurial > vim

diff src/libvterm/src/keyboard.c @ 13770:2449b6ce1456 v8.0.1757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1757: unnecessary changes in libvterm commit https://github.com/vim/vim/commit/b691de05f69905fe417f583083d7e3cc16eb865e Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 24 18:39:14 2018 +0200 patch 8.0.1757: unnecessary changes in libvterm Problem: Unnecessary changes in libvterm. Solution: Bring back // comments and trailing comma in enums.
author Christian Brabandt <cb@256bit.org>
date Tue, 24 Apr 2018 18:45:07 +0200
parents 7846efd291d7
children 811a12a78164
line wrap: on
line diff
--- a/src/libvterm/src/keyboard.c
+++ b/src/libvterm/src/keyboard.c
@@ -15,7 +15,7 @@ void vterm_keyboard_unichar(VTerm *vt, u
     mod &= ~VTERM_MOD_SHIFT;
 
   if(mod == 0) {
-    /* Normal text - ignore just shift */
+    // Normal text - ignore just shift
     char str[6];
     int seqlen = fill_utf8(c, str);
     vterm_push_output_bytes(vt, str, seqlen);
@@ -62,7 +62,7 @@ typedef struct {
     KEYCODE_CSI,
     KEYCODE_CSI_CURSOR,
     KEYCODE_CSINUM,
-    KEYCODE_KEYPAD
+    KEYCODE_KEYPAD,
   } type;
   char literal;
   int csinum;
@@ -70,61 +70,61 @@ typedef struct {
 
 /* Order here must be exactly the same as VTermKey enum! */
 static keycodes_s keycodes[] = {
-  { KEYCODE_NONE,       0, 0 }, /* NONE */
+  { KEYCODE_NONE,       0, 0 }, // NONE
 
-  { KEYCODE_ENTER,      '\r', 0 }, /* ENTER */
-  { KEYCODE_TAB,        '\t',  0 }, /* TAB */
-  { KEYCODE_LITERAL,    '\x7f', 0 }, /* BACKSPACE == ASCII DEL */
-  { KEYCODE_LITERAL,    '\x1b', 0 }, /* ESCAPE */
+  { KEYCODE_ENTER,      '\r', 0 }, // ENTER
+  { KEYCODE_TAB,        '\t',  0 }, // TAB
+  { KEYCODE_LITERAL,    '\x7f', 0 }, // BACKSPACE == ASCII DEL
+  { KEYCODE_LITERAL,    '\x1b', 0 }, // ESCAPE
 
-  { KEYCODE_CSI_CURSOR, 'A', 0 }, /* UP */
-  { KEYCODE_CSI_CURSOR, 'B', 0 }, /* DOWN */
-  { KEYCODE_CSI_CURSOR, 'D', 0 }, /* LEFT */
-  { KEYCODE_CSI_CURSOR, 'C', 0 }, /* RIGHT */
+  { KEYCODE_CSI_CURSOR, 'A', 0 }, // UP
+  { KEYCODE_CSI_CURSOR, 'B', 0 }, // DOWN
+  { KEYCODE_CSI_CURSOR, 'D', 0 }, // LEFT
+  { KEYCODE_CSI_CURSOR, 'C', 0 }, // RIGHT
 
-  { KEYCODE_CSINUM,     '~', 2 },  /* INS */
-  { KEYCODE_CSINUM,     '~', 3 },  /* DEL */
-  { KEYCODE_CSI_CURSOR, 'H', 0 }, /* HOME */
-  { KEYCODE_CSI_CURSOR, 'F', 0 }, /* END */
-  { KEYCODE_CSINUM,     '~', 5 },  /* PAGEUP */
-  { KEYCODE_CSINUM,     '~', 6 },  /* PAGEDOWN */
+  { KEYCODE_CSINUM,     '~', 2 }, // INS
+  { KEYCODE_CSINUM,     '~', 3 }, // DEL
+  { KEYCODE_CSI_CURSOR, 'H', 0 }, // HOME
+  { KEYCODE_CSI_CURSOR, 'F', 0 }, // END
+  { KEYCODE_CSINUM,     '~', 5 }, // PAGEUP
+  { KEYCODE_CSINUM,     '~', 6 }, // PAGEDOWN
 };
 
 static keycodes_s keycodes_fn[] = {
-  { KEYCODE_NONE,       0, 0 },   /* F0 - shouldn't happen */
-  { KEYCODE_CSI_CURSOR, 'P', 0 }, /* F1 */
-  { KEYCODE_CSI_CURSOR, 'Q', 0 }, /* F2 */
-  { KEYCODE_CSI_CURSOR, 'R', 0 }, /* F3 */
-  { KEYCODE_CSI_CURSOR, 'S', 0 }, /* F4 */
-  { KEYCODE_CSINUM,     '~', 15 }, /* F5 */
-  { KEYCODE_CSINUM,     '~', 17 }, /* F6 */
-  { KEYCODE_CSINUM,     '~', 18 }, /* F7 */
-  { KEYCODE_CSINUM,     '~', 19 }, /* F8 */
-  { KEYCODE_CSINUM,     '~', 20 }, /* F9 */
-  { KEYCODE_CSINUM,     '~', 21 }, /* F10 */
-  { KEYCODE_CSINUM,     '~', 23 }, /* F11 */
-  { KEYCODE_CSINUM,     '~', 24 }, /* F12 */
+  { KEYCODE_NONE,       0, 0 },   // F0 - shouldn't happen
+  { KEYCODE_CSI_CURSOR, 'P', 0 }, // F1
+  { KEYCODE_CSI_CURSOR, 'Q', 0 }, // F2
+  { KEYCODE_CSI_CURSOR, 'R', 0 }, // F3
+  { KEYCODE_CSI_CURSOR, 'S', 0 }, // F4
+  { KEYCODE_CSINUM,     '~', 15 }, // F5
+  { KEYCODE_CSINUM,     '~', 17 }, // F6
+  { KEYCODE_CSINUM,     '~', 18 }, // F7
+  { KEYCODE_CSINUM,     '~', 19 }, // F8
+  { KEYCODE_CSINUM,     '~', 20 }, // F9
+  { KEYCODE_CSINUM,     '~', 21 }, // F10
+  { KEYCODE_CSINUM,     '~', 23 }, // F11
+  { KEYCODE_CSINUM,     '~', 24 }, // F12
 };
 
 static keycodes_s keycodes_kp[] = {
-  { KEYCODE_KEYPAD, '0', 'p' }, /* KP_0 */
-  { KEYCODE_KEYPAD, '1', 'q' }, /* KP_1 */
-  { KEYCODE_KEYPAD, '2', 'r' }, /* KP_2 */
-  { KEYCODE_KEYPAD, '3', 's' }, /* KP_3 */
-  { KEYCODE_KEYPAD, '4', 't' }, /* KP_4 */
-  { KEYCODE_KEYPAD, '5', 'u' }, /* KP_5 */
-  { KEYCODE_KEYPAD, '6', 'v' }, /* KP_6 */
-  { KEYCODE_KEYPAD, '7', 'w' }, /* KP_7 */
-  { KEYCODE_KEYPAD, '8', 'x' }, /* KP_8 */
-  { KEYCODE_KEYPAD, '9', 'y' }, /* KP_9 */
-  { KEYCODE_KEYPAD, '*', 'j' }, /* KP_MULT */
-  { KEYCODE_KEYPAD, '+', 'k' }, /* KP_PLUS */
-  { KEYCODE_KEYPAD, ',', 'l' }, /* KP_COMMA */
-  { KEYCODE_KEYPAD, '-', 'm' }, /* KP_MINUS */
-  { KEYCODE_KEYPAD, '.', 'n' }, /* KP_PERIOD */
-  { KEYCODE_KEYPAD, '/', 'o' }, /* KP_DIVIDE */
-  { KEYCODE_KEYPAD, '\n', 'M' }, /* KP_ENTER */
-  { KEYCODE_KEYPAD, '=', 'X' }, /* KP_EQUAL */
+  { KEYCODE_KEYPAD, '0', 'p' }, // KP_0
+  { KEYCODE_KEYPAD, '1', 'q' }, // KP_1
+  { KEYCODE_KEYPAD, '2', 'r' }, // KP_2
+  { KEYCODE_KEYPAD, '3', 's' }, // KP_3
+  { KEYCODE_KEYPAD, '4', 't' }, // KP_4
+  { KEYCODE_KEYPAD, '5', 'u' }, // KP_5
+  { KEYCODE_KEYPAD, '6', 'v' }, // KP_6
+  { KEYCODE_KEYPAD, '7', 'w' }, // KP_7
+  { KEYCODE_KEYPAD, '8', 'x' }, // KP_8
+  { KEYCODE_KEYPAD, '9', 'y' }, // KP_9
+  { KEYCODE_KEYPAD, '*', 'j' }, // KP_MULT
+  { KEYCODE_KEYPAD, '+', 'k' }, // KP_PLUS
+  { KEYCODE_KEYPAD, ',', 'l' }, // KP_COMMA
+  { KEYCODE_KEYPAD, '-', 'm' }, // KP_MINUS
+  { KEYCODE_KEYPAD, '.', 'n' }, // KP_PERIOD
+  { KEYCODE_KEYPAD, '/', 'o' }, // KP_DIVIDE
+  { KEYCODE_KEYPAD, '\n', 'M' }, // KP_ENTER
+  { KEYCODE_KEYPAD, '=', 'X' }, // KP_EQUAL
 };
 
 void vterm_keyboard_key(VTerm *vt, VTermKey key, VTermModifier mod)