From 26932ccfbec88483b0ff5593dd3968df737f2393 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 2 Jun 2003 01:20:46 +0000
Subject: [PATCH] add borders to planars

---
 render2/planar.c | 9 ++++++++-
 render2/planar.h | 3 +++
 render2/render.h | 4 +++-
 render2/test.c   | 3 ++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/render2/planar.c b/render2/planar.c
index 55e18bdb..e01b67e8 100644
--- a/render2/planar.c
+++ b/render2/planar.c
@@ -6,18 +6,25 @@
 #include "debug.h"
 #include "font.h"
 #include <string.h>
+#include <assert.h>
 #include <GL/glx.h>
 
 void RrPlanarSet(struct RrSurface *sur,
                  enum RrSurfaceColorType type,
                  enum RrBevelType bevel,
                  struct RrColor *primary,
-                 struct RrColor *secondary)
+                 struct RrColor *secondary,
+                 int borderwidth,
+                 struct RrColor *border)
 {
     sur->data.planar.colortype = type;
     sur->data.planar.bevel = bevel;
     sur->data.planar.primary = *primary;
     sur->data.planar.secondary = *secondary;
+    assert(borderwidth >= 0);
+    sur->data.planar.borderwidth = borderwidth >= 0 ? borderwidth : 0;
+    if (borderwidth)
+        sur->data.planar.border = *border;
 }
 
 static void copy_parent(struct RrSurface *sur)
diff --git a/render2/planar.h b/render2/planar.h
index 1877b5ca..bb48aca4 100644
--- a/render2/planar.h
+++ b/render2/planar.h
@@ -9,6 +9,9 @@ struct RrPlanarSurface {
 
     struct RrColor primary;
     struct RrColor secondary;
+
+    int borderwidth;
+    struct RrColor border;
 };
 
 #define RrPlanarColorType(sur) ((sur)->data.planar.colortype)
diff --git a/render2/render.h b/render2/render.h
index 6bff9a1c..0a765471 100644
--- a/render2/render.h
+++ b/render2/render.h
@@ -184,7 +184,9 @@ void RrPlanarSet(struct RrSurface *sur,
                  enum RrSurfaceColorType type,
                  enum RrBevelType bevel,
                  struct RrColor *primary,
-                 struct RrColor *secondary);
+                 struct RrColor *secondary,
+                 int borderwidth,
+                 struct RrColor *border);
 
 /* textures */
 
diff --git a/render2/test.c b/render2/test.c
index 261fdbad..eb76e5c9 100644
--- a/render2/test.c
+++ b/render2/test.c
@@ -67,7 +67,8 @@ int main()
     RrSurfaceSetArea(sur, X, Y, W, H);
     RrColorSet(&pri, 0, 0, 0, 0);
     RrColorSet(&sec, 1, 1, 1, 0);
-    RrPlanarSet(sur, RR_PLANAR_PIPECROSS, RR_RAISED_INNER, &pri, &sec);
+    RrPlanarSet(sur, RR_PLANAR_PIPECROSS, RR_RAISED_INNER, &pri, &sec,
+                0, NULL);
 
     quit = 0;
     while (!quit) {
-- 
2.34.1