From 66bd610f04c0360d4327a61c9febe916d5262d25 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 23 Sep 2006 23:12:44 +0000 Subject: [PATCH] Fixed bug #304 WinCE - refactoring of hardware buttons handling Contributed by Dmitry Yakimov --HG-- branch : SDL-1.2 extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402103 --- src/video/wincommon/SDL_syswm.c | 35 ++------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/src/video/wincommon/SDL_syswm.c b/src/video/wincommon/SDL_syswm.c index c5ea7a864..e1106ac84 100644 --- a/src/video/wincommon/SDL_syswm.c +++ b/src/video/wincommon/SDL_syswm.c @@ -41,25 +41,6 @@ /* The screen icon -- needs to be freed on SDL_VideoQuit() */ HICON screen_icn = NULL; -#ifdef _WIN32_WCE - -BOOL (WINAPI *CoreCatchInput)(int flag) = NULL; -int input_catched = 0; -HINSTANCE coredll = NULL; - -// the same API call that gx.dll does to catch the input -void LoadInputCatchFunc() -{ - coredll = SDL_LoadObject("coredll.dll"); - if( coredll ) - { - CoreCatchInput = (int (WINAPI *)(int)) GetProcAddress(coredll, (const unsigned short *) 1453); - } -} - -#endif - - /* Win32 icon mask semantics are different from those of SDL: SDL applies the mask to the icon and copies result to desktop. Win32 applies the mask to the desktop and XORs the icon on. @@ -263,13 +244,7 @@ SDL_GrabMode WIN_GrabInput(_THIS, SDL_GrabMode mode) SetCursorPos(pt.x,pt.y); } #ifdef _WIN32_WCE - if( input_catched ) - { - if( !CoreCatchInput ) LoadInputCatchFunc(); - - if( CoreCatchInput ) - CoreCatchInput(0); - } + AllKeys(0); #endif } else { ClipCursor(&SDL_bounds); @@ -284,13 +259,7 @@ SDL_GrabMode WIN_GrabInput(_THIS, SDL_GrabMode mode) SetCursorPos(pt.x, pt.y); } #ifdef _WIN32_WCE - if( !input_catched ) - { - if( !CoreCatchInput ) LoadInputCatchFunc(); - - if( CoreCatchInput ) - CoreCatchInput(1); - } + AllKeys(1); #endif } return(mode);