Merge branch 'master' into add-sdlhidapi.inc

Author: Free-Pascal-meets-SDL-Website

units/ctypes.inc

@@ -28,10 +28,6 @@ type
   cbool = LongBool;
   {$EXTERNALSYM cbool}
 
-  pcint = ^cint;
-  cint = Integer;
-  {$EXTERNALSYM cint}
-
   pcint8 = ^cint8;
   cint8 = ShortInt;
   {$EXTERNALSYM cint8}
@@ -60,12 +56,6 @@ type
   cuint32 = LongWord;
   {$EXTERNALSYM cuint32}
 
-  culong = LongWord;
-  {$EXTERNALSYM culong}
-
-  cuint = LongWord;
-  {$EXTERNALSYM cuint}
-
   {$IFNDEF Has_Int64}
      pcint64 = ^cint64;
      cint64 = record
@@ -96,11 +86,39 @@ type
   {$ELSE}
     csize_t = cuint64;
   {$ENDIF}
-  {$EXTERNALSYM SIZE_T}
+  {$EXTERNALSYM csize_t}
 
   pcfloat = ^cfloat;
   cfloat = Single;
   {$EXTERNALSYM cfloat}
+
+  pcint = ^cint;
+  pcuint = ^cuint;
+  pclong = ^clong;
+  pculong = ^culong;
+  {
+    Integer type sizes based on:
+    https://en.cppreference.com/w/c/language/arithmetic_types#Data_models
+  }
+  cint = cint32;
+  cuint = cuint32;
+  {$IF DEFINED(CPU32) OR DEFINED(CPU32BITS)}
+    clong = cint32;
+    culong = cuint32;
+  {$ELSE} // 64-bit
+    {$IFDEF MSWINDOWS}
+      clong = cint32;
+      culong = cuint32;
+    {$ELSE}
+      clong = cint64;
+      culong = cuint64;
+    {$ENDIF}
+  {$ENDIF}
+  {$EXTERNALSYM cint}
+  {$EXTERNALSYM cuint}
+  {$EXTERNALSYM clong}
+  {$EXTERNALSYM culong}
+
 {$ENDIF}
 
 { Data types for all compilers }

units/sdl2.pas

@@ -168,14 +168,14 @@ interface
 {$I sdlmutex.inc}                // 2.0.14 WIP
 {$I sdltimer.inc}                // 2.0.18
 {$I sdlpixels.inc}               // 2.0.14 WIP
-{$I sdlrect.inc}                 // 2.0.14
+{$I sdlrect.inc}                 // 2.24.0
 {$I sdlrwops.inc}                // 2.0.14
 {$I sdlaudio.inc}
 {$I sdlblendmode.inc}            // 2.0.14
 {$I sdlsurface.inc}              // 2.0.14
-{$I sdlshape.inc}                // 2.0.14
-{$I sdlvideo.inc}                // 2.0.14
-{$I sdlhints.inc}                // 2.0.22
+{$I sdlvideo.inc}                // 2.24.0
+{$I sdlshape.inc}                // 2.24.0
+{$I sdlhints.inc}                // 2.26.0
 {$I sdlloadso.inc}               // 2.24.1
 {$I sdlmessagebox.inc}           // 2.0.14
 {$I sdlrenderer.inc}             // 2.0.22
@@ -184,21 +184,21 @@ interface
 {$I sdlmouse.inc}                // 2.0.24
 {$I sdlguid.inc}                 // 2.24.0
 {$I sdljoystick.inc}             // 2.24.0
-{$I sdlsensor.inc}
-{$I sdlgamecontroller.inc}       // 2.0.22
+{$I sdlsensor.inc}               // 2.26.0
+{$I sdlgamecontroller.inc}       // 2.24.0
 {$I sdlhaptic.inc}
 {$I sdlhidapi.inc}               // 2.0.18
-{$I sdltouch.inc}
+{$I sdltouch.inc}                // 2.24.0
 {$I sdlgesture.inc}
 {$I sdlsyswm.inc}
-{$I sdlevents.inc}
+{$I sdlevents.inc}               // 2.24.0
 {$I sdllocale.inc}               // 2.0.14
 {$I sdlclipboard.inc}            // 2.24.1
 {$I sdlcpuinfo.inc}              // 2.0.14
 {$I sdlfilesystem.inc}           // 2.24.1
 {$I sdllog.inc}                  // 2.0.14
 {$I sdlmisc.inc}                 // 2.0.14
-{$I sdlsystem.inc}
+{$I sdlsystem.inc}               // 2.24.0
 {$I sdl.inc}                     // 2.0.14
 
 implementation
@@ -255,14 +255,53 @@ function SDL_PointInRect(const p: PSDL_Point; const r: PSDL_Rect): Boolean;
 
 function SDL_RectEmpty(const r: PSDL_Rect): Boolean;
 begin
-  Result := (r^.w <= 0) or (r^.h <= 0);
+  Result := (r = NIL) or (r^.w <= 0) or (r^.h <= 0);
 end;
 
 function SDL_RectEquals(const a, b: PSDL_Rect): Boolean;
 begin
   Result := (a^.x = b^.x) and (a^.y = b^.y) and (a^.w = b^.w) and (a^.h = b^.h);
 end;
 
+function SDL_PointInFRect(const p: PSDL_FPoint; const r: PSDL_FRect): Boolean;
+begin
+  Result :=
+    (p^.x >= r^.x) and (p^.x < (r^.x + r^.w))
+    and
+    (p^.y >= r^.y) and (p^.y < (r^.y + r^.h))
+end;
+
+function SDL_FRectEmpty(const r: PSDL_FRect): Boolean;
+begin
+  Result := (r = NIL) or (r^.w <= cfloat(0.0)) or (r^.h <= cfloat(0.0))
+end;
+
+{ FIXME: This the Pascal System.Abs() function, instead of the C SDL_fabsf() function. }
+function SDL_FRectEqualsEpsilon(const a, b: PSDL_FRect; const epsilon: cfloat): Boolean;
+begin
+  Result :=
+    (a <> NIL) and
+    (b <> NIL) and
+    (
+      (a = b)
+      or
+      (
+        (Abs(a^.x - b^.x) <= epsilon)
+        and
+        (Abs(a^.y - b^.y) <= epsilon)
+        and
+        (Abs(a^.w - b^.w) <= epsilon)
+        and
+        (Abs(a^.h - b^.h) <= epsilon)
+      )
+    )
+end;
+
+function SDL_FRectEquals(const a, b: PSDL_FRect): Boolean; Inline;
+begin
+  Result := SDL_FRectEqualsEpsilon(a, b, SDL_FLT_EPSILON)
+end;
+
 //from "sdl_atomic.h"
 function SDL_AtomicIncRef(atomic: PSDL_Atomic): cint;
 begin
@@ -388,13 +427,6 @@ function SDL_SHAPEMODEALPHA(mode: TWindowShapeMode): Boolean;
   Result := (mode = ShapeModeDefault) or (mode = ShapeModeBinarizeAlpha) or (mode = ShapeModeReverseBinarizeAlpha);
 end;
 
-//from "sdl_sysvideo.h"
-
-function FULLSCREEN_VISIBLE(W: PSDL_Window): Variant;
-begin
-  Result := ((W^.flags and SDL_WINDOW_FULLSCREEN) and (W^.flags and SDL_WINDOW_SHOWN) and not (W^.flags and SDL_WINDOW_MINIMIZED));
-end;
-
 //from "sdl_video.h"
 
 function SDL_WINDOWPOS_UNDEFINED_DISPLAY(X: Variant): Variant;

units/sdl2_image.pas

@@ -167,8 +167,12 @@ function IMG_SaveJPG_RW(surface: PSDL_Surface; dst: PSDL_RWops; freedst: cint32;
   external IMG_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_IMG_SaveJPG_RW' {$ENDIF} {$ENDIF};
 
 {* We'll use SDL for reporting errors *}
-function IMG_SetError(fmt: PAnsiChar): cint32; cdecl;
+function IMG_SetError(fmt: PAnsiChar; args: array of const): cint; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_SetError' {$ELSE} 'SDL_SetError' {$ENDIF};
 function IMG_GetError: PAnsiChar; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_GetError' {$ELSE} 'SDL_GetError' {$ENDIF};
 
 implementation
 
@@ -179,14 +183,4 @@ procedure SDL_IMAGE_VERSION(Out X: TSDL_Version);
   X.patch := SDL_IMAGE_PATCHLEVEL;
 end;
 
-function IMG_SetError(fmt: PAnsiChar): cint32; cdecl;
-begin
-  Result := SDL_SetError(fmt);
-end;
-
-function IMG_GetError: PAnsiChar; cdecl;
-begin
-  Result := SDL_GetError();
-end;
-
 end.

units/sdl2_mixer.pas

@@ -665,9 +665,15 @@ function Mix_GetChunk(channel: cint): PMix_Chunk cdecl; external MIX_LibName {$I
 procedure Mix_CloseAudio cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_CloseAudio' {$ENDIF} {$ENDIF};
 
 {* We'll use SDL for reporting errors *}
-function Mix_SetError(const fmt: PAnsiChar): cint32; cdecl;
+function Mix_SetError(const fmt: PAnsiChar; args: array of const): cint; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_SetError' {$ELSE} 'SDL_SetError' {$ENDIF};
 function Mix_GetError: PAnsiChar; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_GetError' {$ELSE} 'SDL_GetError' {$ENDIF};
 procedure Mix_ClearError(); cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_ClearError' {$ELSE} 'SDL_ClearError' {$ENDIF};
 
 implementation
 
@@ -698,19 +704,4 @@ function Mix_LoadWAV(_file: PAnsiChar): PMix_Chunk;
   Result := Mix_LoadWAV_RW(SDL_RWFromFile(_file, 'rb'), 1);
 end;
 
-function Mix_SetError(const fmt: PAnsiChar): cint32; cdecl;
-begin
-  Result := SDL_SetError(fmt);
-end;
-
-function Mix_GetError: PAnsiChar; cdecl;
-begin
-  Result := SDL_GetError();
-end;
-
-procedure Mix_ClearError; cdecl;
-begin
-  SDL_ClearError()
-end;
-
 end.

units/sdl2_net.pas

@@ -345,8 +345,11 @@ procedure SDLNet_FreeSocketSet(set_: TSDLNet_SocketSet) cdecl; external SDLNet_L
 {* Error reporting functions                                           *}
 {***********************************************************************}
 
-procedure SDLNet_SetError(const fmt: PAnsiChar); cdecl;
+procedure SDLNet_SetError(const fmt: PAnsiChar; args: array of const); cdecl;
+external SDLNet_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDLNet_SetError' {$ENDIF} {$ENDIF};
+
 function SDLNet_GetError(): PAnsiChar; cdecl;
+external SDLNet_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDLNet_GetError' {$ENDIF} {$ENDIF};
 
 {***********************************************************************}
 {* Inline functions to read/write network data                         *}
@@ -397,16 +400,6 @@ function SDLNet_SocketReady(sock: TSDLNet_GenericSocket): cint;
   Result := sock.ready;
 end;
 
-procedure SDLNet_SetError(const fmt: PAnsiChar); cdecl;
-begin
-  SDL_SetError(fmt);
-end;
-
-function SDLNet_GetError(): PAnsiChar; cdecl;
-begin
-  Result := SDL_GetError();
-end;
-
 (*
   procedure SDLNet_Write16(value: cuint16; areap: Pointer);
   begin

units/sdl2_ttf.pas

@@ -2071,9 +2071,15 @@ function TTF_RenderGlyph32_LCD(font: PTTF_Font; ch: cuint32; fg: TSDL_Color; bg:
   external TTF_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_TTF_RenderGlyph32_LCD' {$ENDIF} {$ENDIF};
 
 {* For compatibility with previous versions, here are the old functions *}
-function TTF_RenderText(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface;
-function TTF_RenderUTF8(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface;
-function TTF_RenderUNICODE(font: PTTF_Font; text: pcuint16; fg, bg: TSDL_Color): PSDL_Surface;
+function TTF_RenderText(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface; cdecl;
+  external TTF_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_TTF_RenderText_Shaded' {$ELSE} 'TTF_RenderText_Shaded' {$ENDIF};
+function TTF_RenderUTF8(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface; cdecl;
+  external TTF_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_TTF_RenderUTF8_Shaded' {$ELSE} 'TTF_RenderUTF8_Shaded' {$ENDIF};
+function TTF_RenderUNICODE(font: PTTF_Font; text: pcuint16; fg, bg: TSDL_Color): PSDL_Surface; cdecl;
+  external TTF_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_TTF_RenderUNICODE_Shaded' {$ELSE} 'TTF_RenderUNICODE_Shaded' {$ENDIF};
 
 {*
  * Dispose of a previously-created font.
@@ -2252,14 +2258,18 @@ function TTF_GetFontSDF(font: PTTF_Font): TSDL_bool; cdecl;
  *
  * \sa TTF_GetError
   }
-function TTF_SetError(const fmt: PAnsiChar): cint; cdecl;
+function TTF_SetError(const fmt: PAnsiChar; args: array of const): cint; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_SetError' {$ELSE} 'SDL_SetError' {$ENDIF};
 
 {*
  * Get last SDL_ttf error
  *
  * \sa TTF_SetError
   }
 function TTF_GetError: PAnsiChar; cdecl;
+  external SDL_LibName
+  name {$IF DEFINED(DELPHI) AND DEFINED(MACOS)} '_SDL_GetError' {$ELSE} 'SDL_GetError' {$ENDIF};
 
 {*
  * Direction flags
@@ -2393,30 +2403,5 @@ function SDL_TTF_VERSION_ATLEAST(X, Y, Z: Integer): Boolean;
             ((SDL_TTF_MAJOR_VERSION > X) or (SDL_TTF_MINOR_VERSION > Y) or (SDL_TTF_PATCHLEVEL >= Z));
 end;
 
-function TTF_SetError(const fmt: PAnsiChar): cint; cdecl;
-begin
-  Result := SDL_SetError(fmt);
-end;
-
-function TTF_GetError: PAnsiChar; cdecl;
-begin
-  Result := SDL_GetError();
-end;
-
-function TTF_RenderText(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface;
-begin
-  Result := TTF_RenderText_Shaded(font, text, fg, bg);
-end;
-
-function TTF_RenderUTF8(font: PTTF_Font; text: PAnsiChar; fg, bg: TSDL_Color): PSDL_Surface;
-begin
-  Result := TTF_RenderUTF8_Shaded(font, text, fg, bg);
-end;
-
-function TTF_RenderUNICODE(font: PTTF_Font; text: pcuint16; fg, bg: TSDL_Color): PSDL_Surface;
-begin
-  Result := TTF_RenderUNICODE_Shaded(font, text, fg, bg);
-end;
-
 end.
 

units/sdlerror.inc

@@ -13,7 +13,7 @@
  *
  *  \return -1, there is no error handling for this function
  *}
-function SDL_SetError(const fmt: PAnsiChar): cint; cdecl;
+function SDL_SetError(const fmt: PAnsiChar; args: array of const): cint; cdecl;
   external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_SetError' {$ENDIF} {$ENDIF};
 
 {**