Mercurial > vim

comparison 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
comparison
equal deleted inserted replaced
13769:804c3b21ce59 13770:2449b6ce1456
13 */ 13 */
14 if(c != ' ') 14 if(c != ' ')
15 mod &= ~VTERM_MOD_SHIFT; 15 mod &= ~VTERM_MOD_SHIFT;
16 16
17 if(mod == 0) { 17 if(mod == 0) {
18 /* Normal text - ignore just shift */ 18 // Normal text - ignore just shift
19 char str[6]; 19 char str[6];
20 int seqlen = fill_utf8(c, str); 20 int seqlen = fill_utf8(c, str);
21 vterm_push_output_bytes(vt, str, seqlen); 21 vterm_push_output_bytes(vt, str, seqlen);
22 return; 22 return;
23 } 23 }
60 KEYCODE_ENTER, 60 KEYCODE_ENTER,
61 KEYCODE_SS3, 61 KEYCODE_SS3,
62 KEYCODE_CSI, 62 KEYCODE_CSI,
63 KEYCODE_CSI_CURSOR, 63 KEYCODE_CSI_CURSOR,
64 KEYCODE_CSINUM, 64 KEYCODE_CSINUM,
65 KEYCODE_KEYPAD 65 KEYCODE_KEYPAD,
66 } type; 66 } type;
67 char literal; 67 char literal;
68 int csinum; 68 int csinum;
69 } keycodes_s; 69 } keycodes_s;
70 70
71 /* Order here must be exactly the same as VTermKey enum! */ 71 /* Order here must be exactly the same as VTermKey enum! */
72 static keycodes_s keycodes[] = { 72 static keycodes_s keycodes[] = {
73 { KEYCODE_NONE, 0, 0 }, /* NONE */ 73 { KEYCODE_NONE, 0, 0 }, // NONE
74 74
75 { KEYCODE_ENTER, '\r', 0 }, /* ENTER */ 75 { KEYCODE_ENTER, '\r', 0 }, // ENTER
76 { KEYCODE_TAB, '\t', 0 }, /* TAB */ 76 { KEYCODE_TAB, '\t', 0 }, // TAB
77 { KEYCODE_LITERAL, '\x7f', 0 }, /* BACKSPACE == ASCII DEL */ 77 { KEYCODE_LITERAL, '\x7f', 0 }, // BACKSPACE == ASCII DEL
78 { KEYCODE_LITERAL, '\x1b', 0 }, /* ESCAPE */ 78 { KEYCODE_LITERAL, '\x1b', 0 }, // ESCAPE
79 79
80 { KEYCODE_CSI_CURSOR, 'A', 0 }, /* UP */ 80 { KEYCODE_CSI_CURSOR, 'A', 0 }, // UP
81 { KEYCODE_CSI_CURSOR, 'B', 0 }, /* DOWN */ 81 { KEYCODE_CSI_CURSOR, 'B', 0 }, // DOWN
82 { KEYCODE_CSI_CURSOR, 'D', 0 }, /* LEFT */ 82 { KEYCODE_CSI_CURSOR, 'D', 0 }, // LEFT
83 { KEYCODE_CSI_CURSOR, 'C', 0 }, /* RIGHT */ 83 { KEYCODE_CSI_CURSOR, 'C', 0 }, // RIGHT
84 84
85 { KEYCODE_CSINUM, '~', 2 }, /* INS */ 85 { KEYCODE_CSINUM, '~', 2 }, // INS
86 { KEYCODE_CSINUM, '~', 3 }, /* DEL */ 86 { KEYCODE_CSINUM, '~', 3 }, // DEL
87 { KEYCODE_CSI_CURSOR, 'H', 0 }, /* HOME */ 87 { KEYCODE_CSI_CURSOR, 'H', 0 }, // HOME
88 { KEYCODE_CSI_CURSOR, 'F', 0 }, /* END */ 88 { KEYCODE_CSI_CURSOR, 'F', 0 }, // END
89 { KEYCODE_CSINUM, '~', 5 }, /* PAGEUP */ 89 { KEYCODE_CSINUM, '~', 5 }, // PAGEUP
90 { KEYCODE_CSINUM, '~', 6 }, /* PAGEDOWN */ 90 { KEYCODE_CSINUM, '~', 6 }, // PAGEDOWN
91 }; 91 };
92 92
93 static keycodes_s keycodes_fn[] = { 93 static keycodes_s keycodes_fn[] = {
94 { KEYCODE_NONE, 0, 0 }, /* F0 - shouldn't happen */ 94 { KEYCODE_NONE, 0, 0 }, // F0 - shouldn't happen
95 { KEYCODE_CSI_CURSOR, 'P', 0 }, /* F1 */ 95 { KEYCODE_CSI_CURSOR, 'P', 0 }, // F1
96 { KEYCODE_CSI_CURSOR, 'Q', 0 }, /* F2 */ 96 { KEYCODE_CSI_CURSOR, 'Q', 0 }, // F2
97 { KEYCODE_CSI_CURSOR, 'R', 0 }, /* F3 */ 97 { KEYCODE_CSI_CURSOR, 'R', 0 }, // F3
98 { KEYCODE_CSI_CURSOR, 'S', 0 }, /* F4 */ 98 { KEYCODE_CSI_CURSOR, 'S', 0 }, // F4
99 { KEYCODE_CSINUM, '~', 15 }, /* F5 */ 99 { KEYCODE_CSINUM, '~', 15 }, // F5
100 { KEYCODE_CSINUM, '~', 17 }, /* F6 */ 100 { KEYCODE_CSINUM, '~', 17 }, // F6
101 { KEYCODE_CSINUM, '~', 18 }, /* F7 */ 101 { KEYCODE_CSINUM, '~', 18 }, // F7
102 { KEYCODE_CSINUM, '~', 19 }, /* F8 */ 102 { KEYCODE_CSINUM, '~', 19 }, // F8
103 { KEYCODE_CSINUM, '~', 20 }, /* F9 */ 103 { KEYCODE_CSINUM, '~', 20 }, // F9
104 { KEYCODE_CSINUM, '~', 21 }, /* F10 */ 104 { KEYCODE_CSINUM, '~', 21 }, // F10
105 { KEYCODE_CSINUM, '~', 23 }, /* F11 */ 105 { KEYCODE_CSINUM, '~', 23 }, // F11
106 { KEYCODE_CSINUM, '~', 24 }, /* F12 */ 106 { KEYCODE_CSINUM, '~', 24 }, // F12
107 }; 107 };
108 108
109 static keycodes_s keycodes_kp[] = { 109 static keycodes_s keycodes_kp[] = {
110 { KEYCODE_KEYPAD, '0', 'p' }, /* KP_0 */ 110 { KEYCODE_KEYPAD, '0', 'p' }, // KP_0
111 { KEYCODE_KEYPAD, '1', 'q' }, /* KP_1 */ 111 { KEYCODE_KEYPAD, '1', 'q' }, // KP_1
112 { KEYCODE_KEYPAD, '2', 'r' }, /* KP_2 */ 112 { KEYCODE_KEYPAD, '2', 'r' }, // KP_2
113 { KEYCODE_KEYPAD, '3', 's' }, /* KP_3 */ 113 { KEYCODE_KEYPAD, '3', 's' }, // KP_3
114 { KEYCODE_KEYPAD, '4', 't' }, /* KP_4 */ 114 { KEYCODE_KEYPAD, '4', 't' }, // KP_4
115 { KEYCODE_KEYPAD, '5', 'u' }, /* KP_5 */ 115 { KEYCODE_KEYPAD, '5', 'u' }, // KP_5
116 { KEYCODE_KEYPAD, '6', 'v' }, /* KP_6 */ 116 { KEYCODE_KEYPAD, '6', 'v' }, // KP_6
117 { KEYCODE_KEYPAD, '7', 'w' }, /* KP_7 */ 117 { KEYCODE_KEYPAD, '7', 'w' }, // KP_7
118 { KEYCODE_KEYPAD, '8', 'x' }, /* KP_8 */ 118 { KEYCODE_KEYPAD, '8', 'x' }, // KP_8
119 { KEYCODE_KEYPAD, '9', 'y' }, /* KP_9 */ 119 { KEYCODE_KEYPAD, '9', 'y' }, // KP_9
120 { KEYCODE_KEYPAD, '*', 'j' }, /* KP_MULT */ 120 { KEYCODE_KEYPAD, '*', 'j' }, // KP_MULT
121 { KEYCODE_KEYPAD, '+', 'k' }, /* KP_PLUS */ 121 { KEYCODE_KEYPAD, '+', 'k' }, // KP_PLUS
122 { KEYCODE_KEYPAD, ',', 'l' }, /* KP_COMMA */ 122 { KEYCODE_KEYPAD, ',', 'l' }, // KP_COMMA
123 { KEYCODE_KEYPAD, '-', 'm' }, /* KP_MINUS */ 123 { KEYCODE_KEYPAD, '-', 'm' }, // KP_MINUS
124 { KEYCODE_KEYPAD, '.', 'n' }, /* KP_PERIOD */ 124 { KEYCODE_KEYPAD, '.', 'n' }, // KP_PERIOD
125 { KEYCODE_KEYPAD, '/', 'o' }, /* KP_DIVIDE */ 125 { KEYCODE_KEYPAD, '/', 'o' }, // KP_DIVIDE
126 { KEYCODE_KEYPAD, '\n', 'M' }, /* KP_ENTER */ 126 { KEYCODE_KEYPAD, '\n', 'M' }, // KP_ENTER
127 { KEYCODE_KEYPAD, '=', 'X' }, /* KP_EQUAL */ 127 { KEYCODE_KEYPAD, '=', 'X' }, // KP_EQUAL
128 }; 128 };
129 129
130 void vterm_keyboard_key(VTerm *vt, VTermKey key, VTermModifier mod) 130 void vterm_keyboard_key(VTerm *vt, VTermKey key, VTermModifier mod)
131 { 131 {
132 keycodes_s k; 132 keycodes_s k;