Skip to content

L
libSDL
Commit d123950a authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Reverted Bob's indent checkin 

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