Reverted Bob's indent checkin
authorSam Lantinga <slouken@libsdl.org>
Sat, 10 Jan 2009 21:50:26 +0000
changeset 30138cc00819c8d6
parent 3012 7e30c2dc7783
child 3014 cacb282192a1
Reverted Bob's indent checkin
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
     1.1 --- a/include/SDL_endian.h	Sat Jan 10 18:32:24 2009 +0000
     1.2 +++ b/include/SDL_endian.h	Sat Jan 10 21:50:26 2009 +0000
     1.3 @@ -156,8 +156,8 @@
     1.4      } v;
     1.5      v.u = x;
     1.6    __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
     1.7 -            "1"(v.
     1.8 -                s.b));
     1.9 +            "1"(v.s.
    1.10 +                b));
    1.11      return v.u;
    1.12  }
    1.13  #elif defined(__GNUC__) && defined(__x86_64__)
     2.1 --- a/src/SDL_error.c	Sat Jan 10 18:32:24 2009 +0000
     2.2 +++ b/src/SDL_error.c	Sat Jan 10 21:50:26 2009 +0000
     2.3 @@ -180,8 +180,8 @@
     2.4                  case 's':
     2.5                      len =
     2.6                          SDL_snprintf(msg, maxlen, tmp,
     2.7 -                                     SDL_LookupString(error->
     2.8 -                                                      args[argi++].buf));
     2.9 +                                     SDL_LookupString(error->args[argi++].
    2.10 +                                                      buf));
    2.11                      msg += len;
    2.12                      maxlen -= len;
    2.13                      break;
     3.1 --- a/src/audio/dart/SDL_dart.c	Sat Jan 10 18:32:24 2009 +0000
     3.2 +++ b/src/audio/dart/SDL_dart.c	Sat Jan 10 21:50:26 2009 +0000
     3.3 @@ -62,8 +62,8 @@
     3.4                  pBufDesc->iBufferUsage = BUFFER_EMPTY;
     3.5                  // And notify DART feeder thread that it will have to work a bit.
     3.6                  if (pSDLAudioDevice)
     3.7 -                    DosPostEventSem(pSDLAudioDevice->hidden->
     3.8 -                                    hevAudioBufferPlayed);
     3.9 +                    DosPostEventSem(pSDLAudioDevice->
    3.10 +                                    hidden->hevAudioBufferPlayed);
    3.11              }
    3.12          }
    3.13      }
    3.14 @@ -312,10 +312,11 @@
    3.15          (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].ulUserParm;
    3.16      pBufDesc->iBufferUsage = BUFFER_USED;
    3.17      // Send it to DART to be queued
    3.18 -    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->MixSetupParms.
    3.19 -                                           ulMixHandle,
    3.20 -                                           &(_this->hidden->
    3.21 -                                             pMixBuffers[iFreeBuf]), 1);
    3.22 +    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->
    3.23 +                                           MixSetupParms.ulMixHandle,
    3.24 +                                           &(_this->
    3.25 +                                             hidden->pMixBuffers[iFreeBuf]),
    3.26 +                                           1);
    3.27  
    3.28      _this->hidden->iLastPlayedBuf = iFreeBuf;
    3.29      iFreeBuf = (iFreeBuf + 1) % _this->hidden->iCurrNumBufs;
    3.30 @@ -333,8 +334,8 @@
    3.31          if (_this->hidden) {
    3.32              iFreeBuf = _this->hidden->iNextFreeBuffer;
    3.33              pBufDesc =
    3.34 -                (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].
    3.35 -                ulUserParm;
    3.36 +                (pMixBufferDesc) _this->hidden->
    3.37 +                pMixBuffers[iFreeBuf].ulUserParm;
    3.38  
    3.39              if (pBufDesc) {
    3.40                  if (pBufDesc->iBufferUsage == BUFFER_EMPTY) {
     4.1 --- a/src/audio/windib/SDL_dibaudio.c	Sat Jan 10 18:32:24 2009 +0000
     4.2 +++ b/src/audio/windib/SDL_dibaudio.c	Sat Jan 10 21:50:26 2009 +0000
     4.3 @@ -107,8 +107,8 @@
     4.4  Uint8 *
     4.5  WINWAVEOUT_GetDeviceBuf(_THIS)
     4.6  {
     4.7 -    return (Uint8 *) (this->hidden->wavebuf[this->hidden->next_buffer].
     4.8 -                      lpData);
     4.9 +    return (Uint8 *) (this->hidden->
    4.10 +                      wavebuf[this->hidden->next_buffer].lpData);
    4.11  }
    4.12  
    4.13  void
     5.1 --- a/src/audio/windx5/SDL_dx5audio.c	Sat Jan 10 18:32:24 2009 +0000
     5.2 +++ b/src/audio/windx5/SDL_dx5audio.c	Sat Jan 10 21:50:26 2009 +0000
     5.3 @@ -278,8 +278,9 @@
     5.4          IDirectSoundBuffer_Restore(this->hidden->mixbuf);
     5.5          result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
     5.6                                           this->hidden->mixlen,
     5.7 -                                         (LPVOID *) & this->hidden->
     5.8 -                                         locked_buf, &rawlen, NULL, &junk, 0);
     5.9 +                                         (LPVOID *) & this->
    5.10 +                                         hidden->locked_buf, &rawlen, NULL,
    5.11 +                                         &junk, 0);
    5.12      }
    5.13      if (result != DS_OK) {
    5.14          SetDSerror("DirectSound Lock", result);
     6.1 --- a/src/haptic/darwin/SDL_syshaptic.c	Sat Jan 10 18:32:24 2009 +0000
     6.2 +++ b/src/haptic/darwin/SDL_syshaptic.c	Sat Jan 10 21:50:26 2009 +0000
     6.3 @@ -199,8 +199,8 @@
     6.4                                           CFSTR(kIOHIDPrimaryUsagePageKey));
     6.5                  if (refCF) {
     6.6                      if (!CFNumberGetValue(refCF, kCFNumberLongType,
     6.7 -                                          &SDL_hapticlist
     6.8 -                                          [numhaptics].usagePage))
     6.9 +                                          &SDL_hapticlist[numhaptics].
    6.10 +                                          usagePage))
    6.11                          SDL_SetError
    6.12                              ("Haptic: Recieving device's usage page.");
    6.13                      refCF =
    6.14 @@ -208,8 +208,8 @@
    6.15                                               CFSTR(kIOHIDPrimaryUsageKey));
    6.16                      if (refCF) {
    6.17                          if (!CFNumberGetValue(refCF, kCFNumberLongType,
    6.18 -                                              &SDL_hapticlist
    6.19 -                                              [numhaptics].usage))
    6.20 +                                              &SDL_hapticlist[numhaptics].
    6.21 +                                              usage))
    6.22                              SDL_SetError("Haptic: Recieving device's usage.");
    6.23                      }
    6.24                  }
     7.1 --- a/src/haptic/nds/SDL_syshaptic.c	Sat Jan 10 18:32:24 2009 +0000
     7.2 +++ b/src/haptic/nds/SDL_syshaptic.c	Sat Jan 10 21:50:26 2009 +0000
     7.3 @@ -96,7 +96,6 @@
     7.4      }
     7.5      
     7.6 return 0;
     7.7  
     7.8 }
     7.9 -
    7.10  
    7.11 void
    7.12  NDS_EZF_SetShake(u8 pos) 
    7.13  {
     8.1 --- a/src/haptic/win32/SDL_syshaptic.c	Sat Jan 10 18:32:24 2009 +0000
     8.2 +++ b/src/haptic/win32/SDL_syshaptic.c	Sat Jan 10 21:50:26 2009 +0000
     8.3 @@ -212,8 +212,8 @@
     8.4      /* Get capabilities. */
     8.5      SDL_hapticlist[SDL_numhaptics].capabilities.dwSize = sizeof(DIDEVCAPS);
     8.6      ret = IDirectInputDevice_GetCapabilities(device,
     8.7 -                                             &SDL_hapticlist
     8.8 -                                             [SDL_numhaptics].capabilities);
     8.9 +                                             &SDL_hapticlist[SDL_numhaptics].
    8.10 +                                             capabilities);
    8.11      if (FAILED(ret)) {
    8.12          /* DI_SetError("Getting device capabilities",ret); */
    8.13          IDirectInputDevice_Release(device);
    8.14 @@ -332,8 +332,8 @@
    8.15      /* Now get the IDirectInputDevice2 interface, instead. */
    8.16      ret = IDirectInputDevice_QueryInterface(device,
    8.17                                              &IID_IDirectInputDevice2,
    8.18 -                                            (LPVOID *) & haptic->
    8.19 -                                            hwdata->device);
    8.20 +                                            (LPVOID *) & haptic->hwdata->
    8.21 +                                            device);
    8.22      /* Done with the temporary one now. */
    8.23      IDirectInputDevice_Release(device);
    8.24      if (FAILED(ret)) {
    8.25 @@ -500,8 +500,8 @@
    8.26  SDL_SYS_HapticOpen(SDL_Haptic * haptic)
    8.27  {
    8.28      return SDL_SYS_HapticOpenFromInstance(haptic,
    8.29 -                                          SDL_hapticlist[haptic->
    8.30 -                                                         index].instance);
    8.31 +                                          SDL_hapticlist[haptic->index].
    8.32 +                                          instance);
    8.33  }
    8.34  
    8.35  
     9.1 --- a/src/joystick/linux/SDL_sysjoystick.c	Sat Jan 10 18:32:24 2009 +0000
     9.2 +++ b/src/joystick/linux/SDL_sysjoystick.c	Sat Jan 10 21:50:26 2009 +0000
     9.3 @@ -960,8 +960,8 @@
     9.4  #endif /* USE_LOGICAL_JOYSTICKS */
     9.5  
     9.6          SDL_PrivateJoystickHat(stick, hat,
     9.7 -                               position_map[the_hat->axis[1]][the_hat->
     9.8 -                                                              axis[0]]);
     9.9 +                               position_map[the_hat->
    9.10 +                                            axis[1]][the_hat->axis[0]]);
    9.11      }
    9.12  }
    9.13  
    9.14 @@ -1092,13 +1092,13 @@
    9.15                      code -= BTN_MISC;
    9.16  #ifndef NO_LOGICAL_JOYSTICKS
    9.17                      if (!LogicalJoystickButton(joystick,
    9.18 -                                               joystick->hwdata->
    9.19 -                                               key_map[code],
    9.20 +                                               joystick->
    9.21 +                                               hwdata->key_map[code],
    9.22                                                 events[i].value))
    9.23  #endif
    9.24                          SDL_PrivateJoystickButton(joystick,
    9.25 -                                                  joystick->hwdata->
    9.26 -                                                  key_map[code],
    9.27 +                                                  joystick->
    9.28 +                                                  hwdata->key_map[code],
    9.29                                                    events[i].value);
    9.30                  }
    9.31                  break;
    9.32 @@ -1124,8 +1124,8 @@
    9.33                                               events[i].value))
    9.34  #endif
    9.35                          SDL_PrivateJoystickAxis(joystick,
    9.36 -                                                joystick->hwdata->
    9.37 -                                                abs_map[code],
    9.38 +                                                joystick->
    9.39 +                                                hwdata->abs_map[code],
    9.40                                                  events[i].value);
    9.41                      break;
    9.42                  }
    10.1 --- a/src/joystick/win32/SDL_dxjoystick.c	Sat Jan 10 18:32:24 2009 +0000
    10.2 +++ b/src/joystick/win32/SDL_dxjoystick.c	Sat Jan 10 21:50:26 2009 +0000
    10.3 @@ -38,7 +38,7 @@
    10.4  #include "SDL_joystick.h"
    10.5  #include "../SDL_sysjoystick.h"
    10.6  #include "../SDL_joystick_c.h"
    10.7 -#define INITGUID                /* Only set here, if set twice will cause mingw32 to break. */
    10.8 +#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */
    10.9  #include "SDL_dxjoystick_c.h"
   10.10  
   10.11  
   10.12 @@ -83,334 +83,170 @@
   10.13  
   10.14  /* Taken from Wine - Thanks! */
   10.15  DIOBJECTDATAFORMAT dfDIJoystick2[] = {
   10.16 -    {&GUID_XAxis, DIJOFS_X, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.17 -     0},
   10.18 -    {&GUID_YAxis, DIJOFS_Y, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.19 -     0},
   10.20 -    {&GUID_ZAxis, DIJOFS_Z, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.21 -     0},
   10.22 -    {&GUID_RxAxis, DIJOFS_RX, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.23 -     0},
   10.24 -    {&GUID_RyAxis, DIJOFS_RY, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.25 -     0},
   10.26 -    {&GUID_RzAxis, DIJOFS_RZ, DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE,
   10.27 -     0},
   10.28 -    {&GUID_Slider, DIJOFS_SLIDER(0),
   10.29 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
   10.30 -    {&GUID_Slider, DIJOFS_SLIDER(1),
   10.31 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
   10.32 -    {&GUID_POV, DIJOFS_POV(0), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
   10.33 -     0},
   10.34 -    {&GUID_POV, DIJOFS_POV(1), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
   10.35 -     0},
   10.36 -    {&GUID_POV, DIJOFS_POV(2), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
   10.37 -     0},
   10.38 -    {&GUID_POV, DIJOFS_POV(3), DIDFT_OPTIONAL | DIDFT_POV | DIDFT_ANYINSTANCE,
   10.39 -     0},
   10.40 -    {NULL, DIJOFS_BUTTON(0),
   10.41 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.42 -    {NULL, DIJOFS_BUTTON(1),
   10.43 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.44 -    {NULL, DIJOFS_BUTTON(2),
   10.45 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.46 -    {NULL, DIJOFS_BUTTON(3),
   10.47 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.48 -    {NULL, DIJOFS_BUTTON(4),
   10.49 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.50 -    {NULL, DIJOFS_BUTTON(5),
   10.51 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.52 -    {NULL, DIJOFS_BUTTON(6),
   10.53 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.54 -    {NULL, DIJOFS_BUTTON(7),
   10.55 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.56 -    {NULL, DIJOFS_BUTTON(8),
   10.57 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.58 -    {NULL, DIJOFS_BUTTON(9),
   10.59 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.60 -    {NULL, DIJOFS_BUTTON(10),
   10.61 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.62 -    {NULL, DIJOFS_BUTTON(11),
   10.63 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.64 -    {NULL, DIJOFS_BUTTON(12),
   10.65 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.66 -    {NULL, DIJOFS_BUTTON(13),
   10.67 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.68 -    {NULL, DIJOFS_BUTTON(14),
   10.69 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.70 -    {NULL, DIJOFS_BUTTON(15),
   10.71 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.72 -    {NULL, DIJOFS_BUTTON(16),
   10.73 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.74 -    {NULL, DIJOFS_BUTTON(17),
   10.75 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.76 -    {NULL, DIJOFS_BUTTON(18),
   10.77 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.78 -    {NULL, DIJOFS_BUTTON(19),
   10.79 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.80 -    {NULL, DIJOFS_BUTTON(20),
   10.81 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.82 -    {NULL, DIJOFS_BUTTON(21),
   10.83 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.84 -    {NULL, DIJOFS_BUTTON(22),
   10.85 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.86 -    {NULL, DIJOFS_BUTTON(23),
   10.87 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.88 -    {NULL, DIJOFS_BUTTON(24),
   10.89 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.90 -    {NULL, DIJOFS_BUTTON(25),
   10.91 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.92 -    {NULL, DIJOFS_BUTTON(26),
   10.93 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.94 -    {NULL, DIJOFS_BUTTON(27),
   10.95 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.96 -    {NULL, DIJOFS_BUTTON(28),
   10.97 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
   10.98 -    {NULL, DIJOFS_BUTTON(29),
   10.99 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.100 -    {NULL, DIJOFS_BUTTON(30),
  10.101 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.102 -    {NULL, DIJOFS_BUTTON(31),
  10.103 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.104 -    {NULL, DIJOFS_BUTTON(32),
  10.105 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.106 -    {NULL, DIJOFS_BUTTON(33),
  10.107 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.108 -    {NULL, DIJOFS_BUTTON(34),
  10.109 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.110 -    {NULL, DIJOFS_BUTTON(35),
  10.111 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.112 -    {NULL, DIJOFS_BUTTON(36),
  10.113 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.114 -    {NULL, DIJOFS_BUTTON(37),
  10.115 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.116 -    {NULL, DIJOFS_BUTTON(38),
  10.117 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.118 -    {NULL, DIJOFS_BUTTON(39),
  10.119 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.120 -    {NULL, DIJOFS_BUTTON(40),
  10.121 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.122 -    {NULL, DIJOFS_BUTTON(41),
  10.123 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.124 -    {NULL, DIJOFS_BUTTON(42),
  10.125 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.126 -    {NULL, DIJOFS_BUTTON(43),
  10.127 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.128 -    {NULL, DIJOFS_BUTTON(44),
  10.129 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.130 -    {NULL, DIJOFS_BUTTON(45),
  10.131 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.132 -    {NULL, DIJOFS_BUTTON(46),
  10.133 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.134 -    {NULL, DIJOFS_BUTTON(47),
  10.135 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.136 -    {NULL, DIJOFS_BUTTON(48),
  10.137 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.138 -    {NULL, DIJOFS_BUTTON(49),
  10.139 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.140 -    {NULL, DIJOFS_BUTTON(50),
  10.141 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.142 -    {NULL, DIJOFS_BUTTON(51),
  10.143 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.144 -    {NULL, DIJOFS_BUTTON(52),
  10.145 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.146 -    {NULL, DIJOFS_BUTTON(53),
  10.147 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.148 -    {NULL, DIJOFS_BUTTON(54),
  10.149 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.150 -    {NULL, DIJOFS_BUTTON(55),
  10.151 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.152 -    {NULL, DIJOFS_BUTTON(56),
  10.153 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.154 -    {NULL, DIJOFS_BUTTON(57),
  10.155 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.156 -    {NULL, DIJOFS_BUTTON(58),
  10.157 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.158 -    {NULL, DIJOFS_BUTTON(59),
  10.159 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.160 -    {NULL, DIJOFS_BUTTON(60),
  10.161 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.162 -    {NULL, DIJOFS_BUTTON(61),
  10.163 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.164 -    {NULL, DIJOFS_BUTTON(62),
  10.165 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.166 -    {NULL, DIJOFS_BUTTON(63),
  10.167 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.168 -    {NULL, DIJOFS_BUTTON(64),
  10.169 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.170 -    {NULL, DIJOFS_BUTTON(65),
  10.171 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.172 -    {NULL, DIJOFS_BUTTON(66),
  10.173 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.174 -    {NULL, DIJOFS_BUTTON(67),
  10.175 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.176 -    {NULL, DIJOFS_BUTTON(68),
  10.177 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.178 -    {NULL, DIJOFS_BUTTON(69),
  10.179 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.180 -    {NULL, DIJOFS_BUTTON(70),
  10.181 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.182 -    {NULL, DIJOFS_BUTTON(71),
  10.183 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.184 -    {NULL, DIJOFS_BUTTON(72),
  10.185 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.186 -    {NULL, DIJOFS_BUTTON(73),
  10.187 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.188 -    {NULL, DIJOFS_BUTTON(74),
  10.189 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.190 -    {NULL, DIJOFS_BUTTON(75),
  10.191 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.192 -    {NULL, DIJOFS_BUTTON(76),
  10.193 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.194 -    {NULL, DIJOFS_BUTTON(77),
  10.195 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.196 -    {NULL, DIJOFS_BUTTON(78),
  10.197 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.198 -    {NULL, DIJOFS_BUTTON(79),
  10.199 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.200 -    {NULL, DIJOFS_BUTTON(80),
  10.201 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.202 -    {NULL, DIJOFS_BUTTON(81),
  10.203 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.204 -    {NULL, DIJOFS_BUTTON(82),
  10.205 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.206 -    {NULL, DIJOFS_BUTTON(83),
  10.207 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.208 -    {NULL, DIJOFS_BUTTON(84),
  10.209 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.210 -    {NULL, DIJOFS_BUTTON(85),
  10.211 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.212 -    {NULL, DIJOFS_BUTTON(86),
  10.213 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.214 -    {NULL, DIJOFS_BUTTON(87),
  10.215 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.216 -    {NULL, DIJOFS_BUTTON(88),
  10.217 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.218 -    {NULL, DIJOFS_BUTTON(89),
  10.219 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.220 -    {NULL, DIJOFS_BUTTON(90),
  10.221 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.222 -    {NULL, DIJOFS_BUTTON(91),
  10.223 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.224 -    {NULL, DIJOFS_BUTTON(92),
  10.225 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.226 -    {NULL, DIJOFS_BUTTON(93),
  10.227 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.228 -    {NULL, DIJOFS_BUTTON(94),
  10.229 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.230 -    {NULL, DIJOFS_BUTTON(95),
  10.231 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.232 -    {NULL, DIJOFS_BUTTON(96),
  10.233 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.234 -    {NULL, DIJOFS_BUTTON(97),
  10.235 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.236 -    {NULL, DIJOFS_BUTTON(98),
  10.237 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.238 -    {NULL, DIJOFS_BUTTON(99),
  10.239 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.240 -    {NULL, DIJOFS_BUTTON(100),
  10.241 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.242 -    {NULL, DIJOFS_BUTTON(101),
  10.243 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.244 -    {NULL, DIJOFS_BUTTON(102),
  10.245 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.246 -    {NULL, DIJOFS_BUTTON(103),
  10.247 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.248 -    {NULL, DIJOFS_BUTTON(104),
  10.249 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.250 -    {NULL, DIJOFS_BUTTON(105),
  10.251 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.252 -    {NULL, DIJOFS_BUTTON(106),
  10.253 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.254 -    {NULL, DIJOFS_BUTTON(107),
  10.255 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.256 -    {NULL, DIJOFS_BUTTON(108),
  10.257 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.258 -    {NULL, DIJOFS_BUTTON(109),
  10.259 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.260 -    {NULL, DIJOFS_BUTTON(110),
  10.261 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.262 -    {NULL, DIJOFS_BUTTON(111),
  10.263 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.264 -    {NULL, DIJOFS_BUTTON(112),
  10.265 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.266 -    {NULL, DIJOFS_BUTTON(113),
  10.267 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.268 -    {NULL, DIJOFS_BUTTON(114),
  10.269 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.270 -    {NULL, DIJOFS_BUTTON(115),
  10.271 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.272 -    {NULL, DIJOFS_BUTTON(116),
  10.273 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.274 -    {NULL, DIJOFS_BUTTON(117),
  10.275 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.276 -    {NULL, DIJOFS_BUTTON(118),
  10.277 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.278 -    {NULL, DIJOFS_BUTTON(119),
  10.279 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.280 -    {NULL, DIJOFS_BUTTON(120),
  10.281 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.282 -    {NULL, DIJOFS_BUTTON(121),
  10.283 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.284 -    {NULL, DIJOFS_BUTTON(122),
  10.285 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.286 -    {NULL, DIJOFS_BUTTON(123),
  10.287 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.288 -    {NULL, DIJOFS_BUTTON(124),
  10.289 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.290 -    {NULL, DIJOFS_BUTTON(125),
  10.291 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.292 -    {NULL, DIJOFS_BUTTON(126),
  10.293 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.294 -    {NULL, DIJOFS_BUTTON(127),
  10.295 -     DIDFT_OPTIONAL | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0},
  10.296 -    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lVX),
  10.297 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.298 -    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lVY),
  10.299 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.300 -    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lVZ),
  10.301 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.302 -    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lVRx),
  10.303 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.304 -    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lVRy),
  10.305 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.306 -    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lVRz),
  10.307 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.308 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[0]),
  10.309 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.310 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglVSlider[1]),
  10.311 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.312 -    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lAX),
  10.313 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.314 -    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lAY),
  10.315 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.316 -    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lAZ),
  10.317 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.318 -    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lARx),
  10.319 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.320 -    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lARy),
  10.321 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.322 -    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lARz),
  10.323 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.324 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[0]),
  10.325 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.326 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglASlider[1]),
  10.327 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.328 -    {&GUID_XAxis, FIELD_OFFSET(DIJOYSTATE2, lFX),
  10.329 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.330 -    {&GUID_YAxis, FIELD_OFFSET(DIJOYSTATE2, lFY),
  10.331 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.332 -    {&GUID_ZAxis, FIELD_OFFSET(DIJOYSTATE2, lFZ),
  10.333 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.334 -    {&GUID_RxAxis, FIELD_OFFSET(DIJOYSTATE2, lFRx),
  10.335 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.336 -    {&GUID_RyAxis, FIELD_OFFSET(DIJOYSTATE2, lFRy),
  10.337 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.338 -    {&GUID_RzAxis, FIELD_OFFSET(DIJOYSTATE2, lFRz),
  10.339 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.340 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[0]),
  10.341 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.342 -    {&GUID_Slider, FIELD_OFFSET(DIJOYSTATE2, rglFSlider[1]),
  10.343 -     DIDFT_OPTIONAL | DIDFT_AXIS | DIDFT_ANYINSTANCE, 0},
  10.344 +  { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.345 +  { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.346 +  { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.347 +  { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.348 +  { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.349 +  { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.350 +  { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.351 +  { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.352 +  { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
  10.353 +  { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
  10.354 +  { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
  10.355 +  { &GUID_POV,DIJOFS_POV(3),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
  10.356 +  { NULL,DIJOFS_BUTTON(0),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.357 +  { NULL,DIJOFS_BUTTON(1),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.358 +  { NULL,DIJOFS_BUTTON(2),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.359 +  { NULL,DIJOFS_BUTTON(3),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.360 +  { NULL,DIJOFS_BUTTON(4),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.361 +  { NULL,DIJOFS_BUTTON(5),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.362 +  { NULL,DIJOFS_BUTTON(6),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.363 +  { NULL,DIJOFS_BUTTON(7),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.364 +  { NULL,DIJOFS_BUTTON(8),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.365 +  { NULL,DIJOFS_BUTTON(9),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.366 +  { NULL,DIJOFS_BUTTON(10),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.367 +  { NULL,DIJOFS_BUTTON(11),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.368 +  { NULL,DIJOFS_BUTTON(12),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.369 +  { NULL,DIJOFS_BUTTON(13),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.370 +  { NULL,DIJOFS_BUTTON(14),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.371 +  { NULL,DIJOFS_BUTTON(15),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.372 +  { NULL,DIJOFS_BUTTON(16),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.373 +  { NULL,DIJOFS_BUTTON(17),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.374 +  { NULL,DIJOFS_BUTTON(18),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.375 +  { NULL,DIJOFS_BUTTON(19),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.376 +  { NULL,DIJOFS_BUTTON(20),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.377 +  { NULL,DIJOFS_BUTTON(21),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.378 +  { NULL,DIJOFS_BUTTON(22),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.379 +  { NULL,DIJOFS_BUTTON(23),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.380 +  { NULL,DIJOFS_BUTTON(24),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.381 +  { NULL,DIJOFS_BUTTON(25),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.382 +  { NULL,DIJOFS_BUTTON(26),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.383 +  { NULL,DIJOFS_BUTTON(27),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.384 +  { NULL,DIJOFS_BUTTON(28),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.385 +  { NULL,DIJOFS_BUTTON(29),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.386 +  { NULL,DIJOFS_BUTTON(30),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.387 +  { NULL,DIJOFS_BUTTON(31),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.388 +  { NULL,DIJOFS_BUTTON(32),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.389 +  { NULL,DIJOFS_BUTTON(33),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.390 +  { NULL,DIJOFS_BUTTON(34),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.391 +  { NULL,DIJOFS_BUTTON(35),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.392 +  { NULL,DIJOFS_BUTTON(36),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.393 +  { NULL,DIJOFS_BUTTON(37),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.394 +  { NULL,DIJOFS_BUTTON(38),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.395 +  { NULL,DIJOFS_BUTTON(39),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.396 +  { NULL,DIJOFS_BUTTON(40),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.397 +  { NULL,DIJOFS_BUTTON(41),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.398 +  { NULL,DIJOFS_BUTTON(42),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.399 +  { NULL,DIJOFS_BUTTON(43),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.400 +  { NULL,DIJOFS_BUTTON(44),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.401 +  { NULL,DIJOFS_BUTTON(45),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.402 +  { NULL,DIJOFS_BUTTON(46),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.403 +  { NULL,DIJOFS_BUTTON(47),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.404 +  { NULL,DIJOFS_BUTTON(48),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.405 +  { NULL,DIJOFS_BUTTON(49),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.406 +  { NULL,DIJOFS_BUTTON(50),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.407 +  { NULL,DIJOFS_BUTTON(51),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.408 +  { NULL,DIJOFS_BUTTON(52),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.409 +  { NULL,DIJOFS_BUTTON(53),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.410 +  { NULL,DIJOFS_BUTTON(54),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.411 +  { NULL,DIJOFS_BUTTON(55),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.412 +  { NULL,DIJOFS_BUTTON(56),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.413 +  { NULL,DIJOFS_BUTTON(57),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.414 +  { NULL,DIJOFS_BUTTON(58),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.415 +  { NULL,DIJOFS_BUTTON(59),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.416 +  { NULL,DIJOFS_BUTTON(60),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.417 +  { NULL,DIJOFS_BUTTON(61),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.418 +  { NULL,DIJOFS_BUTTON(62),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.419 +  { NULL,DIJOFS_BUTTON(63),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.420 +  { NULL,DIJOFS_BUTTON(64),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.421 +  { NULL,DIJOFS_BUTTON(65),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.422 +  { NULL,DIJOFS_BUTTON(66),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.423 +  { NULL,DIJOFS_BUTTON(67),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.424 +  { NULL,DIJOFS_BUTTON(68),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.425 +  { NULL,DIJOFS_BUTTON(69),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.426 +  { NULL,DIJOFS_BUTTON(70),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.427 +  { NULL,DIJOFS_BUTTON(71),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.428 +  { NULL,DIJOFS_BUTTON(72),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.429 +  { NULL,DIJOFS_BUTTON(73),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.430 +  { NULL,DIJOFS_BUTTON(74),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.431 +  { NULL,DIJOFS_BUTTON(75),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.432 +  { NULL,DIJOFS_BUTTON(76),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.433 +  { NULL,DIJOFS_BUTTON(77),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.434 +  { NULL,DIJOFS_BUTTON(78),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.435 +  { NULL,DIJOFS_BUTTON(79),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.436 +  { NULL,DIJOFS_BUTTON(80),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.437 +  { NULL,DIJOFS_BUTTON(81),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.438 +  { NULL,DIJOFS_BUTTON(82),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.439 +  { NULL,DIJOFS_BUTTON(83),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.440 +  { NULL,DIJOFS_BUTTON(84),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.441 +  { NULL,DIJOFS_BUTTON(85),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.442 +  { NULL,DIJOFS_BUTTON(86),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.443 +  { NULL,DIJOFS_BUTTON(87),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.444 +  { NULL,DIJOFS_BUTTON(88),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.445 +  { NULL,DIJOFS_BUTTON(89),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.446 +  { NULL,DIJOFS_BUTTON(90),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.447 +  { NULL,DIJOFS_BUTTON(91),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.448 +  { NULL,DIJOFS_BUTTON(92),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.449 +  { NULL,DIJOFS_BUTTON(93),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.450 +  { NULL,DIJOFS_BUTTON(94),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.451 +  { NULL,DIJOFS_BUTTON(95),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.452 +  { NULL,DIJOFS_BUTTON(96),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.453 +  { NULL,DIJOFS_BUTTON(97),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.454 +  { NULL,DIJOFS_BUTTON(98),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.455 +  { NULL,DIJOFS_BUTTON(99),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.456 +  { NULL,DIJOFS_BUTTON(100),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.457 +  { NULL,DIJOFS_BUTTON(101),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.458 +  { NULL,DIJOFS_BUTTON(102),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.459 +  { NULL,DIJOFS_BUTTON(103),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.460 +  { NULL,DIJOFS_BUTTON(104),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.461 +  { NULL,DIJOFS_BUTTON(105),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.462 +  { NULL,DIJOFS_BUTTON(106),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.463 +  { NULL,DIJOFS_BUTTON(107),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.464 +  { NULL,DIJOFS_BUTTON(108),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.465 +  { NULL,DIJOFS_BUTTON(109),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.466 +  { NULL,DIJOFS_BUTTON(110),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.467 +  { NULL,DIJOFS_BUTTON(111),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.468 +  { NULL,DIJOFS_BUTTON(112),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.469 +  { NULL,DIJOFS_BUTTON(113),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.470 +  { NULL,DIJOFS_BUTTON(114),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.471 +  { NULL,DIJOFS_BUTTON(115),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.472 +  { NULL,DIJOFS_BUTTON(116),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.473 +  { NULL,DIJOFS_BUTTON(117),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.474 +  { NULL,DIJOFS_BUTTON(118),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.475 +  { NULL,DIJOFS_BUTTON(119),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.476 +  { NULL,DIJOFS_BUTTON(120),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.477 +  { NULL,DIJOFS_BUTTON(121),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.478 +  { NULL,DIJOFS_BUTTON(122),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.479 +  { NULL,DIJOFS_BUTTON(123),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.480 +  { NULL,DIJOFS_BUTTON(124),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.481 +  { NULL,DIJOFS_BUTTON(125),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.482 +  { NULL,DIJOFS_BUTTON(126),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.483 +  { NULL,DIJOFS_BUTTON(127),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
  10.484 +  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.485 +  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.486 +  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.487 +  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.488 +  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.489 +  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.490 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.491 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.492 +  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.493 +  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.494 +  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.495 +  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.496 +  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.497 +  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.498 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.499 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.500 +  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.501 +  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.502 +  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.503 +  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.504 +  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.505 +  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.506 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.507 +  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
  10.508  };
  10.509  
  10.510  const DIDATAFORMAT c_dfDIJoystick2 = {
  10.511 @@ -428,8 +264,8 @@
  10.512  SetDIerror(const char *function, HRESULT code)
  10.513  {
  10.514      /*
  10.515 -       SDL_SetError("%s() [%s]: %s", function,
  10.516 -       DXGetErrorString9A(code), DXGetErrorDescription9A(code));
  10.517 +    SDL_SetError("%s() [%s]: %s", function,
  10.518 +                 DXGetErrorString9A(code), DXGetErrorDescription9A(code));
  10.519       */
  10.520      SDL_SetError("%s() DirectX error %d", function, code);
  10.521  }
  10.522 @@ -455,7 +291,7 @@
  10.523      }
  10.524  
  10.525      result = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
  10.526 -                              &IID_IDirectInput, (LPVOID) & dinput);
  10.527 +                              &IID_IDirectInput, (LPVOID)&dinput);
  10.528  
  10.529      if (FAILED(result)) {
  10.530          SetDIerror("CoCreateInstance", result);
  10.531 @@ -536,8 +372,8 @@
  10.532  
  10.533      result =
  10.534          IDirectInput_CreateDevice(dinput,
  10.535 -                                  &SYS_Joystick[joystick->index].guidInstance,
  10.536 -                                  &device, NULL);
  10.537 +                                  &SYS_Joystick[joystick->index].
  10.538 +                                  guidInstance, &device, NULL);
  10.539      if (FAILED(result)) {
  10.540          SetDIerror("IDirectInput::CreateDevice", result);
  10.541          return (-1);
  10.542 @@ -546,8 +382,8 @@
  10.543      /* Now get the IDirectInputDevice2 interface, instead. */
  10.544      result = IDirectInputDevice_QueryInterface(device,
  10.545                                                 &IID_IDirectInputDevice2,
  10.546 -                                               (LPVOID *) & joystick->hwdata->
  10.547 -                                               InputDevice);
  10.548 +                                               (LPVOID *) & joystick->
  10.549 +                                               hwdata->InputDevice);
  10.550      /* We are done with this object.  Use the stored one from now on. */
  10.551      IDirectInputDevice_Release(device);
  10.552  
  10.553 @@ -559,8 +395,8 @@
  10.554      /* Aquire shared access. Exclusive access is required for forces,
  10.555       * though. */
  10.556      result =
  10.557 -        IDirectInputDevice2_SetCooperativeLevel(joystick->hwdata->InputDevice,
  10.558 -                                                SDL_HelperWindow,
  10.559 +        IDirectInputDevice2_SetCooperativeLevel(joystick->hwdata->
  10.560 +                                                InputDevice, SDL_HelperWindow,
  10.561                                                  DISCL_EXCLUSIVE |
  10.562                                                  DISCL_BACKGROUND);
  10.563      if (FAILED(result)) {
  10.564 @@ -599,8 +435,8 @@
  10.565  
  10.566          /* reset all accuators. */
  10.567          result =
  10.568 -            IDirectInputDevice2_SendForceFeedbackCommand(joystick->
  10.569 -                                                         hwdata->InputDevice,
  10.570 +            IDirectInputDevice2_SendForceFeedbackCommand(joystick->hwdata->
  10.571 +                                                         InputDevice,
  10.572                                                           DISFFC_RESET);
  10.573  
  10.574          if (FAILED(result)) {
  10.575 @@ -791,8 +627,9 @@
  10.576  
  10.577          case BUTTON:
  10.578              SDL_PrivateJoystickButton_Int(joystick, in->num,
  10.579 -                                          (Uint8) (state.rgbButtons[in->ofs -
  10.580 -                                                                    DIJOFS_BUTTON0]
  10.581 +                                          (Uint8) (state.
  10.582 +                                                   rgbButtons[in->ofs -
  10.583 +                                                              DIJOFS_BUTTON0]
  10.584                                                     ? SDL_PRESSED :
  10.585                                                     SDL_RELEASED));
  10.586              break;
  10.587 @@ -848,8 +685,8 @@
  10.588                  break;
  10.589              case BUTTON:
  10.590                  SDL_PrivateJoystickButton(joystick, in->num,
  10.591 -                                          (Uint8) (evtbuf[i].dwData ?
  10.592 -                                                   SDL_PRESSED :
  10.593 +                                          (Uint8) (evtbuf[i].
  10.594 +                                                   dwData ? SDL_PRESSED :
  10.595                                                     SDL_RELEASED));
  10.596                  break;
  10.597              case HAT:
    11.1 --- a/src/loadso/macosx/SDL_dlcompat.c	Sat Jan 10 18:32:24 2009 +0000
    11.2 +++ b/src/loadso/macosx/SDL_dlcompat.c	Sat Jan 10 21:50:26 2009 +0000
    11.3 @@ -616,8 +616,8 @@
    11.4                  || (LC_LOAD_WEAK_DYLIB == lc->cmd)) {
    11.5                  if ((wh = (struct mach_header *)
    11.6                       my_find_image((char
    11.7 -                                    *) (((struct dylib_command *) lc)->
    11.8 -                                        dylib.name.offset + (char *) lc)))) {
    11.9 +                                    *) (((struct dylib_command *) lc)->dylib.
   11.10 +                                        name.offset + (char *) lc)))) {
   11.11                      if (dyld_NSIsSymbolNameDefinedInImage(wh, symbol)) {
   11.12                          nssym = dyld_NSLookupSymbolInImage(wh,
   11.13                                                             symbol,
    12.1 --- a/src/video/SDL_blit_A.c	Sat Jan 10 18:32:24 2009 +0000
    12.2 +++ b/src/video/SDL_blit_A.c	Sat Jan 10 21:50:26 2009 +0000
    12.3 @@ -283,8 +283,8 @@
    12.4          amult = alpha | (alpha << 8);
    12.5          amult = amult | (amult << 16);
    12.6          chanmask =
    12.7 -            (0xff << df->Rshift) | (0xff << df->Gshift) | (0xff << df->
    12.8 -                                                           Bshift);
    12.9 +            (0xff << df->Rshift) | (0xff << df->
   12.10 +                                    Gshift) | (0xff << df->Bshift);
   12.11          mm_alpha = _mm_set_pi32(0, amult & chanmask);   /* 0000AAAA -> mm_alpha, minus 1 chan */
   12.12          mm_alpha = _mm_unpacklo_pi8(mm_alpha, mm_zero); /* 0A0A0A0A -> mm_alpha, minus 1 chan */
   12.13          /* at this point mm_alpha can be 000A0A0A or 0A0A0A00 or another combo */
   12.14 @@ -526,8 +526,8 @@
   12.15      /* Use zero for alpha if either surface doesn't have alpha */
   12.16      if (dstfmt->Amask) {
   12.17          amask =
   12.18 -            ((srcfmt->Amask) ? RESHIFT(srcfmt->Ashift) : 0x10) << (dstfmt->
   12.19 -                                                                   Ashift);
   12.20 +            ((srcfmt->Amask) ? RESHIFT(srcfmt->
   12.21 +                                       Ashift) : 0x10) << (dstfmt->Ashift);
   12.22      } else {
   12.23          amask =
   12.24              0x10101010 & ((dstfmt->Rmask | dstfmt->Gmask | dstfmt->Bmask) ^
    13.1 --- a/src/video/SDL_blit_N.c	Sat Jan 10 18:32:24 2009 +0000
    13.2 +++ b/src/video/SDL_blit_N.c	Sat Jan 10 21:50:26 2009 +0000
    13.3 @@ -141,8 +141,8 @@
    13.4      /* Use zero for alpha if either surface doesn't have alpha */
    13.5      if (dstfmt->Amask) {
    13.6          amask =
    13.7 -            ((srcfmt->Amask) ? RESHIFT(srcfmt->Ashift) : 0x10) << (dstfmt->
    13.8 -                                                                   Ashift);
    13.9 +            ((srcfmt->Amask) ? RESHIFT(srcfmt->
   13.10 +                                       Ashift) : 0x10) << (dstfmt->Ashift);
   13.11      } else {
   13.12          amask =
   13.13              0x10101010 & ((dstfmt->Rmask | dstfmt->Gmask | dstfmt->Bmask) ^
    14.1 --- a/src/video/SDL_renderer_gl.c	Sat Jan 10 18:32:24 2009 +0000
    14.2 +++ b/src/video/SDL_renderer_gl.c	Sat Jan 10 21:50:26 2009 +0000
    14.3 @@ -926,8 +926,8 @@
    14.4      renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    14.5      renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH,
    14.6                                (pitch / bytes_per_pixel(texture->format)) /
    14.7 -                              ((GL_TextureData *) texture->
    14.8 -                               driverdata)->HACK_RYAN_FIXME);
    14.9 +                              ((GL_TextureData *) texture->driverdata)->
   14.10 +                              HACK_RYAN_FIXME);
   14.11  }
   14.12  
   14.13  static int
    15.1 --- a/src/video/SDL_surface.c	Sat Jan 10 18:32:24 2009 +0000
    15.2 +++ b/src/video/SDL_surface.c	Sat Jan 10 21:50:26 2009 +0000
    15.3 @@ -479,9 +479,9 @@
    15.4          return 0;
    15.5      }
    15.6  
    15.7 -    switch (surface->map->info.
    15.8 -            flags & (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD |
    15.9 -                     SDL_COPY_MOD)) {
   15.10 +    switch (surface->map->
   15.11 +            info.flags & (SDL_COPY_MASK | SDL_COPY_BLEND | SDL_COPY_ADD |
   15.12 +                          SDL_COPY_MOD)) {
   15.13      case SDL_COPY_MASK:
   15.14          *blendMode = SDL_BLENDMODE_MASK;
   15.15          break;
    16.1 --- a/src/video/ataricommon/SDL_atarigl.c	Sat Jan 10 18:32:24 2009 +0000
    16.2 +++ b/src/video/ataricommon/SDL_atarigl.c	Sat Jan 10 21:50:26 2009 +0000
    16.3 @@ -349,9 +349,9 @@
    16.4      }
    16.5  
    16.6      if (!
    16.7 -        (_this->gl_data->
    16.8 -         OSMesaMakeCurrent(gl_ctx, surface->pixels, type, surface->w,
    16.9 -                           surface->h))) {
   16.10 +        (_this->
   16.11 +         gl_data->OSMesaMakeCurrent(gl_ctx, surface->pixels, type, surface->w,
   16.12 +                                    surface->h))) {
   16.13          SDL_SetError("Can not make OpenGL context current");
   16.14          return -1;
   16.15      }
   16.16 @@ -512,11 +512,11 @@
   16.17  
   16.18          gl_ctx =
   16.19              _this->gl_data->OSMesaCreateContextExt(osmesa_format,
   16.20 -                                                   _this->gl_config.
   16.21 -                                                   depth_size,
   16.22 -                                                   _this->gl_config.
   16.23 -                                                   stencil_size, newaccumsize,
   16.24 -                                                   NULL);
   16.25 +                                                   _this->
   16.26 +                                                   gl_config.depth_size,
   16.27 +                                                   _this->
   16.28 +                                                   gl_config.stencil_size,
   16.29 +                                                   newaccumsize, NULL);
   16.30  
   16.31          if (gl_ctx) {
   16.32              gl_curformat = osmesa_format;
    17.1 --- a/src/video/bwindow/SDL_sysvideo.cc	Sat Jan 10 18:32:24 2009 +0000
    17.2 +++ b/src/video/bwindow/SDL_sysvideo.cc	Sat Jan 10 21:50:26 2009 +0000
    17.3 @@ -670,8 +670,8 @@
    17.4                          _this->gl_config.driver_loaded = 1;
    17.5                          SDL_strlcpy(_this->gl_config.driver_path,
    17.6                                      "libGL.so",
    17.7 -                                    SDL_arraysize(_this->gl_config.
    17.8 -                                                  driver_path));
    17.9 +                                    SDL_arraysize(_this->
   17.10 +                                                  gl_config.driver_path));
   17.11                      }
   17.12                  }
   17.13              }
    18.1 --- a/src/video/directfb/SDL_DirectFB_events.c	Sat Jan 10 18:32:24 2009 +0000
    18.2 +++ b/src/video/directfb/SDL_DirectFB_events.c	Sat Jan 10 21:50:26 2009 +0000
    18.3 @@ -60,9 +60,8 @@
    18.4      int ret;
    18.5  
    18.6      if (dispdata->vidIDinuse)
    18.7 -        SDL_DFB_CHECKERR(dispdata->
    18.8 -                         vidlayer->SwitchContext(dispdata->vidlayer,
    18.9 -                                                 DFB_TRUE));
   18.10 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
   18.11 +                         SwitchContext(dispdata->vidlayer, DFB_TRUE));
   18.12  
   18.13    error:
   18.14      return;
   18.15 @@ -149,8 +148,8 @@
   18.16                          SDL_SendMouseMotion(devdata->mouse_id[0], 0, evt.cx,
   18.17                                              evt.cy, 0);
   18.18                          SDL_SendMouseButton(devdata->mouse_id[0], SDL_PRESSED,
   18.19 -                                            DirectFB_TranslateButton
   18.20 -                                            (evt.button));
   18.21 +                                            DirectFB_TranslateButton(evt.
   18.22 +                                                                     button));
   18.23                      } else {
   18.24                          MotionAllMice(_this, evt.x, evt.y);
   18.25                      }
   18.26 @@ -161,8 +160,8 @@
   18.27                                              evt.cy, 0);
   18.28                          SDL_SendMouseButton(devdata->mouse_id[0],
   18.29                                              SDL_RELEASED,
   18.30 -                                            DirectFB_TranslateButton
   18.31 -                                            (evt.button));
   18.32 +                                            DirectFB_TranslateButton(evt.
   18.33 +                                                                     button));
   18.34                      } else {
   18.35                          MotionAllMice(_this, evt.x, evt.y);
   18.36                      }
   18.37 @@ -522,7 +521,6 @@
   18.38  
   18.39      return keysym;
   18.40  }
   18.41 -
   18.42  static int
   18.43  DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button)
   18.44  {
   18.45 @@ -604,19 +602,18 @@
   18.46      devdata->num_keyboard = 0;
   18.47      if (devdata->use_linux_input) {
   18.48          sys_ids = 0;
   18.49 -        SDL_DFB_CHECK(devdata->
   18.50 -                      dfb->EnumInputDevices(devdata->dfb, EnumKeyboards,
   18.51 -                                            devdata));
   18.52 +        SDL_DFB_CHECK(devdata->dfb->
   18.53 +                      EnumInputDevices(devdata->dfb, EnumKeyboards, devdata));
   18.54          if (devdata->num_keyboard == 0) {
   18.55              sys_ids = 1;
   18.56 -            SDL_DFB_CHECK(devdata->
   18.57 -                          dfb->EnumInputDevices(devdata->dfb, EnumKeyboards,
   18.58 -                                                devdata));
   18.59 +            SDL_DFB_CHECK(devdata->dfb->
   18.60 +                          EnumInputDevices(devdata->dfb, EnumKeyboards,
   18.61 +                                           devdata));
   18.62          }
   18.63      } else {
   18.64 -        SDL_DFB_CHECK(devdata->
   18.65 -                      dfb->EnumInputDevices(devdata->dfb, input_device_cb,
   18.66 -                                            devdata));
   18.67 +        SDL_DFB_CHECK(devdata->dfb->
   18.68 +                      EnumInputDevices(devdata->dfb, input_device_cb,
   18.69 +                                       devdata));
   18.70      }
   18.71  }
   18.72  
   18.73 @@ -653,25 +650,33 @@
   18.74              switch (evt.type) {
   18.75              case DIET_BUTTONPRESS:
   18.76                  posted += SDL_PrivateMouseButton(SDL_PRESSED,
   18.77 -                                                 DirectFB_TranslateButton
   18.78 -                                                 (evt.button), 0, 0);
   18.79 +                                                 DirectFB_TranslateButton(evt.
   18.80 +                                                                          button),
   18.81 +                                                 0, 0);
   18.82                  break;
   18.83              case DIET_BUTTONRELEASE:
   18.84                  posted += SDL_PrivateMouseButton(SDL_RELEASED,
   18.85 -                                                 DirectFB_TranslateButton
   18.86 -                                                 (evt.button), 0, 0);
   18.87 +                                                 DirectFB_TranslateButton(evt.
   18.88 +                                                                          button),
   18.89 +                                                 0, 0);
   18.90                  break;
   18.91              case DIET_KEYPRESS:
   18.92                  posted += SDL_PrivateKeyboard(SDL_PRESSED,
   18.93 -                                              DirectFB_TranslateKey
   18.94 -                                              (evt.key_id, evt.key_symbol,
   18.95 -                                               mod, &keysym));
   18.96 +                                              DirectFB_TranslateKey(evt.
   18.97 +                                                                    key_id,
   18.98 +                                                                    evt.
   18.99 +                                                                    key_symbol,
  18.100 +                                                                    mod,
  18.101 +                                                                    &keysym));
  18.102                  break;
  18.103              case DIET_KEYRELEASE:
  18.104                  posted += SDL_PrivateKeyboard(SDL_RELEASED,
  18.105 -                                              DirectFB_TranslateKey
  18.106 -                                              (evt.key_id, evt.key_symbol,
  18.107 -                                               mod, &keysym));
  18.108 +                                              DirectFB_TranslateKey(evt.
  18.109 +                                                                    key_id,
  18.110 +                                                                    evt.
  18.111 +                                                                    key_symbol,
  18.112 +                                                                    mod,
  18.113 +                                                                    &keysym));
  18.114                  break;
  18.115              case DIET_AXISMOTION:
  18.116                  if (evt.flags & DIEF_AXISREL) {
    19.1 --- a/src/video/directfb/SDL_DirectFB_modes.c	Sat Jan 10 18:32:24 2009 +0000
    19.2 +++ b/src/video/directfb/SDL_DirectFB_modes.c	Sat Jan 10 21:50:26 2009 +0000
    19.3 @@ -204,9 +204,8 @@
    19.4      DFBDisplayLayerConfigFlags failed;
    19.5      int ret;
    19.6  
    19.7 -    SDL_DFB_CHECKERR(data->
    19.8 -                     layer->SetCooperativeLevel(data->layer,
    19.9 -                                                DLSCL_ADMINISTRATIVE));
   19.10 +    SDL_DFB_CHECKERR(data->layer->
   19.11 +                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
   19.12      config.width = mode->w;
   19.13      config.height = mode->h;
   19.14      config.pixelformat = SDLToDFBPixelFormat(mode->format);
   19.15 @@ -217,8 +216,8 @@
   19.16      }
   19.17      failed = 0;
   19.18      data->layer->TestConfiguration(data->layer, &config, &failed);
   19.19 -    SDL_DFB_CHECKERR(data->
   19.20 -                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
   19.21 +    SDL_DFB_CHECKERR(data->layer->
   19.22 +                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
   19.23      if (failed == 0)
   19.24          SDL_AddDisplayMode(_this->current_display, mode);
   19.25      else
   19.26 @@ -260,20 +259,19 @@
   19.27          screencbdata->vidlayer[i] = -1;
   19.28      }
   19.29  
   19.30 -    SDL_DFB_CHECKERR(devdata->
   19.31 -                     dfb->EnumScreens(devdata->dfb, &cbScreens,
   19.32 -                                      screencbdata));
   19.33 +    SDL_DFB_CHECKERR(devdata->dfb->
   19.34 +                     EnumScreens(devdata->dfb, &cbScreens, screencbdata));
   19.35  
   19.36      for (i = 0; i < screencbdata->numscreens; i++) {
   19.37          IDirectFBScreen *screen;
   19.38  
   19.39 -        SDL_DFB_CHECKERR(devdata->
   19.40 -                         dfb->GetScreen(devdata->dfb,
   19.41 -                                        screencbdata->screenid[i], &screen));
   19.42 +        SDL_DFB_CHECKERR(devdata->dfb->
   19.43 +                         GetScreen(devdata->dfb, screencbdata->screenid[i],
   19.44 +                                   &screen));
   19.45  
   19.46          screencbdata->aux = i;
   19.47 -        SDL_DFB_CHECKERR(screen->EnumDisplayLayers
   19.48 -                         (screen, &cbLayers, screencbdata));
   19.49 +        SDL_DFB_CHECKERR(screen->
   19.50 +                         EnumDisplayLayers(screen, &cbLayers, screencbdata));
   19.51  #if (DIRECTFB_MAJOR_VERSION >= 1)
   19.52          screen->GetSize(screen, &tcw[i], &tch[i]);
   19.53  #else
   19.54 @@ -295,12 +293,12 @@
   19.55      SDL_DFB_DEBUG("Found %d screens\n", screencbdata->numscreens);
   19.56  
   19.57      for (i = 0; i < screencbdata->numscreens; i++) {
   19.58 -        SDL_DFB_CHECKERR(devdata->dfb->GetDisplayLayer(devdata->dfb,
   19.59 -                                                       screencbdata->
   19.60 -                                                       gralayer[i], &layer));
   19.61 +        SDL_DFB_CHECKERR(devdata->dfb->
   19.62 +                         GetDisplayLayer(devdata->dfb,
   19.63 +                                         screencbdata->gralayer[i], &layer));
   19.64  
   19.65 -        SDL_DFB_CHECKERR(layer->SetCooperativeLevel
   19.66 -                         (layer, DLSCL_ADMINISTRATIVE));
   19.67 +        SDL_DFB_CHECKERR(layer->
   19.68 +                         SetCooperativeLevel(layer, DLSCL_ADMINISTRATIVE));
   19.69          layer->EnableCursor(layer, 1);
   19.70          SDL_DFB_CHECKERR(layer->SetCursorOpacity(layer, 0xC0));
   19.71  
   19.72 @@ -383,9 +381,8 @@
   19.73      data.nummodes = 0;
   19.74      /* Enumerate the available fullscreen modes */
   19.75      SDL_DFB_CALLOC(data.modelist, DFB_MAX_MODES, sizeof(SDL_DisplayMode));
   19.76 -    SDL_DFB_CHECKERR(devdata->
   19.77 -                     dfb->EnumVideoModes(devdata->dfb, EnumModesCallback,
   19.78 -                                         &data));
   19.79 +    SDL_DFB_CHECKERR(devdata->dfb->
   19.80 +                     EnumVideoModes(devdata->dfb, EnumModesCallback, &data));
   19.81  
   19.82      for (i = 0; i < data.nummodes; ++i) {
   19.83          mode = data.modelist[i];
   19.84 @@ -422,9 +419,8 @@
   19.85      DFBDisplayLayerConfigFlags fail = 0;
   19.86      DFBResult ret;
   19.87  
   19.88 -    SDL_DFB_CHECKERR(data->
   19.89 -                     layer->SetCooperativeLevel(data->layer,
   19.90 -                                                DLSCL_ADMINISTRATIVE));
   19.91 +    SDL_DFB_CHECKERR(data->layer->
   19.92 +                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
   19.93  
   19.94      SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &config));
   19.95      config.flags = DLCONF_WIDTH | DLCONF_HEIGHT;
   19.96 @@ -462,8 +458,8 @@
   19.97  
   19.98      /* Double check */
   19.99      SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &rconfig));
  19.100 -    SDL_DFB_CHECKERR(data->
  19.101 -                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
  19.102 +    SDL_DFB_CHECKERR(data->layer->
  19.103 +                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
  19.104  
  19.105      if ((config.width != rconfig.width) ||
  19.106          (config.height != rconfig.height) ||
  19.107 @@ -506,14 +502,13 @@
  19.108              (DFB_DisplayData *) _this->displays[i].driverdata;
  19.109  
  19.110          if (dispdata->layer) {
  19.111 -            SDL_DFB_CHECK(dispdata->
  19.112 -                          layer->SetCooperativeLevel(dispdata->layer,
  19.113 -                                                     DLSCL_ADMINISTRATIVE));
  19.114 -            SDL_DFB_CHECK(dispdata->
  19.115 -                          layer->SetCursorOpacity(dispdata->layer, 0x00));
  19.116 -            SDL_DFB_CHECK(dispdata->
  19.117 -                          layer->SetCooperativeLevel(dispdata->layer,
  19.118 -                                                     DLSCL_SHARED));
  19.119 +            SDL_DFB_CHECK(dispdata->layer->
  19.120 +                          SetCooperativeLevel(dispdata->layer,
  19.121 +                                              DLSCL_ADMINISTRATIVE));
  19.122 +            SDL_DFB_CHECK(dispdata->layer->
  19.123 +                          SetCursorOpacity(dispdata->layer, 0x00));
  19.124 +            SDL_DFB_CHECK(dispdata->layer->
  19.125 +                          SetCooperativeLevel(dispdata->layer, DLSCL_SHARED));
  19.126          }
  19.127  
  19.128          SDL_DFB_RELEASE(dispdata->layer);
    20.1 --- a/src/video/directfb/SDL_DirectFB_mouse.c	Sat Jan 10 18:32:24 2009 +0000
    20.2 +++ b/src/video/directfb/SDL_DirectFB_mouse.c	Sat Jan 10 21:50:26 2009 +0000
    20.3 @@ -132,15 +132,14 @@
    20.4      dsc.height = surface->h;
    20.5      dsc.pixelformat = DSPF_ARGB;
    20.6  
    20.7 -    SDL_DFB_CHECKERR(devdata->
    20.8 -                     dfb->CreateSurface(devdata->dfb, &dsc, &curdata->surf));
    20.9 +    SDL_DFB_CHECKERR(devdata->dfb->
   20.10 +                     CreateSurface(devdata->dfb, &dsc, &curdata->surf));
   20.11      curdata->hotx = hot_x;
   20.12      curdata->hoty = hot_y;
   20.13      cursor->driverdata = curdata;
   20.14  
   20.15 -    SDL_DFB_CHECKERR(curdata->
   20.16 -                     surf->Lock(curdata->surf, DSLF_WRITE, (void *) &dest,
   20.17 -                                &pitch));
   20.18 +    SDL_DFB_CHECKERR(curdata->surf->
   20.19 +                     Lock(curdata->surf, DSLF_WRITE, (void *) &dest, &pitch));
   20.20  
   20.21      /* Relies on the fact that this is only called with ARGB surface. */
   20.22      p = surface->pixels;
   20.23 @@ -175,22 +174,21 @@
   20.24              DFB_WindowData *windata = (DFB_WindowData *) window->driverdata;
   20.25  
   20.26              if (cursor)
   20.27 -                SDL_DFB_CHECKERR(windata->
   20.28 -                                 window->SetCursorShape(windata->window,
   20.29 -                                                        curdata->surf,
   20.30 -                                                        curdata->hotx,
   20.31 -                                                        curdata->hoty));
   20.32 +                SDL_DFB_CHECKERR(windata->window->
   20.33 +                                 SetCursorShape(windata->window,
   20.34 +                                                curdata->surf, curdata->hotx,
   20.35 +                                                curdata->hoty));
   20.36  
   20.37              /* fprintf(stdout, "Cursor is %s\n", cursor ? "on" : "off"); */
   20.38 -            SDL_DFB_CHECKERR(dispdata->
   20.39 -                             layer->SetCooperativeLevel(dispdata->layer,
   20.40 -                                                        DLSCL_ADMINISTRATIVE));
   20.41 -            SDL_DFB_CHECKERR(dispdata->
   20.42 -                             layer->SetCursorOpacity(dispdata->layer,
   20.43 -                                                     cursor ? 0xC0 : 0x00));
   20.44 -            SDL_DFB_CHECKERR(dispdata->
   20.45 -                             layer->SetCooperativeLevel(dispdata->layer,
   20.46 -                                                        DLSCL_SHARED));
   20.47 +            SDL_DFB_CHECKERR(dispdata->layer->
   20.48 +                             SetCooperativeLevel(dispdata->layer,
   20.49 +                                                 DLSCL_ADMINISTRATIVE));
   20.50 +            SDL_DFB_CHECKERR(dispdata->layer->
   20.51 +                             SetCursorOpacity(dispdata->layer,
   20.52 +                                              cursor ? 0xC0 : 0x00));
   20.53 +            SDL_DFB_CHECKERR(dispdata->layer->
   20.54 +                             SetCooperativeLevel(dispdata->layer,
   20.55 +                                                 DLSCL_SHARED));
   20.56          }
   20.57      }
   20.58  
   20.59 @@ -229,8 +227,8 @@
   20.60      int cx, cy;
   20.61  
   20.62      SDL_DFB_CHECKERR(windata->window->GetPosition(windata->window, &cx, &cy));
   20.63 -    SDL_DFB_CHECKERR(dispdata->
   20.64 -                     layer->WarpCursor(dispdata->layer, cx + x, cy + y));
   20.65 +    SDL_DFB_CHECKERR(dispdata->layer->
   20.66 +                     WarpCursor(dispdata->layer, cx + x, cy + y));
   20.67  
   20.68    error:
   20.69      return;
    21.1 --- a/src/video/directfb/SDL_DirectFB_opengl.c	Sat Jan 10 18:32:24 2009 +0000
    21.2 +++ b/src/video/directfb/SDL_DirectFB_opengl.c	Sat Jan 10 21:50:26 2009 +0000
    21.3 @@ -173,8 +173,8 @@
    21.4  
    21.5      SDL_DFB_CALLOC(context, 1, sizeof(*context));
    21.6  
    21.7 -    SDL_DFB_CHECKERR(windata->
    21.8 -                     surface->GetGL(windata->surface, &context->context));
    21.9 +    SDL_DFB_CHECKERR(windata->surface->
   21.10 +                     GetGL(windata->surface, &context->context));
   21.11  
   21.12      if (!context->context)
   21.13          return NULL;
   21.14 @@ -212,12 +212,12 @@
   21.15  
   21.16          windata->gl_context = NULL;
   21.17          /* Everything is unlocked, check for a resize */
   21.18 -        SDL_DFB_CHECKERR(windata->
   21.19 -                         surface->GetSize(windata->surface, &cw, &ch));
   21.20 +        SDL_DFB_CHECKERR(windata->surface->
   21.21 +                         GetSize(windata->surface, &cw, &ch));
   21.22          if (cw != window->w || ch != window->h)
   21.23 -            SDL_DFB_CHECKERR(windata->
   21.24 -                             window->ResizeSurface(windata->window, window->w,
   21.25 -                                                   window->h));
   21.26 +            SDL_DFB_CHECKERR(windata->window->
   21.27 +                             ResizeSurface(windata->window, window->w,
   21.28 +                                           window->h));
   21.29      }
   21.30  
   21.31      if (ctx != NULL) {
   21.32 @@ -266,9 +266,8 @@
   21.33  
   21.34      if (1 || windata->gl_context) {
   21.35          /* SDL_DFB_CHECKERR(windata->gl_context->context->Unlock(windata->gl_context->context)); */
   21.36 -        SDL_DFB_CHECKERR(windata->
   21.37 -                         surface->Flip(windata->surface, &region,
   21.38 -                                       DSFLIP_ONSYNC));
   21.39 +        SDL_DFB_CHECKERR(windata->surface->
   21.40 +                         Flip(windata->surface, &region, DSFLIP_ONSYNC));
   21.41          /* SDL_DFB_CHECKERR(windata->gl_context->context->Lock(windata->gl_context->context)); */
   21.42  
   21.43      }
    22.1 --- a/src/video/directfb/SDL_DirectFB_render.c	Sat Jan 10 18:32:24 2009 +0000
    22.2 +++ b/src/video/directfb/SDL_DirectFB_render.c	Sat Jan 10 21:50:26 2009 +0000
    22.3 @@ -418,12 +418,12 @@
    22.4          int cw, ch;
    22.5          int ret;
    22.6  
    22.7 -        SDL_DFB_CHECKERR(windata->
    22.8 -                         surface->GetSize(windata->surface, &cw, &ch));
    22.9 +        SDL_DFB_CHECKERR(windata->surface->
   22.10 +                         GetSize(windata->surface, &cw, &ch));
   22.11          if (cw != window->w || ch != window->h)
   22.12 -            SDL_DFB_CHECKERR(windata->
   22.13 -                             window->ResizeSurface(windata->window, window->w,
   22.14 -                                                   window->h));
   22.15 +            SDL_DFB_CHECKERR(windata->window->
   22.16 +                             ResizeSurface(windata->window, window->w,
   22.17 +                                           window->h));
   22.18      }
   22.19      return 0;
   22.20    error:
   22.21 @@ -462,24 +462,22 @@
   22.22          layconf.pixelformat = SDLToDFBPixelFormat(data->format);
   22.23          layconf.surface_caps = DSCAPS_VIDEOONLY | DSCAPS_DOUBLE;
   22.24  
   22.25 -        SDL_DFB_CHECKERR(devdata->
   22.26 -                         dfb->GetDisplayLayer(devdata->dfb, dispdata->vidID,
   22.27 -                                              &dispdata->vidlayer));
   22.28 -        SDL_DFB_CHECKERR(dispdata->
   22.29 -                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
   22.30 -                                                       DLSCL_EXCLUSIVE));
   22.31 +        SDL_DFB_CHECKERR(devdata->dfb->
   22.32 +                         GetDisplayLayer(devdata->dfb, dispdata->vidID,
   22.33 +                                         &dispdata->vidlayer));
   22.34 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
   22.35 +                         SetCooperativeLevel(dispdata->vidlayer,
   22.36 +                                             DLSCL_EXCLUSIVE));
   22.37  
   22.38          if (devdata->use_yuv_underlays) {
   22.39              ret = dispdata->vidlayer->SetLevel(dispdata->vidlayer, -1);
   22.40              if (ret != DFB_OK)
   22.41                  SDL_DFB_DEBUG("Underlay Setlevel not supported\n");
   22.42          }
   22.43 -        SDL_DFB_CHECKERR(dispdata->
   22.44 -                         vidlayer->SetConfiguration(dispdata->vidlayer,
   22.45 -                                                    &layconf));
   22.46 -        SDL_DFB_CHECKERR(dispdata->
   22.47 -                         vidlayer->GetSurface(dispdata->vidlayer,
   22.48 -                                              &data->surface));
   22.49 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
   22.50 +                         SetConfiguration(dispdata->vidlayer, &layconf));
   22.51 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
   22.52 +                         GetSurface(dispdata->vidlayer, &data->surface));
   22.53          dispdata->vidIDinuse = 1;
   22.54          data->display = display;
   22.55          return 0;
   22.56 @@ -488,9 +486,9 @@
   22.57    error:
   22.58      if (dispdata->vidlayer) {
   22.59          SDL_DFB_RELEASE(data->surface);
   22.60 -        SDL_DFB_CHECKERR(dispdata->
   22.61 -                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
   22.62 -                                                       DLSCL_ADMINISTRATIVE));
   22.63 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
   22.64 +                         SetCooperativeLevel(dispdata->vidlayer,
   22.65 +                                             DLSCL_ADMINISTRATIVE));
   22.66          SDL_DFB_RELEASE(dispdata->vidlayer);
   22.67      }
   22.68      return 1;
   22.69 @@ -542,14 +540,12 @@
   22.70          data->pixels = NULL;
   22.71  
   22.72          /* Create the surface */
   22.73 -        SDL_DFB_CHECKERR(devdata->
   22.74 -                         dfb->CreateSurface(devdata->dfb, &dsc,
   22.75 -                                            &data->surface));
   22.76 +        SDL_DFB_CHECKERR(devdata->dfb->
   22.77 +                         CreateSurface(devdata->dfb, &dsc, &data->surface));
   22.78          if (SDL_ISPIXELFORMAT_INDEXED(data->format)
   22.79              && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
   22.80 -            SDL_DFB_CHECKERR(data->
   22.81 -                             surface->GetPalette(data->surface,
   22.82 -                                                 &data->palette));
   22.83 +            SDL_DFB_CHECKERR(data->surface->
   22.84 +                             GetPalette(data->surface, &data->palette));
   22.85          }
   22.86  
   22.87      }
   22.88 @@ -606,9 +602,9 @@
   22.89              entries[i].b = colors[i].b;
   22.90              entries[i].a = 0xFF;
   22.91          }
   22.92 -        SDL_DFB_CHECKERR(data->
   22.93 -                         palette->SetEntries(data->palette, entries, ncolors,
   22.94 -                                             firstcolor));
   22.95 +        SDL_DFB_CHECKERR(data->palette->
   22.96 +                         SetEntries(data->palette, entries, ncolors,
   22.97 +                                    firstcolor));
   22.98          return 0;
   22.99      } else {
  22.100          SDL_SetError("YUV textures don't have a palette");
  22.101 @@ -630,9 +626,9 @@
  22.102          DFBColor entries[256];
  22.103          int i;
  22.104  
  22.105 -        SDL_DFB_CHECKERR(data->
  22.106 -                         palette->GetEntries(data->palette, entries, ncolors,
  22.107 -                                             firstcolor));
  22.108 +        SDL_DFB_CHECKERR(data->palette->
  22.109 +                         GetEntries(data->palette, entries, ncolors,
  22.110 +                                    firstcolor));
  22.111  
  22.112          for (i = 0; i < ncolors; ++i) {
  22.113              colors[i].r = entries[i].r;
  22.114 @@ -811,9 +807,8 @@
  22.115      a = renderer->a;
  22.116  
  22.117      SetBlendMode(data, renderer->blendMode, NULL);
  22.118 -    SDL_DFB_CHECKERR(data->
  22.119 -                     surface->SetDrawingFlags(data->surface,
  22.120 -                                              data->drawFlags));
  22.121 +    SDL_DFB_CHECKERR(data->surface->
  22.122 +                     SetDrawingFlags(data->surface, data->drawFlags));
  22.123  
  22.124      switch (renderer->blendMode) {
  22.125      case SDL_BLENDMODE_NONE:
  22.126 @@ -873,9 +868,9 @@
  22.127      DFBResult ret;
  22.128  
  22.129      PrepareDraw(renderer);
  22.130 -    SDL_DFB_CHECKERR(data->
  22.131 -                     surface->FillRectangle(data->surface, rect->x, rect->y,
  22.132 -                                            rect->w, rect->h));
  22.133 +    SDL_DFB_CHECKERR(data->surface->
  22.134 +                     FillRectangle(data->surface, rect->x, rect->y, rect->w,
  22.135 +                                   rect->h));
  22.136  
  22.137      return 0;
  22.138    error:
  22.139 @@ -899,18 +894,15 @@
  22.140          SDL_VideoDisplay *display = texturedata->display;
  22.141          DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
  22.142  
  22.143 -        SDL_DFB_CHECKERR(dispdata->
  22.144 -                         vidlayer->SetSourceRectangle(dispdata->vidlayer,
  22.145 -                                                      srcrect->x, srcrect->y,
  22.146 -                                                      srcrect->w,
  22.147 -                                                      srcrect->h));
  22.148 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
  22.149 +                         SetSourceRectangle(dispdata->vidlayer, srcrect->x,
  22.150 +                                            srcrect->y, srcrect->w,
  22.151 +                                            srcrect->h));
  22.152          windata->window->GetPosition(windata->window, &px, &py);
  22.153 -        SDL_DFB_CHECKERR(dispdata->
  22.154 -                         vidlayer->SetScreenRectangle(dispdata->vidlayer,
  22.155 -                                                      px + dstrect->x,
  22.156 -                                                      py + dstrect->y,
  22.157 -                                                      dstrect->w,
  22.158 -                                                      dstrect->h));
  22.159 +        SDL_DFB_CHECKERR(dispdata->vidlayer->
  22.160 +                         SetScreenRectangle(dispdata->vidlayer,
  22.161 +                                            px + dstrect->x, py + dstrect->y,
  22.162 +                                            dstrect->w, dstrect->h));
  22.163      } else {
  22.164          DFBRectangle sr, dr;
  22.165          DFBSurfaceBlittingFlags flags = 0;
  22.166 @@ -938,8 +930,9 @@
  22.167  
  22.168          SDL_DFB_CHECKERR(data->surface->SetColor(data->surface, 0xFF,
  22.169                                                   0xFF, 0xFF, 0xFF));
  22.170 -        if (texture->modMode &
  22.171 -            (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA)) {
  22.172 +        if (texture->
  22.173 +            modMode & (SDL_TEXTUREMODULATE_COLOR | SDL_TEXTUREMODULATE_ALPHA))
  22.174 +        {
  22.175              if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA) {
  22.176                  alpha = texture->a;
  22.177                  SDL_DFB_CHECKERR(data->surface->SetColor(data->surface, 0xFF,
  22.178 @@ -947,10 +940,9 @@
  22.179              }
  22.180              if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
  22.181  
  22.182 -                SDL_DFB_CHECKERR(data->
  22.183 -                                 surface->SetColor(data->surface, texture->r,
  22.184 -                                                   texture->g, texture->b,
  22.185 -                                                   alpha));
  22.186 +                SDL_DFB_CHECKERR(data->surface->
  22.187 +                                 SetColor(data->surface, texture->r,
  22.188 +                                          texture->g, texture->b, alpha));
  22.189                  flags |= DSBLIT_COLORIZE;
  22.190              }
  22.191              if (alpha < 0xFF)
  22.192 @@ -961,25 +953,24 @@
  22.193  
  22.194          SetBlendMode(data, texture->blendMode, texturedata);
  22.195  
  22.196 -        SDL_DFB_CHECKERR(data->surface->SetBlittingFlags(data->surface,
  22.197 -                                                         data->
  22.198 -                                                         blitFlags | flags));
  22.199 +        SDL_DFB_CHECKERR(data->surface->
  22.200 +                         SetBlittingFlags(data->surface,
  22.201 +                                          data->blitFlags | flags));
  22.202  
  22.203  #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 2)
  22.204          SDL_DFB_CHECKERR(data->surface->SetRenderOptions(data->surface,
  22.205 -                                                         texturedata->render_options));
  22.206 +                                                         texturedata->
  22.207 +                                                         render_options));
  22.208  #endif
  22.209  
  22.210          if (srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
  22.211 -            SDL_DFB_CHECKERR(data->
  22.212 -                             surface->Blit(data->surface,
  22.213 -                                           texturedata->surface, &sr, dr.x,
  22.214 -                                           dr.y));
  22.215 +            SDL_DFB_CHECKERR(data->surface->
  22.216 +                             Blit(data->surface, texturedata->surface,
  22.217 +                                  &sr, dr.x, dr.y));
  22.218          } else {
  22.219 -            SDL_DFB_CHECKERR(data->
  22.220 -                             surface->StretchBlit(data->surface,
  22.221 -                                                  texturedata->surface, &sr,
  22.222 -                                                  &dr));
  22.223 +            SDL_DFB_CHECKERR(data->surface->
  22.224 +                             StretchBlit(data->surface, texturedata->surface,
  22.225 +                                         &sr, &dr));
  22.226          }
  22.227      }
  22.228      return 0;
  22.229 @@ -1002,8 +993,8 @@
  22.230      sr.h = window->h;
  22.231  
  22.232      /* Send the data to the display */
  22.233 -    SDL_DFB_CHECKERR(data->
  22.234 -                     surface->Flip(data->surface, NULL, data->flipflags));
  22.235 +    SDL_DFB_CHECKERR(data->surface->
  22.236 +                     Flip(data->surface, NULL, data->flipflags));
  22.237  
  22.238      return;
  22.239    error:
    23.1 --- a/src/video/directfb/SDL_DirectFB_video.c	Sat Jan 10 18:32:24 2009 +0000
    23.2 +++ b/src/video/directfb/SDL_DirectFB_video.c	Sat Jan 10 21:50:26 2009 +0000
    23.3 @@ -190,15 +190,14 @@
    23.4  
    23.5      /* Create global Eventbuffer for axis events */
    23.6      if (devdata->use_linux_input) {
    23.7 -        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_ALL,
    23.8 -                                                     DFB_TRUE,
    23.9 -                                                     &devdata->events));
   23.10 +        SDL_DFB_CHECKERR(dfb->
   23.11 +                         CreateInputEventBuffer(dfb, DICAPS_ALL,
   23.12 +                                                DFB_TRUE, &devdata->events));
   23.13      } else {
   23.14 -        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb,
   23.15 -                                                     DICAPS_AXES
   23.16 -                                                     /*DICAPS_ALL */ ,
   23.17 -                                                     DFB_TRUE,
   23.18 -                                                     &devdata->events));
   23.19 +        SDL_DFB_CHECKERR(dfb->
   23.20 +                         CreateInputEventBuffer(dfb,
   23.21 +                                                DICAPS_AXES /*DICAPS_ALL */ ,
   23.22 +                                                DFB_TRUE, &devdata->events));
   23.23      }
   23.24  
   23.25      devdata->initialized = 1;
    24.1 --- a/src/video/directfb/SDL_DirectFB_window.c	Sat Jan 10 18:32:24 2009 +0000
    24.2 +++ b/src/video/directfb/SDL_DirectFB_window.c	Sat Jan 10 21:50:26 2009 +0000
    24.3 @@ -43,11 +43,11 @@
    24.4      SDL_DFB_CALLOC(window->driverdata, 1, sizeof(DFB_WindowData));
    24.5      windata = (DFB_WindowData *) window->driverdata;
    24.6  
    24.7 -    SDL_DFB_CHECKERR(devdata->
    24.8 -                     dfb->SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
    24.9 -    SDL_DFB_CHECKERR(dispdata->
   24.10 -                     layer->SetCooperativeLevel(dispdata->layer,
   24.11 -                                                DLSCL_ADMINISTRATIVE));
   24.12 +    SDL_DFB_CHECKERR(devdata->dfb->
   24.13 +                     SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
   24.14 +    SDL_DFB_CHECKERR(dispdata->layer->
   24.15 +                     SetCooperativeLevel(dispdata->layer,
   24.16 +                                         DLSCL_ADMINISTRATIVE));
   24.17  
   24.18      /* Fill the window description. */
   24.19      if (window->x == SDL_WINDOWPOS_CENTERED) {
   24.20 @@ -100,9 +100,8 @@
   24.21      /* DSCAPS_VIDEOONLY has negative impact on performance */
   24.22  
   24.23      /* Create the window. */
   24.24 -    SDL_DFB_CHECKERR(dispdata->
   24.25 -                     layer->CreateWindow(dispdata->layer, &desc,
   24.26 -                                         &windata->window));
   24.27 +    SDL_DFB_CHECKERR(dispdata->layer->
   24.28 +                     CreateWindow(dispdata->layer, &desc, &windata->window));
   24.29  
   24.30      windata->window->GetOptions(windata->window, &wopts);
   24.31  #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 0)
   24.32 @@ -120,14 +119,14 @@
   24.33  
   24.34      windata->window->SetOptions(windata->window, wopts);
   24.35      /* Get the window's surface. */
   24.36 -    SDL_DFB_CHECKERR(windata->
   24.37 -                     window->GetSurface(windata->window, &windata->surface));
   24.38 +    SDL_DFB_CHECKERR(windata->window->
   24.39 +                     GetSurface(windata->window, &windata->surface));
   24.40      windata->window->SetOpacity(windata->window, 0xFF);
   24.41 -    SDL_DFB_CHECKERR(windata->window->CreateEventBuffer(windata->window,
   24.42 -                                                        &(windata->
   24.43 -                                                          eventbuffer)));
   24.44 -    SDL_DFB_CHECKERR(windata->
   24.45 -                     window->EnableEvents(windata->window, DWET_ALL));
   24.46 +    SDL_DFB_CHECKERR(windata->window->
   24.47 +                     CreateEventBuffer(windata->window,
   24.48 +                                       &(windata->eventbuffer)));
   24.49 +    SDL_DFB_CHECKERR(windata->window->
   24.50 +                     EnableEvents(windata->window, DWET_ALL));
   24.51  
   24.52      if (window->flags & SDL_WINDOW_FULLSCREEN)
   24.53          windata->window->SetStackingClass(windata->window, DWSC_UPPER);
   24.54 @@ -203,21 +202,19 @@
   24.55          int ch;
   24.56  
   24.57          /* Make sure all events are disabled for this operation ! */
   24.58 -        SDL_DFB_CHECKERR(windata->
   24.59 -                         window->DisableEvents(windata->window, DWET_ALL));
   24.60 +        SDL_DFB_CHECKERR(windata->window->
   24.61 +                         DisableEvents(windata->window, DWET_ALL));
   24.62  
   24.63          SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &cw, &ch));
   24.64          if (cw != window->w || ch != window->h)
   24.65 -            SDL_DFB_CHECKERR(windata->
   24.66 -                             window->Resize(windata->window, window->w,
   24.67 -                                            window->h));
   24.68 -        SDL_DFB_CHECKERR(windata->
   24.69 -                         window->EnableEvents(windata->window, DWET_ALL));
   24.70 +            SDL_DFB_CHECKERR(windata->window->
   24.71 +                             Resize(windata->window, window->w, window->h));
   24.72 +        SDL_DFB_CHECKERR(windata->window->
   24.73 +                         EnableEvents(windata->window, DWET_ALL));
   24.74  
   24.75  #else
   24.76 -        SDL_DFB_CHECKERR(windata->
   24.77 -                         window->Resize(windata->window, window->w,
   24.78 -                                        window->h));
   24.79 +        SDL_DFB_CHECKERR(windata->window->
   24.80 +                         Resize(windata->window, window->w, window->h));
   24.81  #endif
   24.82          SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &window->w, &window->h));    /* if a window manager should have decided otherwise */
   24.83  
    25.1 --- a/src/video/ipod/SDL_ipodvideo.c	Sat Jan 10 18:32:24 2009 +0000
    25.2 +++ b/src/video/ipod/SDL_ipodvideo.c	Sat Jan 10 21:50:26 2009 +0000
    25.3 @@ -777,8 +777,8 @@
    25.4                          ~(3 << (2 * (x % 4)));
    25.5                      ipod_scr[y * (lcd_width / 4) + x / 4] |=
    25.6                          (((Uint8 *) (SDL_VideoSurface->pixels))[y *
    25.7 -                                                                SDL_VideoSurface->pitch
    25.8 -                                                                +
    25.9 +                                                                SDL_VideoSurface->
   25.10 +                                                                pitch +
   25.11                                                                  x] & 3) << (2
   25.12                                                                              *
   25.13                                                                              (x
    26.1 --- a/src/video/os2fslib/SDL_os2fslib.c	Sat Jan 10 18:32:24 2009 +0000
    26.2 +++ b/src/video/os2fslib/SDL_os2fslib.c	Sat Jan 10 21:50:26 2009 +0000
    26.3 @@ -440,8 +440,8 @@
    26.4                      if ((!pVideo->hidden->pSDLSurface) ||
    26.5                          ((pVideo->hidden->pSDLSurface)
    26.6                           &&
    26.7 -                         ((pVideo->hidden->pSDLSurface->
    26.8 -                           flags & SDL_RESIZABLE) == 0)))
    26.9 +                         ((pVideo->hidden->
   26.10 +                           pSDLSurface->flags & SDL_RESIZABLE) == 0)))
   26.11                          FSLib_ToggleFSMode(hwnd, !FSLib_QueryFSMode(hwnd));
   26.12  #ifdef DEBUG_BUILD
   26.13                      else
   26.14 @@ -690,15 +690,15 @@
   26.15                              WinQueryWindowPos(hwnd, &swp);
   26.16                              if ((!pVideo->hidden->pSDLSurface) ||
   26.17                                  ((pVideo->hidden->pSDLSurface) &&
   26.18 -                                 (pVideo->hidden->pSDLSurface->
   26.19 -                                  flags & SDL_RESIZABLE)
   26.20 +                                 (pVideo->hidden->
   26.21 +                                  pSDLSurface->flags & SDL_RESIZABLE)
   26.22                                   &&
   26.23                                   ((swp.cx !=
   26.24 -                                   pVideo->hidden->SrcBufferDesc.
   26.25 -                                   uiXResolution)
   26.26 +                                   pVideo->hidden->
   26.27 +                                   SrcBufferDesc.uiXResolution)
   26.28                                    || (swp.cy !=
   26.29 -                                      pVideo->hidden->
   26.30 -                                      SrcBufferDesc.uiYResolution))
   26.31 +                                      pVideo->hidden->SrcBufferDesc.
   26.32 +                                      uiYResolution))
   26.33                                   && (!FSLib_QueryFSMode(hwnd)))) {
   26.34                                  // Resizable surface and in resizing!
   26.35                                  // So, don't blit now!
   26.36 @@ -717,10 +717,10 @@
   26.37                                  FSLIB_BITBLT(hwnd,
   26.38                                               pVideo->hidden->pchSrcBuffer, 0,
   26.39                                               0,
   26.40 +                                             pVideo->hidden->
   26.41 +                                             SrcBufferDesc.uiXResolution,
   26.42                                               pVideo->hidden->SrcBufferDesc.
   26.43 -                                             uiXResolution,
   26.44 -                                             pVideo->hidden->
   26.45 -                                             SrcBufferDesc.uiYResolution);
   26.46 +                                             uiYResolution);
   26.47                              }
   26.48                          }
   26.49  #ifdef DEBUG_BUILD
   26.50 @@ -2503,21 +2503,26 @@
   26.51                                         pModeInfoFound->uiXResolution,
   26.52                                         pModeInfoFound->uiYResolution,
   26.53                                         pModeInfoFound->uiBPP, ((unsigned int)
   26.54 -                                                               pModeInfoFound->PixelFormat.ucRedMask)
   26.55 -                                       << pModeInfoFound->
   26.56 -                                       PixelFormat.ucRedPosition,
   26.57 -                                       ((unsigned int)
   26.58 -                                        pModeInfoFound->PixelFormat.ucGreenMask)
   26.59 -                                       << pModeInfoFound->
   26.60 -                                       PixelFormat.ucGreenPosition,
   26.61 -                                       ((unsigned int)
   26.62 -                                        pModeInfoFound->PixelFormat.ucBlueMask)
   26.63 -                                       << pModeInfoFound->
   26.64 -                                       PixelFormat.ucBluePosition,
   26.65 -                                       ((unsigned int)
   26.66 -                                        pModeInfoFound->PixelFormat.ucAlphaMask)
   26.67 -                                       << pModeInfoFound->
   26.68 -                                       PixelFormat.ucAlphaPosition);
   26.69 +                                                               pModeInfoFound->
   26.70 +                                                               PixelFormat.
   26.71 +                                                               ucRedMask)
   26.72 +                                       << pModeInfoFound->PixelFormat.
   26.73 +                                       ucRedPosition, ((unsigned int)
   26.74 +                                                       pModeInfoFound->
   26.75 +                                                       PixelFormat.
   26.76 +                                                       ucGreenMask)
   26.77 +                                       << pModeInfoFound->PixelFormat.
   26.78 +                                       ucGreenPosition, ((unsigned int)
   26.79 +                                                         pModeInfoFound->
   26.80 +                                                         PixelFormat.
   26.81 +                                                         ucBlueMask)
   26.82 +                                       << pModeInfoFound->PixelFormat.
   26.83 +                                       ucBluePosition, ((unsigned int)
   26.84 +                                                        pModeInfoFound->
   26.85 +                                                        PixelFormat.
   26.86 +                                                        ucAlphaMask)
   26.87 +                                       << pModeInfoFound->PixelFormat.
   26.88 +                                       ucAlphaPosition);
   26.89  
   26.90          if (pResult == NULL) {
   26.91              DosReleaseMutexSem(_this->hidden->hmtxUseSrcBuffer);
   26.92 @@ -2531,23 +2536,27 @@
   26.93  
   26.94          // Adjust pixel format mask!
   26.95          pResult->format->Rmask =
   26.96 -            ((unsigned int) pModeInfoFound->PixelFormat.
   26.97 -             ucRedMask) << pModeInfoFound->PixelFormat.ucRedPosition;
   26.98 +            ((unsigned int) pModeInfoFound->
   26.99 +             PixelFormat.ucRedMask) << pModeInfoFound->PixelFormat.
  26.100 +            ucRedPosition;
  26.101          pResult->format->Rshift = pModeInfoFound->PixelFormat.ucRedPosition;
  26.102          pResult->format->Rloss = pModeInfoFound->PixelFormat.ucRedAdjust;
  26.103          pResult->format->Gmask =
  26.104 -            ((unsigned int) pModeInfoFound->PixelFormat.
  26.105 -             ucGreenMask) << pModeInfoFound->PixelFormat.ucGreenPosition;
  26.106 +            ((unsigned int) pModeInfoFound->
  26.107 +             PixelFormat.ucGreenMask) << pModeInfoFound->PixelFormat.
  26.108 +            ucGreenPosition;
  26.109          pResult->format->Gshift = pModeInfoFound->PixelFormat.ucGreenPosition;
  26.110          pResult->format->Gloss = pModeInfoFound->PixelFormat.ucGreenAdjust;
  26.111          pResult->format->Bmask =
  26.112 -            ((unsigned int) pModeInfoFound->PixelFormat.
  26.113 -             ucBlueMask) << pModeInfoFound->PixelFormat.ucBluePosition;
  26.114 +            ((unsigned int) pModeInfoFound->
  26.115 +             PixelFormat.ucBlueMask) << pModeInfoFound->PixelFormat.
  26.116 +            ucBluePosition;
  26.117          pResult->format->Bshift = pModeInfoFound->PixelFormat.ucBluePosition;
  26.118          pResult->format->Bloss = pModeInfoFound->PixelFormat.ucBlueAdjust;
  26.119          pResult->format->Amask =
  26.120 -            ((unsigned int) pModeInfoFound->PixelFormat.
  26.121 -             ucAlphaMask) << pModeInfoFound->PixelFormat.ucAlphaPosition;
  26.122 +            ((unsigned int) pModeInfoFound->
  26.123 +             PixelFormat.ucAlphaMask) << pModeInfoFound->PixelFormat.
  26.124 +            ucAlphaPosition;
  26.125          pResult->format->Ashift = pModeInfoFound->PixelFormat.ucAlphaPosition;
  26.126          pResult->format->Aloss = pModeInfoFound->PixelFormat.ucAlphaAdjust;
  26.127  
  26.128 @@ -2806,23 +2815,25 @@
  26.129      vformat->BytesPerPixel = (vformat->BitsPerPixel + 7) / 8;
  26.130  
  26.131      vformat->Rmask =
  26.132 -        ((unsigned int) pDesktopMode->PixelFormat.ucRedMask) << pDesktopMode->
  26.133 -        PixelFormat.ucRedPosition;
  26.134 +        ((unsigned int) pDesktopMode->PixelFormat.
  26.135 +         ucRedMask) << pDesktopMode->PixelFormat.ucRedPosition;
  26.136      vformat->Rshift = pDesktopMode->PixelFormat.ucRedPosition;
  26.137      vformat->Rloss = pDesktopMode->PixelFormat.ucRedAdjust;
  26.138      vformat->Gmask =
  26.139 -        ((unsigned int) pDesktopMode->PixelFormat.
  26.140 -         ucGreenMask) << pDesktopMode->PixelFormat.ucGreenPosition;
  26.141 +        ((unsigned int) pDesktopMode->
  26.142 +         PixelFormat.ucGreenMask) << pDesktopMode->PixelFormat.
  26.143 +        ucGreenPosition;
  26.144      vformat->Gshift = pDesktopMode->PixelFormat.ucGreenPosition;
  26.145      vformat->Gloss = pDesktopMode->PixelFormat.ucGreenAdjust;
  26.146      vformat->Bmask =
  26.147 -        ((unsigned int) pDesktopMode->PixelFormat.
  26.148 -         ucBlueMask) << pDesktopMode->PixelFormat.ucBluePosition;
  26.149 +        ((unsigned int) pDesktopMode->
  26.150 +         PixelFormat.ucBlueMask) << pDesktopMode->PixelFormat.ucBluePosition;
  26.151      vformat->Bshift = pDesktopMode->PixelFormat.ucBluePosition;
  26.152      vformat->Bloss = pDesktopMode->PixelFormat.ucBlueAdjust;
  26.153      vformat->Amask =
  26.154 -        ((unsigned int) pDesktopMode->PixelFormat.
  26.155 -         ucAlphaMask) << pDesktopMode->PixelFormat.ucAlphaPosition;
  26.156 +        ((unsigned int) pDesktopMode->
  26.157 +         PixelFormat.ucAlphaMask) << pDesktopMode->PixelFormat.
  26.158 +        ucAlphaPosition;
  26.159      vformat->Ashift = pDesktopMode->PixelFormat.ucAlphaPosition;
  26.160      vformat->Aloss = pDesktopMode->PixelFormat.ucAlphaAdjust;
  26.161  
  26.162 @@ -2927,10 +2938,10 @@
  26.163                 sizeof(_this->hidden->SrcBufferDesc));
  26.164      // Allocate new video buffer!
  26.165      _this->hidden->pchSrcBuffer =
  26.166 -        (char *) SDL_malloc(_this->hidden->pAvailableFSLibVideoModes->
  26.167 -                            uiScanLineSize *
  26.168 -                            _this->hidden->pAvailableFSLibVideoModes->
  26.169 -                            uiYResolution);
  26.170 +        (char *) SDL_malloc(_this->hidden->
  26.171 +                            pAvailableFSLibVideoModes->uiScanLineSize *
  26.172 +                            _this->hidden->
  26.173 +                            pAvailableFSLibVideoModes->uiYResolution);
  26.174      if (!_this->hidden->pchSrcBuffer) {
  26.175  #ifdef DEBUG_BUILD
  26.176          printf
    27.1 --- a/src/video/photon/SDL_ph_gl.c	Sat Jan 10 18:32:24 2009 +0000
    27.2 +++ b/src/video/photon/SDL_ph_gl.c	Sat Jan 10 21:50:26 2009 +0000
    27.3 @@ -314,14 +314,17 @@
    27.4          && (this->gl_config.accum_blue_size != 0)
    27.5          && (this->gl_config.accum_green_size != 0)) {
    27.6          qnxgl_attribs_slide = qnxgl_attrib_set_accum(qnxgl_attribs_slide,
    27.7 -                                                     this->gl_config.
    27.8 -                                                     accum_red_size +
    27.9 -                                                     this->gl_config.
   27.10 -                                                     accum_blue_size +
   27.11 -                                                     this->gl_config.accum_green_size
   27.12 +                                                     this->
   27.13 +                                                     gl_config.accum_red_size
   27.14                                                       +
   27.15                                                       this->
   27.16 -                                                     gl_config.accum_alpha_size);
   27.17 +                                                     gl_config.accum_blue_size
   27.18 +                                                     +
   27.19 +                                                     this->
   27.20 +                                                     gl_config.
   27.21 +                                                     accum_green_size +
   27.22 +                                                     this->gl_config.
   27.23 +                                                     accum_alpha_size);
   27.24      }
   27.25  
   27.26      /* Stereo mode */
    28.1 --- a/src/video/photon/SDL_phyuv.c	Sat Jan 10 18:32:24 2009 +0000
    28.2 +++ b/src/video/photon/SDL_phyuv.c	Sat Jan 10 21:50:26 2009 +0000
    28.3 @@ -149,8 +149,8 @@
    28.4                                      &overlay->hwdata->caps);
    28.5          if (rtncode == 0) {
    28.6              if (overlay->hwdata->caps.format == format) {
    28.7 -                if ((overlay->hwdata->caps.
    28.8 -                     flags & Pg_SCALER_CAP_DST_CHROMA_KEY) ==
    28.9 +                if ((overlay->hwdata->
   28.10 +                     caps.flags & Pg_SCALER_CAP_DST_CHROMA_KEY) ==
   28.11                      Pg_SCALER_CAP_DST_CHROMA_KEY) {
   28.12                      overlay->hwdata->ischromakey = 1;
   28.13                  }
    29.1 --- a/src/video/win32/SDL_d3drender.c	Sat Jan 10 18:32:24 2009 +0000
    29.2 +++ b/src/video/win32/SDL_d3drender.c	Sat Jan 10 21:50:26 2009 +0000
    29.3 @@ -693,8 +693,8 @@
    29.4          result =
    29.5              IDirect3DDevice9_CreateTexture(renderdata->device, texture->w,
    29.6                                             texture->h, 1, 0,
    29.7 -                                           PixelFormatToD3DFMT
    29.8 -                                           (texture->format),
    29.9 +                                           PixelFormatToD3DFMT(texture->
   29.10 +                                                               format),
   29.11                                             D3DPOOL_SYSTEMMEM, &temp, NULL);
   29.12          if (FAILED(result)) {
   29.13              D3D_SetError("CreateTexture()", result);
    30.1 --- a/src/video/win32/SDL_win32video.c	Sat Jan 10 18:32:24 2009 +0000
    30.2 +++ b/src/video/win32/SDL_win32video.c	Sat Jan 10 21:50:26 2009 +0000
    30.3 @@ -114,8 +114,10 @@
    30.4              (UINT(*)(UINT, UINT, LPVOID)) GetProcAddress(data->wintabDLL,
    30.5                                                           PROCNAME(WTInfoA));
    30.6          data->WTOpenA =
    30.7 -            (HCTX(*)(HWND, LPLOGCONTEXTA, BOOL))
    30.8 -            GetProcAddress(data->wintabDLL, PROCNAME(WTOpenA));
    30.9 +            (HCTX(*)(HWND, LPLOGCONTEXTA, BOOL)) GetProcAddress(data->
   30.10 +                                                                wintabDLL,
   30.11 +                                                                PROCNAME
   30.12 +                                                                (WTOpenA));
   30.13          data->WTPacket =
   30.14              (int (*)(HCTX, UINT, LPVOID)) GetProcAddress(data->wintabDLL,
   30.15                                                           PROCNAME(WTPacket));
    31.1 --- a/src/video/x11/SDL_x11events.c	Sat Jan 10 18:32:24 2009 +0000
    31.2 +++ b/src/video/x11/SDL_x11events.c	Sat Jan 10 21:50:26 2009 +0000
    31.3 @@ -311,6 +311,7 @@
    31.4                      }
    31.5                      continue;
    31.6                  }
    31.7 +
    31.8  #if SDL_VIDEO_DRIVER_X11_XINPUT
    31.9                  data = (X11_MouseData *) mouse->driverdata;
   31.10                  if (xevent.type == data->motion) {
    32.1 --- a/src/video/x11/SDL_x11opengl.c	Sat Jan 10 18:32:24 2009 +0000
    32.2 +++ b/src/video/x11/SDL_x11opengl.c	Sat Jan 10 21:50:26 2009 +0000
    32.3 @@ -417,8 +417,8 @@
    32.4      SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
    32.5      Display *display = data->videodata->display;
    32.6      int screen =
    32.7 -        ((SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata)->
    32.8 -        screen;
    32.9 +        ((SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->
   32.10 +         driverdata)->screen;
   32.11      XWindowAttributes xattr;
   32.12      XVisualInfo v, *vinfo;
   32.13      int n;
    33.1 --- a/src/video/x11/SDL_x11video.c	Sat Jan 10 18:32:24 2009 +0000
    33.2 +++ b/src/video/x11/SDL_x11video.c	Sat Jan 10 21:50:26 2009 +0000
    33.3 @@ -271,7 +271,10 @@
    33.4  SDL_bool
    33.5  X11_UseDirectColorVisuals()
    33.6  {
    33.7 -    return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
    33.8 +    /* Once we implement DirectColor colormaps and gamma ramp support...
    33.9 +       return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
   33.10 +     */
   33.11 +    return SDL_FALSE;
   33.12  }
   33.13  
   33.14  /* vim: set ts=4 sw=4 expandtab: */