hedgewars: comparison hedgewars/SDLh.pas

equal deleted inserted replaced

-:15487f7fed42
+:a04c30940d2d
 // SDL_Init() flags
 SDL_INIT_TIMER          = $00000001;
 SDL_INIT_AUDIO          = $00000010;
 SDL_INIT_VIDEO          = $00000020;
 SDL_INIT_JOYSTICK       = $00000200;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 SDL_INIT_HAPTIC         = $00001000;
 SDL_INIT_GAMECONTROLLER = $00002000; // implicitly activates JOYSTICK */
 {$ELSE}
 SDL_INIT_CDROM          = $00000100;
 SDL_INIT_EVENTTHREAD    = $01000000;
 SDL_BUTTON_RIGHT     = 3;
 SDL_BUTTON_WHEELUP   = 4;
 SDL_BUTTON_WHEELDOWN = 5;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 // SDL_Event types
 // pascal does not support unions as is, so we list here every possible event
 // and later associate a struct type each
 SDL_FIRSTEVENT        = 0;              // type
 SDL_COMMONDEVENT      = 1;              // type and timestamp
 // 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}
+{$IFDEF SDL2}
 PSDL_Window   = Pointer;
 PSDL_Renderer = Pointer;
 PSDL_Texture  = Pointer;
 PSDL_GLContext= Pointer;
+TSDL_TouchId  = Int64;
+{$ENDIF}
 TSDL_FingerId = Int64;
-TSDL_TouchId  = Int64;
-{$ENDIF}
 TSDL_eventaction = (SDL_ADDEVENT, SDL_PEEPEVENT, SDL_GETEVENT);
 PSDL_Rect = ^TSDL_Rect;
 TSDL_Rect = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 x, y, w, h: LongInt;
 {$ELSE}
 x, y: SmallInt;
 w, h: Word;
 {$ENDIF}
 x, y: LongInt;
 end;
 PSDL_PixelFormat = ^TSDL_PixelFormat;
 TSDL_PixelFormat = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 format: LongWord;
 palette: Pointer;
 BitsPerPixel : Byte;
 BytesPerPixel: Byte;
 padding: array[0..1] of Byte;
 PSDL_Surface = ^TSDL_Surface;
 TSDL_Surface = record
 flags : LongWord;
 format: PSDL_PixelFormat;
 w, h  : LongInt;
-pitch : {$IFDEF SDL13}LongInt{$ELSE}Word{$ENDIF};
+pitch : {$IFDEF SDL2}LongInt{$ELSE}Word{$ENDIF};
 pixels: Pointer;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 userdata: Pointer;
 locked: LongInt;
 lock_data: Pointer;
 clip_rect: TSDL_Rect;
 map: Pointer;
 TRead  = function( context: PSDL_RWops; Ptr: Pointer; size: LongInt; maxnum : LongInt ): LongInt;  cdecl;
 TWrite = function( context: PSDL_RWops; Ptr: Pointer; size: LongInt; num: LongInt ): LongInt; cdecl;
 TClose = function( context: PSDL_RWops ): LongInt; cdecl;
 TStdio = record
-autoclose: {$IFDEF SDL13}Boolean{$ELSE}LongInt{$ENDIF};
+autoclose: {$IFDEF SDL2}Boolean{$ELSE}LongInt{$ENDIF};
 fp: Pointer;
 end;
 TMem = record
 base: PByte;
 stop: PByte;
 end;
 TUnknown = record
 data1: Pointer;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 data2: Pointer;
 {$ENDIF}
 end;
 {$IFDEF ANDROID}
 TWinbuffer = record
 data = pointer;
 size, left : LongInt;
 end;
 TWindowsio = record
-append = {$IFDEF SDL13}Boolean{$ELSE}LongInt{$ENDIF};
+append = {$IFDEF SDL2}Boolean{$ELSE}LongInt{$ENDIF};
 h = pointer;
 buffer = TWinbuffer;
 end;
 {$ENDIF}
 {$ENDIF}
 end;
 {* SDL_Event type definition *}
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 TSDL_Keysym = record
 scancode: LongInt;
 sym: LongInt;
 modifier: Word;
 unused: LongWord;
 w, h: LongInt;
 end;
 {$ENDIF}
 TSDL_KeyboardEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 windowID: LongWord;
 state, repeat_, padding2, padding3: Byte;
 {$ELSE}
 {$ENDIF}
 keysym: TSDL_Keysym;
 end;
 TSDL_MouseMotionEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 windowID: LongWord;
 which, state: LongWord;
 x, y, xrel, yrel: LongInt;
 x, y, xrel, yrel: Word;
 {$ENDIF}
 end;
 TSDL_MouseButtonEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 windowID: LongWord;
 which: LongWord;
 button, state, padding1, padding2: Byte;
 {$ENDIF}
 end;
 TSDL_MouseWheelEvent = record
 type_: LongWord;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 timestamp: LongWord;
 windowID: LongWord;
 which: LongWord;
 {$ELSE}
 which: Byte;
 {$ENDIF}
 x, y: LongInt;
 end;
 TSDL_JoyAxisEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 which: LongWord;
 {$ELSE}
 type_: Byte;
 which: Byte;
 {$ENDIF}
 axis: Byte;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 padding1, padding2, padding3: Byte;
 value: LongInt;
 padding4: Word;
 {$ELSE}
 value: SmallInt;
 {$ENDIF}
 end;
 TSDL_JoyBallEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 which: LongWord;
 {$ELSE}
 type_: Byte;
 which: Byte;
 {$ENDIF}
 ball: Byte;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 padding1, padding2, padding3: Byte;
 {$ENDIF}
 xrel, yrel: SmallInt;
 end;
 TSDL_JoyHatEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 which: LongWord;
 {$ELSE}
 type_: Byte;
 which: Byte;
 {$ENDIF}
 hat: Byte;
 value: Byte;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 padding1, padding2: Byte;
 {$ENDIF}
 end;
 TSDL_JoyButtonEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 {$ELSE}
 type_: Byte;
 {$ENDIF}
 which: Byte;
 button: Byte;
 state: Byte;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 padding1: Byte;
 {$ENDIF}
 end;
 TSDL_QuitEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 {$ELSE}
 type_: Byte;
 {$ENDIF}
 end;
 TSDL_UserEvent = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 type_: LongWord;
 timestamp: LongWord;
 windowID: LongWord;
 {$ELSE}
 type_: Byte;
 data1, data2: Pointer;
 end;
 PSDL_Event = ^TSDL_Event;
 TSDL_Event = record
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 case LongInt of
 SDL_FIRSTEVENT: (type_: LongWord);
 SDL_COMMONDEVENT: (common: TSDL_CommonEvent);
 SDL_WINDOWEVENT: (window: TSDL_WindowEvent);
 SDL_KEYDOWN,
 SDL_GL_ACCUM_ALPHA_SIZE,
 SDL_GL_STEREO,
 SDL_GL_MULTISAMPLEBUFFERS,
 SDL_GL_MULTISAMPLESAMPLES,
 SDL_GL_ACCELERATED_VISUAL,
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 SDL_GL_RETAINED_BACKING,
 SDL_GL_CONTEXT_MAJOR_VERSION,
 SDL_GL_CONTEXT_MINOR_VERSION,
 SDL_GL_CONTEXT_EGL,
 SDL_GL_CONTEXT_FLAGS,
 {$ELSE}
 SDL_GL_SWAP_CONTROL
 {$ENDIF}
 );
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 TSDL_ArrayByteOrder = (  // array component order, low Byte -> high Byte
 SDL_ARRAYORDER_NONE,
 SDL_ARRAYORDER_RGB,
 SDL_ARRAYORDER_RGBA,
 SDL_ARRAYORDER_ARGB,
 function  SDL_DisplayFormatAlpha(Surface: PSDL_Surface): PSDL_Surface; cdecl; external SDLLibName;
 function  SDL_RWFromFile(filename, mode: PChar): PSDL_RWops; cdecl; external SDLLibName;
 function  SDL_SaveBMP_RW(surface: PSDL_Surface; dst: PSDL_RWops; freedst: LongInt): LongInt; cdecl; external SDLLibName;
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 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;
 procedure SDL_WarpMouseInWindow(window: PSDL_Window; x, y: LongInt); 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: TSDL_eventaction; minType, maxType: LongWord): LongInt; cdecl; external SDLLibName;
+function  SDL_AllocFormat(format: LongWord): PSDL_PixelFormat; cdecl; external SDLLibName;
+procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat); cdecl; external SDLLibName;
 {$ELSE}
 function  SDL_PeepEvents(event: PSDL_Event; numevents: LongInt; action: TSDL_eventaction; mask: LongWord): LongInt; cdecl; external SDLLibName;
+function  SDL_EnableUNICODE(enable: LongInt): LongInt; cdecl; external SDLLibName;
+function  SDL_EnableKeyRepeat(timedelay, interval: LongInt): LongInt; cdecl; external SDLLibName;
+function  SDL_VideoDriverName(namebuf: PChar; maxlen: LongInt): PChar; 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_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;
 function  SDL_ShowCursor(toggle: LongInt): LongInt; cdecl; external SDLLibName;
+procedure SDL_WarpMouse(x, y: Word); {$IFDEF SDL2}inline{$ELSE}cdecl; external SDLLibName{$ENDIF};
+function  SDL_GetKeyState(numkeys: PLongInt): PByteArray; cdecl; external SDLLibName {$IFDEF SDL2} name 'SDL_GetKeyboardState'{$ENDIF};
 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;
-// remember to mark the threaded functions as 'cdecl; export;'
+(* remember to mark the threaded functions as 'cdecl; export;'
-// (or have fun debugging nil arguments)
+(or have fun debugging nil arguments) *)
-function  SDL_CreateThread(fn: Pointer; {$IFDEF SDL13}name: PChar;{$ENDIF} data: Pointer): PSDL_Thread; cdecl; external SDLLibName;
+function  SDL_CreateThread(fn: Pointer; {$IFDEF SDL2}name: PChar;{$ENDIF} data: Pointer): PSDL_Thread; cdecl; external SDLLibName;
 procedure SDL_WaitThread(thread: PSDL_Thread; status: PLongInt); cdecl; external SDLLibName;
 procedure SDL_KillThread(thread: PSDL_Thread); 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 {$IFNDEF SDL13}name 'SDL_mutexP'{$ENDIF};
+function  SDL_LockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName {$IFNDEF SDL2}name 'SDL_mutexP'{$ENDIF};
-function  SDL_UnlockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName {$IFNDEF SDL13}name 'SDL_mutexV'{$ENDIF};
+function  SDL_UnlockMutex(mutex: PSDL_mutex): LongInt; cdecl; external SDLLibName {$IFNDEF SDL2}name 'SDL_mutexV'{$ENDIF};
 function  SDL_GL_SetAttribute(attr: TSDL_GLattr; value: LongInt): LongInt; cdecl; external SDLLibName;
 procedure SDL_GL_SwapBuffers; cdecl; external SDLLibName;
 procedure SDL_LockAudio; cdecl; external SDLLibName;
 function SDL_putenv(const text: PChar): LongInt; cdecl; external SDLLibName;
 function SDL_getenv(const text: PChar): PChar; cdecl; external SDLLibName;
 {$ENDIF}
-{* Compatibility between SDL-1.2 and SDL-1.3 *}
-procedure SDL_WarpMouse(x, y: Word); {$IFDEF SDL13}inline{$ELSE}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}
-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(timedelay, 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; w, h: PLongInt): LongInt; cdecl; external SDL_TTFLibName;
 function  TTF_OpenFontRW(src: PSDL_RWops; freesrc: LongBool; size: LongInt): PTTF_Font; cdecl; external SDL_TTFLibName;
 procedure TTF_SetFontStyle(font: PTTF_Font; style: LongInt); cdecl; external SDL_TTFLibName;
 (*  SDL_mixer  *)
-function  Mix_Init(flags: LongInt): LongInt; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
+function  Mix_Init(flags: LongInt): LongInt; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName{$ELSE}inline{$ENDIF};
-procedure Mix_Quit; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName;{$ENDIF}
+procedure Mix_Quit; {$IFDEF SDL_MIXER_NEWER}cdecl; external SDL_MixerLibName{$ELSE}inline{$ENDIF};
 function  Mix_OpenAudio(frequency: LongInt; format: Word; channels: LongInt; chunksize: LongInt): LongInt; cdecl; external SDL_MixerLibName;
 procedure Mix_CloseAudio; cdecl; external SDL_MixerLibName;
 function  Mix_QuerySpec(frequency: PLongInt; format: PWord; channels: PLongInt): LongInt; cdecl; external SDL_MixerLibName;
 function  Mix_FadeOutChannel(channel: LongInt; fadems: LongInt): LongInt; cdecl; external SDL_MixerLibName;
 procedure Mix_SetPostMix( mix_func: TPostMix; arg: pointer); cdecl; external SDL_MixerLibName;
 (*  SDL_image  *)
-function  IMG_Init(flags: LongInt): LongInt; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
+function  IMG_Init(flags: LongInt): LongInt; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName{$ELSE}inline{$ENDIF};
-procedure IMG_Quit; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName;{$ENDIF}
+procedure IMG_Quit; {$IFDEF SDL_IMAGE_NEWER}cdecl; external SDL_ImageLibName{$ELSE}inline{$ENDIF};
 function  IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
 function  IMG_Load_RW(rwop: PSDL_RWops; freesrc: LongBool): PSDL_Surface; cdecl; external SDL_ImageLibName;
 function  IMG_LoadPNG_RW(rwop: PSDL_RWops): PSDL_Surface; cdecl; external SDL_ImageLibName;
 function  IMG_LoadTyped_RW(rwop: PSDL_RWops; freesrc: LongBool; type_: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
 procedure SDLNet_Write32(value: LongWord; buf: Pointer);
 function  SDLNet_Read16(buf: Pointer): Word;
 function  SDLNet_Read32(buf: Pointer): LongWord;
 implementation
-{$IFDEF SDL13}
+{$IFDEF SDL2}
-uses strings, uVariables, uStore;
+uses uStore;
-// compatible functions
+// for sdl1.2 we directly call SDL_WarpMouse()
+// for sdl2 we provide a SDL_WarpMouse() which calls the right SDL_WarpMouseInWindow() function
+// this has the advantage of reducing 'uses' and 'ifdef' statements
+// (SDLwindow is a private member of uStore module)
 procedure SDL_WarpMouse(x, y: Word); inline;
 begin
 WarpMouse(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);
-SDL_VideoDriverName:= namebuf
-end;
-SDL_VideoDriverName:= name;
-end;
-function SDL_EnableUNICODE(enable: LongInt): LongInt;
-begin
-enable:= enable; // avoid hint
-SDL_StartTextInput();
-SDL_EnableUNICODE:= 0;
-end;
-function SDL_EnableKeyRepeat(timedelay, interval: LongInt): LongInt;
-begin
-timedelay:= timedelay;  // avoid hint
-interval:= interval;    // avoid hint
-SDL_EnableKeyRepeat:= 0;
-end;
-{$ELSE}
-const conversionFormat: TSDL_PixelFormat = (
-palette: nil; BitsPerPixel: 32; BytesPerPixel: 4;
-Rloss: 0; Gloss: 0; Bloss: 0; Aloss: 0;
-Rshift: RShift; Gshift: GShift; Bshift: BShift; Ashift: AShift;
-RMask: RMask; GMask: GMask; BMask: BMask; AMask: AMask;
-colorkey: 0; alpha: 255);
-function SDL_AllocFormat(format: LongWord): PSDL_PixelFormat;
-begin
-format:= format;
-SDL_AllocFormat:= @conversionFormat;
-end;
-procedure SDL_FreeFormat(pixelformat: PSDL_PixelFormat);
-begin
-pixelformat:= pixelformat;  // avoid hint
-end;
 {$ENDIF}
 function SDL_MustLock(Surface: PSDL_Surface): Boolean;
 begin
 SDL_MustLock:=
-{$IFDEF SDL13}
+{$IFDEF SDL2}
 ((surface^.flags and SDL_RLEACCEL) <> 0)
 {$ELSE}
 ( surface^.offset <> 0 ) or (( surface^.flags and (SDL_HWSURFACE or SDL_ASYNCBLIT or SDL_RLEACCEL)) <> 0)
 {$ENDIF}
 end;
 {$IFNDEF SDL_MIXER_NEWER}
-function  Mix_Init(flags: LongInt): LongInt;
+function  Mix_Init(flags: LongInt): LongInt; inline;
 begin
 Mix_Init:= flags;
 end;
-procedure Mix_Quit;
+procedure Mix_Quit; inline;
 begin
 end;
 {$ENDIF}
 {$IFNDEF SDL_IMAGE_NEWER}
-function  IMG_Init(flags: LongInt): LongInt;
+function  IMG_Init(flags: LongInt): LongInt; inline;
 begin
 IMG_Init:= flags;
 end;
-procedure IMG_Quit;
+procedure IMG_Quit; inline;
 begin
 end;
 {$ENDIF}
 procedure SDLNet_Write16(value: Word; buf: Pointer);

changeset 9317	a04c30940d2d
parent 9311	5baf10a52f43
child 9319	492a0ad67e33