Mercurial > sdl-ios-xcode

changeset 3538:a1896642a47e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
X11 driver compiles again, lines are not yet implemented
author Sam Lantinga <slouken@libsdl.org>
date Thu, 10 Dec 2009 09:27:23 +0000
parents e897a4a9f578
children f2846bf19360
files src/video/x11/SDL_x11render.c src/video/x11/SDL_x11sym.h
diffstat 2 files changed, 106 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/x11/SDL_x11render.c	Thu Dec 10 08:28:26 2009 +0000
+++ b/src/video/x11/SDL_x11render.c	Thu Dec 10 09:27:23 2009 +0000
@@ -48,10 +48,12 @@
                            void **pixels, int *pitch);
 static void X11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
 static int X11_SetDrawBlendMode(SDL_Renderer * renderer);
-static int X11_RenderPoint(SDL_Renderer * renderer, int x, int y);
-static int X11_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2,
-                          int y2);
-static int X11_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect);
+static int X11_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points,
+                            int count);
+static int X11_RenderLines(SDL_Renderer * renderer, const SDL_Point * points,
+                           int count);
+static int X11_RenderRects(SDL_Renderer * renderer, const SDL_Rect ** rects,
+                           int count);
 static int X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
                           const SDL_Rect * srcrect, const SDL_Rect * dstrect);
 static void X11_RenderPresent(SDL_Renderer * renderer);
@@ -200,9 +202,9 @@
     renderer->LockTexture = X11_LockTexture;
     renderer->UnlockTexture = X11_UnlockTexture;
     renderer->SetDrawBlendMode = X11_SetDrawBlendMode;
-    renderer->RenderPoint = X11_RenderPoint;
-    renderer->RenderLine = X11_RenderLine;
-    renderer->RenderFill = X11_RenderFill;
+    renderer->RenderPoints = X11_RenderPoints;
+    renderer->RenderLines = X11_RenderLines;
+    renderer->RenderRects = X11_RenderRects;
     renderer->RenderCopy = X11_RenderCopy;
     renderer->RenderPresent = X11_RenderPresent;
     renderer->DestroyTexture = X11_DestroyTexture;
@@ -590,73 +592,126 @@
 }
 
 static int
-X11_RenderPoint(SDL_Renderer * renderer, int x, int y)
+X11_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points, int count)
 {
     X11_RenderData *data = (X11_RenderData *) renderer->driverdata;
+    SDL_Window *window = SDL_GetWindowFromID(renderer->window);
     unsigned long foreground;
+    XPoint *xpoints, *xpoint;
+    int i, xcount;
 
     if (data->makedirty) {
         SDL_Rect rect;
 
-        rect.x = x;
-        rect.y = y;
-        rect.w = 1;
-        rect.h = 1;
-        SDL_AddDirtyRect(&data->dirty, &rect);
-    }
-
-    foreground = renderdrawcolor(renderer, 1);
-    XSetForeground(data->display, data->gc, foreground);
-    XDrawPoint(data->display, data->drawable, data->gc, x, y);
-    return 0;
-}
-
-static int
-X11_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
-{
-    X11_RenderData *data = (X11_RenderData *) renderer->driverdata;
-    unsigned long foreground;
-
-    if (data->makedirty) {
-        SDL_Rect rect;
-
-        if (x1 < x2) {
-            rect.x = x1;
-            rect.w = (x2 - x1) + 1;
-        } else {
-            rect.x = x2;
-            rect.w = (x1 - x2) + 1;
-        }
-        if (y1 < y2) {
-            rect.y = y1;
-            rect.h = (y2 - y1) + 1;
-        } else {
-            rect.y = y2;
-            rect.h = (y1 - y2) + 1;
+        /* Get the smallest rectangle that contains everything */
+        rect.x = 0;
+        rect.y = 0;
+        rect.w = window->w;
+        rect.h = window->h;
+        if (!SDL_EnclosePoints(points, count, &rect, &rect)) {
+            /* Nothing to draw */
+            return 0;
         }
         SDL_AddDirtyRect(&data->dirty, &rect);
     }
 
     foreground = renderdrawcolor(renderer, 1);
     XSetForeground(data->display, data->gc, foreground);
-    XDrawLine(data->display, data->drawable, data->gc, x1, y1, x2, y2);
+
+    xpoint = xpoints = SDL_stack_alloc(XPoint, count);
+    xcount = 0;
+    for (i = 0; i < count; ++i) {
+        int x = points[i].x;
+        int y = points[i].y;
+        if (x < 0 || x >= window->w || y < 0 || y >= window->h) {
+            continue;
+        }
+        xpoint->x = (short)x;
+        xpoint->y = (short)y;
+        ++xpoint;
+        ++xcount;
+    }
+    if (xcount > 0) {
+        XDrawPoints(data->display, data->drawable, data->gc, xpoints, xcount,
+                    CoordModeOrigin);
+    }
+    SDL_stack_free(xpoints);
+
     return 0;
 }
 
 static int
-X11_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect)
+X11_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count)
 {
     X11_RenderData *data = (X11_RenderData *) renderer->driverdata;
+    SDL_Window *window = SDL_GetWindowFromID(renderer->window);
+    SDL_Rect clip, rect;
     unsigned long foreground;
 
+    clip.x = 0;
+    clip.y = 0;
+    clip.w = window->w;
+    clip.h = window->h;
+
     if (data->makedirty) {
-        SDL_AddDirtyRect(&data->dirty, rect);
+        /* Get the smallest rectangle that contains everything */
+        SDL_EnclosePoints(points, count, NULL, &rect);
+        if (!SDL_IntersectRect(&rect, &clip, &rect)) {
+            /* Nothing to draw */
+            return 0;
+        }
+        SDL_AddDirtyRect(&data->dirty, &rect);
     }
 
     foreground = renderdrawcolor(renderer, 1);
     XSetForeground(data->display, data->gc, foreground);
-    XFillRectangle(data->display, data->drawable, data->gc, rect->x, rect->y,
-                   rect->w, rect->h);
+    /* FIXME: Can we properly handle lines that extend beyond visible space? */
+    //XDrawLine(data->display, data->drawable, data->gc, x1, y1, x2, y2);
+    return 0;
+}
+
+static int
+X11_RenderRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
+{
+    X11_RenderData *data = (X11_RenderData *) renderer->driverdata;
+    SDL_Window *window = SDL_GetWindowFromID(renderer->window);
+    SDL_Rect clip, rect;
+    unsigned long foreground;
+    XRectangle *xrects, *xrect;
+    int i, xcount;
+
+    clip.x = 0;
+    clip.y = 0;
+    clip.w = window->w;
+    clip.h = window->h;
+
+    foreground = renderdrawcolor(renderer, 1);
+    XSetForeground(data->display, data->gc, foreground);
+
+    xrect = xrects = SDL_stack_alloc(XRectangle, count);
+    xcount = 0;
+    for (i = 0; i < count; ++i) {
+        if (!SDL_IntersectRect(rects[i], &clip, &rect)) {
+            continue;
+        }
+
+        xrect->x = (short)rect.x;
+        xrect->y = (short)rect.y;
+        xrect->width = (unsigned short)rect.w;
+        xrect->height = (unsigned short)rect.h;
+        ++xrect;
+        ++xcount;
+
+        if (data->makedirty) {
+            SDL_AddDirtyRect(&data->dirty, &rect);
+        }
+    }
+    if (xcount > 0) {
+        XFillRectangles(data->display, data->drawable, data->gc,
+                        xrects, xcount);
+    }
+    SDL_stack_free(xpoints);
+
     return 0;
 }
 
--- a/src/video/x11/SDL_x11sym.h	Thu Dec 10 08:28:26 2009 +0000
+++ b/src/video/x11/SDL_x11sym.h	Thu Dec 10 09:27:23 2009 +0000
@@ -50,8 +50,7 @@
 SDL_X11_SYM(int,XDeleteProperty,(Display* a,Window b,Atom c),(a,b,c),return)
 SDL_X11_SYM(int,XDestroyWindow,(Display* a,Window b),(a,b),return)
 SDL_X11_SYM(int,XDisplayKeycodes,(Display* a,int* b,int* c),(a,b,c),return)
-SDL_X11_SYM(int,XDrawRectangle,(Display* a,Drawable b,GC c,int d, int e, unsigned int f, unsigned int g),(a,b,c,d,e,f,g),return)
-SDL_X11_SYM(int,XFillRectangle,(Display* a,Drawable b,GC c,int d, int e, unsigned int f, unsigned int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(int,XFillRectangles,(Display* a,Drawable b,GC c,XRectangle* d,int e),(a,b,c,d,e),return)
 SDL_X11_SYM(char*,XDisplayName,(_Xconst char* a),(a),return)
 SDL_X11_SYM(int,XEventsQueued,(Display* a,int b),(a,b),return)
 SDL_X11_SYM(Bool,XFilterEvent,(XEvent *event,Window w),(event,w),return)
@@ -95,8 +94,8 @@
 SDL_X11_SYM(int,XPeekEvent,(Display* a,XEvent* b),(a,b),return)
 SDL_X11_SYM(int,XPending,(Display* a),(a),return)
 SDL_X11_SYM(int,XPutImage,(Display* a,Drawable b,GC c,XImage* d,int e,int f,int g,int h,unsigned int i,unsigned int j),(a,b,c,d,e,f,g,h,i,j),return)
-SDL_X11_SYM(int,XDrawLine,(Display* a, Drawable b, GC c, int d, int e, int f, int g),(a,b,c,d,e,f,g),return)
-SDL_X11_SYM(int,XDrawPoint,(Display* a, Drawable b, GC c, int d, int e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XDrawLines,(Display* a, Drawable b, GC c, XPoint* d, int e, int f),(a,b,c,d,e,f),return)
+SDL_X11_SYM(int,XDrawPoints,(Display* a, Drawable b, GC c, XPoint* d, int e, int f),(a,b,c,d,e,f),return)
 SDL_X11_SYM(int,XQueryColors,(Display* a,Colormap b,XColor* c,int d),(a,b,c,d),return)
 SDL_X11_SYM(int,XQueryKeymap,(Display* a,char *b),(a,b),return)
 SDL_X11_SYM(Bool,XQueryPointer,(Display* a,Window b,Window* c,Window* d,int* e,int* f,int* g,int* h,unsigned int* i),(a,b,c,d,e,f,g,h,i),return)