| Message ID | CED27056-4BCC-48A5-90E7-CA881874B67C@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 1 March 2016 at 22:07, Programmingkid <programmingkidx@gmail.com> wrote: > This patch adds the file MacKeys.h. It is a file that contains all the constants > for the Macintosh keyboard keycodes. > > Signed-off-by: John Arbuckle <programmingkidx@gmail.com> > > --- > Note to Peter Maydell: > I know you wanted me to use the constants from the file HIToolbox/Events.h, but > I can't. It only exists on Mac OS X, so other operating systems like Linux > would not be able to use it. This file is also used in the adb.c file, so > cross-platform compatibility is a must. What I suggested was that you should use the Events.h constants in ui/cocoa.m (which is OSX only) and have a file in include/hw/input/ for the keys for the ADB keyboard emulation. This patch should really be in a patch series with the patches that use the new header. > include/hw/input/MacKeys.h | 139 ++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 139 insertions(+), 0 deletions(-) > create mode 100644 include/hw/input/MacKeys.h > > diff --git a/include/hw/input/MacKeys.h b/include/hw/input/MacKeys.h > new file mode 100644 > index 0000000..7d00190 > --- /dev/null > +++ b/include/hw/input/MacKeys.h > @@ -0,0 +1,139 @@ > +/* > + * MacKeys.h > + * > + * Provides a enum of all the Macintosh keycodes. > + * Note: keys like Power, volume related, and eject are handled at a lower > + * level and are not available to QEMU. That doesn't mean we can't > + * substitute one key for another. The function keys like F1 make a good > + * substitute for these keys. This can be done in the GTK, SDL, or Cocoa > + * code. > + */ Can you include the standard copyright and license comment at the top, please? Header files need the usual #ifndef/#define/#endif wrappers to guard against multiple inclusion. > + > + /* > + * I didn't count the Power key as the largest value because it's very large > + * value would cause arrays that depend on MAC_KEY_LARGEST_VALUE to be too > + * big. > + */ > + MAC_KEY_POWER = 32639, The adb keyboard device appears to assume each keycode is a byte, so how does this work? It looks like it's a two-byte scancode, maybe. You probably want to handle that specially somehow. (Power is special anyway because as well as maybe being a scancode it shorts the ADB pin 2 to ground, which is how a powered-off mac actually gets woken up.) > +/* Could not find the value for this key. */ > +/* #define MAC_KEY_EJECT */ thanks -- PMM
On 03/01/2016 04:08 PM, Peter Maydell wrote: > On 1 March 2016 at 22:07, Programmingkid <programmingkidx@gmail.com> wrote: >> This patch adds the file MacKeys.h. It is a file that contains all the constants >> for the Macintosh keyboard keycodes. >> >> Signed-off-by: John Arbuckle <programmingkidx@gmail.com> >> >> --- >> Note to Peter Maydell: >> I know you wanted me to use the constants from the file HIToolbox/Events.h, but >> I can't. It only exists on Mac OS X, so other operating systems like Linux >> would not be able to use it. This file is also used in the adb.c file, so >> cross-platform compatibility is a must. > > What I suggested was that you should use the Events.h constants in > ui/cocoa.m (which is OSX only) and have a file in include/hw/input/ > for the keys for the ADB keyboard emulation. > > This patch should really be in a patch series with the patches that > use the new header. > >> include/hw/input/MacKeys.h | 139 ++++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 139 insertions(+), 0 deletions(-) >> create mode 100644 include/hw/input/MacKeys.h Can we please use lower-case naming of mac-keys.h? Just because Mac headers use Capital Names doesn't mean we have to break our internal conventions to follow.
diff --git a/include/hw/input/MacKeys.h b/include/hw/input/MacKeys.h new file mode 100644 index 0000000..7d00190 --- /dev/null +++ b/include/hw/input/MacKeys.h @@ -0,0 +1,139 @@ +/* + * MacKeys.h + * + * Provides a enum of all the Macintosh keycodes. + * Note: keys like Power, volume related, and eject are handled at a lower + * level and are not available to QEMU. That doesn't mean we can't + * substitute one key for another. The function keys like F1 make a good + * substitute for these keys. This can be done in the GTK, SDL, or Cocoa + * code. + */ + +enum { + MAC_KEY_A = 0, + MAC_KEY_B = 11, + MAC_KEY_C = 8, + MAC_KEY_D = 2, + MAC_KEY_E = 14, + MAC_KEY_F = 3, + MAC_KEY_G = 5, + MAC_KEY_H = 4, + MAC_KEY_I = 34, + MAC_KEY_J = 38, + MAC_KEY_K = 40, + MAC_KEY_L = 37, + MAC_KEY_M = 46, + MAC_KEY_N = 45, + MAC_KEY_O = 31, + MAC_KEY_P = 35, + MAC_KEY_Q = 12, + MAC_KEY_R = 15, + MAC_KEY_S = 1, + MAC_KEY_T = 17, + MAC_KEY_U = 32, + MAC_KEY_V = 9, + MAC_KEY_W = 13, + MAC_KEY_X = 7, + MAC_KEY_Y = 16, + MAC_KEY_Z = 6, + + MAC_KEY_0 = 29, + MAC_KEY_1 = 18, + MAC_KEY_2 = 19, + MAC_KEY_3 = 20, + MAC_KEY_4 = 21, + MAC_KEY_5 = 23, + MAC_KEY_6 = 22, + MAC_KEY_7 = 26, + MAC_KEY_8 = 28, + MAC_KEY_9 = 25, + + MAC_KEY_GRAVE_ACCENT = 50, + MAC_KEY_MINUS = 27, + MAC_KEY_EQUAL = 24, + MAC_KEY_DELETE = 51, + MAC_KEY_CAPS_LOCK = 57, + MAC_KEY_TAB = 48, + MAC_KEY_RETURN = 36, + MAC_KEY_LEFT_BRACKET = 33, + MAC_KEY_RIGHT_BRACKET = 30, + MAC_KEY_BACKSLASH = 42, + MAC_KEY_SEMICOLON = 41, + MAC_KEY_APOSTROPHE = 39, + MAC_KEY_COMMA = 43, + MAC_KEY_PERIOD = 47, + MAC_KEY_FORWARD_SLASH = 44, + MAC_KEY_LEFT_SHIFT = 56, + MAC_KEY_RIGHT_SHIFT = 60, + MAC_KEY_SPACEBAR = 49, + MAC_KEY_LEFT_CONTROL = 59, + MAC_KEY_RIGHT_CONTROL = 62, + MAC_KEY_LEFT_OPTION = 58, + MAC_KEY_RIGHT_OPTION = 61, + MAC_KEY_LEFT_COMMAND = 55, + MAC_KEY_RIGHT_COMMAND = 54, + + MAC_KEY_KP_0 = 82, + MAC_KEY_KP_1 = 83, + MAC_KEY_KP_2 = 84, + MAC_KEY_KP_3 = 85, + MAC_KEY_KP_4 = 86, + MAC_KEY_KP_5 = 87, + MAC_KEY_KP_6 = 88, + MAC_KEY_KP_7 = 89, + MAC_KEY_KP_8 = 91, + MAC_KEY_KP_9 = 92, + MAC_KEY_KP_PERIOD = 65, + MAC_KEY_KP_ENTER = 76, + MAC_KEY_KP_PLUS = 69, + MAC_KEY_KP_SUBTRACT = 78, + MAC_KEY_KP_MULTIPLY = 67, + MAC_KEY_KP_DIVIDE = 75, + MAC_KEY_KP_EQUAL = 81, + MAC_KEY_KP_CLEAR = 71, + + MAC_KEY_UP = 126, + MAC_KEY_DOWN = 125, + MAC_KEY_LEFT = 123, + MAC_KEY_RIGHT = 124, + + MAC_KEY_HELP = 114, + MAC_KEY_HOME = 115, + MAC_KEY_PAGE_UP = 116, + MAC_KEY_PAGE_DOWN = 121, + MAC_KEY_END = 119, + MAC_KEY_FORWARD_DELETE = 117, + + MAC_KEY_ESC = 53, + MAC_KEY_F1 = 122, + MAC_KEY_F2 = 120, + MAC_KEY_F3 = 99, + MAC_KEY_F4 = 118, + MAC_KEY_F5 = 96, + MAC_KEY_F6 = 97, + MAC_KEY_F7 = 98, + MAC_KEY_F8 = 100, + MAC_KEY_F9 = 101, + MAC_KEY_F10 = 109, + MAC_KEY_F11 = 103, + MAC_KEY_F12 = 111, + MAC_KEY_F13 = 105, + MAC_KEY_F14 = 107, + MAC_KEY_F15 = 113, + + MAC_KEY_VOLUME_UP = 72, + MAC_KEY_VOLUME_DOWN = 73, + MAC_KEY_VOLUME_MUTE = 74, + + /* + * I didn't count the Power key as the largest value because it's very large + * value would cause arrays that depend on MAC_KEY_LARGEST_VALUE to be too + * big. + */ + MAC_KEY_POWER = 32639, + + MAC_KEY_LARGEST_VALUE = MAC_KEY_UP, +}; + +/* Could not find the value for this key. */ +/* #define MAC_KEY_EJECT */
This patch adds the file MacKeys.h. It is a file that contains all the constants for the Macintosh keyboard keycodes. Signed-off-by: John Arbuckle <programmingkidx@gmail.com> --- Note to Peter Maydell: I know you wanted me to use the constants from the file HIToolbox/Events.h, but I can't. It only exists on Mac OS X, so other operating systems like Linux would not be able to use it. This file is also used in the adb.c file, so cross-platform compatibility is a must. include/hw/input/MacKeys.h | 139 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) create mode 100644 include/hw/input/MacKeys.h