sdl-ios-xcode: src/video/cocoa/SDL

annotate src/video/cocoa/SDL_cocoamodes.h @ 4425:a3e71b957215

Fixed bug #961 Kalle Olavi Niemitalo 2010-02-28 09:15:50 PST It seems the SDLK_LMETA and SDLK_RMETA constants have been removed from SDL 1.3. I grepped for them in the SDL source tree and these were the only hits: ./include/SDL_compat.h:230:#define SDLK_LSUPER SDLK_LMETA ./include/SDL_compat.h:231:#define SDLK_RSUPER SDLK_RMETA ./src/video/bwindow/SDL_BWin.h:194: keymap[0x66] = SDLK_LMETA; ./src/video/bwindow/SDL_BWin.h:195: keymap[0x67] = SDLK_RMETA; I don't know how compatible SDL 1.3 is supposed to be with applications designed for SDL 1.2. However, as you can see, SDL itself is still trying to use the removed constants, and that is clearly a bug. Because SDL_compat.h defines KMOD_LMETA as KMOD_LGUI, I suppose it should also define SDLK_LMETA as SDLK_LGUI, and SDLK_RMETA likewise.

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 09 Mar 2010 06:07:48 +0000
parents	f7b03b6838cb
children	b530ef003506

rev	line source
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #ifndef _SDL_cocoamodes_h
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #define _SDL_cocoamodes_h
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
1934 70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	27 typedef struct
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	28 {
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	29 CGDirectDisplayID display;
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	30 } SDL_DisplayData;
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	31
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	32 typedef struct
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	33 {
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	34 CFDictionaryRef moderef;
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	35 } SDL_DisplayModeData;
70139af5ac27 Implemented Mac OS X video mode selection. Sam Lantinga <slouken@libsdl.org> parents: 1931 diff changeset	36
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 extern void Cocoa_InitModes(_THIS);
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	38 extern int Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	39 extern void Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	40 extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
1931 103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 extern void Cocoa_QuitModes(_THIS);
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 #endif /* _SDL_cocoamodes_h */
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
103c6fec2a60 The Mac OS X Cocoa video driver is under construction... Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoamodes.h @ 4425:a3e71b957215