diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-10 20:13:51 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-10 20:13:51 +0000 |
commit | b7b429537cca734cfd5ea274b078e5001e3ea01a (patch) | |
tree | 9356b73294770e6d82d71a72b1b905941b9b2384 /sys | |
parent | 50d53807a662f8fc574513758de31710ce92c6d9 (diff) |
Switch to RAWKEY_xxx constants.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/adb/keyboard.h | 267 |
1 files changed, 132 insertions, 135 deletions
diff --git a/sys/dev/adb/keyboard.h b/sys/dev/adb/keyboard.h index cb37801a0fa..0d7c65af51c 100644 --- a/sys/dev/adb/keyboard.h +++ b/sys/dev/adb/keyboard.h @@ -1,4 +1,4 @@ -/* $OpenBSD: keyboard.h,v 1.3 2006/02/12 21:49:08 miod Exp $ */ +/* $OpenBSD: keyboard.h,v 1.4 2006/03/10 20:13:50 miod Exp $ */ /* $NetBSD: keyboard.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $ */ /*- @@ -41,150 +41,147 @@ #define ADBK_PRESS(key) (((key) & 0x80) == 0) #define ADBK_KEYDOWN(key) (key) #define ADBK_KEYUP(key) ((key) | 0x80) -#define ADBK_MODIFIER(key) ((((key) & 0x7f) == ADBK_SHIFT) || \ - (((key) & 0x7f) == ADBK_CONTROL) || \ - (((key) & 0x7f) == ADBK_FLOWER) || \ - (((key) & 0x7f) == ADBK_OPTION)) #ifndef KEYBOARD_ARRAY extern unsigned char keyboard[128]; #else +#include <dev/wscons/wskbdraw.h> unsigned char keyboard[128] = { - 30, - 31, - 32, - 33, - 35, - 34, - 44, - 45, - 46, - 47, + RAWKEY_a, + RAWKEY_s, + RAWKEY_d, + RAWKEY_f, + RAWKEY_h, + RAWKEY_g, + RAWKEY_z, + RAWKEY_x, + RAWKEY_c, + RAWKEY_v, #ifdef FIX_SV_X_KBDBUG - 41, + RAWKEY_grave, #else - 86, + RAWKEY_less, #endif - 48, - 16, - 17, - 18, - 19, - 21, - 20, - 2, - 3, - 4, - 5, - 7, - 6, - 13, - 10, - 8, - 12, - 9, - 11, - 27, - 24, - 22, - 26, - 23, - 25, - 28, - 38, - 36, - 40, - 37, - 39, - 43, - 51, - 53, - 49, - 50, - 52, - 15, - 57, + RAWKEY_b, + RAWKEY_q, + RAWKEY_w, + RAWKEY_e, + RAWKEY_r, + RAWKEY_y, + RAWKEY_t, + RAWKEY_1, + RAWKEY_2, + RAWKEY_3, + RAWKEY_4, + RAWKEY_6, + RAWKEY_5, + RAWKEY_equal, + RAWKEY_9, + RAWKEY_7, + RAWKEY_minus, + RAWKEY_8, + RAWKEY_0, + RAWKEY_bracketright, + RAWKEY_o, + RAWKEY_u, + RAWKEY_bracketleft, + RAWKEY_i, + RAWKEY_p, + RAWKEY_Return, + RAWKEY_l, + RAWKEY_j, + RAWKEY_apostrophe, + RAWKEY_k, + RAWKEY_semicolon, + RAWKEY_backslash, + RAWKEY_comma, + RAWKEY_slash, + RAWKEY_n, + RAWKEY_m, + RAWKEY_period, + RAWKEY_Tab, + RAWKEY_space, #ifdef FIX_SV_X_KBDBUG - 86, + RAWKEY_less, #else - 41, + RAWKEY_grave, #endif - 211, /* Delete */ - 105, /* MODE/KP_Enter */ - 1, - 29, - 219, - 42, - 58, - 56, /* L Alt */ - 203, /* Left */ - 205, /* Right */ - 208, /* Down */ - 200, /* Up */ - 0, /* Fn */ - 0, - 83, - 0, - 55, - 0, - 78, - 0, - 69, - 0, - 0, - 0, - 181, - 156, - 0, - 74, - 0, - 0, - 118, - 82, - 79, - 80, - 81, - 75, - 76, - 77, - 71, - 0, - 72, - 73, - 0, - 0, - 51, - 63, /* F5 */ - 64, /* F6 */ - 65, /* F7 */ - 61, /* F3 */ - 66, /* F8 */ - 67, /* F9 */ - 0, - 87, /* F11 */ - 0, - 0, - 156, - 0, - 0, - 68, /* F10 */ - 0, - 88, /* F12 */ - 0, - 0, - 0, - 199, - 201, - 0, - 62, /* F4 */ - 207, - 60, /* F2 */ - 209, - 59, /* F1 */ - 0, - 0, - 0, - 0, - 0 /* pwr */ + RAWKEY_Delete, + RAWKEY_KP_Enter, + RAWKEY_Escape, + RAWKEY_Control_L, + 219, /* XXX */ + RAWKEY_Shift_L, + RAWKEY_Caps_Lock, + RAWKEY_Alt_L, + RAWKEY_Left, + RAWKEY_Right, + RAWKEY_Down, + RAWKEY_Up, + 0, /* Fn */ + 0, + RAWKEY_KP_Delete, + 0, + RAWKEY_KP_Multiply, + 0, + RAWKEY_KP_Add, + 0, + RAWKEY_Num_Lock, + 0, + 0, + 0, + RAWKEY_KP_Divide, + RAWKEY_KP_Enter, + 0, + RAWKEY_KP_Subtract, + 0, + 0, + RAWKEY_KP_Equal, + RAWKEY_KP_Insert, + RAWKEY_KP_End, + RAWKEY_KP_Down, + RAWKEY_KP_Next, + RAWKEY_KP_Left, + RAWKEY_KP_Begin, + RAWKEY_KP_Right, + RAWKEY_KP_Home, + 0, + RAWKEY_KP_Up, + RAWKEY_KP_Prior, + 0, + 0, + RAWKEY_KP_Delete, + RAWKEY_f5, + RAWKEY_f6, + RAWKEY_f7, + RAWKEY_f3, + RAWKEY_f8, + RAWKEY_f9, + 0, + RAWKEY_f11, + 0, + RAWKEY_Print_Screen, + RAWKEY_KP_Enter, + RAWKEY_Hold_Screen, + 0, + RAWKEY_f10, + 0, + RAWKEY_f12, + 0, + RAWKEY_Pause, + RAWKEY_Insert, + RAWKEY_Home, + RAWKEY_Prior, + RAWKEY_Delete, + RAWKEY_f4, + RAWKEY_End, + RAWKEY_f2, + RAWKEY_Next, + RAWKEY_f1, + 0, + 0, + 0, + 0, + 0 }; #endif /* KEYBOARD_ARRAY */ |