I ran a global "make indent" it modified the following files.
authorBob Pendleton <bob@pendleton.com>
Fri, 09 Jan 2009 20:43:30 +0000
changeset 3011 8f4ed5ec2b06
parent 3010 a6694a812119
child 3012 7e30c2dc7783
I ran a global "make indent" it modified the following files.
include/SDL_endian.h
src/SDL_error.c
src/audio/dart/SDL_dart.c
src/audio/windib/SDL_dibaudio.c
src/audio/windx5/SDL_dx5audio.c
src/haptic/darwin/SDL_syshaptic.c
src/haptic/nds/SDL_syshaptic.c
src/haptic/win32/SDL_syshaptic.c
src/joystick/linux/SDL_sysjoystick.c
src/joystick/win32/SDL_dxjoystick.c
src/loadso/macosx/SDL_dlcompat.c
src/video/SDL_blit_A.c
src/video/SDL_blit_N.c
src/video/SDL_renderer_gl.c
src/video/SDL_surface.c
src/video/ataricommon/SDL_atarigl.c
src/video/bwindow/SDL_sysvideo.cc
src/video/directfb/SDL_DirectFB_events.c
src/video/directfb/SDL_DirectFB_modes.c
src/video/directfb/SDL_DirectFB_mouse.c
src/video/directfb/SDL_DirectFB_opengl.c
src/video/directfb/SDL_DirectFB_render.c
src/video/directfb/SDL_DirectFB_video.c
src/video/directfb/SDL_DirectFB_window.c
src/video/ipod/SDL_ipodvideo.c
src/video/os2fslib/SDL_os2fslib.c
src/video/photon/SDL_ph_gl.c
src/video/photon/SDL_phyuv.c
src/video/win32/SDL_d3drender.c
src/video/win32/SDL_win32video.c
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11opengl.c
src/video/x11/SDL_x11video.c
--- a/include/SDL_endian.h	Fri Jan 09 20:41:31 2009 +0000
+++ b/include/SDL_endian.h	Fri Jan 09 20:43:30 2009 +0000
@@ -156,8 +156,8 @@
     } v;
     v.u = x;
   __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
-            "1"(v.s.
-                b));
+            "1"(v.
+                s.b));
     return v.u;
 }
 #elif defined(__GNUC__) && defined(__x86_64__)
--- a/src/SDL_error.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/SDL_error.c	Fri Jan 09 20:43:30 2009 +0000
@@ -180,8 +180,8 @@
                 case 's':
                     len =
                         SDL_snprintf(msg, maxlen, tmp,
-                                     SDL_LookupString(error->args[argi++].
-                                                      buf));
+                                     SDL_LookupString(error->
+                                                      args[argi++].buf));
                     msg += len;
                     maxlen -= len;
                     break;
--- a/src/audio/dart/SDL_dart.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/audio/dart/SDL_dart.c	Fri Jan 09 20:43:30 2009 +0000
@@ -62,8 +62,8 @@
                 pBufDesc->iBufferUsage = BUFFER_EMPTY;
                 // And notify DART feeder thread that it will have to work a bit.
                 if (pSDLAudioDevice)
-                    DosPostEventSem(pSDLAudioDevice->
-                                    hidden->hevAudioBufferPlayed);
+                    DosPostEventSem(pSDLAudioDevice->hidden->
+                                    hevAudioBufferPlayed);
             }
         }
     }
@@ -312,11 +312,10 @@
         (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].ulUserParm;
     pBufDesc->iBufferUsage = BUFFER_USED;
     // Send it to DART to be queued
-    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->
-                                           MixSetupParms.ulMixHandle,
-                                           &(_this->
-                                             hidden->pMixBuffers[iFreeBuf]),
-                                           1);
+    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->MixSetupParms.
+                                           ulMixHandle,
+                                           &(_this->hidden->
+                                             pMixBuffers[iFreeBuf]), 1);
 
     _this->hidden->iLastPlayedBuf = iFreeBuf;
     iFreeBuf = (iFreeBuf + 1) % _this->hidden->iCurrNumBufs;
@@ -334,8 +333,8 @@
         if (_this->hidden) {
             iFreeBuf = _this->hidden->iNextFreeBuffer;
             pBufDesc =
-                (pMixBufferDesc) _this->hidden->
-                pMixBuffers[iFreeBuf].ulUserParm;
+                (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].
+                ulUserParm;
 
             if (pBufDesc) {
                 if (pBufDesc->iBufferUsage == BUFFER_EMPTY) {
--- a/src/audio/windib/SDL_dibaudio.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/audio/windib/SDL_dibaudio.c	Fri Jan 09 20:43:30 2009 +0000
@@ -107,8 +107,8 @@
 Uint8 *
 WINWAVEOUT_GetDeviceBuf(_THIS)
 {
-    return (Uint8 *) (this->hidden->
-                      wavebuf[this->hidden->next_buffer].lpData);
+    return (Uint8 *) (this->hidden->wavebuf[this->hidden->next_buffer].
+                      lpData);
 }
 
 void
--- a/src/audio/windx5/SDL_dx5audio.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/audio/windx5/SDL_dx5audio.c	Fri Jan 09 20:43:30 2009 +0000
@@ -278,9 +278,8 @@
         IDirectSoundBuffer_Restore(this->hidden->mixbuf);
         result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
                                          this->hidden->mixlen,
-                                         (LPVOID *) & this->
-                                         hidden->locked_buf, &rawlen, NULL,
-                                         &junk, 0);
+                                         (LPVOID *) & this->hidden->
+                                         locked_buf, &rawlen, NULL, &junk, 0);
     }
     if (result != DS_OK) {
         SetDSerror("DirectSound Lock", result);
--- a/src/haptic/darwin/SDL_syshaptic.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/haptic/darwin/SDL_syshaptic.c	Fri Jan 09 20:43:30 2009 +0000
@@ -199,8 +199,8 @@
                                          CFSTR(kIOHIDPrimaryUsagePageKey));
                 if (refCF) {
                     if (!CFNumberGetValue(refCF, kCFNumberLongType,
-                                          &SDL_hapticlist[numhaptics].
-                                          usagePage))
+                                          &SDL_hapticlist
+                                          [numhaptics].usagePage))
                         SDL_SetError
                             ("Haptic: Recieving device's usage page.");
                     refCF =
@@ -208,8 +208,8 @@
                                              CFSTR(kIOHIDPrimaryUsageKey));
                     if (refCF) {
                         if (!CFNumberGetValue(refCF, kCFNumberLongType,
-                                              &SDL_hapticlist[numhaptics].
-                                              usage))
+                                              &SDL_hapticlist
+                                              [numhaptics].usage))
                             SDL_SetError("Haptic: Recieving device's usage.");
                     }
                 }
--- a/src/haptic/nds/SDL_syshaptic.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/haptic/nds/SDL_syshaptic.c	Fri Jan 09 20:43:30 2009 +0000
@@ -96,6 +96,7 @@
     }
     
return 0;
 
}
+
 
void
 NDS_EZF_SetShake(u8 pos) 
 {
--- a/src/haptic/win32/SDL_syshaptic.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Fri Jan 09 20:43:30 2009 +0000
@@ -212,8 +212,8 @@
     /* Get capabilities. */
     SDL_hapticlist[SDL_numhaptics].capabilities.dwSize = sizeof(DIDEVCAPS);
     ret = IDirectInputDevice_GetCapabilities(device,
-                                             &SDL_hapticlist[SDL_numhaptics].
-                                             capabilities);
+                                             &SDL_hapticlist
+                                             [SDL_numhaptics].capabilities);
     if (FAILED(ret)) {
         /* DI_SetError("Getting device capabilities",ret); */
         IDirectInputDevice_Release(device);
@@ -332,8 +332,8 @@
     /* Now get the IDirectInputDevice2 interface, instead. */
     ret = IDirectInputDevice_QueryInterface(device,
                                             &IID_IDirectInputDevice2,
-                                            (LPVOID *) & haptic->hwdata->
-                                            device);
+                                            (LPVOID *) & haptic->
+                                            hwdata->device);
     /* Done with the temporary one now. */
     IDirectInputDevice_Release(device);
     if (FAILED(ret)) {
@@ -500,8 +500,8 @@
 SDL_SYS_HapticOpen(SDL_Haptic * haptic)
 {
     return SDL_SYS_HapticOpenFromInstance(haptic,
-                                          SDL_hapticlist[haptic->index].
-                                          instance);
+                                          SDL_hapticlist[haptic->
+                                                         index].instance);
 }
 
 
--- a/src/joystick/linux/SDL_sysjoystick.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/joystick/linux/SDL_sysjoystick.c	Fri Jan 09 20:43:30 2009 +0000
@@ -960,8 +960,8 @@
 #endif /* USE_LOGICAL_JOYSTICKS */
 
         SDL_PrivateJoystickHat(stick, hat,
-                               position_map[the_hat->
-                                            axis[1]][the_hat->axis[0]]);
+                               position_map[the_hat->axis[1]][the_hat->
+                                                              axis[0]]);
     }
 }
 
@@ -1092,13 +1092,13 @@
                     code -= BTN_MISC;
 #ifndef NO_LOGICAL_JOYSTICKS
                     if (!LogicalJoystickButton(joystick,
-                                               joystick->
-                                               hwdata->key_map[code],
+                                               joystick->hwdata->
+                                               key_map[code],
                                                events[i].value))
 #endif
                         SDL_PrivateJoystickButton(joystick,
-                                                  joystick->
-                                                  hwdata->key_map[code],
+                                                  joystick->hwdata->
+                                                  key_map[code],
                                                   events[i].value);
                 }
                 break;
@@ -1124,8 +1124,8 @@
                                              events[i].value))
 #endif
                         SDL_PrivateJoystickAxis(joystick,
-                                                joystick->
-                                                hwdata->abs_map[code],
+                                                joystick->hwdata->
+                                                abs_map[code],
                                                 events[i].value);
                     break;
                 }
--- a/src/joystick/win32/SDL_dxjoystick.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/joystick/win32/SDL_dxjoystick.c	Fri Jan 09 20:43:30 2009 +0000
@@ -38,7 +38,7 @@
 #include "SDL_joystick.h"
 #include "../SDL_sysjoystick.h"
 #include "../SDL_joystick_c.h"
-#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */
+#define INITGUID                /* Only set here, if set twice will cause mingw32 to break. */
 #include "SDL_dxjoystick_c.h"
 
 
@@ -83,170 +83,334 @@
 
 /* Taken from Wine - Thanks! */
 DIOBJECTDATAFORMAT dfDIJoystick2[] = {
-  { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
-  { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
-  { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
-  { &GUID_POV,DIJOFS_POV(3),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(0),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(1),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(2),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(3),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(4),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(5),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(6),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(7),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(8),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(9),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(10),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(11),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(12),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(13),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(14),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(15),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(16),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(17),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(18),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(19),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(20),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(21),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(22),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(23),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(24),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(25),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(26),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(27),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(28),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(29),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(30),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(31),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(32),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(33),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(34),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(35),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(36),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(37),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(38),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(39),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(40),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(41),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(42),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(43),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(44),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(45),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(46),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(47),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(48),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(49),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(50),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(51),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(52),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(53),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(54),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(55),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(56),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(57),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(58),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(59),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(60),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(61),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(62),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(63),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(64),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(65),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(66),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(67),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(68),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(69),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(70),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(71),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(72),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(73),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(74),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(75),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(76),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(77),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(78),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(79),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(80),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(81),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(82),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(83),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(84),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(85),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(86),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(87),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(88),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(89),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(90),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(91),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(92),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(93),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(94),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(95),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(96),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(97),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(98),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(99),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(100),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(101),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(102),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(103),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(104),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(105),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(106),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(107),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(108),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(109),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(110),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(111),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(112),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(113),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(114),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(115),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(116),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(117),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(118),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(119),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(120),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(121),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(122),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(123),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(124),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(125),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(126),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { NULL,DIJOFS_BUTTON(127),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
-  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
-  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+    {&GUID_XAxis, DIJOFS_X, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_YAxis, DIJOFS_Y, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_ZAxis, DIJOFS_Z, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_RxAxis, DIJOFS_RX, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_RyAxis, DIJOFS_RY, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_RzAxis, DIJOFS_RZ, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_Slider, DIJOFS_SLIDER(0),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, DIJOFS_SLIDER(1),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_POV, DIJOFS_POV(0), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_POV, DIJOFS_POV(1), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_POV, DIJOFS_POV(2), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
+     0},
+    {&GUID_POV, DIJOFS_POV(3), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
+     0},
+    {NULL, DIJOFS_BUTTON(0),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(1),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(2),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(3),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(4),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(5),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(6),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(7),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(8),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(9),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(10),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(11),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(12),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(13),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(14),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(15),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(16),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(17),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(18),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(19),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(20),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(21),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(22),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(23),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(24),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(25),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(26),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(27),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(28),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(29),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(30),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(31),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(32),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(33),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(34),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(35),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(36),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(37),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(38),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(39),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(40),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(41),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(42),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(43),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(44),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(45),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(46),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(47),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(48),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(49),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(50),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(51),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(52),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(53),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(54),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(55),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(56),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(57),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(58),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(59),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(60),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(61),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(62),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(63),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(64),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(65),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(66),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(67),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(68),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(69),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(70),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(71),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(72),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(73),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(74),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(75),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(76),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(77),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(78),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(79),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(80),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(81),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(82),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(83),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(84),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(85),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(86),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(87),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(88),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(89),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(90),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(91),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(92),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(93),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(94),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(95),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(96),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(97),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(98),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(99),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(100),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(101),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(102),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(103),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(104),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(105),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(106),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(107),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(108),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(109),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(110),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(111),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(112),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(113),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(114),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(115),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(116),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(117),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(118),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(119),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(120),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(121),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(122),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(123),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(124),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(125),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(126),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {NULL, DIJOFS_BUTTON(127),
+     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
+    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lVX),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lVY),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lVZ),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lVRx),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lVRy),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lVRz),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[0]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[1]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lAX),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lAY),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lAZ),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lARx),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lARy),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lARz),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[0]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[1]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lFX),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lFY),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lFZ),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lFRx),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lFRy),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lFRz),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[0]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
+    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[1]),
+     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
 };
 
 const DIDATAFORMAT c_dfDIJoystick2 = {
@@ -264,8 +428,8 @@
 SetDIerror(const char *function, HRESULT code)
 {
     /*
-    SDL_SetError("%s() [%s]: %s", function,
-                 DXGetErrorString9A(code), DXGetErrorDescription9A(code));
+       SDL_SetError("%s() [%s]: %s", function,
+       DXGetErrorString9A(code), DXGetErrorDescription9A(code));
      */
     SDL_SetError("%s() DirectX error %d", function, code);
 }
@@ -291,7 +455,7 @@
     }
 
     result = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
-                              &IID_IDirectInput, (LPVOID)&dinput);
+                              &IID_IDirectInput, (LPVOID) & dinput);
 
     if (FAILED(result)) {
         SetDIerror("CoCreateInstance", result);
@@ -372,8 +536,8 @@
 
     result =
         IDirectInput_CreateDevice(dinput,
-                                  &SYS_Joystick[joystick->index].
-                                  guidInstance, &device, NULL);
+                                  &SYS_Joystick[joystick->index].guidInstance,
+                                  &device, NULL);
     if (FAILED(result)) {
         SetDIerror("IDirectInput::CreateDevice", result);
         return (-1);
@@ -382,8 +546,8 @@
     /* Now get the IDirectInputDevice2 interface, instead. */
     result = IDirectInputDevice_QueryInterface(device,
                                                &IID_IDirectInputDevice2,
-                                               (LPVOID *) & joystick->
-                                               hwdata->InputDevice);
+                                               (LPVOID *) & joystick->hwdata->
+                                               InputDevice);
     /* We are done with this object.  Use the stored one from now on. */
     IDirectInputDevice_Release(device);
 
@@ -395,8 +559,8 @@
     /* Aquire shared access. Exclusive access is required for forces,
      * though. */
     result =
-        IDirectInputDevice2_SetCooperativeLevel(joystick->hwdata->
-                                                InputDevice, SDL_HelperWindow,
+        IDirectInputDevice2_SetCooperativeLevel(joystick->hwdata->InputDevice,
+                                                SDL_HelperWindow,
                                                 DISCL_EXCLUSIVE |
                                                 DISCL_BACKGROUND);
     if (FAILED(result)) {
@@ -435,8 +599,8 @@
 
         /* reset all accuators. */
         result =
-            IDirectInputDevice2_SendForceFeedbackCommand(joystick->hwdata->
-                                                         InputDevice,
+            IDirectInputDevice2_SendForceFeedbackCommand(joystick->
+                                                         hwdata->InputDevice,
                                                          DISFFC_RESET);
 
         if (FAILED(result)) {
@@ -627,9 +791,8 @@
 
         case BUTTON:
             SDL_PrivateJoystickButton_Int(joystick, in->num,
-                                          (Uint8) (state.
-                                                   rgbButtons[in->ofs -
-                                                              DIJOFS_BUTTON0]
+                                          (Uint8) (state.rgbButtons[in->ofs -
+                                                                    DIJOFS_BUTTON0]
                                                    ? SDL_PRESSED :
                                                    SDL_RELEASED));
             break;
@@ -685,8 +848,8 @@
                 break;
             case BUTTON:
                 SDL_PrivateJoystickButton(joystick, in->num,
-                                          (Uint8) (evtbuf[i].
-                                                   dwData ? SDL_PRESSED :
+                                          (Uint8) (evtbuf[i].dwData ?
+                                                   SDL_PRESSED :
                                                    SDL_RELEASED));
                 break;
             case HAT:
--- a/src/loadso/macosx/SDL_dlcompat.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/loadso/macosx/SDL_dlcompat.c	Fri Jan 09 20:43:30 2009 +0000
@@ -616,8 +616,8 @@
                 || (LC_LOAD_WEAK_DYLIB == lc->cmd)) {
                 if ((wh = (struct mach_header *)
                      my_find_image((char
-                                    *) (((struct dylib_command *) lc)->dylib.
-                                        name.offset + (char *) lc)))) {
+                                    *) (((struct dylib_command *) lc)->
+                                        dylib.name.offset + (char *) lc)))) {
                     if (dyld_NSIsSymbolNameDefinedInImage(wh, symbol)) {
                         nssym = dyld_NSLookupSymbolInImage(wh,
                                                            symbol,
--- a/src/video/SDL_blit_A.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/SDL_blit_A.c	Fri Jan 09 20:43:30 2009 +0000
@@ -283,8 +283,8 @@
         amult = alpha | (alpha << 8);
         amult = amult | (amult << 16);
         chanmask =
-            (0xff << df->Rshift) | (0xff << df->
-                                    Gshift) | (0xff << df->Bshift);
+            (0xff << df->Rshift) | (0xff << df->Gshift) | (0xff << df->
+                                                           Bshift);
         mm_alpha = _mm_set_pi32(0, amult & chanmask);   /* 0000AAAA -> mm_alpha, minus 1 chan */
         mm_alpha = _mm_unpacklo_pi8(mm_alpha, mm_zero); /* 0A0A0A0A -> mm_alpha, minus 1 chan */
         /* at this point mm_alpha can be 000A0A0A or 0A0A0A00 or another combo */
@@ -526,8 +526,8 @@
     /* Use zero for alpha if either surface doesn't have alpha */
     if (dstfmt->Amask) {
         amask =
-            ((srcfmt->Amask) ? RESHIFT(srcfmt->
-                                       Ashift) : 0x10) << (dstfmt->Ashift);
+            ((srcfmt->Amask) ? RESHIFT(srcfmt->Ashift) : 0x10) << (dstfmt->
+                                                                   Ashift);
     } else {
         amask =
             0x10101010 & ((dstfmt->Rmask | dstfmt->Gmask | dstfmt->Bmask) ^
--- a/src/video/SDL_blit_N.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/SDL_blit_N.c	Fri Jan 09 20:43:30 2009 +0000
@@ -141,8 +141,8 @@
     /* Use zero for alpha if either surface doesn't have alpha */
     if (dstfmt->Amask) {
         amask =
-            ((srcfmt->Amask) ? RESHIFT(srcfmt->
-                                       Ashift) : 0x10) << (dstfmt->Ashift);
+            ((srcfmt->Amask) ? RESHIFT(srcfmt->Ashift) : 0x10) << (dstfmt->
+                                                                   Ashift);
     } else {
         amask =
             0x10101010 & ((dstfmt->Rmask | dstfmt->Gmask | dstfmt->Bmask) ^
--- a/src/video/SDL_renderer_gl.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/SDL_renderer_gl.c	Fri Jan 09 20:43:30 2009 +0000
@@ -926,8 +926,8 @@
     renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH,
                               (pitch / bytes_per_pixel(texture->format)) /
-                              ((GL_TextureData *) texture->driverdata)->
-                              HACK_RYAN_FIXME);
+                              ((GL_TextureData *) texture->
+                               driverdata)->HACK_RYAN_FIXME);
 }
 
 static int
--- a/src/video/SDL_surface.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/SDL_surface.c	Fri Jan 09 20:43:30 2009 +0000
@@ -479,9 +479,9 @@
         return 0;
     }
 
-    switch (surface->map->
-            info.flags & (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD |
-                          SDL_COPY_MOD)) {
+    switch (surface->map->info.
+            flags & (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD |
+                     SDL_COPY_MOD)) {
     case SDL_COPY_MASK:
         *blendMode = SDL_BLENDMODE_MASK;
         break;
--- a/src/video/ataricommon/SDL_atarigl.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/ataricommon/SDL_atarigl.c	Fri Jan 09 20:43:30 2009 +0000
@@ -349,9 +349,9 @@
     }
 
     if (!
-        (_this->
-         gl_data->OSMesaMakeCurrent(gl_ctx, surface->pixels, type, surface->w,
-                                    surface->h))) {
+        (_this->gl_data->
+         OSMesaMakeCurrent(gl_ctx, surface->pixels, type, surface->w,
+                           surface->h))) {
         SDL_SetError("Can not make OpenGL context current");
         return -1;
     }
@@ -512,11 +512,11 @@
 
         gl_ctx =
             _this->gl_data->OSMesaCreateContextExt(osmesa_format,
-                                                   _this->
-                                                   gl_config.depth_size,
-                                                   _this->
-                                                   gl_config.stencil_size,
-                                                   newaccumsize, NULL);
+                                                   _this->gl_config.
+                                                   depth_size,
+                                                   _this->gl_config.
+                                                   stencil_size, newaccumsize,
+                                                   NULL);
 
         if (gl_ctx) {
             gl_curformat = osmesa_format;
--- a/src/video/bwindow/SDL_sysvideo.cc	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/bwindow/SDL_sysvideo.cc	Fri Jan 09 20:43:30 2009 +0000
@@ -670,8 +670,8 @@
                         _this->gl_config.driver_loaded = 1;
                         SDL_strlcpy(_this->gl_config.driver_path,
                                     "libGL.so",
-                                    SDL_arraysize(_this->
-                                                  gl_config.driver_path));
+                                    SDL_arraysize(_this->gl_config.
+                                                  driver_path));
                     }
                 }
             }
--- a/src/video/directfb/SDL_DirectFB_events.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_events.c	Fri Jan 09 20:43:30 2009 +0000
@@ -60,8 +60,9 @@
     int ret;
 
     if (dispdata->vidIDinuse)
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SwitchContext(dispdata->vidlayer, DFB_TRUE));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SwitchContext(dispdata->vidlayer,
+                                                 DFB_TRUE));
 
   error:
     return;
@@ -148,8 +149,8 @@
                         SDL_SendMouseMotion(devdata->mouse_id[0], 0, evt.cx,
                                             evt.cy, 0);
                         SDL_SendMouseButton(devdata->mouse_id[0], SDL_PRESSED,
-                                            DirectFB_TranslateButton(evt.
-                                                                     button));
+                                            DirectFB_TranslateButton
+                                            (evt.button));
                     } else {
                         MotionAllMice(_this, evt.x, evt.y);
                     }
@@ -160,8 +161,8 @@
                                             evt.cy, 0);
                         SDL_SendMouseButton(devdata->mouse_id[0],
                                             SDL_RELEASED,
-                                            DirectFB_TranslateButton(evt.
-                                                                     button));
+                                            DirectFB_TranslateButton
+                                            (evt.button));
                     } else {
                         MotionAllMice(_this, evt.x, evt.y);
                     }
@@ -521,6 +522,7 @@
 
     return keysym;
 }
+
 static int
 DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button)
 {
@@ -602,18 +604,19 @@
     devdata->num_keyboard = 0;
     if (devdata->use_linux_input) {
         sys_ids = 0;
-        SDL_DFB_CHECK(devdata->dfb->
-                      EnumInputDevices(devdata->dfb, EnumKeyboards, devdata));
+        SDL_DFB_CHECK(devdata->
+                      dfb->EnumInputDevices(devdata->dfb, EnumKeyboards,
+                                            devdata));
         if (devdata->num_keyboard == 0) {
             sys_ids = 1;
-            SDL_DFB_CHECK(devdata->dfb->
-                          EnumInputDevices(devdata->dfb, EnumKeyboards,
-                                           devdata));
+            SDL_DFB_CHECK(devdata->
+                          dfb->EnumInputDevices(devdata->dfb, EnumKeyboards,
+                                                devdata));
         }
     } else {
-        SDL_DFB_CHECK(devdata->dfb->
-                      EnumInputDevices(devdata->dfb, input_device_cb,
-                                       devdata));
+        SDL_DFB_CHECK(devdata->
+                      dfb->EnumInputDevices(devdata->dfb, input_device_cb,
+                                            devdata));
     }
 }
 
@@ -650,33 +653,25 @@
             switch (evt.type) {
             case DIET_BUTTONPRESS:
                 posted += SDL_PrivateMouseButton(SDL_PRESSED,
-                                                 DirectFB_TranslateButton(evt.
-                                                                          button),
-                                                 0, 0);
+                                                 DirectFB_TranslateButton
+                                                 (evt.button), 0, 0);
                 break;
             case DIET_BUTTONRELEASE:
                 posted += SDL_PrivateMouseButton(SDL_RELEASED,
-                                                 DirectFB_TranslateButton(evt.
-                                                                          button),
-                                                 0, 0);
+                                                 DirectFB_TranslateButton
+                                                 (evt.button), 0, 0);
                 break;
             case DIET_KEYPRESS:
                 posted += SDL_PrivateKeyboard(SDL_PRESSED,
-                                              DirectFB_TranslateKey(evt.
-                                                                    key_id,
-                                                                    evt.
-                                                                    key_symbol,
-                                                                    mod,
-                                                                    &keysym));
+                                              DirectFB_TranslateKey
+                                              (evt.key_id, evt.key_symbol,
+                                               mod, &keysym));
                 break;
             case DIET_KEYRELEASE:
                 posted += SDL_PrivateKeyboard(SDL_RELEASED,
-                                              DirectFB_TranslateKey(evt.
-                                                                    key_id,
-                                                                    evt.
-                                                                    key_symbol,
-                                                                    mod,
-                                                                    &keysym));
+                                              DirectFB_TranslateKey
+                                              (evt.key_id, evt.key_symbol,
+                                               mod, &keysym));
                 break;
             case DIET_AXISMOTION:
                 if (evt.flags & DIEF_AXISREL) {
--- a/src/video/directfb/SDL_DirectFB_modes.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_modes.c	Fri Jan 09 20:43:30 2009 +0000
@@ -204,8 +204,9 @@
     DFBDisplayLayerConfigFlags failed;
     int ret;
 
-    SDL_DFB_CHECKERR(data->layer->
-                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
+    SDL_DFB_CHECKERR(data->
+                     layer->SetCooperativeLevel(data->layer,
+                                                DLSCL_ADMINISTRATIVE));
     config.width = mode->w;
     config.height = mode->h;
     config.pixelformat = SDLToDFBPixelFormat(mode->format);
@@ -216,8 +217,8 @@
     }
     failed = 0;
     data->layer->TestConfiguration(data->layer, &config, &failed);
-    SDL_DFB_CHECKERR(data->layer->
-                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
+    SDL_DFB_CHECKERR(data->
+                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
     if (failed == 0)
         SDL_AddDisplayMode(_this->current_display, mode);
     else
@@ -259,19 +260,20 @@
         screencbdata->vidlayer[i] = -1;
     }
 
-    SDL_DFB_CHECKERR(devdata->dfb->
-                     EnumScreens(devdata->dfb, &cbScreens, screencbdata));
+    SDL_DFB_CHECKERR(devdata->
+                     dfb->EnumScreens(devdata->dfb, &cbScreens,
+                                      screencbdata));
 
     for (i = 0; i < screencbdata->numscreens; i++) {
         IDirectFBScreen *screen;
 
-        SDL_DFB_CHECKERR(devdata->dfb->
-                         GetScreen(devdata->dfb, screencbdata->screenid[i],
-                                   &screen));
+        SDL_DFB_CHECKERR(devdata->
+                         dfb->GetScreen(devdata->dfb,
+                                        screencbdata->screenid[i], &screen));
 
         screencbdata->aux = i;
-        SDL_DFB_CHECKERR(screen->
-                         EnumDisplayLayers(screen, &cbLayers, screencbdata));
+        SDL_DFB_CHECKERR(screen->EnumDisplayLayers
+                         (screen, &cbLayers, screencbdata));
 #if (DIRECTFB_MAJOR_VERSION >= 1)
         screen->GetSize(screen, &tcw[i], &tch[i]);
 #else
@@ -293,12 +295,12 @@
     SDL_DFB_DEBUG("Found %d screens\n", screencbdata->numscreens);
 
     for (i = 0; i < screencbdata->numscreens; i++) {
-        SDL_DFB_CHECKERR(devdata->dfb->
-                         GetDisplayLayer(devdata->dfb,
-                                         screencbdata->gralayer[i], &layer));
+        SDL_DFB_CHECKERR(devdata->dfb->GetDisplayLayer(devdata->dfb,
+                                                       screencbdata->
+                                                       gralayer[i], &layer));
 
-        SDL_DFB_CHECKERR(layer->
-                         SetCooperativeLevel(layer, DLSCL_ADMINISTRATIVE));
+        SDL_DFB_CHECKERR(layer->SetCooperativeLevel
+                         (layer, DLSCL_ADMINISTRATIVE));
         layer->EnableCursor(layer, 1);
         SDL_DFB_CHECKERR(layer->SetCursorOpacity(layer, 0xC0));
 
@@ -381,8 +383,9 @@
     data.nummodes = 0;
     /* Enumerate the available fullscreen modes */
     SDL_DFB_CALLOC(data.modelist, DFB_MAX_MODES, sizeof(SDL_DisplayMode));
-    SDL_DFB_CHECKERR(devdata->dfb->
-                     EnumVideoModes(devdata->dfb, EnumModesCallback, &data));
+    SDL_DFB_CHECKERR(devdata->
+                     dfb->EnumVideoModes(devdata->dfb, EnumModesCallback,
+                                         &data));
 
     for (i = 0; i < data.nummodes; ++i) {
         mode = data.modelist[i];
@@ -419,8 +422,9 @@
     DFBDisplayLayerConfigFlags fail = 0;
     DFBResult ret;
 
-    SDL_DFB_CHECKERR(data->layer->
-                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
+    SDL_DFB_CHECKERR(data->
+                     layer->SetCooperativeLevel(data->layer,
+                                                DLSCL_ADMINISTRATIVE));
 
     SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &config));
     config.flags = DLCONF_WIDTH | DLCONF_HEIGHT;
@@ -458,8 +462,8 @@
 
     /* Double check */
     SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &rconfig));
-    SDL_DFB_CHECKERR(data->layer->
-                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
+    SDL_DFB_CHECKERR(data->
+                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
 
     if ((config.width != rconfig.width) ||
         (config.height != rconfig.height) ||
@@ -502,13 +506,14 @@
             (DFB_DisplayData *) _this->displays[i].driverdata;
 
         if (dispdata->layer) {
-            SDL_DFB_CHECK(dispdata->layer->
-                          SetCooperativeLevel(dispdata->layer,
-                                              DLSCL_ADMINISTRATIVE));
-            SDL_DFB_CHECK(dispdata->layer->
-                          SetCursorOpacity(dispdata->layer, 0x00));
-            SDL_DFB_CHECK(dispdata->layer->
-                          SetCooperativeLevel(dispdata->layer, DLSCL_SHARED));
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCooperativeLevel(dispdata->layer,
+                                                     DLSCL_ADMINISTRATIVE));
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCursorOpacity(dispdata->layer, 0x00));
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCooperativeLevel(dispdata->layer,
+                                                     DLSCL_SHARED));
         }
 
         SDL_DFB_RELEASE(dispdata->layer);
--- a/src/video/directfb/SDL_DirectFB_mouse.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_mouse.c	Fri Jan 09 20:43:30 2009 +0000
@@ -132,14 +132,15 @@
     dsc.height = surface->h;
     dsc.pixelformat = DSPF_ARGB;
 
-    SDL_DFB_CHECKERR(devdata->dfb->
-                     CreateSurface(devdata->dfb, &dsc, &curdata->surf));
+    SDL_DFB_CHECKERR(devdata->
+                     dfb->CreateSurface(devdata->dfb, &dsc, &curdata->surf));
     curdata->hotx = hot_x;
     curdata->hoty = hot_y;
     cursor->driverdata = curdata;
 
-    SDL_DFB_CHECKERR(curdata->surf->
-                     Lock(curdata->surf, DSLF_WRITE, (void *) &dest, &pitch));
+    SDL_DFB_CHECKERR(curdata->
+                     surf->Lock(curdata->surf, DSLF_WRITE, (void *) &dest,
+                                &pitch));
 
     /* Relies on the fact that this is only called with ARGB surface. */
     p = surface->pixels;
@@ -174,21 +175,22 @@
             DFB_WindowData *windata = (DFB_WindowData *) window->driverdata;
 
             if (cursor)
-                SDL_DFB_CHECKERR(windata->window->
-                                 SetCursorShape(windata->window,
-                                                curdata->surf, curdata->hotx,
-                                                curdata->hoty));
+                SDL_DFB_CHECKERR(windata->
+                                 window->SetCursorShape(windata->window,
+                                                        curdata->surf,
+                                                        curdata->hotx,
+                                                        curdata->hoty));
 
             /* fprintf(stdout, "Cursor is %s\n", cursor ? "on" : "off"); */
-            SDL_DFB_CHECKERR(dispdata->layer->
-                             SetCooperativeLevel(dispdata->layer,
-                                                 DLSCL_ADMINISTRATIVE));
-            SDL_DFB_CHECKERR(dispdata->layer->
-                             SetCursorOpacity(dispdata->layer,
-                                              cursor ? 0xC0 : 0x00));
-            SDL_DFB_CHECKERR(dispdata->layer->
-                             SetCooperativeLevel(dispdata->layer,
-                                                 DLSCL_SHARED));
+            SDL_DFB_CHECKERR(dispdata->
+                             layer->SetCooperativeLevel(dispdata->layer,
+                                                        DLSCL_ADMINISTRATIVE));
+            SDL_DFB_CHECKERR(dispdata->
+                             layer->SetCursorOpacity(dispdata->layer,
+                                                     cursor ? 0xC0 : 0x00));
+            SDL_DFB_CHECKERR(dispdata->
+                             layer->SetCooperativeLevel(dispdata->layer,
+                                                        DLSCL_SHARED));
         }
     }
 
@@ -227,8 +229,8 @@
     int cx, cy;
 
     SDL_DFB_CHECKERR(windata->window->GetPosition(windata->window, &cx, &cy));
-    SDL_DFB_CHECKERR(dispdata->layer->
-                     WarpCursor(dispdata->layer, cx + x, cy + y));
+    SDL_DFB_CHECKERR(dispdata->
+                     layer->WarpCursor(dispdata->layer, cx + x, cy + y));
 
   error:
     return;
--- a/src/video/directfb/SDL_DirectFB_opengl.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_opengl.c	Fri Jan 09 20:43:30 2009 +0000
@@ -173,8 +173,8 @@
 
     SDL_DFB_CALLOC(context, 1, sizeof(*context));
 
-    SDL_DFB_CHECKERR(windata->surface->
-                     GetGL(windata->surface, &context->context));
+    SDL_DFB_CHECKERR(windata->
+                     surface->GetGL(windata->surface, &context->context));
 
     if (!context->context)
         return NULL;
@@ -212,12 +212,12 @@
 
         windata->gl_context = NULL;
         /* Everything is unlocked, check for a resize */
-        SDL_DFB_CHECKERR(windata->surface->
-                         GetSize(windata->surface, &cw, &ch));
+        SDL_DFB_CHECKERR(windata->
+                         surface->GetSize(windata->surface, &cw, &ch));
         if (cw != window->w || ch != window->h)
-            SDL_DFB_CHECKERR(windata->window->
-                             ResizeSurface(windata->window, window->w,
-                                           window->h));
+            SDL_DFB_CHECKERR(windata->
+                             window->ResizeSurface(windata->window, window->w,
+                                                   window->h));
     }
 
     if (ctx != NULL) {
@@ -266,8 +266,9 @@
 
     if (1 || windata->gl_context) {
         /* SDL_DFB_CHECKERR(windata->gl_context->context->Unlock(windata->gl_context->context)); */
-        SDL_DFB_CHECKERR(windata->surface->
-                         Flip(windata->surface, &region, DSFLIP_ONSYNC));
+        SDL_DFB_CHECKERR(windata->
+                         surface->Flip(windata->surface, &region,
+                                       DSFLIP_ONSYNC));
         /* SDL_DFB_CHECKERR(windata->gl_context->context->Lock(windata->gl_context->context)); */
 
     }
--- a/src/video/directfb/SDL_DirectFB_render.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_render.c	Fri Jan 09 20:43:30 2009 +0000
@@ -418,12 +418,12 @@
         int cw, ch;
         int ret;
 
-        SDL_DFB_CHECKERR(windata->surface->
-                         GetSize(windata->surface, &cw, &ch));
+        SDL_DFB_CHECKERR(windata->
+                         surface->GetSize(windata->surface, &cw, &ch));
         if (cw != window->w || ch != window->h)
-            SDL_DFB_CHECKERR(windata->window->
-                             ResizeSurface(windata->window, window->w,
-                                           window->h));
+            SDL_DFB_CHECKERR(windata->
+                             window->ResizeSurface(windata->window, window->w,
+                                                   window->h));
     }
     return 0;
   error:
@@ -462,22 +462,24 @@
         layconf.pixelformat = SDLToDFBPixelFormat(data->format);
         layconf.surface_caps = DSCAPS_VIDEOONLY | DSCAPS_DOUBLE;
 
-        SDL_DFB_CHECKERR(devdata->dfb->
-                         GetDisplayLayer(devdata->dfb, dispdata->vidID,
-                                         &dispdata->vidlayer));
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SetCooperativeLevel(dispdata->vidlayer,
-                                             DLSCL_EXCLUSIVE));
+        SDL_DFB_CHECKERR(devdata->
+                         dfb->GetDisplayLayer(devdata->dfb, dispdata->vidID,
+                                              &dispdata->vidlayer));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+                                                       DLSCL_EXCLUSIVE));
 
         if (devdata->use_yuv_underlays) {
             ret = dispdata->vidlayer->SetLevel(dispdata->vidlayer, -1);
             if (ret != DFB_OK)
                 SDL_DFB_DEBUG("Underlay Setlevel not supported\n");
         }
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SetConfiguration(dispdata->vidlayer, &layconf));
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         GetSurface(dispdata->vidlayer, &data->surface));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetConfiguration(dispdata->vidlayer,
+                                                    &layconf));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->GetSurface(dispdata->vidlayer,
+                                              &data->surface));
         dispdata->vidIDinuse = 1;
         data->display = display;
         return 0;
@@ -486,9 +488,9 @@
   error:
     if (dispdata->vidlayer) {
         SDL_DFB_RELEASE(data->surface);
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SetCooperativeLevel(dispdata->vidlayer,
-                                             DLSCL_ADMINISTRATIVE));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+                                                       DLSCL_ADMINISTRATIVE));
         SDL_DFB_RELEASE(dispdata->vidlayer);
     }
     return 1;
@@ -540,12 +542,14 @@
         data->pixels = NULL;
 
         /* Create the surface */
-        SDL_DFB_CHECKERR(devdata->dfb->
-                         CreateSurface(devdata->dfb, &dsc, &data->surface));
+        SDL_DFB_CHECKERR(devdata->
+                         dfb->CreateSurface(devdata->dfb, &dsc,
+                                            &data->surface));
         if (SDL_ISPIXELFORMAT_INDEXED(data->format)
             && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
-            SDL_DFB_CHECKERR(data->surface->
-                             GetPalette(data->surface, &data->palette));
+            SDL_DFB_CHECKERR(data->
+                             surface->GetPalette(data->surface,
+                                                 &data->palette));
         }
 
     }
@@ -602,9 +606,9 @@
             entries[i].b = colors[i].b;
             entries[i].a = 0xFF;
         }
-        SDL_DFB_CHECKERR(data->palette->
-                         SetEntries(data->palette, entries, ncolors,
-                                    firstcolor));
+        SDL_DFB_CHECKERR(data->
+                         palette->SetEntries(data->palette, entries, ncolors,
+                                             firstcolor));
         return 0;
     } else {
         SDL_SetError("YUV textures don't have a palette");
@@ -626,9 +630,9 @@
         DFBColor entries[256];
         int i;
 
-        SDL_DFB_CHECKERR(data->palette->
-                         GetEntries(data->palette, entries, ncolors,
-                                    firstcolor));
+        SDL_DFB_CHECKERR(data->
+                         palette->GetEntries(data->palette, entries, ncolors,
+                                             firstcolor));
 
         for (i = 0; i < ncolors; ++i) {
             colors[i].r = entries[i].r;
@@ -807,8 +811,9 @@
     a = renderer->a;
 
     SetBlendMode(data, renderer->blendMode, NULL);
-    SDL_DFB_CHECKERR(data->surface->
-                     SetDrawingFlags(data->surface, data->drawFlags));
+    SDL_DFB_CHECKERR(data->
+                     surface->SetDrawingFlags(data->surface,
+                                              data->drawFlags));
 
     switch (renderer->blendMode) {
     case SDL_BLENDMODE_NONE:
@@ -868,9 +873,9 @@
     DFBResult ret;
 
     PrepareDraw(renderer);
-    SDL_DFB_CHECKERR(data->surface->
-                     FillRectangle(data->surface, rect->x, rect->y, rect->w,
-                                   rect->h));
+    SDL_DFB_CHECKERR(data->
+                     surface->FillRectangle(data->surface, rect->x, rect->y,
+                                            rect->w, rect->h));
 
     return 0;
   error:
@@ -894,15 +899,18 @@
         SDL_VideoDisplay *display = texturedata->display;
         DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
 
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SetSourceRectangle(dispdata->vidlayer, srcrect->x,
-                                            srcrect->y, srcrect->w,
-                                            srcrect->h));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetSourceRectangle(dispdata->vidlayer,
+                                                      srcrect->x, srcrect->y,
+                                                      srcrect->w,
+                                                      srcrect->h));
         windata->window->GetPosition(windata->window, &px, &py);
-        SDL_DFB_CHECKERR(dispdata->vidlayer->
-                         SetScreenRectangle(dispdata->vidlayer,
-                                            px + dstrect->x, py + dstrect->y,
-                                            dstrect->w, dstrect->h));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetScreenRectangle(dispdata->vidlayer,
+                                                      px + dstrect->x,
+                                                      py + dstrect->y,
+                                                      dstrect->w,
+                                                      dstrect->h));
     } else {
         DFBRectangle sr, dr;
         DFBSurfaceBlittingFlags flags = 0;
@@ -930,9 +938,8 @@
 
         SDL_DFB_CHECKERR(data->surface->SetColor(data->surface, 0xFF,
                                                  0xFF, 0xFF, 0xFF));
-        if (texture->
-            modMode & (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA))
-        {
+        if (texture->modMode &
+            (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA)) {
             if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA) {
                 alpha = texture->a;
                 SDL_DFB_CHECKERR(data->surface->SetColor(data->surface, 0xFF,
@@ -940,9 +947,10 @@
             }
             if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
 
-                SDL_DFB_CHECKERR(data->surface->
-                                 SetColor(data->surface, texture->r,
-                                          texture->g, texture->b, alpha));
+                SDL_DFB_CHECKERR(data->
+                                 surface->SetColor(data->surface, texture->r,
+                                                   texture->g, texture->b,
+                                                   alpha));
                 flags |= DSBLIT_COLORIZE;
             }
             if (alpha < 0xFF)
@@ -953,24 +961,25 @@
 
         SetBlendMode(data, texture->blendMode, texturedata);
 
-        SDL_DFB_CHECKERR(data->surface->
-                         SetBlittingFlags(data->surface,
-                                          data->blitFlags | flags));
+        SDL_DFB_CHECKERR(data->surface->SetBlittingFlags(data->surface,
+                                                         data->
+                                                         blitFlags | flags));
 
 #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 2)
         SDL_DFB_CHECKERR(data->surface->SetRenderOptions(data->surface,
-                                                         texturedata->
-                                                         render_options));
+                                                         texturedata->render_options));
 #endif
 
         if (srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
-            SDL_DFB_CHECKERR(data->surface->
-                             Blit(data->surface, texturedata->surface,
-                                  &sr, dr.x, dr.y));
+            SDL_DFB_CHECKERR(data->
+                             surface->Blit(data->surface,
+                                           texturedata->surface, &sr, dr.x,
+                                           dr.y));
         } else {
-            SDL_DFB_CHECKERR(data->surface->
-                             StretchBlit(data->surface, texturedata->surface,
-                                         &sr, &dr));
+            SDL_DFB_CHECKERR(data->
+                             surface->StretchBlit(data->surface,
+                                                  texturedata->surface, &sr,
+                                                  &dr));
         }
     }
     return 0;
@@ -993,8 +1002,8 @@
     sr.h = window->h;
 
     /* Send the data to the display */
-    SDL_DFB_CHECKERR(data->surface->
-                     Flip(data->surface, NULL, data->flipflags));
+    SDL_DFB_CHECKERR(data->
+                     surface->Flip(data->surface, NULL, data->flipflags));
 
     return;
   error:
--- a/src/video/directfb/SDL_DirectFB_video.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_video.c	Fri Jan 09 20:43:30 2009 +0000
@@ -190,14 +190,15 @@
 
     /* Create global Eventbuffer for axis events */
     if (devdata->use_linux_input) {
-        SDL_DFB_CHECKERR(dfb->
-                         CreateInputEventBuffer(dfb, DICAPS_ALL,
-                                                DFB_TRUE, &devdata->events));
+        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_ALL,
+                                                     DFB_TRUE,
+                                                     &devdata->events));
     } else {
-        SDL_DFB_CHECKERR(dfb->
-                         CreateInputEventBuffer(dfb,
-                                                DICAPS_AXES /*DICAPS_ALL */ ,
-                                                DFB_TRUE, &devdata->events));
+        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb,
+                                                     DICAPS_AXES
+                                                     /*DICAPS_ALL */ ,
+                                                     DFB_TRUE,
+                                                     &devdata->events));
     }
 
     devdata->initialized = 1;
--- a/src/video/directfb/SDL_DirectFB_window.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/directfb/SDL_DirectFB_window.c	Fri Jan 09 20:43:30 2009 +0000
@@ -43,11 +43,11 @@
     SDL_DFB_CALLOC(window->driverdata, 1, sizeof(DFB_WindowData));
     windata = (DFB_WindowData *) window->driverdata;
 
-    SDL_DFB_CHECKERR(devdata->dfb->
-                     SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
-    SDL_DFB_CHECKERR(dispdata->layer->
-                     SetCooperativeLevel(dispdata->layer,
-                                         DLSCL_ADMINISTRATIVE));
+    SDL_DFB_CHECKERR(devdata->
+                     dfb->SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
+    SDL_DFB_CHECKERR(dispdata->
+                     layer->SetCooperativeLevel(dispdata->layer,
+                                                DLSCL_ADMINISTRATIVE));
 
     /* Fill the window description. */
     if (window->x == SDL_WINDOWPOS_CENTERED) {
@@ -100,8 +100,9 @@
     /* DSCAPS_VIDEOONLY has negative impact on performance */
 
     /* Create the window. */
-    SDL_DFB_CHECKERR(dispdata->layer->
-                     CreateWindow(dispdata->layer, &desc, &windata->window));
+    SDL_DFB_CHECKERR(dispdata->
+                     layer->CreateWindow(dispdata->layer, &desc,
+                                         &windata->window));
 
     windata->window->GetOptions(windata->window, &wopts);
 #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 0)
@@ -119,14 +120,14 @@
 
     windata->window->SetOptions(windata->window, wopts);
     /* Get the window's surface. */
-    SDL_DFB_CHECKERR(windata->window->
-                     GetSurface(windata->window, &windata->surface));
+    SDL_DFB_CHECKERR(windata->
+                     window->GetSurface(windata->window, &windata->surface));
     windata->window->SetOpacity(windata->window, 0xFF);
-    SDL_DFB_CHECKERR(windata->window->
-                     CreateEventBuffer(windata->window,
-                                       &(windata->eventbuffer)));
-    SDL_DFB_CHECKERR(windata->window->
-                     EnableEvents(windata->window, DWET_ALL));
+    SDL_DFB_CHECKERR(windata->window->CreateEventBuffer(windata->window,
+                                                        &(windata->
+                                                          eventbuffer)));
+    SDL_DFB_CHECKERR(windata->
+                     window->EnableEvents(windata->window, DWET_ALL));
 
     if (window->flags & SDL_WINDOW_FULLSCREEN)
         windata->window->SetStackingClass(windata->window, DWSC_UPPER);
@@ -202,19 +203,21 @@
         int ch;
 
         /* Make sure all events are disabled for this operation ! */
-        SDL_DFB_CHECKERR(windata->window->
-                         DisableEvents(windata->window, DWET_ALL));
+        SDL_DFB_CHECKERR(windata->
+                         window->DisableEvents(windata->window, DWET_ALL));
 
         SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &cw, &ch));
         if (cw != window->w || ch != window->h)
-            SDL_DFB_CHECKERR(windata->window->
-                             Resize(windata->window, window->w, window->h));
-        SDL_DFB_CHECKERR(windata->window->
-                         EnableEvents(windata->window, DWET_ALL));
+            SDL_DFB_CHECKERR(windata->
+                             window->Resize(windata->window, window->w,
+                                            window->h));
+        SDL_DFB_CHECKERR(windata->
+                         window->EnableEvents(windata->window, DWET_ALL));
 
 #else
-        SDL_DFB_CHECKERR(windata->window->
-                         Resize(windata->window, window->w, window->h));
+        SDL_DFB_CHECKERR(windata->
+                         window->Resize(windata->window, window->w,
+                                        window->h));
 #endif
         SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &window->w, &window->h));    /* if a window manager should have decided otherwise */
 
--- a/src/video/ipod/SDL_ipodvideo.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/ipod/SDL_ipodvideo.c	Fri Jan 09 20:43:30 2009 +0000
@@ -777,8 +777,8 @@
                         ~(3 << (2 * (x % 4)));
                     ipod_scr[y * (lcd_width / 4) + x / 4] |=
                         (((Uint8 *) (SDL_VideoSurface->pixels))[y *
-                                                                SDL_VideoSurface->
-                                                                pitch +
+                                                                SDL_VideoSurface->pitch
+                                                                +
                                                                 x] & 3) << (2
                                                                             *
                                                                             (x
--- a/src/video/os2fslib/SDL_os2fslib.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/os2fslib/SDL_os2fslib.c	Fri Jan 09 20:43:30 2009 +0000
@@ -440,8 +440,8 @@
                     if ((!pVideo->hidden->pSDLSurface) ||
                         ((pVideo->hidden->pSDLSurface)
                          &&
-                         ((pVideo->hidden->
-                           pSDLSurface->flags & SDL_RESIZABLE) == 0)))
+                         ((pVideo->hidden->pSDLSurface->
+                           flags & SDL_RESIZABLE) == 0)))
                         FSLib_ToggleFSMode(hwnd, !FSLib_QueryFSMode(hwnd));
 #ifdef DEBUG_BUILD
                     else
@@ -690,15 +690,15 @@
                             WinQueryWindowPos(hwnd, &swp);
                             if ((!pVideo->hidden->pSDLSurface) ||
                                 ((pVideo->hidden->pSDLSurface) &&
-                                 (pVideo->hidden->
-                                  pSDLSurface->flags & SDL_RESIZABLE)
+                                 (pVideo->hidden->pSDLSurface->
+                                  flags & SDL_RESIZABLE)
                                  &&
                                  ((swp.cx !=
-                                   pVideo->hidden->
-                                   SrcBufferDesc.uiXResolution)
+                                   pVideo->hidden->SrcBufferDesc.
+                                   uiXResolution)
                                   || (swp.cy !=
-                                      pVideo->hidden->SrcBufferDesc.
-                                      uiYResolution))
+                                      pVideo->hidden->
+                                      SrcBufferDesc.uiYResolution))
                                  && (!FSLib_QueryFSMode(hwnd)))) {
                                 // Resizable surface and in resizing!
                                 // So, don't blit now!
@@ -717,10 +717,10 @@
                                 FSLIB_BITBLT(hwnd,
                                              pVideo->hidden->pchSrcBuffer, 0,
                                              0,
+                                             pVideo->hidden->SrcBufferDesc.
+                                             uiXResolution,
                                              pVideo->hidden->
-                                             SrcBufferDesc.uiXResolution,
-                                             pVideo->hidden->SrcBufferDesc.
-                                             uiYResolution);
+                                             SrcBufferDesc.uiYResolution);
                             }
                         }
 #ifdef DEBUG_BUILD
@@ -2503,26 +2503,21 @@
                                        pModeInfoFound->uiXResolution,
                                        pModeInfoFound->uiYResolution,
                                        pModeInfoFound->uiBPP, ((unsigned int)
-                                                               pModeInfoFound->
-                                                               PixelFormat.
-                                                               ucRedMask)
-                                       << pModeInfoFound->PixelFormat.
-                                       ucRedPosition, ((unsigned int)
-                                                       pModeInfoFound->
-                                                       PixelFormat.
-                                                       ucGreenMask)
-                                       << pModeInfoFound->PixelFormat.
-                                       ucGreenPosition, ((unsigned int)
-                                                         pModeInfoFound->
-                                                         PixelFormat.
-                                                         ucBlueMask)
-                                       << pModeInfoFound->PixelFormat.
-                                       ucBluePosition, ((unsigned int)
-                                                        pModeInfoFound->
-                                                        PixelFormat.
-                                                        ucAlphaMask)
-                                       << pModeInfoFound->PixelFormat.
-                                       ucAlphaPosition);
+                                                               pModeInfoFound->PixelFormat.ucRedMask)
+                                       << pModeInfoFound->
+                                       PixelFormat.ucRedPosition,
+                                       ((unsigned int)
+                                        pModeInfoFound->PixelFormat.ucGreenMask)
+                                       << pModeInfoFound->
+                                       PixelFormat.ucGreenPosition,
+                                       ((unsigned int)
+                                        pModeInfoFound->PixelFormat.ucBlueMask)
+                                       << pModeInfoFound->
+                                       PixelFormat.ucBluePosition,
+                                       ((unsigned int)
+                                        pModeInfoFound->PixelFormat.ucAlphaMask)
+                                       << pModeInfoFound->
+                                       PixelFormat.ucAlphaPosition);
 
         if (pResult == NULL) {
             DosReleaseMutexSem(_this->hidden->hmtxUseSrcBuffer);
@@ -2536,27 +2531,23 @@
 
         // Adjust pixel format mask!
         pResult->format->Rmask =
-            ((unsigned int) pModeInfoFound->
-             PixelFormat.ucRedMask) << pModeInfoFound->PixelFormat.
-            ucRedPosition;
+            ((unsigned int) pModeInfoFound->PixelFormat.
+             ucRedMask) << pModeInfoFound->PixelFormat.ucRedPosition;
         pResult->format->Rshift = pModeInfoFound->PixelFormat.ucRedPosition;
         pResult->format->Rloss = pModeInfoFound->PixelFormat.ucRedAdjust;
         pResult->format->Gmask =
-            ((unsigned int) pModeInfoFound->
-             PixelFormat.ucGreenMask) << pModeInfoFound->PixelFormat.
-            ucGreenPosition;
+            ((unsigned int) pModeInfoFound->PixelFormat.
+             ucGreenMask) << pModeInfoFound->PixelFormat.ucGreenPosition;
         pResult->format->Gshift = pModeInfoFound->PixelFormat.ucGreenPosition;
         pResult->format->Gloss = pModeInfoFound->PixelFormat.ucGreenAdjust;
         pResult->format->Bmask =
-            ((unsigned int) pModeInfoFound->
-             PixelFormat.ucBlueMask) << pModeInfoFound->PixelFormat.
-            ucBluePosition;
+            ((unsigned int) pModeInfoFound->PixelFormat.
+             ucBlueMask) << pModeInfoFound->PixelFormat.ucBluePosition;
         pResult->format->Bshift = pModeInfoFound->PixelFormat.ucBluePosition;
         pResult->format->Bloss = pModeInfoFound->PixelFormat.ucBlueAdjust;
         pResult->format->Amask =
-            ((unsigned int) pModeInfoFound->
-             PixelFormat.ucAlphaMask) << pModeInfoFound->PixelFormat.
-            ucAlphaPosition;
+            ((unsigned int) pModeInfoFound->PixelFormat.
+             ucAlphaMask) << pModeInfoFound->PixelFormat.ucAlphaPosition;
         pResult->format->Ashift = pModeInfoFound->PixelFormat.ucAlphaPosition;
         pResult->format->Aloss = pModeInfoFound->PixelFormat.ucAlphaAdjust;
 
@@ -2815,25 +2806,23 @@
     vformat->BytesPerPixel = (vformat->BitsPerPixel + 7) / 8;
 
     vformat->Rmask =
-        ((unsigned int) pDesktopMode->PixelFormat.
-         ucRedMask) << pDesktopMode->PixelFormat.ucRedPosition;
+        ((unsigned int) pDesktopMode->PixelFormat.ucRedMask) << pDesktopMode->
+        PixelFormat.ucRedPosition;
     vformat->Rshift = pDesktopMode->PixelFormat.ucRedPosition;
     vformat->Rloss = pDesktopMode->PixelFormat.ucRedAdjust;
     vformat->Gmask =
-        ((unsigned int) pDesktopMode->
-         PixelFormat.ucGreenMask) << pDesktopMode->PixelFormat.
-        ucGreenPosition;
+        ((unsigned int) pDesktopMode->PixelFormat.
+         ucGreenMask) << pDesktopMode->PixelFormat.ucGreenPosition;
     vformat->Gshift = pDesktopMode->PixelFormat.ucGreenPosition;
     vformat->Gloss = pDesktopMode->PixelFormat.ucGreenAdjust;
     vformat->Bmask =
-        ((unsigned int) pDesktopMode->
-         PixelFormat.ucBlueMask) << pDesktopMode->PixelFormat.ucBluePosition;
+        ((unsigned int) pDesktopMode->PixelFormat.
+         ucBlueMask) << pDesktopMode->PixelFormat.ucBluePosition;
     vformat->Bshift = pDesktopMode->PixelFormat.ucBluePosition;
     vformat->Bloss = pDesktopMode->PixelFormat.ucBlueAdjust;
     vformat->Amask =
-        ((unsigned int) pDesktopMode->
-         PixelFormat.ucAlphaMask) << pDesktopMode->PixelFormat.
-        ucAlphaPosition;
+        ((unsigned int) pDesktopMode->PixelFormat.
+         ucAlphaMask) << pDesktopMode->PixelFormat.ucAlphaPosition;
     vformat->Ashift = pDesktopMode->PixelFormat.ucAlphaPosition;
     vformat->Aloss = pDesktopMode->PixelFormat.ucAlphaAdjust;
 
@@ -2938,10 +2927,10 @@
                sizeof(_this->hidden->SrcBufferDesc));
     // Allocate new video buffer!
     _this->hidden->pchSrcBuffer =
-        (char *) SDL_malloc(_this->hidden->
-                            pAvailableFSLibVideoModes->uiScanLineSize *
-                            _this->hidden->
-                            pAvailableFSLibVideoModes->uiYResolution);
+        (char *) SDL_malloc(_this->hidden->pAvailableFSLibVideoModes->
+                            uiScanLineSize *
+                            _this->hidden->pAvailableFSLibVideoModes->
+                            uiYResolution);
     if (!_this->hidden->pchSrcBuffer) {
 #ifdef DEBUG_BUILD
         printf
--- a/src/video/photon/SDL_ph_gl.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/photon/SDL_ph_gl.c	Fri Jan 09 20:43:30 2009 +0000
@@ -314,17 +314,14 @@
         && (this->gl_config.accum_blue_size != 0)
         && (this->gl_config.accum_green_size != 0)) {
         qnxgl_attribs_slide = qnxgl_attrib_set_accum(qnxgl_attribs_slide,
-                                                     this->
-                                                     gl_config.accum_red_size
+                                                     this->gl_config.
+                                                     accum_red_size +
+                                                     this->gl_config.
+                                                     accum_blue_size +
+                                                     this->gl_config.accum_green_size
                                                      +
                                                      this->
-                                                     gl_config.accum_blue_size
-                                                     +
-                                                     this->
-                                                     gl_config.
-                                                     accum_green_size +
-                                                     this->gl_config.
-                                                     accum_alpha_size);
+                                                     gl_config.accum_alpha_size);
     }
 
     /* Stereo mode */
--- a/src/video/photon/SDL_phyuv.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/photon/SDL_phyuv.c	Fri Jan 09 20:43:30 2009 +0000
@@ -149,8 +149,8 @@
                                     &overlay->hwdata->caps);
         if (rtncode == 0) {
             if (overlay->hwdata->caps.format == format) {
-                if ((overlay->hwdata->
-                     caps.flags & Pg_SCALER_CAP_DST_CHROMA_KEY) ==
+                if ((overlay->hwdata->caps.
+                     flags & Pg_SCALER_CAP_DST_CHROMA_KEY) ==
                     Pg_SCALER_CAP_DST_CHROMA_KEY) {
                     overlay->hwdata->ischromakey = 1;
                 }
--- a/src/video/win32/SDL_d3drender.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/win32/SDL_d3drender.c	Fri Jan 09 20:43:30 2009 +0000
@@ -693,8 +693,8 @@
         result =
             IDirect3DDevice9_CreateTexture(renderdata->device, texture->w,
                                            texture->h, 1, 0,
-                                           PixelFormatToD3DFMT(texture->
-                                                               format),
+                                           PixelFormatToD3DFMT
+                                           (texture->format),
                                            D3DPOOL_SYSTEMMEM, &temp, NULL);
         if (FAILED(result)) {
             D3D_SetError("CreateTexture()", result);
--- a/src/video/win32/SDL_win32video.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/win32/SDL_win32video.c	Fri Jan 09 20:43:30 2009 +0000
@@ -114,10 +114,8 @@
             (UINT(*)(UINT, UINT, LPVOID)) GetProcAddress(data->wintabDLL,
                                                          PROCNAME(WTInfoA));
         data->WTOpenA =
-            (HCTX(*)(HWND, LPLOGCONTEXTA, BOOL)) GetProcAddress(data->
-                                                                wintabDLL,
-                                                                PROCNAME
-                                                                (WTOpenA));
+            (HCTX(*)(HWND, LPLOGCONTEXTA, BOOL))
+            GetProcAddress(data->wintabDLL, PROCNAME(WTOpenA));
         data->WTPacket =
             (int (*)(HCTX, UINT, LPVOID)) GetProcAddress(data->wintabDLL,
                                                          PROCNAME(WTPacket));
--- a/src/video/x11/SDL_x11events.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/x11/SDL_x11events.c	Fri Jan 09 20:43:30 2009 +0000
@@ -311,7 +311,6 @@
                     }
                     continue;
                 }
-
 #if SDL_VIDEO_DRIVER_X11_XINPUT
                 data = (X11_MouseData *) mouse->driverdata;
                 if (xevent.type == data->motion) {
--- a/src/video/x11/SDL_x11opengl.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/x11/SDL_x11opengl.c	Fri Jan 09 20:43:30 2009 +0000
@@ -417,8 +417,8 @@
     SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
     Display *display = data->videodata->display;
     int screen =
-        ((SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->
-         driverdata)->screen;
+        ((SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata)->
+        screen;
     XWindowAttributes xattr;
     XVisualInfo v, *vinfo;
     int n;
--- a/src/video/x11/SDL_x11video.c	Fri Jan 09 20:41:31 2009 +0000
+++ b/src/video/x11/SDL_x11video.c	Fri Jan 09 20:43:30 2009 +0000
@@ -271,10 +271,7 @@
 SDL_bool
 X11_UseDirectColorVisuals()
 {
-    /* Once we implement DirectColor colormaps and gamma ramp support...
-       return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
-     */
-    return SDL_FALSE;
+    return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
 }
 
 /* vim: set ts=4 sw=4 expandtab: */