The-Homebrew-Cloud/dosbox-wii
2
0
Fork 0
mirror of https://github.com/retro100/dosbox-wii.git synced 2024-12-25 18:11:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync to dosbox svn

Browse Source
This commit is contained in:
dborth 2009-05-19 08:06:18 +00:00
parent 9e0f047d1b
commit f8b3bdf41c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/sdl_mapper.cpp
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/* $Id: sdl_mapper.cpp,v 1.58 2009/04/25 06:59:54 qbix79 Exp $ */ /* $Id: sdl_mapper.cpp,v 1.59 2009/05/14 18:01:25 qbix79 Exp $ */
#include <vector> #include <vector>
#include <list> #include <list>
@ -2283,11 +2283,7 @@ void MAPPER_Run(bool pressed) {
/* Be sure that there is no update in progress */ /* Be sure that there is no update in progress */
GFX_EndUpdate( 0 ); GFX_EndUpdate( 0 );
#ifdef HW_RVL
mapper.surface=SDL_SetVideoMode(640,480,16,0);
#else
mapper.surface=SDL_SetVideoMode(640,480,8,0); mapper.surface=SDL_SetVideoMode(640,480,8,0);
#endif
if (mapper.surface == NULL) E_Exit("Could not initialize video mode for mapper: %s",SDL_GetError()); if (mapper.surface == NULL) E_Exit("Could not initialize video mode for mapper: %s",SDL_GetError());
/* Set some palette entries */ /* Set some palette entries */
@ -2336,7 +2332,7 @@ void MAPPER_Init(void) {
} }
} }
//Somehow including them at the top conflicts with something in setup.h //Somehow including them at the top conflicts with something in setup.h
#ifdef LINUX #ifdef C_X11_XKB
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#endif #endif
@ -2385,7 +2381,7 @@ void MAPPER_StartUp(Section * sec) {
sdlkey_map[0x41]=SDLK_KP6; sdlkey_map[0x41]=SDLK_KP6;
#elif !defined (WIN32) /* => Linux & BSDs */ #elif !defined (WIN32) /* => Linux & BSDs */
bool evdev_input = false; bool evdev_input = false;
#ifdef LINUX #ifdef C_X11_XKB
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
if (SDL_GetWMInfo(&info)) { if (SDL_GetWMInfo(&info)) {