--- a/hedgewars/SDLh.pas Sat Nov 12 15:48:55 2011 +0100
+++ b/hedgewars/SDLh.pas Sat Nov 12 17:06:49 2011 +0100
@@ -83,7 +83,7 @@
SDL_ImageLibName = 'SDL_image';
SDL_NetLibName = 'SDL_net';
{$ELSE}
- SDLLibName = 'SDL';
+ SDLLibName = 'libSDL.so';
SDL_TTFLibName = 'libSDL_ttf.so';
SDL_MixerLibName = 'libSDL_mixer.so';
SDL_ImageLibName = 'libSDL_image.so';
@@ -109,6 +109,7 @@
SDL_INIT_NOPARACHUTE = $00100000;
SDL_INIT_EVERYTHING = $0000FFFF;
+ SDL_ALLEVENTS = $FFFFFFFF;
SDL_APPINPUTFOCUS = $02;
SDL_BUTTON_WHEELUP = 4;
SDL_BUTTON_WHEELDOWN = 5;
@@ -141,9 +142,15 @@
SDL_FINGERDOWN = $700;
SDL_FINGERUP = $701;
SDL_FINGERMOTION = $702;
- //TODO: implement otheer event types
+ SDL_TOUCHBUTTONDOWN = $703;
+ SDL_TOUCHBUTTONUP = $704;
+ SDL_DOLLARGESTURE = $800;
+ SDL_DOLLARRECORD = $801;
+ SDL_MULTIGESTURE = $802;
+ SDL_CLIPBOARDUPDATE = $900;
SDL_USEREVENT = $8000;
SDL_LASTEVENT = $FFFF;
+ // no compatibility events $7000
// SDL_Surface flags
SDL_SWSURFACE = $00000000; //*< Not used */
@@ -233,8 +240,6 @@
SDL_HWPALETTE = $20000000;
SDL_DOUBLEBUF = $40000000;
SDL_FULLSCREEN = $80000000;
-
- SDL_ALLEVENTS = $FFFFFFFF;
{$ENDIF}
{$IFDEF ENDIAN_LITTLE}
@@ -291,6 +296,10 @@
/////////////////////// TYPE DEFINITIONS ///////////////////////
/////////////////////////////////////////////////////////////////
+// two important reference points for the wanderers of this area
+// http://www.freepascal.org/docs-html/ref/refsu5.html
+// http://www.freepascal.org/docs-html/prog/progsu144.html
+
type
{$IFDEF SDL13}
PSDL_Window = Pointer;
@@ -316,15 +325,15 @@
PSDL_PixelFormat = ^TSDL_PixelFormat;
TSDL_PixelFormat = record
{$IFDEF SDL13}
- format: Longword;
- palette: Pointer; // actually it is a PSDL_Palette
+ format: LongWord;
+ palette: Pointer;
BitsPerPixel : Byte;
BytesPerPixel: Byte;
padding: array[0..1] of Byte;
- RMask : Longword;
- GMask : Longword;
- BMask : Longword;
- AMask : Longword;
+ RMask : LongWord;
+ GMask : LongWord;
+ BMask : LongWord;
+ AMask : LongWord;
Rloss : Byte;
Gloss : Byte;
Bloss : Byte;
@@ -347,11 +356,11 @@
Gshift: Byte;
Bshift: Byte;
Ashift: Byte;
- RMask : Longword;
- GMask : Longword;
- BMask : Longword;
- AMask : Longword;
- colorkey: Longword;
+ RMask : LongWord;
+ GMask : LongWord;
+ BMask : LongWord;
+ AMask : LongWord;
+ colorkey: LongWord;
alpha: Byte;
{$ENDIF}
end;
@@ -360,10 +369,10 @@
PSDL_Surface = ^TSDL_Surface;
TSDL_Surface = record
- flags : Longword;
+ flags : LongWord;
format: PSDL_PixelFormat;
w, h : LongInt;
- pitch : Word;
+ pitch : {$IFDEF SDL13}LongInt{$ELSE}Word{$ENDIF};
pixels: Pointer;
offset: LongInt;
{$IFDEF SDL13}
@@ -379,12 +388,12 @@
PSDL_Color = ^TSDL_Color;
TSDL_Color = record
- case byte of
+ case Byte of
0: ( r: Byte;
g: Byte;
b: Byte;
unused: Byte; );
- 1: ( value: Longword; );
+ 1: ( value: LongWord; );
end;
@@ -395,8 +404,8 @@
TClose = function( context: PSDL_RWops ): LongInt; cdecl;
TStdio = record
- autoclose: {$IFDEF SDL13}boolean{$ELSE}LongInt{$ENDIF};
- fp: pointer;
+ autoclose: {$IFDEF SDL13}Boolean{$ELSE}LongInt{$ENDIF};
+ fp: Pointer;
end;
TMem = record
@@ -414,7 +423,7 @@
read: TRead;
write: TWrite;
close: TClose;
- type_: Longword;
+ type_: LongWord;
case Byte of
0: (stdio: TStdio);
1: (mem: TMem);
@@ -428,31 +437,84 @@
TSDL_KeySym = record
scancode: LongInt;
sym: LongInt;
- modifier: Smallint;
- unicode: LongInt;
+ modifier: Word;
+ unicode: LongWord;
end;
TSDL_WindowEvent = record
- type_: LongInt;
- windowID: LongInt;
- event: byte;
- padding1, padding2, padding3: byte;
+ type_: LongWord;
+ windowID: LongWord;
+ event: Byte;
+ padding1, padding2, padding3: Byte;
data1, data2: LongInt;
end;
+
+ // available in sdl12 but not exposed
+ TSDL_TextEditingEvent = record
+ type_: LongWord;
+ windowID: LongWord;
+ text: array[0..31] of Byte;
+ start, lenght: LongInt;
+ end;
+
+ // available in sdl12 but not exposed
+ TSDL_TextInputEvent = record
+ type_: LongWord;
+ windowID: LongWord;
+ text: array[0..31] of Byte;
+ end;
+
+ TSDL_TouchFingerEvent = record
+ type_: LongWord;
+ windowId: LongWord;
+ touchId: Int64;
+ fingerId: Int64;
+ state, padding1, padding2, padding3: Byte;
+ x, y: Word;
+ dx, dy: SmallInt;
+ pressure: Word;
+ end;
+
+ TSDL_TouchButtonEvent = record
+ type_: LongWord;
+ windowId: LongWord;
+ touchId: Int64;
+ state, button, padding1, padding2: Byte;
+ end;
+
+ TSDL_MultiGestureEvent = record
+ type_: LongWord;
+ windowId: LongWord;
+ touchId: Int64;
+ dTheta, dDist, x, y: Single;
+ numFingers, padding: Word;
+ end;
+
+ TSDL_DollarGestureEvent = record
+ type_: LongWord;
+ windowId: LongWord;
+ touchId: Int64;
+ gesturedId: Int64;
+ numFingers: LongWord;
+ error: Single;
+ end;
+
+ TSDL_SysWMEvent = record
+ type_: LongWord;
+ msg: Pointer;
+ end;
{$ELSE}
TSDL_KeySym = record
scancode: Byte;
- sym: Longword;
- modifier: Longword;
+ sym: LongWord;
+ modifier: LongWord;
unicode: Word;
end;
- // these two are present in sdl1.3 but only for backward compatibility
- // and in 1.3 type_ is LongInt, not byte
TSDL_ActiveEvent = record
- type_: byte;
- gain: byte;
- state: byte;
+ type_: Byte;
+ gain: Byte;
+ state: Byte;
end;
TSDL_ResizeEvent = record
@@ -463,88 +525,74 @@
TSDL_KeyboardEvent = record
{$IFDEF SDL13}
- type_: LongInt;
- windowID: LongInt;
- state, repeat_, padding2, padding3: byte;
+ type_: LongWord;
+ windowID: LongWord;
+ state, repeat_, padding2, padding3: Byte;
{$ELSE}
- type_: byte;
- which: byte;
- state: byte;
+ type_, which, state: Byte;
{$ENDIF}
keysym: TSDL_KeySym;
end;
-//TODO: implement SDL_TextEditingEvent + SDL_TextInputEvent for sdl13
-
- // this structure is wrong but the correct version makes the game hang
TSDL_MouseMotionEvent = record
- which: byte;
- state: byte;
{$IFDEF SDL13}
- type_: LongInt;
- windowID: LongInt;
- padding1, padding2: byte;
+ type_: LongWord;
+ windowID: LongWord;
+ state, padding1, padding2, padding3: Byte;
x, y, z, xrel, yrel : LongInt;
- pressure, pressure_max, pressure_min,
- rotation, tilt, cursor: LongInt;
{$ELSE}
- type_: byte;
- x, y, xrel, yrel : word;
+ type_, which, state: Byte;
+ x, y, xrel, yrel : Word;
{$ENDIF}
end;
TSDL_MouseButtonEvent = record
{$IFDEF SDL13}
- type_: LongInt;
- windowID: LongInt;
+ type_: LongWord;
+ windowID: LongWord;
+ buttonm, state, padding1, padding2: Byte;
x, y: LongInt;
- padding1: byte;
{$ELSE}
- type_,
- which,
- button,
- state: byte;
- x, y: word;
+ type_, which, button, state: Byte;
+ x, y: Word;
{$ENDIF}
end;
+ TSDL_MouseWheelEvent = record
+ type_: LongWord;
{$IFDEF SDL13}
- TSDL_MouseWheelEvent = record
- type_: LongInt;
- windowID: LongInt;
+ windowID: LongWord;
+{$ELSE}
which: Byte;
x, y: LongInt;
end;
-//TODO: implement SDL_ProximityEvent
-{$ENDIF}
-
TSDL_JoyAxisEvent = record
- type_: {$IFDEF SDL13}LongInt{$ELSE}Byte{$ENDIF};
+ type_: {$IFDEF SDL13}LongWord{$ELSE}Byte{$ENDIF};
which: Byte;
axis: Byte;
{$IFDEF SDL13}
padding1, padding2: Byte;
value: LongInt;
{$ELSE}
- value: Smallint;
+ value: SmallInt;
{$ENDIF}
end;
TSDL_JoyBallEvent = record
- type_: {$IFDEF SDL13}LongInt{$ELSE}Byte{$ENDIF};
+ type_: {$IFDEF SDL13}LongWord{$ELSE}Byte{$ENDIF};
which: Byte;
ball: Byte;
{$IFDEF SDL13}
padding1, padding2: Byte;
xrel, yrel: LongInt;
{$ELSE}
- xrel, yrel: Smallint;
+ xrel, yrel: SmallInt;
{$ENDIF}
end;
TSDL_JoyHatEvent = record
- type_: {$IFDEF SDL13}LongInt{$ELSE}Byte{$ENDIF};
+ type_: {$IFDEF SDL13}LongWord{$ELSE}Byte{$ENDIF};
which: Byte;
hat: Byte;
value: Byte;
@@ -554,7 +602,7 @@
end;
TSDL_JoyButtonEvent = record
- type_: {$IFDEF SDL13}LongInt{$ELSE}Byte{$ENDIF};
+ type_: {$IFDEF SDL13}LongWord{$ELSE}Byte{$ENDIF};
which: Byte;
button: Byte;
state: Byte;
@@ -579,13 +627,13 @@
//TODO: implement SDL_TouchButtonEvent, SDL_MultiGestureEvent, SDL_DollarGestureEvent
TSDL_QuitEvent = record
- type_: {$IFDEF SDL13}LongInt{$ELSE}Byte{$ENDIF};
+ type_: {$IFDEF SDL13}LongWord{$ELSE}Byte{$ENDIF};
end;
TSDL_UserEvent = record
{$IFDEF SDL13}
- type_: LongInt;
- windowID: LongInt;
+ type_: LongWord;
+ windowID: LongWord;
{$ELSE}
type_: Byte;
{$ENDIF}
@@ -601,8 +649,8 @@
SDL_WINDOWEVENT: (window: TSDL_WindowEvent);
SDL_KEYDOWN,
SDL_KEYUP: (key: TSDL_KeyboardEvent);
- SDL_TEXTEDITING,
- SDL_TEXTINPUT: (edit: byte);
+ SDL_TEXTEDITING: (edit: TSDL_TextEditingEvent);
+ SDL_TEXTINPUT: (tedit: TSDL_TextInputEvent);
SDL_MOUSEMOTION: (motion: TSDL_MouseMotionEvent);
SDL_MOUSEBUTTONDOWN,
SDL_MOUSEBUTTONUP: (button: TSDL_MouseButtonEvent);
@@ -617,10 +665,18 @@
SDL_FINGERDOWN:(tfinger: TSDL_TouchFingerEvent);
SDL_QUITEV: (quit: TSDL_QuitEvent);
SDL_USEREVENT: (user: TSDL_UserEvent);
- //TODO: implement other events
+ SDL_SYSWMEVENT: (syswm: TSDL_SysWMEvent);
+ SDL_FINGERDOWN,
+ SDL_FINGERUP,
+ SDL_FINGERMOTION: (tfinger: TSDL_TouchFingerEvent);
+ SDL_TOUCHBUTTONUP,
+ SDL_TOUCHBUTTONDOWN: (tbutton: TSDL_TouchButtonEvent);
+ SDL_MULTIGESTURE: (mgesture: TSDL_MultiGestureEvent);
+ SDL_DOLLARGESTURE: (dgesture: TSDL_DollarGestureEvent);
+ SDL_ALLEVENTS: (foo: shortstring);
{$ELSE}
case Byte of
- SDL_NOEVENT: (type_: byte);
+ SDL_NOEVENT: (type_: Byte);
SDL_ACTIVEEVENT: (active: TSDL_ActiveEvent);
SDL_KEYDOWN,
SDL_KEYUP: (key: TSDL_KeyboardEvent);
@@ -635,13 +691,12 @@
SDL_QUITEV: (quit: TSDL_QuitEvent);
//SDL_SYSWMEVENT,SDL_EVENT_RESERVEDA,SDL_EVENT_RESERVEDB
SDL_VIDEORESIZE: (resize: TSDL_ResizeEvent);
+ SDL_ALLEVENTS: (foo: shortstring);
{$ENDIF}
end;
-
TSDL_EventFilter = function( event : PSDL_Event ): Integer; cdecl;
-
PByteArray = ^TByteArray;
TByteArray = array[0..65535] of Byte;
PLongWordArray = ^TLongWordArray;
@@ -677,7 +732,7 @@
);
{$IFDEF SDL13}
- TSDL_ArrayByteOrder = ( // array component order, low byte -> high byte
+ TSDL_ArrayByteOrder = ( // array component order, low Byte -> high Byte
SDL_ARRAYORDER_NONE,
SDL_ARRAYORDER_RGB,
SDL_ARRAYORDER_RGBA,
@@ -701,9 +756,9 @@
{* SDL_mixer *}
PMixChunk = ^TMixChunk;
TMixChunk = record
- allocated: Longword;
+ allocated: LongWord;
abuf : PByte;
- alen : Longword;
+ alen : LongWord;
volume : PByte;
end;
TMusic = (MUS_CMD, MUS_WAV, MUS_MOD, MUS_MID, MUS_OGG, MUS_MP3);
@@ -711,13 +766,13 @@
TMidiSong = record
samples : LongInt;
- events : pointer;
+ events : Pointer;
end;
TMusicUnion = record
case Byte of
0: ( midi : TMidiSong );
- 1: ( ogg : pointer);
+ 1: ( ogg : Pointer);
end;
PMixMusic = ^TMixMusic;
@@ -726,7 +781,7 @@
{* SDL_net *}
TIPAddress = record
- host: Longword;
+ host: LongWord;
port: Word;
end;
@@ -752,16 +807,12 @@
{* SDL *}
-function SDL_Init(flags: Longword): LongInt; cdecl; external SDLLibName;
+function SDL_Init(flags: LongWord): LongInt; cdecl; external SDLLibName;
function SDL_InitSubSystem(flags: LongWord): LongInt; cdecl; external SDLLibName;
procedure SDL_Quit; cdecl; external SDLLibName;
-function SDL_VideoDriverName(var namebuf; maxlen: LongInt): PChar; cdecl; external SDLLibName;
-function SDL_EnableUNICODE(enable: LongInt): LongInt; cdecl; external SDLLibName;
-function SDL_EnableKeyRepeat(delay_, interval: LongInt): LongInt; cdecl; external SDLLibName;
-
-procedure SDL_Delay(msec: Longword); cdecl; external SDLLibName;
-function SDL_GetTicks: Longword; cdecl; external SDLLibName;
+procedure SDL_Delay(msec: LongWord); cdecl; external SDLLibName;
+function SDL_GetTicks: LongWord; cdecl; external SDLLibName;
function SDL_MustLock(Surface: PSDL_Surface): Boolean;
function SDL_LockSurface(Surface: PSDL_Surface): LongInt; cdecl; external SDLLibName;
@@ -769,23 +820,23 @@
function SDL_GetError: PChar; cdecl; external SDLLibName;
-function SDL_SetVideoMode(width, height, bpp: LongInt; flags: Longword): PSDL_Surface; cdecl; external SDLLibName;
-function SDL_CreateRGBSurface(flags: Longword; Width, Height, Depth: LongInt; RMask, GMask, BMask, AMask: Longword): PSDL_Surface; cdecl; external SDLLibName;
-function SDL_CreateRGBSurfaceFrom(pixels: Pointer; width, height, depth, pitch: LongInt; RMask, GMask, BMask, AMask: Longword): PSDL_Surface; cdecl; external SDLLibName;
+function SDL_SetVideoMode(width, height, bpp: LongInt; flags: LongWord): PSDL_Surface; cdecl; external SDLLibName;
+function SDL_CreateRGBSurface(flags: LongWord; Width, Height, Depth: LongInt; RMask, GMask, BMask, AMask: LongWord): PSDL_Surface; cdecl; external SDLLibName;
+function SDL_CreateRGBSurfaceFrom(pixels: Pointer; width, height, depth, pitch: LongInt; RMask, GMask, BMask, AMask: LongWord): PSDL_Surface; cdecl; external SDLLibName;
procedure SDL_FreeSurface(Surface: PSDL_Surface); cdecl; external SDLLibName;
-function SDL_SetColorKey(surface: PSDL_Surface; flag, key: Longword): LongInt; cdecl; external SDLLibName;
-function SDL_SetAlpha(surface: PSDL_Surface; flag, key: Longword): LongInt; cdecl; external SDLLibName;
+function SDL_SetColorKey(surface: PSDL_Surface; flag, key: LongWord): LongInt; cdecl; external SDLLibName;
+function SDL_SetAlpha(surface: PSDL_Surface; flag, key: LongWord): LongInt; cdecl; external SDLLibName;
function SDL_ConvertSurface(src: PSDL_Surface; fmt: PSDL_PixelFormat; flags: LongInt): PSDL_Surface; cdecl; external SDLLibName;
function SDL_UpperBlit(src: PSDL_Surface; srcrect: PSDL_Rect; dst: PSDL_Surface; dstrect: PSDL_Rect): LongInt; cdecl; external SDLLibName;
-function SDL_FillRect(dst: PSDL_Surface; dstrect: PSDL_Rect; color: Longword): LongInt; cdecl; external SDLLibName;
-procedure SDL_UpdateRect(Screen: PSDL_Surface; x, y: LongInt; w, h: Longword); cdecl; external SDLLibName;
+function SDL_FillRect(dst: PSDL_Surface; dstrect: PSDL_Rect; color: LongWord): LongInt; cdecl; external SDLLibName;
+procedure SDL_UpdateRect(Screen: PSDL_Surface; x, y: LongInt; w, h: LongWord); cdecl; external SDLLibName;
function SDL_Flip(Screen: PSDL_Surface): LongInt; cdecl; external SDLLibName;
-procedure SDL_GetRGB(pixel: Longword; fmt: PSDL_PixelFormat; r, g, b: PByte); cdecl; external SDLLibName;
-procedure SDL_GetRGBA(pixel: Longword; fmt: PSDL_PixelFormat; r, g, b, a: PByte); cdecl; external SDLLibName;
-function SDL_MapRGB(format: PSDL_PixelFormat; r, g, b: Byte): Longword; cdecl; external SDLLibName;
-function SDL_MapRGBA(format: PSDL_PixelFormat; r, g, b, a: Byte): Longword; cdecl; external SDLLibName;
+procedure SDL_GetRGB(pixel: LongWord; fmt: PSDL_PixelFormat; r, g, b: PByte); cdecl; external SDLLibName;
+procedure SDL_GetRGBA(pixel: LongWord; fmt: PSDL_PixelFormat; r, g, b, a: PByte); cdecl; external SDLLibName;
+function SDL_MapRGB(format: PSDL_PixelFormat; r, g, b: Byte): LongWord; cdecl; external SDLLibName;
+function SDL_MapRGBA(format: PSDL_PixelFormat; r, g, b, a: Byte): LongWord; cdecl; external SDLLibName;
function SDL_DisplayFormat(Surface: PSDL_Surface): PSDL_Surface; cdecl; external SDLLibName;
function SDL_DisplayFormatAlpha(Surface: PSDL_Surface): PSDL_Surface; cdecl; external SDLLibName;
@@ -794,11 +845,12 @@
function SDL_SaveBMP_RW(surface: PSDL_Surface; dst: PSDL_RWops; freedst: LongInt): LongInt; cdecl; external SDLLibName;
{$IFDEF SDL13}
-function SDL_CreateWindow(title: PChar; x,y,w,h, flags: LongInt): PSDL_Window; cdecl; external SDLLibName;
-function SDL_CreateRenderer(window: PSDL_Window; index, flags: LongInt): PSDL_Renderer; cdecl; external SDLLibName;
+function SDL_CreateWindow(title: PChar; x,y,w,h: LongInt; flags: LongWord): PSDL_Window; cdecl; external SDLLibName;
+function SDL_CreateRenderer(window: PSDL_Window; index: LongInt; flags: LongWord): PSDL_Renderer; cdecl; external SDLLibName;
function SDL_DestroyWindow(window: PSDL_Window): LongInt; cdecl; external SDLLibName;
function SDL_DestroyRenderer(renderer: PSDL_Renderer): LongInt; cdecl; external SDLLibName;
procedure SDL_SetWindowSize(window: PSDL_Window; w, h: LongInt); cdecl; external SDLLibName;
+function SDL_GetCurrentVideoDriver:Pchar; cdecl; external SDLLibName;
function SDL_GL_CreateContext(window: PSDL_Window): PSDL_GLContext; cdecl; external SDLLibName;
procedure SDL_GL_DeleteContext(context: PSDL_GLContext); cdecl; external SDLLibName;
@@ -809,44 +861,40 @@
function SDL_GetNumVideoDisplays: LongInt; cdecl; external SDLLibName;
procedure SDL_ShowWindow(window: PSDL_Window); cdecl; external SDLLibName;
-function SDL_SetRenderDrawColor(renderer: PSDL_Renderer; r,g,b,a: byte): LongInt; cdecl; external SDLLibName;
+function SDL_SetRenderDrawColor(renderer: PSDL_Renderer; r,g,b,a: Byte): LongInt; cdecl; external SDLLibName;
function SDL_GetRenderer(window: PSDL_Window): PSDL_Renderer; cdecl; external SDLLibName;
function SDL_RenderFillRect(renderer: PSDL_Renderer; rect: PSDL_Rect): LongInt; cdecl; external SDLLibName;
function SDL_RenderClear(renderer: PSDL_Renderer): LongInt; cdecl; external SDLLibName;
procedure SDL_RenderPresent(renderer: PSDL_Renderer); cdecl; external SDLLibName;
-function SDL_RenderReadPixels(renderer: PSDL_Renderer; rect: PSDL_Rect; format: LongInt; pixels: pointer; pitch: LongInt): LongInt; cdecl; external SDLLibName;
+function SDL_RenderReadPixels(renderer: PSDL_Renderer; rect: PSDL_Rect; format: LongInt; pixels: Pointer; pitch: LongInt): LongInt; cdecl; external SDLLibName;
function SDL_RenderSetViewport(window: PSDL_Window; rect: PSDL_Rect): LongInt; cdecl; external SDLLibName;
-function SDL_SelectMouse(index: LongInt): LongInt; cdecl; external SDLLibName;
function SDL_GetRelativeMouseState(x, y: PLongInt): Byte; cdecl; external SDLLibName;
-function SDL_GetNumMice: LongInt; cdecl; external SDLLibName;
-function SDL_PixelFormatEnumToMasks(format: TSDL_ArrayByteOrder; bpp: PLongInt; Rmask, Gmask, Bmask, Amask: PLongInt): boolean; cdecl; external SDLLibName;
-
+function SDL_PixelFormatEnumToMasks(format: TSDL_ArrayByteOrder; bpp: PLongInt; Rmask, Gmask, Bmask, Amask: PLongInt): Boolean; cdecl; external SDLLibName;
procedure SDL_WarpMouseInWindow(window: PSDL_Window; x, y: LongInt); cdecl; external SDLLibName;
-function SDL_SetHint(name, value: PChar): boolean; cdecl; external SDLLibName;
+function SDL_SetHint(name, value: PChar): Boolean; cdecl; external SDLLibName;
+procedure SDL_StartTextInput; cdecl; external SDLLibName;
-function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; minType, maxType: LongInt): LongInt; cdecl; external SDLLibName;
+function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; minType, maxType: LongWord): LongInt; cdecl; external SDLLibName;
{$ELSE}
-function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; mask: Longword): LongInt; cdecl; external SDLLibName;
+function SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: SDL_eventaction; mask: LongWord): LongInt; cdecl; external SDLLibName;
{$ENDIF}
function SDL_GetMouseState(x, y: PLongInt): Byte; cdecl; external SDLLibName;
-function SDL_GetKeyName(key: Longword): PChar; cdecl; external SDLLibName;
+function SDL_GetKeyName(key: LongWord): PChar; cdecl; external SDLLibName;
procedure SDL_PumpEvents; cdecl; external SDLLibName;
function SDL_PollEvent(event: PSDL_Event): LongInt; cdecl; external SDLLibName;
function SDL_WaitEvent(event: PSDL_Event): LongInt; cdecl; external SDLLibName;
-procedure SDL_SetEventFilter( filter : TSDL_EventFilter ); cdecl; external SDLLibName;
+procedure SDL_SetEventFilter(filter: TSDL_EventFilter); cdecl; external SDLLibName;
function SDL_ShowCursor(toggle: LongInt): LongInt; cdecl; external SDLLibName;
-procedure SDL_WM_SetIcon(icon: PSDL_Surface; mask : byte); cdecl; external SDLLibName;
+procedure SDL_WM_SetIcon(icon: PSDL_Surface; mask : Byte); cdecl; external SDLLibName;
procedure SDL_WM_SetCaption(title: PChar; icon: PChar); cdecl; external SDLLibName;
function SDL_WM_ToggleFullScreen(surface: PSDL_Surface): LongInt; cdecl; external SDLLibName;
-function SDL_CreateThread(fn: pointer; data: pointer): PSDL_Thread; cdecl; external SDLLibName;
-procedure SDL_WaitThread(thread: PSDL_Thread; status: PLongInt); cdecl; external SDLLibName;
function SDL_CreateMutex: PSDL_mutex; cdecl; external SDLLibName;
procedure SDL_DestroyMutex(mutex: PSDL_mutex); cdecl; external SDLLibName;
function SDL_LockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName name 'SDL_mutexP';
@@ -880,14 +928,17 @@
{* Compatibility between SDL-1.2 and SDL-1.3 *}
procedure SDL_WarpMouse(x, y: Word); {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
function SDL_GetKeyState(numkeys: PLongInt): PByteArray; cdecl; external SDLLibName {$IFDEF SDL13} name 'SDL_GetKeyboardState'{$ENDIF};
-function SDL_AllocFormat(format: Longword): PSDL_PixelFormat; {$IFDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
+function SDL_AllocFormat(format: LongWord): PSDL_PixelFormat; {$IFDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat); {$IFDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
+function SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
+function SDL_EnableUNICODE(enable: LongInt): LongInt; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
+function SDL_EnableKeyRepeat(delay_, interval: LongInt): LongInt; {$IFNDEF SDL13}cdecl; external SDLLibName;{$ENDIF}
(* SDL_ttf *)
function TTF_Init: LongInt; cdecl; external SDL_TTFLibName;
procedure TTF_Quit; cdecl; external SDL_TTFLibName;
-function TTF_SizeUTF8(font: PTTF_Font; const text: PChar; out w, h: LongInt): LongInt; cdecl; external SDL_TTFLibName;
+function TTF_SizeUTF8(font: PTTF_Font; const text: PChar; w, h: PLongInt): LongInt; cdecl; external SDL_TTFLibName;
function TTF_RenderUTF8_Solid(font: PTTF_Font; const text: PChar; fg: TSDL_Color): PSDL_Surface; cdecl; external SDL_TTFLibName;
function TTF_RenderUTF8_Blended(font: PTTF_Font; const text: PChar; fg: TSDL_Color): PSDL_Surface; cdecl; external SDL_TTFLibName;
@@ -953,13 +1004,13 @@
function SDLNet_CheckSockets(_set: PSDLNet_SocketSet; timeout: LongInt): LongInt; cdecl; external SDL_NetLibName;
-procedure SDLNet_Write16(value: Word; buf: pointer);
-procedure SDLNet_Write32(value: LongWord; buf: pointer);
-function SDLNet_Read16(buf: pointer): Word;
-function SDLNet_Read32(buf: pointer): LongWord;
+procedure SDLNet_Write16(value: Word; buf: Pointer);
+procedure SDLNet_Write32(value: LongWord; buf: Pointer);
+function SDLNet_Read16(buf: Pointer): Word;
+function SDLNet_Read32(buf: Pointer): LongWord;
implementation
-uses uVariables;
+uses strings, uVariables;
{$IFDEF SDL13}
// this needs to be reimplemented because in SDL_compat.c the window is the one created in the SDL_SetVideoMode
@@ -968,8 +1019,31 @@
begin
SDL_WarpMouseInWindow(SDLwindow, x, y);
end;
+
+function SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar;
+var name : PChar = nil;
+begin
+ name:= SDL_GetCurrentVideoDriver();
+ if (name <> nil) and (namebuf <> nil) then
+ begin
+ strlcopy(namebuf, name, maxlen);
+ exit(namebuf)
+ end;
+ exit(name);
+end;
+
+function SDL_EnableUNICODE(enable: LongInt): LongInt;
+begin
+ SDL_StartTextInput();
+ exit(0);
+end;
+
+function SDL_EnableKeyRepeat(delay_, interval: LongInt): LongInt;
+begin
+ exit(0);
+end;
{$ELSE}
-function SDL_AllocFormat(format: Longword): PSDL_PixelFormat;
+function SDL_AllocFormat(format: LongWord): PSDL_PixelFormat;
const conversionFormat: TSDL_PixelFormat = (
palette: nil; BitsPerPixel: 32; BytesPerPixel: 4;
Rloss: 0; Gloss: 0; Bloss: 0; Aloss: 0;
@@ -1019,13 +1093,13 @@
end;
{$ENDIF}
-procedure SDLNet_Write16(value: Word; buf: pointer);
+procedure SDLNet_Write16(value: Word; buf: Pointer);
begin
PByteArray(buf)^[1]:= value;
PByteArray(buf)^[0]:= value shr 8
end;
-procedure SDLNet_Write32(value: LongWord; buf: pointer);
+procedure SDLNet_Write32(value: LongWord; buf: Pointer);
begin
PByteArray(buf)^[3]:= value;
PByteArray(buf)^[2]:= value shr 8;
@@ -1033,13 +1107,13 @@
PByteArray(buf)^[0]:= value shr 24
end;
-function SDLNet_Read16(buf: pointer): Word;
+function SDLNet_Read16(buf: Pointer): Word;
begin
SDLNet_Read16:= PByteArray(buf)^[1] or
(PByteArray(buf)^[0] shl 8)
end;
-function SDLNet_Read32(buf: pointer): LongWord;
+function SDLNet_Read32(buf: Pointer): LongWord;
begin
SDLNet_Read32:= PByteArray(buf)^[3] or
(PByteArray(buf)^[2] shl 8) or