summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/windowmanager-sdl.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-01-19 17:18:36 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-01-20 15:50:58 +0100
commit7be5cb3070d0fd20fba412742e6354a8c96be838 (patch)
tree54cb16cd007e271ada2cc28d3ec2e83257537348 /crawl-ref/source/windowmanager-sdl.cc
parent895ea411bbe873a6654749a248027f7c5384e3b8 (diff)
downloadcrawl-ref-7be5cb3070d0fd20fba412742e6354a8c96be838.tar.gz
crawl-ref-7be5cb3070d0fd20fba412742e6354a8c96be838.zip
Rename WM_* to WME_*, because Windows.
It's a bad idea to reuse the names of one of core win32 concepts for something similar but distinct.
Diffstat (limited to 'crawl-ref/source/windowmanager-sdl.cc')
-rw-r--r--crawl-ref/source/windowmanager-sdl.cc40
1 files changed, 20 insertions, 20 deletions
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
index 54618b4a1b..192834a076 100644
--- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -572,12 +572,12 @@ int SDLWrapper::wait_event(wm_event *event)
{
case SDL_ACTIVEEVENT:
SDL_SetModState(KMOD_NONE);
- event->type = WM_ACTIVEEVENT;
+ event->type = WME_ACTIVEEVENT;
event->active.gain = sdlevent.active.gain;
event->active.state = sdlevent.active.state;
break;
case SDL_KEYDOWN:
- event->type = WM_KEYDOWN;
+ event->type = WME_KEYDOWN;
event->key.state = sdlevent.key.state;
event->key.keysym.scancode = sdlevent.key.keysym.scancode;
event->key.keysym.key_mod = _get_modifiers(sdlevent.key.keysym);
@@ -594,7 +594,7 @@ int SDLWrapper::wait_event(wm_event *event)
*/
break;
case SDL_KEYUP:
- event->type = WM_KEYUP;
+ event->type = WME_KEYUP;
event->key.state = sdlevent.key.state;
event->key.keysym.scancode = sdlevent.key.keysym.scancode;
event->key.keysym.key_mod = _get_modifiers(sdlevent.key.keysym);
@@ -603,33 +603,33 @@ int SDLWrapper::wait_event(wm_event *event)
break;
case SDL_MOUSEMOTION:
- event->type = WM_MOUSEMOTION;
+ event->type = WME_MOUSEMOTION;
_translate_event(sdlevent.motion, event->mouse_event);
break;
case SDL_MOUSEBUTTONUP:
- event->type = WM_MOUSEBUTTONUP;
+ event->type = WME_MOUSEBUTTONUP;
_translate_event(sdlevent.button, event->mouse_event);
break;
case SDL_MOUSEBUTTONDOWN:
- event->type = WM_MOUSEBUTTONDOWN;
+ event->type = WME_MOUSEBUTTONDOWN;
_translate_event(sdlevent.button, event->mouse_event);
break;
case SDL_VIDEORESIZE:
- event->type = WM_RESIZE;
+ event->type = WME_RESIZE;
event->resize.w = sdlevent.resize.w;
event->resize.h = sdlevent.resize.h;
break;
case SDL_VIDEOEXPOSE:
- event->type = WM_EXPOSE;
+ event->type = WME_EXPOSE;
break;
case SDL_QUIT:
- event->type = WM_QUIT;
+ event->type = WME_QUIT;
break;
// I leave these as the same, because the original tilesdl does, too
case SDL_USEREVENT:
default:
- event->type = WM_CUSTOMEVENT;
+ event->type = WME_CUSTOMEVENT;
event->custom.code = sdlevent.user.code;
event->custom.data1 = sdlevent.user.data1;
event->custom.data2 = sdlevent.user.data2;
@@ -667,43 +667,43 @@ unsigned int SDLWrapper::get_event_count(wm_event_type type)
Uint32 eventmask;
switch (type)
{
- case WM_ACTIVEEVENT:
+ case WME_ACTIVEEVENT:
eventmask = SDL_EVENTMASK(SDL_ACTIVEEVENT);
break;
- case WM_KEYDOWN:
+ case WME_KEYDOWN:
eventmask = SDL_EVENTMASK(SDL_KEYDOWN);
break;
- case WM_KEYUP:
+ case WME_KEYUP:
eventmask = SDL_EVENTMASK(SDL_KEYUP);
break;
- case WM_MOUSEMOTION:
+ case WME_MOUSEMOTION:
eventmask = SDL_EVENTMASK(SDL_MOUSEMOTION);
break;
- case WM_MOUSEBUTTONUP:
+ case WME_MOUSEBUTTONUP:
eventmask = SDL_EVENTMASK(SDL_MOUSEBUTTONUP);
break;
- case WM_MOUSEBUTTONDOWN:
+ case WME_MOUSEBUTTONDOWN:
eventmask = SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN);
break;
- case WM_QUIT:
+ case WME_QUIT:
eventmask = SDL_EVENTMASK(SDL_QUIT);
break;
- case WM_CUSTOMEVENT:
+ case WME_CUSTOMEVENT:
eventmask = SDL_EVENTMASK(SDL_USEREVENT);
break;
- case WM_RESIZE:
+ case WME_RESIZE:
eventmask = SDL_EVENTMASK(SDL_VIDEORESIZE);
break;
- case WM_EXPOSE:
+ case WME_EXPOSE:
eventmask = SDL_EVENTMASK(SDL_VIDEOEXPOSE);
break;