add legacy plotter API

svn path=/trunk/libnsfb/; revision=7304

11 files changed, 148 insertions, 11 deletions

diff --git a/src/16bpp_plotters.c b/src/16bpp_plotters.c
index b2abff7..035a9a6 100644
--- a/src/16bpp_plotters.c
+++ b/src/16bpp_plotters.c
@@ -11,10 +11,11 @@
 #include <stdlib.h>
 
 #include "libnsfb.h"
+#include "libnsfb_plot_util.h"
+
 #include "nsfb.h"
 #include "nsfb_plot.h"
 #include "plotters.h"
-#include "plot_util.h"
 
 static inline uint16_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
 {
diff --git a/src/32bpp_plotters.c b/src/32bpp_plotters.c
index 5848405..2456f58 100644
--- a/src/32bpp_plotters.c
+++ b/src/32bpp_plotters.c
@@ -11,10 +11,11 @@
 #include <stdlib.h>
 
 #include "libnsfb.h"
+#include "libnsfb_plot_util.h"
+
 #include "nsfb.h"
 #include "nsfb_plot.h"
 #include "plotters.h"
-#include "plot_util.h"
 
 static inline uint32_t *
 get_xy_loc(nsfb_t *nsfb, int x, int y)
diff --git a/src/8bpp_plotters.c b/src/8bpp_plotters.c
index a6bb3a3..40a06f9 100644
--- a/src/8bpp_plotters.c
+++ b/src/8bpp_plotters.c
@@ -13,10 +13,11 @@
 #include <string.h>
 
 #include "libnsfb.h"
+#include "libnsfb_plot_util.h"
+
 #include "nsfb.h"
 #include "nsfb_plot.h"
 #include "plotters.h"
-#include "plot_util.h"
 
 static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
 {
diff --git a/src/Makefile b/src/Makefile
index bb142d0..431abd9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 # Sources
-DIR_SOURCES := libnsfb.c frontend.c frontend_sdl.c frontend_linux.c frontend_vnc.c frontend_able.c frontend_ram.c plot.c plot_util.c plotters.c 32bpp_plotters.c 16bpp_plotters.c 8bpp_plotters.c
+DIR_SOURCES := libnsfb.c frontend.c frontend_sdl.c frontend_linux.c frontend_vnc.c frontend_able.c frontend_ram.c plot.c legacy_plot.c plot_util.c plotters.c 32bpp_plotters.c 16bpp_plotters.c 8bpp_plotters.c
 
 
 include build/makefiles/Makefile.subdir
diff --git a/src/frontend.c b/src/frontend.c
index 68edb9e..c53ba66 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -47,7 +47,7 @@ static int frontend_defaults(nsfb_t *nsfb)
     nsfb->height = 600;
     nsfb->bpp = 16;
 
-    /* select plotters for bpp */
+    /* select default sw plotters for bpp */
     select_plotters(nsfb);
 
     return 0;
diff --git a/src/frontend_sdl.c b/src/frontend_sdl.c
index 82342d3..ca98199 100644
--- a/src/frontend_sdl.c
+++ b/src/frontend_sdl.c
@@ -13,6 +13,7 @@
 #include "libnsfb_event.h"
 #include "nsfb.h"
 #include "frontend.h"
+#include "plotters.h"
 
 enum nsfb_key_code_e sdl_nsfb_map[] = {
     NSFB_KEY_UNKNOWN,
@@ -378,6 +379,9 @@ static int sdl_set_geometry(nsfb_t *nsfb, int width, int height, int bpp)
     nsfb->height = height;
     nsfb->bpp = bpp;
 
+    /* select default sw plotters for bpp */
+    select_plotters(nsfb);
+
     return 0;
 }
 
@@ -390,7 +394,7 @@ static int sdl_initialise(nsfb_t *nsfb)
 
     /* sanity checked depth. */
     if ((nsfb->bpp != 32) && (nsfb->bpp != 16) && (nsfb->bpp != 8))
-        nsfb->bpp = 16;
+        return -1;
 
     /* initialise SDL library */
     if (SDL_Init(SDL_INIT_VIDEO) < 0 ) {
diff --git a/src/legacy_plot.c b/src/legacy_plot.c
new file mode 100644
index 0000000..fc7a7ef
--- /dev/null
+++ b/src/legacy_plot.c
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2009 Vincent Sanders <vince@simtec.co.uk>
+ *
+ * This file is part of libnsfb, http://www.netsurf-browser.org/
+ * Licenced under the MIT License,
+ *                http://www.opensource.org/licenses/mit-license.php
+ *
+ * This is the exported plotter interface for the libnsfb graphics library.
+ */
+
+#include <stdbool.h>
+
+#include "libnsfb.h"
+#include "libnsfb_plot.h"
+#include "libnsfb_legacy_plot.h"
+#include "nsfb.h"
+#include "nsfb_plot.h"
+
+/* legacy interface global context */
+static nsfb_t *gnsfb;
+
+bool nsfb_lplot_ctx(nsfb_t *nsfb)
+{
+    gnsfb = nsfb;
+    return true;
+}
+
+bool nsfb_lplot_clip(int x0, int y0, int x1, int y1)
+{
+    nsfb_bbox_t clip;
+    clip.x0 = x0;
+    clip.y0 = y0;
+    clip.x1 = x1;
+    clip.y1 = y1;
+
+    return gnsfb->plotter_fns->set_clip(gnsfb, &clip);
+}
+
+bool nsfb_lplot_line(int x0, int y0, int x1, int y1, int line_width,
+			nsfb_colour_t c, bool dotted, bool dashed)
+{
+    nsfb_bbox_t line;
+    line.x0 = x0;
+    line.y0 = y0;
+    line.x1 = x1;
+    line.y1 = y1;
+    return gnsfb->plotter_fns->line(gnsfb, &line, line_width, c, dotted, dashed);
+}
+
+bool nsfb_lplot_rectangle(int x0, 
+                               int y0, 
+                               int width, 
+                               int height,
+                               int line_width, 
+                               nsfb_colour_t c, 
+                               bool dotted, 
+                               bool dashed)
+{
+    nsfb_bbox_t rect;
+    rect.x0 = x0;
+    rect.y0 = y0;
+    rect.x1 = x0 + width;
+    rect.y1 = y0 + height;
+
+    return gnsfb->plotter_fns->rectangle(gnsfb, &rect, line_width, c, dotted, dashed);
+
+}
+
+bool nsfb_lplot_polygon(const int *p, unsigned int n, nsfb_colour_t fillc)
+{
+    return gnsfb->plotter_fns->polygon(gnsfb, p, n, fillc);
+}
+
+bool nsfb_lplot_fill(int x0, int y0, int x1, int y1, nsfb_colour_t c)
+{
+    nsfb_bbox_t rect;
+    rect.x0 = x0;
+    rect.y0 = y0;
+    rect.x1 = x1;
+    rect.y1 = y1;
+
+    return gnsfb->plotter_fns->fill(gnsfb, &rect, c);
+}
+
+bool nsfb_lplot_clg(nsfb_colour_t c)
+{
+    return gnsfb->plotter_fns->clg(gnsfb, c);
+}
+
+
+bool 
+nsfb_lplot_disc(int x, int y, int radius, nsfb_colour_t c, bool filled)
+{
+    nsfb_bbox_t ellipse;
+    ellipse.x0 = x - radius;
+    ellipse.y0 = y - radius;
+    ellipse.x1 = x + radius;
+    ellipse.y1 = y + radius;
+
+    if (filled)
+        return gnsfb->plotter_fns->ellipse_fill(gnsfb, &ellipse, c);
+    else
+        return gnsfb->plotter_fns->ellipse(gnsfb, &ellipse, c);
+}
+
+bool 
+nsfb_lplot_arc(int x, int y, int radius, int angle1, int angle2,
+	    		nsfb_colour_t c)
+{
+    return gnsfb->plotter_fns->arc(gnsfb, x, y, radius, angle1, angle2, c);
+}
+
+
+
diff --git a/src/libnsfb.c b/src/libnsfb.c
index 172b554..83e1a37 100644
--- a/src/libnsfb.c
+++ b/src/libnsfb.c
@@ -51,7 +51,7 @@ nsfb_init_frontend(nsfb_t *nsfb)
     return nsfb->frontend_rtns->initialise(nsfb);
 }
 
-bool nsfb_input(nsfb_t *nsfb, nsfb_event_t *event, int timeout)
+bool nsfb_event(nsfb_t *nsfb, nsfb_event_t *event, int timeout)
 {
     return nsfb->frontend_rtns->input(nsfb, event, timeout);
 }
diff --git a/src/plot.c b/src/plot.c
index 99b4882..440a445 100644
--- a/src/plot.c
+++ b/src/plot.c
@@ -15,7 +15,14 @@
  */
 bool nsfb_plot_set_clip(nsfb_t *nsfb, nsfb_bbox_t *clip)
 {
-    return nsfb->plotter_fns->clip(nsfb, clip);
+    return nsfb->plotter_fns->set_clip(nsfb, clip);
+}
+
+/** Get the previously set clipping region.
+ */
+bool nsfb_plot_get_clip(nsfb_t *nsfb, nsfb_bbox_t *clip)
+{
+    return nsfb->plotter_fns->get_clip(nsfb, clip);
 }
 
 /** Clears plotting area to a flat colour.
diff --git a/src/plot_util.c b/src/plot_util.c
index 058a0f9..ae1f548 100644
--- a/src/plot_util.c
+++ b/src/plot_util.c
@@ -1,8 +1,9 @@
 #include <stdbool.h>
 
 #include "libnsfb.h"
+#include "libnsfb_plot_util.h"
+
 #include "nsfb.h"
-#include "plot_util.h"
 
 enum {
         POINT_LEFTOF_REGION = 1,
diff --git a/src/plotters.c b/src/plotters.c
index 12a31d1..4a7598e 100644
--- a/src/plotters.c
+++ b/src/plotters.c
@@ -6,9 +6,10 @@
 #include <string.h>
 
 #include "libnsfb.h"
+#include "libnsfb_plot_util.h"
+
 #include "nsfb.h"
 #include "nsfb_plot.h"
-#include "plot_util.h"
 #include "plotters.h"
 
 extern const nsfb_plotter_fns_t _nsfb_1bpp_plotters;
@@ -38,6 +39,12 @@ static bool set_clip(nsfb_t *nsfb, nsfb_bbox_t *clip)
     return true;    
 }
 
+static bool get_clip(nsfb_t *nsfb, nsfb_bbox_t *clip)
+{
+    *clip = nsfb->clip;
+    return true;    
+}
+
 static bool clg(nsfb_t *nsfb, nsfb_colour_t c)
 {
     return nsfb->plotter_fns->fill(nsfb, &nsfb->clip, c);
@@ -500,7 +507,8 @@ bool select_plotters(nsfb_t *nsfb)
 
     /* set the generics */
     nsfb->plotter_fns->clg = clg;
-    nsfb->plotter_fns->clip = set_clip;
+    nsfb->plotter_fns->set_clip = set_clip;
+    nsfb->plotter_fns->get_clip = get_clip;
     nsfb->plotter_fns->polygon = polygon;
     nsfb->plotter_fns->rectangle = rectangle;
     nsfb->plotter_fns->ellipse = ellipse;