static void sdlEventProc(const SDL_Event &e, Game &game)
{
int val;
+ SDLMod mod;
+
switch(e.type)
{
case SDL_MOUSEMOTION:
SDL_WM_ToggleFullScreen(SDL_GetVideoSurface());
}
- if (e.key.keysym.sym < SDLK_LAST)
+ else if (e.key.keysym.sym < SDLK_LAST)
{
if (KeyTable[e.key.keysym.sym] != 0xffff)
SetKey(KeyTable[e.key.keysym.sym]);
}
- if (e.key.keysym.mod & KMOD_CTRL)
+ mod = SDL_GetModState();
+ if (mod & KMOD_CTRL)
SetKey(MAC_CONTROL_KEY);
- if (e.key.keysym.mod & KMOD_ALT)
+ if (mod & KMOD_ALT)
SetKey(MAC_OPTION_KEY);
- if (e.key.keysym.mod & KMOD_SHIFT)
+ if (mod & KMOD_SHIFT)
SetKey(MAC_SHIFT_KEY);
- if (e.key.keysym.mod & KMOD_CAPS)
+ if (mod & KMOD_CAPS)
SetKey(MAC_CAPS_LOCK_KEY);
return;
ClearKey(KeyTable[e.key.keysym.sym]);
}
- if (e.key.keysym.mod & KMOD_CTRL)
+ mod = SDL_GetModState();
+ if ((mod & KMOD_CTRL) == 0)
ClearKey(MAC_CONTROL_KEY);
- if (e.key.keysym.mod & KMOD_ALT)
+ if ((mod & KMOD_ALT) == 0)
ClearKey(MAC_OPTION_KEY);
- if (e.key.keysym.mod & KMOD_SHIFT)
+ if ((mod & KMOD_SHIFT) == 0)
ClearKey(MAC_SHIFT_KEY);
- if (e.key.keysym.mod & KMOD_CAPS)
+ if ((mod & KMOD_CAPS) == 0)
ClearKey(MAC_CAPS_LOCK_KEY);
return;
}
if(width==840 && height==524)whichres=5;
if(width==1024 && height==640)whichres=6;
if(width==1344 && height==840)whichres=7;
+ if(width==1920 && height==1200)whichres=8;
return whichres;
}
if(width==840 && height==524)whichres=5;
if(width==1024 && height==640)whichres=6;
if(width==1344 && height==840)whichres=7;
+ if(width>=1920 && height>=1200)whichres=8;
return whichres;
}
while (true)
{
- if(whichres<=0 || whichres>7){
+ if(whichres<=0 || whichres>8){
whichres = 0;
width=640;
height=480;
width=1344;
height=840;
}
+ if(whichres==8){
+ width=1920;
+ height=1200;
+ }
+
+ // currently with SDL, we just use whatever the native bitdepth
+ // of the display is and don't care.
+ #if USE_SDL
+ break;
+ #endif
if ((detail != 0) && (resolutionDepths[whichres][1] != 0))
{
detail = 0;
break;
}
- else if (0 == whichres)
+ else
+
+ if (0 == whichres)
{
break;
}