Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge changes from ams/cleanup. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | ams/sdl1 |
Files: | files | file ages | folders |
SHA3-256: |
e3ef95ff7cc7208d6bcc00666be35b3e |
User & Date: | ams 2024-05-31 07:40:47 |
Context
2024-05-31
| ||
08:33 | Implement first stap at working keyboard input. check-in: db7f9eef58 user: ams tags: ams/sdl1 | |
07:40 | Merge changes from ams/cleanup. check-in: e3ef95ff7c user: ams tags: ams/sdl1 | |
07:39 | Merge changes from trunk. check-in: 9721679bb8 user: ams tags: ams/sdl1 | |
2024-05-30
| ||
07:38 | cadet.c: Move keymap to cadet.defs. Closed-Leaf check-in: a654806104 user: ams tags: ams/cleanup | |
Changes
Changes to cadet.c.
1 2 3 | /* cadet.c --- Space Cadet (aka new) keyboard translation */ | < | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | /* cadet.c --- Space Cadet (aka new) keyboard translation */ #include <stdint.h> #include <string.h> #include <stdbool.h> #include "ucode.h" #include "utrace.h" #include "iob.h" #include "kbd.h" #include "misc.h" #include "ucode.h" #include "utrace.h" #if WITH_X11 #include "x11.h" |
︙ | ︙ | |||
53 54 55 56 57 58 59 | #define CADET_RIGHT_META 0165 #define CADET_RIGHT_SUPER 065 #define CADET_RIGHT_HYPER 0175 #define CADET_CAPSLOCK 0125 #define CADET_ALTLOCK 015 #define CADET_MODELOCK 03 | < < < < | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | #define CADET_RIGHT_META 0165 #define CADET_RIGHT_SUPER 065 #define CADET_RIGHT_HYPER 0175 #define CADET_CAPSLOCK 0125 #define CADET_ALTLOCK 015 #define CADET_MODELOCK 03 unsigned short cadet_kbd_map[256][2]; unsigned short cadet_modifier_map[11]; int cadet_shifts = CADET_IX_UNSHIFT; static void cadet_allup_event(int mods) |
︙ | ︙ | |||
126 127 128 129 130 131 132 | keycode = modmap->modifiermap[modifier * modmap->max_keypermod + i]; if (keymap[keycode / 8] & (1 << keycode % 8)) { keymap[keycode / 8] &= ~(1 << keycode % 8); /* Clear the key in KEYMAP. */ DEBUG(TRACE_KBD, "cadet_allup_key() - bucky pressed (%d); keycode = %d\n", bucky, keycode); switch (bucky) { case KBD_SHIFT: | < < < < < < < < < < < | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | keycode = modmap->modifiermap[modifier * modmap->max_keypermod + i]; if (keymap[keycode / 8] & (1 << keycode % 8)) { keymap[keycode / 8] &= ~(1 << keycode % 8); /* Clear the key in KEYMAP. */ DEBUG(TRACE_KBD, "cadet_allup_key() - bucky pressed (%d); keycode = %d\n", bucky, keycode); switch (bucky) { case KBD_SHIFT: mods |= CADET_ALLUP_SHIFT; shifts |= (1 << CADET_IX_SHIFT); break; case KBD_TOP: mods |= CADET_ALLUP_TOP; shifts |= (1 << CADET_IX_TOP); break; case KBD_CONTROL: mods |= CADET_ALLUP_CONTROL; break; case KBD_META: mods |= CADET_ALLUP_META; break; case KBD_SHIFT_LOCK: mods |= CADET_ALLUP_CAPS_LOCK; break; case KBD_MODE_LOCK: mods |= CADET_ALLUP_MODELOCK; break; case KBD_GREEK: mods |= CADET_ALLUP_GREEK; shifts |= (1 << CADET_IX_GREEK); break; case KBD_REPEAT: break; case KBD_ALT_LOCK: mods |= CADET_ALLUP_ALTLOCK; break; case KBD_HYPER: mods |= CADET_ALLUP_HYPER; break; case KBD_SUPER: mods |= CADET_ALLUP_SUPER; break; default: WARNING(TRACE_KBD, "kbd (cadet): unknown bucky key: 0%o\n", x11_modifier_map[modifier]); break; } } |
︙ | ︙ | |||
193 194 195 196 197 198 199 | DEBUG(TRACE_KBD, "cadet_allup_key() - found a key that is up which is not a shift; keymap[%d] = 0%o\n", i, keymap[i]); allup = false; break; } } if (allup == true) { DEBUG(TRACE_KBD, "cadet_allup_key() - all-up event; mods = 0%o, shifts = 0%o\n", mods, shifts); | | | | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | DEBUG(TRACE_KBD, "cadet_allup_key() - found a key that is up which is not a shift; keymap[%d] = 0%o\n", i, keymap[i]); allup = false; break; } } if (allup == true) { DEBUG(TRACE_KBD, "cadet_allup_key() - all-up event; mods = 0%o, shifts = 0%o\n", mods, shifts); cadet_shifts = shifts; /* Keep track of shifts. */ cadet_allup_event(mods); /* Generate all-up event. */ } return allup; } #elif WITH_SDL1 bool cadet_allup_key(void) { |
︙ | ︙ | |||
238 239 240 241 242 243 244 | int *kbd_map, int *modifier_map ) { int lmchar; /* Lisp Machine charachter to insert */ int scc; /* Space Cadet scancode. */ int wantshift; /* Index into second column in cadet_kbd_map. */ | | | 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 | int *kbd_map, int *modifier_map ) { int lmchar; /* Lisp Machine charachter to insert */ int scc; /* Space Cadet scancode. */ int wantshift; /* Index into second column in cadet_kbd_map. */ int shkey; /* Shift key being pressed. */ int oshift; if (!keydown && cadet_allup_key() == true) return; oshift = cadet_shifts; DEBUG(TRACE_KBD, "cadet_process_key() - XLookupString(keysym = 0%o), bi = %d\n", keysym, bi); if (bi != -1) { |
︙ | ︙ | |||
324 325 326 327 328 329 330 | cadet_modifier_map[KBD_TOP] = CADET_LEFT_TOP; cadet_modifier_map[KBD_CONTROL] = CADET_LEFT_CONTROL; cadet_modifier_map[KBD_META] = CADET_LEFT_META; cadet_modifier_map[KBD_SUPER] = CADET_LEFT_SUPER; cadet_modifier_map[KBD_HYPER] = CADET_LEFT_HYPER; cadet_modifier_map[KBD_SHIFT_LOCK] = CADET_CAPSLOCK; | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | cadet_modifier_map[KBD_TOP] = CADET_LEFT_TOP; cadet_modifier_map[KBD_CONTROL] = CADET_LEFT_CONTROL; cadet_modifier_map[KBD_META] = CADET_LEFT_META; cadet_modifier_map[KBD_SUPER] = CADET_LEFT_SUPER; cadet_modifier_map[KBD_HYPER] = CADET_LEFT_HYPER; cadet_modifier_map[KBD_SHIFT_LOCK] = CADET_CAPSLOCK; #define X(lmch, scc, wantshift) \ cadet_kbd_map[LMCH_##lmch][0] = scc; cadet_kbd_map[LMCH_##lmch][1] = wantshift; #include "cadet.defs" /* Hacks... */ #if 0 X(LMCH_bracketleft, 0166, CADET_IX_UNSHIFT); X(LMCH_bracketright, 0146, CADET_IX_UNSHIFT); X(LMCH_braceleft, 0132, CADET_IX_SHIFT); X(LMCH_braceright, 0137, CADET_IX_SHIFT); #endif #undef X } |
Added cadet.defs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | /* cadet.defs --- Space Cadet keyboard mappings -*- C -*- * * The syntax of the X macro is as follows: * X(name, value, shift) */ /* Unshifted */ X(macro, 0100, CADET_IX_UNSHIFT) X(terminal, 0040, CADET_IX_UNSHIFT) X(quote, 0120, CADET_IX_UNSHIFT) X(overstrike, 0160, CADET_IX_UNSHIFT) X(clear_input, 0110, CADET_IX_UNSHIFT) X(clear_screen, 0050, CADET_IX_UNSHIFT) X(hold_output, 0030, CADET_IX_UNSHIFT) X(stop_output, 0170, CADET_IX_UNSHIFT) X(abort, 0067, CADET_IX_UNSHIFT) X(break, 0167, CADET_IX_UNSHIFT) X(resume, 0047, CADET_IX_UNSHIFT) X(call, 0107, CADET_IX_UNSHIFT) X(roman_i, 0101, CADET_IX_UNSHIFT) X(roman_ii, 0001, CADET_IX_UNSHIFT) X(system, 0141, CADET_IX_UNSHIFT) X(colon, 0021, CADET_IX_UNSHIFT) X(1, 0121, CADET_IX_UNSHIFT) X(2, 0061, CADET_IX_UNSHIFT) X(3, 0161, CADET_IX_UNSHIFT) X(4, 0011, CADET_IX_UNSHIFT) X(5, 0111, CADET_IX_UNSHIFT) X(6, 0051, CADET_IX_UNSHIFT) X(7, 0151, CADET_IX_UNSHIFT) X(8, 0031, CADET_IX_UNSHIFT) X(9, 0071, CADET_IX_UNSHIFT) X(0, 0171, CADET_IX_UNSHIFT) X(minus, 0131, CADET_IX_UNSHIFT) X(equal, 0126, CADET_IX_UNSHIFT) X(braceleft, 0166, CADET_IX_UNSHIFT) X(braceright, 0146, CADET_IX_UNSHIFT) X(status, 0046, CADET_IX_UNSHIFT) X(hand_up, 0106, CADET_IX_UNSHIFT) X(hand_down, 0176, CADET_IX_UNSHIFT) X(roman_iii, 0102, CADET_IX_UNSHIFT) X(roman_iv, 0002, CADET_IX_UNSHIFT) X(network, 0042, CADET_IX_UNSHIFT) X(tab, 0022, CADET_IX_UNSHIFT) X(q, 0122, CADET_IX_UNSHIFT) X(w, 0062, CADET_IX_UNSHIFT) X(e, 0162, CADET_IX_UNSHIFT) X(r, 0012, CADET_IX_UNSHIFT) X(t, 0112, CADET_IX_UNSHIFT) X(y, 0052, CADET_IX_UNSHIFT) X(u, 0152, CADET_IX_UNSHIFT) X(i, 0032, CADET_IX_UNSHIFT) X(o, 0072, CADET_IX_UNSHIFT) X(p, 0172, CADET_IX_UNSHIFT) X(parenleft, 0132, CADET_IX_UNSHIFT) X(parenright, 0137, CADET_IX_UNSHIFT) X(grave, 0077, CADET_IX_UNSHIFT) X(backslash, 0037, CADET_IX_UNSHIFT) X(delete, 0157, CADET_IX_UNSHIFT) X(hand_left, 0117, CADET_IX_UNSHIFT) X(hand_right, 0017, CADET_IX_UNSHIFT) X(altmode, 0143, CADET_IX_UNSHIFT) X(rubout, 0023, CADET_IX_UNSHIFT) X(a, 0123, CADET_IX_UNSHIFT) X(s, 0063, CADET_IX_UNSHIFT) X(d, 0163, CADET_IX_UNSHIFT) X(f, 0013, CADET_IX_UNSHIFT) X(g, 0113, CADET_IX_UNSHIFT) X(h, 0053, CADET_IX_UNSHIFT) X(j, 0153, CADET_IX_UNSHIFT) X(k, 0033, CADET_IX_UNSHIFT) X(l, 0073, CADET_IX_UNSHIFT) X(semicolon, 0173, CADET_IX_UNSHIFT) X(apostrophe, 0133, CADET_IX_UNSHIFT) X(return, 0136, CADET_IX_UNSHIFT) X(line, 0036, CADET_IX_UNSHIFT) X(end, 0156, CADET_IX_UNSHIFT) X(help, 0116, CADET_IX_UNSHIFT) X(z, 0124, CADET_IX_UNSHIFT) X(x, 0064, CADET_IX_UNSHIFT) X(c, 0164, CADET_IX_UNSHIFT) X(v, 0014, CADET_IX_UNSHIFT) X(b, 0114, CADET_IX_UNSHIFT) X(n, 0054, CADET_IX_UNSHIFT) X(m, 0154, CADET_IX_UNSHIFT) X(comma, 0034, CADET_IX_UNSHIFT) X(period, 0074, CADET_IX_UNSHIFT) X(slash, 0174, CADET_IX_UNSHIFT) X(space, 0134, CADET_IX_UNSHIFT) /* Shift */ X(plus_minus, 0021, CADET_IX_SHIFT) X(exclam, 0121, CADET_IX_SHIFT) X(at, 0061, CADET_IX_SHIFT) X(numbersign, 0161, CADET_IX_SHIFT) X(dollar, 0011, CADET_IX_SHIFT) X(percent, 0111, CADET_IX_SHIFT) X(asciicircum, 0051, CADET_IX_SHIFT) X(ampersand, 0151, CADET_IX_SHIFT) X(asterisk, 0031, CADET_IX_SHIFT) X(parenleft, 0071, CADET_IX_SHIFT) X(parenright, 0171, CADET_IX_SHIFT) X(underscore, 0131, CADET_IX_SHIFT) X(plus, 0126, CADET_IX_SHIFT) X(less, 0034, CADET_IX_SHIFT) X(greater, 0074, CADET_IX_SHIFT) X(Q, 0122, CADET_IX_SHIFT) X(W, 0062, CADET_IX_SHIFT) X(E, 0162, CADET_IX_SHIFT) X(R, 0012, CADET_IX_SHIFT) X(T, 0112, CADET_IX_SHIFT) X(Y, 0052, CADET_IX_SHIFT) X(U, 0152, CADET_IX_SHIFT) X(I, 0032, CADET_IX_SHIFT) X(O, 0072, CADET_IX_SHIFT) X(P, 0172, CADET_IX_SHIFT) X(bracketleft, 0132, CADET_IX_SHIFT) X(bracketright, 0137, CADET_IX_SHIFT) X(asciitilde, 0077, CADET_IX_SHIFT) X(bar, 0037, CADET_IX_SHIFT) X(A, 0123, CADET_IX_SHIFT) X(S, 0063, CADET_IX_SHIFT) X(D, 0163, CADET_IX_SHIFT) X(F, 0013, CADET_IX_SHIFT) X(G, 0113, CADET_IX_SHIFT) X(H, 0053, CADET_IX_SHIFT) X(J, 0153, CADET_IX_SHIFT) X(K, 0033, CADET_IX_SHIFT) X(L, 0073, CADET_IX_SHIFT) X(quotedbl, 0133, CADET_IX_SHIFT) X(Z, 0124, CADET_IX_SHIFT) X(X, 0064, CADET_IX_SHIFT) X(C, 0164, CADET_IX_SHIFT) X(V, 0014, CADET_IX_SHIFT) X(B, 0114, CADET_IX_SHIFT) X(N, 0054, CADET_IX_SHIFT) X(M, 0154, CADET_IX_SHIFT) X(question, 0174, CADET_IX_SHIFT) /* Top */ X(and_sign, 0122, CADET_IX_TOP) X(or_sign, 0062, CADET_IX_TOP) X(up_horseshoe, 0162, CADET_IX_TOP) X(down_horseshoe, 0012, CADET_IX_TOP) X(left_horseshoe, 0112, CADET_IX_TOP) X(right_horseshoe, 0052, CADET_IX_TOP) X(universal_quantifier, 0152, CADET_IX_TOP) X(infinity, 0032, CADET_IX_TOP) X(existential_quantifier, 0072, CADET_IX_TOP) X(partial_delta, 0172, CADET_IX_TOP) X(up_arrow, 0113, CADET_IX_TOP) X(down_arrow, 0053, CADET_IX_TOP) X(left_arrow, 0153, CADET_IX_TOP) X(right_arrow, 0033, CADET_IX_TOP) X(double_arrow, 0073, CADET_IX_TOP) X(not_equal, 0164, CADET_IX_TOP) X(equivalence, 0114, CADET_IX_TOP) X(less_or_equal, 0054, CADET_IX_TOP) X(greater_or_equal, 0154, CADET_IX_TOP) /* Greek */ X(circle_plus, 0176, CADET_IX_GREEK) X(epsilon, 0162, CADET_IX_GREEK) X(pi, 0172, CADET_IX_GREEK) X(not_sign, 0077, CADET_IX_GREEK) X(circle_x, 0117, CADET_IX_GREEK) X(alpha, 0123, CADET_IX_GREEK) X(delta, 0163, CADET_IX_GREEK) X(gamma, 0113, CADET_IX_GREEK) X(lambda, 0073, CADET_IX_GREEK) X(center_dot, 0133, CADET_IX_GREEK) X(beta, 0114, CADET_IX_GREEK) X(integral, 0174, CADET_IX_GREEK) |