Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Sheena pointed out that "scancode" and "keysym" are single words and …

…shouldn't be camel-cased.
  • Loading branch information
slouken committed Feb 7, 2011
1 parent c662582 commit d86cf5672519b6a0cf31d775d6598ed5b72d9a60
@@ -215,8 +215,10 @@ struct SDL_SysWMinfo;
*/
/*@{*/

#define SDL_keysym SDL_KeySym
#define SDL_scancode SDL_ScanCode
#define SDL_keysym SDL_Keysym
#define SDL_KeySym SDL_Keysym
#define SDL_scancode SDL_Scancode
#define SDL_ScanCode SDL_Scancode

/**
* \name Renamed keys
@@ -151,7 +151,7 @@ typedef struct SDL_KeyboardEvent
Uint8 repeat; /**< Non-zero if this is a key repeat */
Uint8 padding2;
Uint8 padding3;
SDL_KeySym keysym; /**< The key that was pressed or released */
SDL_Keysym keysym; /**< The key that was pressed or released */
} SDL_KeyboardEvent;

#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
@@ -45,13 +45,13 @@ extern "C" {
/**
* \brief The SDL keysym structure, used in key events.
*/
typedef struct SDL_KeySym
typedef struct SDL_Keysym
{
SDL_ScanCode scancode; /**< SDL physical key code - see ::SDL_ScanCode for details */
SDL_Scancode scancode; /**< SDL physical key code - see ::SDL_Scancode for details */
SDLKey sym; /**< SDL virtual key code - see ::SDLKey for details */
Uint16 mod; /**< current key modifiers */
Uint32 unicode; /**< \deprecated use SDL_TextInputEvent instead */
} SDL_KeySym;
} SDL_Keysym;

/* Function prototypes */

@@ -65,7 +65,7 @@ extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void);
*
* \param numkeys if non-NULL, receives the length of the returned array.
*
* \return An array of key states. Indexes into this array are obtained by using ::SDL_ScanCode values.
* \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
*
* \b Example:
* \code
@@ -97,17 +97,17 @@ extern DECLSPEC void SDLCALL SDL_SetModState(SDLMod modstate);
*
* \sa SDL_GetKeyName()
*/
extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_ScanCode scancode);
extern DECLSPEC SDLKey SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);

/**
* \brief Get the scancode corresponding to the given key code according to the
* current keyboard layout.
*
* See ::SDL_ScanCode for details.
* See ::SDL_Scancode for details.
*
* \sa SDL_GetScancodeName()
*/
extern DECLSPEC SDL_ScanCode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDLKey key);

/**
* \brief Get a human-readable name for a scancode.
@@ -117,9 +117,9 @@ extern DECLSPEC SDL_ScanCode SDLCALL SDL_GetScancodeFromKey(SDLKey key);
* copy it. If the scancode doesn't have a name, this function returns
* an empty string ("").
*
* \sa SDL_ScanCode
* \sa SDL_Scancode
*/
extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_ScanCode
extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode
scancode);

/**
@@ -35,7 +35,7 @@
* \brief The SDL keyboard scancode representation.
*
* Values of this type are used to represent keyboard keys, among other places
* in the \link SDL_KeySym::scancode key.keysym.scancode \endlink field of the
* in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the
* SDL_Event structure.
*
* The values in this enumeration are based on the USB usage page standard:
@@ -392,7 +392,7 @@ typedef enum

SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
for array bounds */
} SDL_ScanCode;
} SDL_Scancode;

#endif /* _SDL_scancode_h */

@@ -562,7 +562,7 @@ void
SDL_ResetKeyboard(void)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
SDL_ScanCode scancode;
SDL_Scancode scancode;

for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
if (keyboard->keystate[scancode] == SDL_PRESSED) {
@@ -590,7 +590,7 @@ SDL_SetKeymap(int start, SDLKey * keys, int length)
}

void
SDL_SetScancodeName(SDL_ScanCode scancode, const char *name)
SDL_SetScancodeName(SDL_Scancode scancode, const char *name)
{
SDL_scancode_names[scancode] = name;
}
@@ -638,7 +638,7 @@ SDL_SetKeyboardFocus(SDL_Window * window)
}

int
SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode)
SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
int posted;
@@ -849,18 +849,18 @@ SDL_SetModState(SDLMod modstate)
}

SDLKey
SDL_GetKeyFromScancode(SDL_ScanCode scancode)
SDL_GetKeyFromScancode(SDL_Scancode scancode)
{
SDL_Keyboard *keyboard = &SDL_keyboard;

return keyboard->keymap[scancode];
}

SDL_ScanCode
SDL_Scancode
SDL_GetScancodeFromKey(SDLKey key)
{
SDL_Keyboard *keyboard = &SDL_keyboard;
SDL_ScanCode scancode;
SDL_Scancode scancode;

for (scancode = SDL_SCANCODE_UNKNOWN; scancode < SDL_NUM_SCANCODES;
++scancode) {
@@ -872,7 +872,7 @@ SDL_GetScancodeFromKey(SDLKey key)
}

const char *
SDL_GetScancodeName(SDL_ScanCode scancode)
SDL_GetScancodeName(SDL_Scancode scancode)
{
const char *name = SDL_scancode_names[scancode];

@@ -890,7 +890,7 @@ SDL_GetKeyName(SDLKey key)

if (key & SDLK_SCANCODE_MASK) {
return
SDL_GetScancodeName((SDL_ScanCode) (key & ~SDLK_SCANCODE_MASK));
SDL_GetScancodeName((SDL_Scancode) (key & ~SDLK_SCANCODE_MASK));
}

switch (key) {
@@ -43,13 +43,13 @@ extern void SDL_SetKeymap(int start, SDLKey * keys, int length);
name. Encoded as UTF-8. The string is not copied, thus the pointer given to
this function must stay valid forever (or at least until the call to
VideoQuit()). */
extern void SDL_SetScancodeName(SDL_ScanCode scancode, const char *name);
extern void SDL_SetScancodeName(SDL_Scancode scancode, const char *name);

/* Set the keyboard focus window */
extern void SDL_SetKeyboardFocus(SDL_Window * window);

/* Send a keyboard key event */
extern int SDL_SendKeyboardKey(Uint8 state, SDL_ScanCode scancode);
extern int SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode);

/* Send keyboard text input */
extern int SDL_SendKeyboardText(const char *text);
@@ -27,7 +27,7 @@
- experimentation on various ADB and USB ISO keyboards and one ADB ANSI keyboard
*/
/* *INDENT-OFF* */
static const SDL_ScanCode darwin_scancode_table[] = {
static const SDL_Scancode darwin_scancode_table[] = {
/* 0 */ SDL_SCANCODE_A,
/* 1 */ SDL_SCANCODE_S,
/* 2 */ SDL_SCANCODE_D,
@@ -26,7 +26,7 @@
- Linux kernel source input.h
*/
/* *INDENT-OFF* */
static SDL_ScanCode const linux_scancode_table[] = {
static SDL_Scancode const linux_scancode_table[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
@@ -26,7 +26,7 @@
- msdn.microsoft.com
*/
/* *INDENT-OFF* */
static const SDL_ScanCode windows_scancode_table[] = {
static const SDL_Scancode windows_scancode_table[] = {
/* 0, 0x00 */ SDL_SCANCODE_UNKNOWN,
/* 1, 0x01 */ SDL_SCANCODE_UNKNOWN,
/* 2, 0x02 */ SDL_SCANCODE_UNKNOWN,
@@ -26,7 +26,7 @@
- atKeyNames.h from XFree86 source code
*/
/* *INDENT-OFF* */
static const SDL_ScanCode xfree86_scancode_table[] = {
static const SDL_Scancode xfree86_scancode_table[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
@@ -177,7 +177,7 @@ static const SDL_ScanCode xfree86_scancode_table[] = {
};

/* for wireless usb keyboard (manufacturer TRUST) without numpad. */
static const SDL_ScanCode xfree86_scancode_table2[] = {
static const SDL_Scancode xfree86_scancode_table2[] = {
/* 0 */ SDL_SCANCODE_UNKNOWN,
/* 1 */ SDL_SCANCODE_ESCAPE,
/* 2 */ SDL_SCANCODE_1,
@@ -37,7 +37,7 @@ void Android_InitKeyboard()
SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
}

static SDL_ScanCode Android_Keycodes[] = {
static SDL_Scancode Android_Keycodes[] = {
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_UNKNOWN */
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_LEFT */
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_RIGHT */
@@ -151,10 +151,10 @@ static SDL_ScanCode Android_Keycodes[] = {
SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_MODE */
};

static SDL_ScanCode
static SDL_Scancode
TranslateKeycode(int keycode)
{
SDL_ScanCode scancode = SDL_SCANCODE_UNKNOWN;
SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;

if (keycode < SDL_arraysize(Android_Keycodes)) {
scancode = Android_Keycodes[keycode];
@@ -509,7 +509,7 @@ class SDL_BWin:public BDirectWindow

if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
SDL_KeySym keysym;
SDL_Keysym keysym;
keysym.scancode = key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
@@ -543,7 +543,7 @@ class SDL_BWin:public BDirectWindow
int32 modifiers;
if (msg->FindInt32("key", &key) == B_OK
&& msg->FindInt32("modifiers", &modifiers) == B_OK) {
SDL_KeySym keysym;
SDL_Keysym keysym;
keysym.scancode = key;
if ((key > 0) && (key < 128)) {
keysym.sym = keymap[key];
@@ -246,7 +246,7 @@ - (NSArray *) validAttributesForMarkedText
HandleNonDeviceModifier(unsigned int device_independent_mask,
unsigned int oldMods,
unsigned int newMods,
SDL_ScanCode scancode)
SDL_Scancode scancode)
{
unsigned int oldMask, newMask;

@@ -268,7 +268,7 @@ - (NSArray *) validAttributesForMarkedText
*/
static void
HandleModifierOneSide(unsigned int oldMods, unsigned int newMods,
SDL_ScanCode scancode,
SDL_Scancode scancode,
unsigned int sided_device_dependent_mask)
{
unsigned int old_dep_mask, new_dep_mask;
@@ -297,8 +297,8 @@ - (NSArray *) validAttributesForMarkedText
static void
HandleModifierSide(int device_independent_mask,
unsigned int oldMods, unsigned int newMods,
SDL_ScanCode left_scancode,
SDL_ScanCode right_scancode,
SDL_Scancode left_scancode,
SDL_Scancode right_scancode,
unsigned int left_device_dependent_mask,
unsigned int right_device_dependent_mask)
{
@@ -341,8 +341,8 @@ - (NSArray *) validAttributesForMarkedText
static void
ReleaseModifierSide(unsigned int device_independent_mask,
unsigned int oldMods, unsigned int newMods,
SDL_ScanCode left_scancode,
SDL_ScanCode right_scancode,
SDL_Scancode left_scancode,
SDL_Scancode right_scancode,
unsigned int left_device_dependent_mask,
unsigned int right_device_dependent_mask)
{
@@ -409,13 +409,13 @@ - (NSArray *) validAttributesForMarkedText
unsigned int oldMods, unsigned int newMods)
{
/* Set up arrays for the key syms for the left and right side. */
const SDL_ScanCode left_mapping[] = {
const SDL_Scancode left_mapping[] = {
SDL_SCANCODE_LSHIFT,
SDL_SCANCODE_LCTRL,
SDL_SCANCODE_LALT,
SDL_SCANCODE_LGUI
};
const SDL_ScanCode right_mapping[] = {
const SDL_Scancode right_mapping[] = {
SDL_SCANCODE_RSHIFT,
SDL_SCANCODE_RCTRL,
SDL_SCANCODE_RALT,
@@ -489,7 +489,7 @@ - (NSArray *) validAttributesForMarkedText
#endif
const void *chr_data;
int i;
SDL_ScanCode scancode;
SDL_Scancode scancode;
SDLKey keymap[SDL_NUM_SCANCODES];

/* See if the keymap needs to be updated */
@@ -675,7 +675,7 @@ - (NSArray *) validAttributesForMarkedText
{
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
unsigned short scancode = [event keyCode];
SDL_ScanCode code;
SDL_Scancode code;
#if 0
const char *text;
#endif

0 comments on commit d86cf56

Please sign in to comment.