diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-03-20 15:52:15 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-03-23 02:34:49 -0700 |
| commit | 231e2b1f7a6d35d5aa0f4782b21a20ab1724d619 (patch) | |
| tree | 1c36918c27b14a461956f46aa105a61166c62073 | |
| parent | cbe5a490813cfb25e4a507a12617a3dccc83b4c0 (diff) | |
keymap: Establish our keymap.h API
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/xtoq/keymap.h | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/xtoq/keymap.h b/src/xtoq/keymap.h index de4aed8..1952155 100644 --- a/src/xtoq/keymap.h +++ b/src/xtoq/keymap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved. + * Copyright (c) 2012 Apple Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -24,33 +24,15 @@ * use or other dealings in this Software without prior written authorization. */ -#ifndef QUARTZ_KEYBOARD_H -#define QUARTZ_KEYBOARD_H 1 +#ifndef XTOQ_KEYBOARD_H +#define XTOQ_KEYBOARD_H -#define XK_TECHNICAL // needed to get XK_Escape -#define XK_PUBLISHING -#include "X11/keysym.h" -#include "inputstr.h" +int XtoQModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); +int XtoQModifierNXKeyToNXKeycode(int key, int side); +int XtoQModifierNXKeyToNXMask(int key); +int XtoQModifierNXMaskToNXKey(int mask); +int XtoQModifierStringToNXMask(const char *string, int separatelr); -// Each key can generate 4 glyphs. They are, in order: -// unshifted, shifted, modeswitch unshifted, modeswitch shifted -#define GLYPHS_PER_KEY 4 -#define NUM_KEYCODES 248 // NX_NUMKEYCODES might be better -#define MIN_KEYCODE XkbMinLegalKeyCode // unfortunately, this isn't 0... -#define MAX_KEYCODE NUM_KEYCODES + MIN_KEYCODE - 1 +void XtoQKeymapReSync(void); -/* These functions need to be implemented by Xquartz, XDarwin, etc. */ -Bool QuartsResyncKeymap(Bool sendDDXEvent); - -/* Provided for darwinEvents.c */ -void DarwinKeyboardReloadHandler(void); -int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); -int DarwinModifierNXKeyToNXKeycode(int key, int side); -int DarwinModifierNXKeyToNXMask(int key); -int DarwinModifierNXMaskToNXKey(int mask); -int DarwinModifierStringToNXMask(const char *string, int separatelr); - -/* Provided for darwin.c */ -void DarwinKeyboardInit(DeviceIntPtr pDev); - -#endif /* QUARTZ_KEYBOARD_H */ +#endif /* XTOQ_KEYBOARD_H */ |