We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for clipping the rects to the window bounds

shmem_x11framebuffer.patch (text/plain), 2.44 KB, created by Marcus von Appen on 2012-07-03 04:21:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus von Appen

Created: 2012-07-03 04:21:48 UTC

Size: 2.44 KB

patch

obsolete

>diff -r 6bb657898f55 src/video/x11/SDL_x11framebuffer.c
>--- a/src/video/x11/SDL_x11framebuffer.c	Tue Feb 28 21:58:36 2012 -0500
>+++ b/src/video/x11/SDL_x11framebuffer.c	Tue Mar 27 08:13:47 2012 +0200
>@@ -154,33 +154,68 @@
>     SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>     Display *display = data->videodata->display;
>     int i;
>-    SDL_Rect *rect;
>-
>+    int x, y, w ,h;
> #ifndef NO_SHARED_MEMORY
>     if (data->use_mitshm) {
>         for (i = 0; i < numrects; ++i) {
>-            rect = &rects[i];
>+            x = rects[i].x;
>+            y = rects[i].y;
>+            w = rects[i].w;
>+            h = rects[i].h;
> 
>-            if (rect->w == 0 || rect->h == 0) { /* Clipped? */
>+            if (w <= 0 || h <= 0 || (x + w) <= 0 || (y + h) <= 0) {
>+                /* Clipped? */
>                 continue;
>             }
>+            if (x < 0)
>+            {
>+                x += w;
>+                w += rects[i].x;
>+            }
>+            if (y < 0)
>+            {
>+                y += h;
>+                h += rects[i].y;
>+            }
>+            if (x + w > window->w)
>+                w = window->w - x;
>+            if (y + h > window->h)
>+                h = window->h - y;
>+
>             XShmPutImage(display, data->xwindow, data->gc, data->ximage,
>-                    rect->x, rect->y,
>-                    rect->x, rect->y, rect->w, rect->h, False);
>+                x, y, x, y, w, h, False);
>         }
>     }
>     else
> #endif /* !NO_SHARED_MEMORY */
>     {
>         for (i = 0; i < numrects; ++i) {
>-            rect = &rects[i];
>+            x = rects[i].x;
>+            y = rects[i].y;
>+            w = rects[i].w;
>+            h = rects[i].h;
> 
>-            if (rect->w == 0 || rect->h == 0) { /* Clipped? */
>+            if (w <= 0 || h <= 0 || (x + w) <= 0 || (y + h) <= 0) {
>+                /* Clipped? */
>                 continue;
>             }
>+            if (x < 0)
>+            {
>+                x += w;
>+                w += rects[i].x;
>+            }
>+            if (y < 0)
>+            {
>+                y += h;
>+                h += rects[i].y;
>+            }
>+            if (x + w > window->w)
>+                w = window->w - x;
>+            if (y + h > window->h)
>+                h = window->h - y;
>+
>             XPutImage(display, data->xwindow, data->gc, data->ximage,
>-                  rect->x, rect->y,
>-                  rect->x, rect->y, rect->w, rect->h);
>+                x, y, x, y, w, h);
>         }
>     }
>

Actions: View | Diff

Attachments on bug 1535: 895 | 896

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.