Mercurial > sdl-ios-xcode
view src/video/dga/SDL_dgavideo.h @ 4389:c6c3a6e7db46 SDL-1.2
Fixed bug #899
Jeremiah Morris 2009-12-09 16:23:50 PST
Re-enable mouseLocation workaround on 10.4, 10.5
OS X systems before 10.6 have a bug with [NSEvent mouseLocation] if the screen
resolution changes. SDL_QuartzVideo.m contains a workaround for this bug, but
it was placed inside an #ifdef in revision 4762. The comment reads, "I'm
gambling they fixed this by 10.4."
After seeing this bug on several Tiger and Leopard systems (both PPC and
Intel), I can confirm that it's not fixed until 10.6. The workaround doesn't
compile for x86_64/10.6, so I can understand why it was segregated, but it
needs to remain in place for the i386 and ppc versions. The workaround causes
no problems under 10.6, even though it's not necessary there.
Patch is attached with one method of keeping the workaround active on the
systems that need it.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 15:11:49 +0000 |
parents | a1b03ba2fcd0 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 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_dgavideo_h #define _SDL_dgavideo_h #include <X11/Xlib.h> /* Apparently some X11 systems can't include this multiple times... */ #ifndef SDL_INCLUDED_XLIBINT_H #define SDL_INCLUDED_XLIBINT_H 1 #include <X11/Xlibint.h> #endif #include <X11/Xproto.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "../SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* Define this if you need the DGA driver to be thread-safe */ #define LOCK_DGA_DISPLAY #ifdef LOCK_DGA_DISPLAY #define LOCK_DISPLAY() SDL_mutexP(event_lock) #define UNLOCK_DISPLAY() SDL_mutexV(event_lock) #else #define LOCK_DISPLAY() #define UNLOCK_DISPLAY() #endif /* This is the structure we use to keep track of video memory */ typedef struct vidmem_bucket { struct vidmem_bucket *prev; int used; int dirty; Uint8 *base; unsigned int size; struct vidmem_bucket *next; } vidmem_bucket; /* Private display data */ struct SDL_PrivateVideoData { Display *DGA_Display; Colormap DGA_colormap; int visualClass; #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */ int SDL_nummodes[NUM_MODELISTS]; SDL_Rect **SDL_modelist[NUM_MODELISTS]; /* Information for the video surface */ Uint8 *memory_base; int memory_pitch; SDL_mutex *hw_lock; int sync_needed; int was_flipped; /* Information for hardware surfaces */ vidmem_bucket surfaces; int surfaces_memtotal; int surfaces_memleft; /* Information for double-buffering */ int flip_page; int flip_yoffset[2]; Uint8 *flip_address[2]; /* Used to handle DGA events */ int event_base; #ifdef LOCK_DGA_DISPLAY SDL_mutex *event_lock; #endif /* Screensaver settings */ int allow_screensaver; }; /* Old variable names */ #define DGA_Display (this->hidden->DGA_Display) #define DGA_Screen DefaultScreen(DGA_Display) #define DGA_colormap (this->hidden->DGA_colormap) #define DGA_visualClass (this->hidden->visualClass) #define memory_base (this->hidden->memory_base) #define memory_pitch (this->hidden->memory_pitch) #define flip_page (this->hidden->flip_page) #define flip_yoffset (this->hidden->flip_yoffset) #define flip_address (this->hidden->flip_address) #define sync_needed (this->hidden->sync_needed) #define was_flipped (this->hidden->was_flipped) #define SDL_nummodes (this->hidden->SDL_nummodes) #define SDL_modelist (this->hidden->SDL_modelist) #define surfaces (this->hidden->surfaces) #define surfaces_memtotal (this->hidden->surfaces_memtotal) #define surfaces_memleft (this->hidden->surfaces_memleft) #define hw_lock (this->hidden->hw_lock) #define DGA_event_base (this->hidden->event_base) #define event_lock (this->hidden->event_lock) #define allow_screensaver (this->hidden->allow_screensaver) #endif /* _SDL_dgavideo_h */