Mercurial > sdl-ios-xcode
view src/events/SDL_keyboard_c.h @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | f7b03b6838cb |
children | 5c64052fb476 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifndef _SDL_keyboard_c_h #define _SDL_keyboard_c_h #include "SDL_keysym.h" #include "SDL_events.h" typedef struct SDL_Keyboard SDL_Keyboard; struct SDL_Keyboard { /* Free the keyboard when it's time */ void (*FreeKeyboard) (SDL_Keyboard * keyboard); /* Data common to all keyboards */ SDL_Window *focus; Uint16 modstate; Uint8 keystate[SDL_NUM_SCANCODES]; SDLKey keymap[SDL_NUM_SCANCODES]; void *driverdata; }; /* Initialize the keyboard subsystem */ extern int SDL_KeyboardInit(void); /* Get the keyboard at an index */ extern SDL_Keyboard *SDL_GetKeyboard(int index); /* Add a keyboard, possibly reattaching at a particular index (or -1), returning the index of the keyboard, or -1 if there was an error. */ extern int SDL_AddKeyboard(const SDL_Keyboard * keyboard, int index); /* Remove a keyboard at an index, clearing the slot for later */ extern void SDL_DelKeyboard(int index); /* Clear the state of a keyboard at an index */ extern void SDL_ResetKeyboard(int index); /* Get the default keymap */ extern void SDL_GetDefaultKeymap(SDLKey * keymap); /* Set the mapping of scancode to key codes for this keyboard */ extern void SDL_SetKeymap(int index, int start, SDLKey * keys, int length); /* Set a platform-dependent key name, overriding the default platform-agnostic 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); /* Set the keyboard focus window */ extern void SDL_SetKeyboardFocus(int index, SDL_Window * window); /* Send a keyboard event for a keyboard at an index */ extern int SDL_SendKeyboardKey(int index, Uint8 state, SDL_scancode scancode); /* Send keyboard text input for a keyboard at an index */ extern int SDL_SendKeyboardText(int index, const char *text); /* Send editing text for selected range from start to end */ extern int SDL_SendEditingText(const char *text, int start, int end); /* Shutdown the keyboard subsystem */ extern void SDL_KeyboardQuit(void); #endif /* _SDL_keyboard_c_h */ /* vi: set ts=4 sw=4 expandtab: */