SDL_Rect now uses int for position and size.

Added a few more rectangle functions.
Added a dirty rectangle list implementation.

include/SDL_video.h

@@ -53,8 +53,8 @@ extern "C" {
  */
 typedef struct SDL_Rect
 {
-    Sint16 x, y;
-    Uint16 w, h;
+    int x, y;
+    int w, h;
 } SDL_Rect;
 
 /**
@@ -177,7 +177,8 @@ typedef enum
     SDL_Renderer_PresentVSync = 0x00000010,     /**< Present is synchronized with the refresh rate */
     SDL_Renderer_RenderTarget = 0x00000020,     /**< The renderer can create texture render targets */
     SDL_Renderer_Accelerated = 0x00000040,      /**< The renderer uses hardware acceleration */
-    SDL_Renderer_Minimal = 0x00000080,          /**< The renderer only supports the read/write pixel and present functions */
+    SDL_Renderer_ = 0x00000080,      /**< The renderer uses hardware acceleration */
+    SDL_Renderer_Minimal = 0x00000100,          /**< The renderer only supports the read/write pixel and present functions */
 } SDL_RendererFlags;
 
 /**
@@ -1525,12 +1526,50 @@ extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void);
  */
 extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
 
-/*
- * Calculate the intersection of two rectangles
+/**
+ * \def SDL_RectEmpty()
+ *
+ * \brief Returns true if the rectangle has no area.
+ */
+#define SDL_RectEmpty(X)    (((X)->w <= 0) || ((X)->h <= 0))
+
+/**
+ * \def SDL_RectEquals()
+ *
+ * \brief Returns true if the two rectangles are equal.
+ */
+#define SDL_RectEquals(A, B)   (((A)->x == (B)->x) && ((A)->y == (B)->y) && \
+                                ((A)->w == (B)->w) && ((A)->h == (B)->h))
+
+/**
+ * \fn SDL_bool SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B);
+ *
+ * \brief Determine whether two rectangles intersect.
+ *
+ * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A,
+                                                     const SDL_Rect * B);
+
+/**
+ * \fn SDL_bool SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+ *
+ * \brief Calculate the intersection of two rectangles.
+ *
+ * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A,
                                                    const SDL_Rect * B,
-                                                   SDL_Rect * intersection);
+                                                   SDL_Rect * result);
+
+/**
+ * \fn void SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+ *
+ * \brief Calculate the union of two rectangles
+ */
+extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A,
+                                           const SDL_Rect * B,
+                                           SDL_Rect * result);
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus

src/SDL_compat.c

@@ -307,8 +307,6 @@ GetEnvironmentWindowPosition(int w, int h, int *x, int *y)
 SDL_Surface *
 SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
 {
-    SDL_EventFilter filter;
-    void *filterparam;
     const SDL_DisplayMode *desktop_mode;
     SDL_DisplayMode mode;
     int window_x = SDL_WINDOWPOS_UNDEFINED;

src/video/SDL_rect.c

@@ -0,0 +1,189 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_video.h"
+#include "SDL_rect_c.h"
+
+SDL_bool
+SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    /* Horizontal intersection */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    if (Amax <= Amin)
+        return SDL_FALSE;
+
+    /* Vertical intersection */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    if (Amax <= Amin)
+        return SDL_FALSE;
+
+    return SDL_TRUE;
+}
+
+SDL_bool
+SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    /* Horizontal intersection */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    result->x = Amin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    result->w = Amax - Amin;
+
+    /* Vertical intersection */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    result->y = Amin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    result->h = Amax - Amin;
+
+    return !SDL_RectEmpty(result);
+}
+
+void
+SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    /* Horizontal union */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin < Amin)
+        Amin = Bmin;
+    result->x = Amin;
+    if (Bmax > Amax)
+        Amax = Bmax;
+    result->w = Amax - Amin;
+
+    /* Vertical intersection */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin < Amin)
+        Amin = Bmin;
+    result->y = Amin;
+    if (Bmax > Amax)
+        Amax = Bmax;
+    result->h = Amax - Amin;
+}
+
+void
+SDL_AddDirtyRect(SDL_DirtyRectList * list, const SDL_Rect * rect)
+{
+    SDL_DirtyRect *dirty;
+    SDL_DirtyRect *check, *prev, *next;
+
+    if (list->free) {
+        dirty = list->free;
+        list->free = dirty->next;
+    } else {
+        dirty = (SDL_DirtyRect *) SDL_malloc(sizeof(*dirty));
+        if (!dirty) {
+            return;
+        }
+    }
+    dirty->rect = *rect;
+
+    /* FIXME: At what point is this optimization too expensive? */
+    for (prev = NULL, check = list->list; check; check = next) {
+        next = check->next;
+
+        if (SDL_HasIntersection(&dirty->rect, &check->rect)) {
+            SDL_UnionRect(&dirty->rect, &check->rect, &dirty->rect);
+            if (prev) {
+                prev->next = next;
+            } else {
+                list->list = next;
+            }
+            check->next = list->free;
+            list->free = check;
+            --list->count;
+        } else {
+            prev = check;
+        }
+    }
+
+    dirty->next = list->list;
+    list->list = dirty;
+    ++list->count;
+}
+
+void
+SDL_ClearDirtyRects(SDL_DirtyRectList * list)
+{
+    while (list->list) {
+        SDL_DirtyRect *elem = list->list;
+        list->list = elem->next;
+        elem->next = list->free;
+        list->free = elem;
+    }
+    list->count = 0;
+}
+
+void
+SDL_FreeDirtyRects(SDL_DirtyRectList * list)
+{
+    while (list->list) {
+        SDL_DirtyRect *elem = list->list;
+        list->list = elem->next;
+        SDL_free(elem);
+    }
+    while (list->free) {
+        SDL_DirtyRect *elem = list->free;
+        list->free = elem->next;
+        SDL_free(elem);
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/SDL_rect_c.h

@@ -0,0 +1,41 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+typedef struct SDL_DirtyRect
+{
+    SDL_Rect rect;
+    struct SDL_DirtyRect *next;
+} SDL_DirtyRect;
+
+typedef struct SDL_DirtyRectList
+{
+    int count;
+    SDL_DirtyRect *list;
+    SDL_DirtyRect *free;
+} SDL_DirtyRectList;
+
+extern void SDL_AddDirtyRect(SDL_DirtyRectList * list, const SDL_Rect * rect);
+extern void SDL_ClearDirtyRects(SDL_DirtyRectList * list);
+extern void SDL_FreeDirtyRects(SDL_DirtyRectList * list);
+
+/* vi: set ts=4 sw=4 expandtab: */