--- a/src/video/wincommon/SDL_sysevents.c	Mon May 29 03:53:21 2006 +0000
+++ b/src/video/wincommon/SDL_sysevents.c	Mon May 29 04:04:35 2006 +0000
@@ -72,20 +72,20 @@
 
 
 /* Functions called by the message processing function */
-LONG (*HandleMessage) (_THIS, HWND hwnd, UINT msg, WPARAM wParam,
-                       LPARAM lParam) = NULL;
+LONG(*HandleMessage) (_THIS, HWND hwnd, UINT msg, WPARAM wParam,
+                      LPARAM lParam) = NULL;
 void (*WIN_RealizePalette) (_THIS);
 void (*WIN_PaletteChanged) (_THIS, HWND window);
 void (*WIN_WinPAINT) (_THIS, HDC hdc);
-extern void DIB_SwapGamma (_THIS);
+extern void DIB_SwapGamma(_THIS);
 
 #ifndef NO_GETKEYBOARDSTATE
 /* Variables and support functions for SDL_ToUnicode() */
 static int codepage;
-static int Is9xME ();
-static int GetCodePage ();
-static int WINAPI ToUnicode9xME (UINT vkey, UINT scancode, BYTE * keystate,
-                                 LPWSTR wchars, int wsize, UINT flags);
+static int Is9xME();
+static int GetCodePage();
+static int WINAPI ToUnicode9xME(UINT vkey, UINT scancode, BYTE * keystate,
+                                LPWSTR wchars, int wsize, UINT flags);
 
 ToUnicodeFN SDL_ToUnicode = ToUnicode9xME;
 #endif /* !NO_GETKEYBOARDSTATE */
@@ -95,7 +95,7 @@
 
 // dynamically load aygshell dll because we want SDL to work on HPC and be300
 HINSTANCE aygshell = NULL;
-BOOL (WINAPI * SHFullScreen) (HWND hwndRequester, DWORD dwState) = 0;
+BOOL(WINAPI * SHFullScreen) (HWND hwndRequester, DWORD dwState) = 0;
 
 #define SHFS_SHOWTASKBAR            0x0001
 #define SHFS_HIDETASKBAR            0x0002
@@ -105,20 +105,20 @@
 #define SHFS_HIDESTARTICON          0x0020
 
 static void
-LoadAygshell (void)
+LoadAygshell(void)
 {
     if (!aygshell)
-        aygshell = SDL_LoadObject ("aygshell.dll");
+        aygshell = SDL_LoadObject("aygshell.dll");
     if ((aygshell != 0) && (SHFullScreen == 0)) {
         SHFullScreen = (int (WINAPI *) (struct HWND__ *, unsigned long))
-            SDL_LoadFunction (aygshell, "SHFullScreen");
+            SDL_LoadFunction(aygshell, "SHFullScreen");
     }
 }
 
 /* for gapi landscape mode */
 static void
-GapiTransform (SDL_ScreenOrientation rotate, char hires, Sint16 * x,
-               Sint16 * y)
+GapiTransform(SDL_ScreenOrientation rotate, char hires, Sint16 * x,
+              Sint16 * y)
 {
     Sint16 rotatedX;
     Sint16 rotatedY;
@@ -181,56 +181,56 @@
    about
 */
 void
-WIN_FlushMessageQueue ()
+WIN_FlushMessageQueue()
 {
     MSG msg;
-    while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) {
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
         if (msg.message == WM_QUIT)
             break;
-        TranslateMessage (&msg);
-        DispatchMessage (&msg);
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
     }
 }
 
 static void
-SDL_RestoreGameMode (void)
+SDL_RestoreGameMode(void)
 {
 #ifdef _WIN32_WCE
     SDL_VideoDevice *this = current_video;
-    if (SDL_strcmp (this->name, "gapi") == 0) {
+    if (SDL_strcmp(this->name, "gapi") == 0) {
         if (this->hidden->suspended) {
             this->hidden->suspended = 0;
         }
     }
 #else
-    ShowWindow (SDL_Window, SW_RESTORE);
+    ShowWindow(SDL_Window, SW_RESTORE);
 #endif
 
 #ifndef NO_CHANGEDISPLAYSETTINGS
 #ifndef _WIN32_WCE
-    ChangeDisplaySettings (&SDL_fullscreen_mode, CDS_FULLSCREEN);
+    ChangeDisplaySettings(&SDL_fullscreen_mode, CDS_FULLSCREEN);
 #endif
 #endif /* NO_CHANGEDISPLAYSETTINGS */
 }
 static void
-SDL_RestoreDesktopMode (void)
+SDL_RestoreDesktopMode(void)
 {
 
 #ifdef _WIN32_WCE
     SDL_VideoDevice *this = current_video;
-    if (SDL_strcmp (this->name, "gapi") == 0) {
+    if (SDL_strcmp(this->name, "gapi") == 0) {
         if (!this->hidden->suspended) {
             this->hidden->suspended = 1;
         }
     }
 #else
     /* WinCE does not have a taskbar, so minimizing is not convenient */
-    ShowWindow (SDL_Window, SW_MINIMIZE);
+    ShowWindow(SDL_Window, SW_MINIMIZE);
 #endif
 
 #ifndef NO_CHANGEDISPLAYSETTINGS
 #ifndef _WIN32_WCE
-    ChangeDisplaySettings (NULL, 0);
+    ChangeDisplaySettings(NULL, 0);
 #endif
 #endif /* NO_CHANGEDISPLAYSETTINGS */
 }
@@ -247,30 +247,30 @@
    Therefore, we implement our own version of _TrackMouseEvent() which
    uses our own implementation if TrackMouseEvent() is not available.
 */
-static BOOL (WINAPI * _TrackMouseEvent) (TRACKMOUSEEVENT * ptme) = NULL;
+static BOOL(WINAPI * _TrackMouseEvent) (TRACKMOUSEEVENT * ptme) = NULL;
 
 static VOID CALLBACK
-TrackMouseTimerProc (HWND hWnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+TrackMouseTimerProc(HWND hWnd, UINT uMsg, UINT idEvent, DWORD dwTime)
 {
     RECT rect;
     POINT pt;
 
-    GetClientRect (hWnd, &rect);
-    MapWindowPoints (hWnd, NULL, (LPPOINT) & rect, 2);
-    GetCursorPos (&pt);
-    if (!PtInRect (&rect, pt) || (WindowFromPoint (pt) != hWnd)) {
-        if (!KillTimer (hWnd, idEvent)) {
+    GetClientRect(hWnd, &rect);
+    MapWindowPoints(hWnd, NULL, (LPPOINT) & rect, 2);
+    GetCursorPos(&pt);
+    if (!PtInRect(&rect, pt) || (WindowFromPoint(pt) != hWnd)) {
+        if (!KillTimer(hWnd, idEvent)) {
             /* Error killing the timer! */
         }
-        PostMessage (hWnd, WM_MOUSELEAVE, 0, 0);
+        PostMessage(hWnd, WM_MOUSELEAVE, 0, 0);
     }
 }
 static BOOL WINAPI
-WIN_TrackMouseEvent (TRACKMOUSEEVENT * ptme)
+WIN_TrackMouseEvent(TRACKMOUSEEVENT * ptme)
 {
     if (ptme->dwFlags == TME_LEAVE) {
-        return SetTimer (ptme->hwndTrack, ptme->dwFlags, 100,
-                         (TIMERPROC) TrackMouseTimerProc) != 0;
+        return SetTimer(ptme->hwndTrack, ptme->dwFlags, 100,
+                        (TIMERPROC) TrackMouseTimerProc) != 0;
     }
     return FALSE;
 }
@@ -278,15 +278,15 @@
 
 /* Function to retrieve the current keyboard modifiers */
 static void
-WIN_GetKeyboardState (void)
+WIN_GetKeyboardState(void)
 {
 #ifndef NO_GETKEYBOARDSTATE
     SDLMod state;
     BYTE keyboard[256];
-    Uint8 *kstate = SDL_GetKeyState (NULL);
+    Uint8 *kstate = SDL_GetKeyState(NULL);
 
     state = KMOD_NONE;
-    if (GetKeyboardState (keyboard)) {
+    if (GetKeyboardState(keyboard)) {
         if (keyboard[VK_LSHIFT] & 0x80) {
             state |= KMOD_LSHIFT;
             kstate[SDLK_LSHIFT] = SDL_PRESSED;
@@ -320,7 +320,7 @@
             kstate[SDLK_CAPSLOCK] = SDL_PRESSED;
         }
     }
-    SDL_SetModState (state);
+    SDL_SetModState(state);
 #endif /* !NO_GETKEYBOARDSTATE */
 }
 
@@ -328,19 +328,19 @@
 DJM: This is no longer static as (DX5/DIB)_CreateWindow needs it
 */
 LRESULT CALLBACK
-WinMessage (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     SDL_VideoDevice *this = current_video;
     static int mouse_pressed = 0;
     static int in_window = 0;
 #ifdef WMMSG_DEBUG
-    fprintf (stderr, "Received windows message:  ");
+    fprintf(stderr, "Received windows message:  ");
     if (msg > MAX_WMMSG) {
-        fprintf (stderr, "%d", msg);
+        fprintf(stderr, "%d", msg);
     } else {
-        fprintf (stderr, "%s", wmtab[msg]);
+        fprintf(stderr, "%s", wmtab[msg]);
     }
-    fprintf (stderr, " -- 0x%X, 0x%X\n", wParam, lParam);
+    fprintf(stderr, " -- 0x%X, 0x%X\n", wParam, lParam);
 #endif
     switch (msg) {
 
@@ -350,37 +350,37 @@
             BOOL minimized;
             Uint8 appstate;
 
-            minimized = HIWORD (wParam);
-            if (!minimized && (LOWORD (wParam) != WA_INACTIVE)) {
+            minimized = HIWORD(wParam);
+            if (!minimized && (LOWORD(wParam) != WA_INACTIVE)) {
                 /* Gain the following states */
                 appstate = SDL_APPACTIVE | SDL_APPINPUTFOCUS;
                 if (this->input_grab != SDL_GRAB_OFF) {
-                    WIN_GrabInput (this, SDL_GRAB_ON);
+                    WIN_GrabInput(this, SDL_GRAB_ON);
                 }
-                if (!(SDL_GetAppState () & SDL_APPINPUTFOCUS)) {
-                    if (!DDRAW_FULLSCREEN ()) {
-                        DIB_SwapGamma (this);
+                if (!(SDL_GetAppState() & SDL_APPINPUTFOCUS)) {
+                    if (!DDRAW_FULLSCREEN()) {
+                        DIB_SwapGamma(this);
                     }
-                    if (WINDIB_FULLSCREEN ()) {
-                        SDL_RestoreGameMode ();
+                    if (WINDIB_FULLSCREEN()) {
+                        SDL_RestoreGameMode();
                     }
                 }
 #if defined(_WIN32_WCE)
-                if (WINDIB_FULLSCREEN ()) {
-                    LoadAygshell ();
+                if (WINDIB_FULLSCREEN()) {
+                    LoadAygshell();
                     if (SHFullScreen)
-                        SHFullScreen (SDL_Window,
-                                      SHFS_HIDESTARTICON |
-                                      SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
+                        SHFullScreen(SDL_Window,
+                                     SHFS_HIDESTARTICON |
+                                     SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
                     else
-                        ShowWindow (FindWindow
-                                    (TEXT ("HHTaskBar"), NULL), SW_HIDE);
+                        ShowWindow(FindWindow
+                                   (TEXT("HHTaskBar"), NULL), SW_HIDE);
 
                 }
 #endif
 
-                posted = SDL_PrivateAppActive (1, appstate);
-                WIN_GetKeyboardState ();
+                posted = SDL_PrivateAppActive(1, appstate);
+                WIN_GetKeyboardState();
             } else {
                 /* Lose the following states */
                 appstate = SDL_APPINPUTFOCUS;
@@ -388,29 +388,29 @@
                     appstate |= SDL_APPACTIVE;
                 }
                 if (this->input_grab != SDL_GRAB_OFF) {
-                    WIN_GrabInput (this, SDL_GRAB_OFF);
+                    WIN_GrabInput(this, SDL_GRAB_OFF);
                 }
-                if (SDL_GetAppState () & SDL_APPINPUTFOCUS) {
-                    if (!DDRAW_FULLSCREEN ()) {
-                        DIB_SwapGamma (this);
+                if (SDL_GetAppState() & SDL_APPINPUTFOCUS) {
+                    if (!DDRAW_FULLSCREEN()) {
+                        DIB_SwapGamma(this);
                     }
-                    if (WINDIB_FULLSCREEN ()) {
-                        SDL_RestoreDesktopMode ();
+                    if (WINDIB_FULLSCREEN()) {
+                        SDL_RestoreDesktopMode();
 #if defined(_WIN32_WCE)
-                        LoadAygshell ();
+                        LoadAygshell();
                         if (SHFullScreen)
-                            SHFullScreen (SDL_Window,
-                                          SHFS_SHOWSTARTICON |
-                                          SHFS_SHOWTASKBAR |
-                                          SHFS_SHOWSIPBUTTON);
+                            SHFullScreen(SDL_Window,
+                                         SHFS_SHOWSTARTICON |
+                                         SHFS_SHOWTASKBAR |
+                                         SHFS_SHOWSIPBUTTON);
                         else
-                            ShowWindow (FindWindow
-                                        (TEXT ("HHTaskBar"), NULL), SW_SHOW);
+                            ShowWindow(FindWindow
+                                       (TEXT("HHTaskBar"), NULL), SW_SHOW);
 
 #endif
                     }
                 }
-                posted = SDL_PrivateAppActive (0, appstate);
+                posted = SDL_PrivateAppActive(0, appstate);
             }
             return (0);
         }
@@ -420,7 +420,7 @@
         {
 
             /* Mouse is handled by DirectInput when fullscreen */
-            if (SDL_VideoSurface && !DINPUT_FULLSCREEN ()) {
+            if (SDL_VideoSurface && !DINPUT_FULLSCREEN()) {
                 Sint16 x, y;
 
                 /* mouse has entered the window */
@@ -428,19 +428,19 @@
 #ifdef WM_MOUSELEAVE
                     TRACKMOUSEEVENT tme;
 
-                    tme.cbSize = sizeof (tme);
+                    tme.cbSize = sizeof(tme);
                     tme.dwFlags = TME_LEAVE;
                     tme.hwndTrack = SDL_Window;
-                    _TrackMouseEvent (&tme);
+                    _TrackMouseEvent(&tme);
 #endif /* WM_MOUSELEAVE */
                     in_window = TRUE;
 
-                    posted = SDL_PrivateAppActive (1, SDL_APPMOUSEFOCUS);
+                    posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
                 }
 
                 /* mouse has moved within the window */
-                x = LOWORD (lParam);
-                y = HIWORD (lParam);
+                x = LOWORD(lParam);
+                y = HIWORD(lParam);
                 if (mouse_relative) {
                     POINT center;
                     center.x = (SDL_VideoSurface->w / 2);
@@ -448,17 +448,17 @@
                     x -= (Sint16) center.x;
                     y -= (Sint16) center.y;
                     if (x || y) {
-                        ClientToScreen (SDL_Window, &center);
-                        SetCursorPos (center.x, center.y);
-                        posted = SDL_PrivateMouseMotion (0, 1, x, y);
+                        ClientToScreen(SDL_Window, &center);
+                        SetCursorPos(center.x, center.y);
+                        posted = SDL_PrivateMouseMotion(0, 1, x, y);
                     }
                 } else {
 #ifdef _WIN32_WCE
                     if (SDL_VideoSurface)
-                        GapiTransform (this->hidden->userOrientation,
-                                       this->hidden->hiresFix, &x, &y);
+                        GapiTransform(this->hidden->userOrientation,
+                                      this->hidden->hiresFix, &x, &y);
 #endif
-                    posted = SDL_PrivateMouseMotion (0, 0, x, y);
+                    posted = SDL_PrivateMouseMotion(0, 0, x, y);
                 }
             }
         }
@@ -469,11 +469,11 @@
         {
 
             /* Mouse is handled by DirectInput when fullscreen */
-            if (SDL_VideoSurface && !DINPUT_FULLSCREEN ()) {
+            if (SDL_VideoSurface && !DINPUT_FULLSCREEN()) {
                 /* mouse has left the window */
                 /* or */
                 /* Elvis has left the building! */
-                posted = SDL_PrivateAppActive (0, SDL_APPMOUSEFOCUS);
+                posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
             }
             in_window = FALSE;
         }
@@ -488,7 +488,7 @@
     case WM_RBUTTONUP:
         {
             /* Mouse is handled by DirectInput when fullscreen */
-            if (SDL_VideoSurface && !DINPUT_FULLSCREEN ()) {
+            if (SDL_VideoSurface && !DINPUT_FULLSCREEN()) {
                 Sint16 x, y;
                 Uint8 button, state;
 
@@ -497,7 +497,7 @@
                    it acts like a normal windows "component"
                    (e.g. gains keyboard focus on a mouse click).
                  */
-                SetFocus (SDL_Window);
+                SetFocus(SDL_Window);
 
                 /* Figure out which button to use */
                 switch (msg) {
@@ -532,12 +532,12 @@
                 if (state == SDL_PRESSED) {
                     /* Grab mouse so we get up events */
                     if (++mouse_pressed > 0) {
-                        SetCapture (hwnd);
+                        SetCapture(hwnd);
                     }
                 } else {
                     /* Release mouse after all up events */
                     if (--mouse_pressed <= 0) {
-                        ReleaseCapture ();
+                        ReleaseCapture();
                         mouse_pressed = 0;
                     }
                 }
@@ -547,15 +547,15 @@
                     x = 0;
                     y = 0;
                 } else {
-                    x = (Sint16) LOWORD (lParam);
-                    y = (Sint16) HIWORD (lParam);
+                    x = (Sint16) LOWORD(lParam);
+                    y = (Sint16) HIWORD(lParam);
 #ifdef _WIN32_WCE
                     if (SDL_VideoSurface)
-                        GapiTransform (this->hidden->userOrientation,
-                                       this->hidden->hiresFix, &x, &y);
+                        GapiTransform(this->hidden->userOrientation,
+                                      this->hidden->hiresFix, &x, &y);
 #endif
                 }
-                posted = SDL_PrivateMouseButton (state, button, x, y);
+                posted = SDL_PrivateMouseButton(state, button, x, y);
             }
         }
         return (0);
@@ -563,16 +563,16 @@
 
 #if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
     case WM_MOUSEWHEEL:
-        if (SDL_VideoSurface && !DINPUT_FULLSCREEN ()) {
-            int move = (short) HIWORD (wParam);
+        if (SDL_VideoSurface && !DINPUT_FULLSCREEN()) {
+            int move = (short) HIWORD(wParam);
             if (move) {
                 Uint8 button;
                 if (move > 0)
                     button = SDL_BUTTON_WHEELUP;
                 else
                     button = SDL_BUTTON_WHEELDOWN;
-                posted = SDL_PrivateMouseButton (SDL_PRESSED, button, 0, 0);
-                posted |= SDL_PrivateMouseButton (SDL_RELEASED, button, 0, 0);
+                posted = SDL_PrivateMouseButton(SDL_PRESSED, button, 0, 0);
+                posted |= SDL_PrivateMouseButton(SDL_RELEASED, button, 0, 0);
             }
         }
         return (0);
@@ -603,7 +603,7 @@
             }
 
             /* Get the current position of our window */
-            GetWindowRect (SDL_Window, &size);
+            GetWindowRect(SDL_Window, &size);
             x = size.left;
             y = size.top;
 
@@ -623,11 +623,11 @@
                Aparently it's too difficult for MS to check
                inside their function, so I have to do it here.
              */
-            style = GetWindowLong (hwnd, GWL_STYLE);
-            AdjustWindowRect (&size,
-                              style,
-                              style & WS_CHILDWINDOW ? FALSE
-                              : GetMenu (hwnd) != NULL);
+            style = GetWindowLong(hwnd, GWL_STYLE);
+            AdjustWindowRect(&size,
+                             style,
+                             style & WS_CHILDWINDOW ? FALSE
+                             : GetMenu(hwnd) != NULL);
 
             width = size.right - size.left;
             height = size.bottom - size.top;
@@ -651,10 +651,10 @@
             SDL_VideoDevice *this = current_video;
             int w, h;
 
-            GetClientRect (SDL_Window, &SDL_bounds);
-            ClientToScreen (SDL_Window, (LPPOINT) & SDL_bounds);
-            ClientToScreen (SDL_Window, (LPPOINT) & SDL_bounds + 1);
-            if (!SDL_resizing && !IsZoomed (SDL_Window) &&
+            GetClientRect(SDL_Window, &SDL_bounds);
+            ClientToScreen(SDL_Window, (LPPOINT) & SDL_bounds);
+            ClientToScreen(SDL_Window, (LPPOINT) & SDL_bounds + 1);
+            if (!SDL_resizing && !IsZoomed(SDL_Window) &&
                 SDL_PublicSurface &&
                 !(SDL_PublicSurface->flags & SDL_FULLSCREEN)) {
                 SDL_windowX = SDL_bounds.left;
@@ -663,11 +663,11 @@
             w = SDL_bounds.right - SDL_bounds.left;
             h = SDL_bounds.bottom - SDL_bounds.top;
             if (this->input_grab != SDL_GRAB_OFF) {
-                ClipCursor (&SDL_bounds);
+                ClipCursor(&SDL_bounds);
             }
             if (SDL_PublicSurface &&
                 (SDL_PublicSurface->flags & SDL_RESIZABLE)) {
-                SDL_PrivateResize (w, h);
+                SDL_PrivateResize(w, h);
             }
         }
         break;
@@ -677,9 +677,9 @@
         {
             Uint16 hittest;
 
-            hittest = LOWORD (lParam);
+            hittest = LOWORD(lParam);
             if (hittest == HTCLIENT) {
-                SetCursor (SDL_hcursor);
+                SetCursor(SDL_hcursor);
                 return (TRUE);
             }
         }
@@ -688,7 +688,7 @@
         /* We are about to get palette focus! */
     case WM_QUERYNEWPALETTE:
         {
-            WIN_RealizePalette (current_video);
+            WIN_RealizePalette(current_video);
             return (TRUE);
         }
         break;
@@ -696,7 +696,7 @@
         /* Another application changed the palette */
     case WM_PALETTECHANGED:
         {
-            WIN_PaletteChanged (current_video, (HWND) wParam);
+            WIN_PaletteChanged(current_video, (HWND) wParam);
         }
         break;
 
@@ -706,39 +706,39 @@
             HDC hdc;
             PAINTSTRUCT ps;
 
-            hdc = BeginPaint (SDL_Window, &ps);
+            hdc = BeginPaint(SDL_Window, &ps);
             if (current_video->screen &&
                 !(current_video->screen->flags & SDL_INTERNALOPENGL)) {
-                WIN_WinPAINT (current_video, hdc);
+                WIN_WinPAINT(current_video, hdc);
             }
-            EndPaint (SDL_Window, &ps);
+            EndPaint(SDL_Window, &ps);
         }
         return (0);
 
         /* DJM: Send an expose event in this case */
     case WM_ERASEBKGND:
         {
-            posted = SDL_PrivateExpose ();
+            posted = SDL_PrivateExpose();
         }
         return (0);
 
     case WM_CLOSE:
         {
-            if ((posted = SDL_PrivateQuit ()))
-                PostQuitMessage (0);
+            if ((posted = SDL_PrivateQuit()))
+                PostQuitMessage(0);
         }
         return (0);
 
     case WM_DESTROY:
         {
-            PostQuitMessage (0);
+            PostQuitMessage(0);
         }
         return (0);
 
 #ifndef NO_GETKEYBOARDSTATE
     case WM_INPUTLANGCHANGE:
         {
-            codepage = GetCodePage ();
+            codepage = GetCodePage();
         }
         return (TRUE);
 #endif
@@ -747,33 +747,33 @@
         {
             /* Special handling by the video driver */
             if (HandleMessage) {
-                return (HandleMessage (current_video,
-                                       hwnd, msg, wParam, lParam));
+                return (HandleMessage(current_video,
+                                      hwnd, msg, wParam, lParam));
             }
         }
         break;
     }
-    return (DefWindowProc (hwnd, msg, wParam, lParam));
+    return (DefWindowProc(hwnd, msg, wParam, lParam));
 }
 
 /* Allow the application handle to be stored and retrieved later */
 static void *SDL_handle = NULL;
 
 void
-SDL_SetModuleHandle (void *handle)
+SDL_SetModuleHandle(void *handle)
 {
     SDL_handle = handle;
 }
 
 void *
-SDL_GetModuleHandle (void)
+SDL_GetModuleHandle(void)
 {
     void *handle;
 
     if (SDL_handle) {
         handle = SDL_handle;
     } else {
-        handle = GetModuleHandle (NULL);
+        handle = GetModuleHandle(NULL);
     }
     return (handle);
 }
@@ -785,7 +785,7 @@
 
 /* Register the class for this application -- exported for winmain.c */
 int
-SDL_RegisterApp (char *name, Uint32 style, void *hInst)
+SDL_RegisterApp(char *name, Uint32 style, void *hInst)
 {
     WNDCLASS class;
 #ifdef WM_MOUSELEAVE
@@ -803,24 +803,24 @@
     if (!name && !SDL_Appname) {
         name = "SDL_app";
         SDL_Appstyle = CS_BYTEALIGNCLIENT;
-        SDL_Instance = hInst ? hInst : SDL_GetModuleHandle ();
+        SDL_Instance = hInst ? hInst : SDL_GetModuleHandle();
     }
 
     if (name) {
 #ifdef _WIN32_WCE
         /* WinCE uses the UNICODE version */
-        SDL_Appname = SDL_iconv_utf8_ucs2 (name);
+        SDL_Appname = SDL_iconv_utf8_ucs2(name);
 #else
-        SDL_Appname = SDL_iconv_utf8_latin1 (name);
+        SDL_Appname = SDL_iconv_utf8_latin1(name);
 #endif /* _WIN32_WCE */
         SDL_Appstyle = style;
-        SDL_Instance = hInst ? hInst : SDL_GetModuleHandle ();
+        SDL_Instance = hInst ? hInst : SDL_GetModuleHandle();
     }
 
     /* Register the application class */
     class.hCursor = NULL;
-    class.hIcon = LoadImage (SDL_Instance, SDL_Appname,
-                             IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+    class.hIcon = LoadImage(SDL_Instance, SDL_Appname,
+                            IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
     class.lpszMenuName = NULL;
     class.lpszClassName = SDL_Appname;
     class.hbrBackground = NULL;
@@ -832,18 +832,18 @@
     class.lpfnWndProc = WinMessage;
     class.cbWndExtra = 0;
     class.cbClsExtra = 0;
-    if (!RegisterClass (&class)) {
-        SDL_SetError ("Couldn't register application class");
+    if (!RegisterClass(&class)) {
+        SDL_SetError("Couldn't register application class");
         return (-1);
     }
 #ifdef WM_MOUSELEAVE
     /* Get the version of TrackMouseEvent() we use */
     _TrackMouseEvent = NULL;
-    handle = GetModuleHandle ("USER32.DLL");
+    handle = GetModuleHandle("USER32.DLL");
     if (handle) {
         _TrackMouseEvent =
-            (BOOL (WINAPI *) (TRACKMOUSEEVENT *)) GetProcAddress (handle,
-                                                                  "TrackMouseEvent");
+            (BOOL(WINAPI *) (TRACKMOUSEEVENT *)) GetProcAddress(handle,
+                                                                "TrackMouseEvent");
     }
     if (_TrackMouseEvent == NULL) {
         _TrackMouseEvent = WIN_TrackMouseEvent;
@@ -852,8 +852,8 @@
 
 #ifndef NO_GETKEYBOARDSTATE
     /* Initialise variables for SDL_ToUnicode() */
-    codepage = GetCodePage ();
-    SDL_ToUnicode = Is9xME ()? ToUnicode9xME : ToUnicode;
+    codepage = GetCodePage();
+    SDL_ToUnicode = Is9xME()? ToUnicode9xME : ToUnicode;
 #endif
 
     app_registered = 1;
@@ -862,7 +862,7 @@
 
 /* Unregisters the windowclass registered in SDL_RegisterApp above. */
 void
-SDL_UnregisterApp ()
+SDL_UnregisterApp()
 {
     WNDCLASS class;
 
@@ -873,10 +873,10 @@
     --app_registered;
     if (app_registered == 0) {
         /* Check for any registered window classes. */
-        if (GetClassInfo (SDL_Instance, SDL_Appname, &class)) {
-            UnregisterClass (SDL_Appname, SDL_Instance);
+        if (GetClassInfo(SDL_Instance, SDL_Appname, &class)) {
+            UnregisterClass(SDL_Appname, SDL_Instance);
         }
-        SDL_free (SDL_Appname);
+        SDL_free(SDL_Appname);
         SDL_Appname = NULL;
     }
 }
@@ -885,42 +885,41 @@
 /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */
 
 static int
-Is9xME ()
+Is9xME()
 {
     OSVERSIONINFO info;
 
-    SDL_memset (&info, 0, sizeof (info));
-    info.dwOSVersionInfoSize = sizeof (info);
-    if (!GetVersionEx (&info)) {
+    SDL_memset(&info, 0, sizeof(info));
+    info.dwOSVersionInfoSize = sizeof(info);
+    if (!GetVersionEx(&info)) {
         return 0;
     }
     return (info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS);
 }
 
 static int
-GetCodePage ()
+GetCodePage()
 {
     char buff[8];
-    int lcid = MAKELCID (LOWORD (GetKeyboardLayout (0)), SORT_DEFAULT);
-    int cp = GetACP ();
+    int lcid = MAKELCID(LOWORD(GetKeyboardLayout(0)), SORT_DEFAULT);
+    int cp = GetACP();
 
-    if (GetLocaleInfo
-        (lcid, LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof (buff))) {
-        cp = SDL_atoi (buff);
+    if (GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof(buff))) {
+        cp = SDL_atoi(buff);
     }
     return cp;
 }
 
 static int WINAPI
-ToUnicode9xME (UINT vkey, UINT scancode, PBYTE keystate, LPWSTR wchars,
-               int wsize, UINT flags)
+ToUnicode9xME(UINT vkey, UINT scancode, PBYTE keystate, LPWSTR wchars,
+              int wsize, UINT flags)
 {
     BYTE chars[2];
 
     if (ToAsciiEx
         (vkey, scancode, keystate, (WORD *) chars, 0,
-         GetKeyboardLayout (0)) == 1) {
-        return MultiByteToWideChar (codepage, 0, chars, 1, wchars, wsize);
+         GetKeyboardLayout(0)) == 1) {
+        return MultiByteToWideChar(codepage, 0, chars, 1, wchars, wsize);
     }
     return 0;
 }