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

annotate src/video/x11/SDL_x11modes.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	073b86030262

rev	line source
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3521 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #ifndef _SDL_x11modes_h
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #define _SDL_x11modes_h
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 typedef struct
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 int screen;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 Visual *visual;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1950 diff changeset	31 int depth;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2874 diff changeset	32 int scanline_pad;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	33
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	34 int use_xinerama;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	35 int use_xrandr;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	36 int use_vidmode;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	37
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	38 #if SDL_VIDEO_DRIVER_X11_XINERAMA
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	39 SDL_NAME(XineramaScreenInfo) xinerama_info;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	40 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	41 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	42 XRRScreenConfiguration *screen_config;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	43 int saved_size;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	44 Rotation saved_rotation;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	45 short saved_rate;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	46 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	47 #if SDL_VIDEO_DRIVER_X11_VIDMODE
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	48 SDL_NAME(XF86VidModeModeInfo) saved_mode;
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	49 struct
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	50 {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	51 int x, y;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	52 } saved_view;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	53 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	54
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 } SDL_DisplayData;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56
3521 76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	57 extern int X11_InitModes(_THIS);
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2916 diff changeset	58 extern void X11_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2916 diff changeset	59 extern int X11_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 extern void X11_QuitModes(_THIS);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 #endif /* _SDL_x11modes_h */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11modes.h @ 4425:a3e71b957215