summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxbe
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/graphics/nxbe')
-rw-r--r--nuttx/graphics/nxbe/Make.defs2
-rw-r--r--nuttx/graphics/nxbe/nxbe.h28
-rw-r--r--nuttx/graphics/nxbe/nxbe_configure.c9
-rw-r--r--nuttx/graphics/nxbe/nxbe_setpixel.c158
4 files changed, 193 insertions, 4 deletions
diff --git a/nuttx/graphics/nxbe/Make.defs b/nuttx/graphics/nxbe/Make.defs
index 2f9388fc0..4003715b5 100644
--- a/nuttx/graphics/nxbe/Make.defs
+++ b/nuttx/graphics/nxbe/Make.defs
@@ -35,7 +35,7 @@
NXBE_ASRCS =
NXBE_CSRCS = nxbe_configure.c nxbe_colormap.c nxbe_clipper.c \
- nxbe_closewindow.c \
+ nxbe_closewindow.c nxbe_setpixel.c \
nxbe_setposition.c nxbe_setsize.c nxbe_raise.c nxbe_lower.c \
nxbe_fill.c nxbe_filltrapezoid.c nxbe_move.c nxbe_bitmap.c \
nxbe_redraw.c nxbe_redrawbelow.c nxbe_visible.c
diff --git a/nuttx/graphics/nxbe/nxbe.h b/nuttx/graphics/nxbe/nxbe.h
index d3c3bed82..5d9cd2695 100644
--- a/nuttx/graphics/nxbe/nxbe.h
+++ b/nuttx/graphics/nxbe/nxbe.h
@@ -1,8 +1,8 @@
/****************************************************************************
* graphics/nxbe/nxbe.h
*
- * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -84,6 +84,9 @@ struct nxbe_plane_s
{
/* Raster operation callbacks for this bits-per-pixel value */
+ void (*setpixel)(FAR NX_PLANEINFOTYPE *pinfo,
+ FAR const struct nxgl_point_s *pos,
+ nxgl_mxpixel_t color);
void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
nxgl_mxpixel_t color);
@@ -288,6 +291,27 @@ EXTERN void nxbe_raise(FAR struct nxbe_window_s *wnd);
EXTERN void nxbe_lower(FAR struct nxbe_window_s *wnd);
/****************************************************************************
+ * Name: nxbe_setpixel
+ *
+ * Description:
+ * Set a single pixel in the window to the specified color. This is simply
+ * a degenerate case of nxbe_fill(), but may be optimized in some architectures.
+ *
+ * Input Parameters:
+ * wnd - The window structure reference
+ * pos - The pixel location to be set
+ * col - The color to use in the set
+ *
+ * Return:
+ * None
+ *
+ ****************************************************************************/
+
+EXTERN void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
+ FAR const struct nxgl_point_s *pos,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+/****************************************************************************
* Name: nxbe_fill
*
* Description:
diff --git a/nuttx/graphics/nxbe/nxbe_configure.c b/nuttx/graphics/nxbe/nxbe_configure.c
index 881bcd99e..fc694f4f3 100644
--- a/nuttx/graphics/nxbe/nxbe_configure.c
+++ b/nuttx/graphics/nxbe/nxbe_configure.c
@@ -2,7 +2,7 @@
* graphics/nxbe/nxbe_configure.c
*
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -129,6 +129,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_1BPP
if (be->plane[i].pinfo.bpp == 1)
{
+ be->plane[i].setpixel = nxgl_setpixel_1bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_1bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_1bpp;
be->plane[i].moverectangle = nxgl_moverectangle_1bpp;
@@ -139,6 +140,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_2BPP
if (be->plane[i].pinfo.bpp == 2)
{
+ be->plane[i].setpixel = nxgl_setpixel_2bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_2bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_2bpp;
be->plane[i].moverectangle = nxgl_moverectangle_2bpp;
@@ -149,6 +151,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_4BPP
if (be->plane[i].pinfo.bpp == 4)
{
+ be->plane[i].setpixel = nxgl_setpixel_4bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_4bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_4bpp;
be->plane[i].moverectangle = nxgl_moverectangle_4bpp;
@@ -159,6 +162,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_8BPP
if (be->plane[i].pinfo.bpp == 8)
{
+ be->plane[i].setpixel = nxgl_setpixel_8bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_8bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_8bpp;
be->plane[i].moverectangle = nxgl_moverectangle_8bpp;
@@ -169,6 +173,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_16BPP
if (be->plane[i].pinfo.bpp == 16)
{
+ be->plane[i].setpixel = nxgl_setpixel_16bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_16bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_16bpp;
be->plane[i].moverectangle = nxgl_moverectangle_16bpp;
@@ -179,6 +184,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_24BPP
if (be->plane[i].pinfo.bpp == 24)
{
+ be->plane[i].setpixel = nxgl_setpixel_24bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_24bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_24bpp;
be->plane[i].moverectangle = nxgl_moverectangle_24bpp;
@@ -189,6 +195,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
#ifndef CONFIG_NX_DISABLE_32BPP
if (be->plane[i].pinfo.bpp == 32)
{
+ be->plane[i].setpixel = nxgl_setpixel_32bpp;
be->plane[i].fillrectangle = nxgl_fillrectangle_32bpp;
be->plane[i].filltrapezoid = nxgl_filltrapezoid_32bpp;
be->plane[i].moverectangle = nxgl_moverectangle_32bpp;
diff --git a/nuttx/graphics/nxbe/nxbe_setpixel.c b/nuttx/graphics/nxbe/nxbe_setpixel.c
new file mode 100644
index 000000000..d333b9b76
--- /dev/null
+++ b/nuttx/graphics/nxbe/nxbe_setpixel.c
@@ -0,0 +1,158 @@
+/****************************************************************************
+ * graphics/nxbe/nxbe_setpixel.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/nx/nxglib.h>
+
+#include "nxbe.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct nxbe_setpixel_s
+{
+ struct nxbe_clipops_s cops;
+ nxgl_mxpixel_t color;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxbe_clipfill
+ *
+ * Description:
+ * Called from nxbe_clipper() to performed the fill operation on visible portions
+ * of the rectangle.
+ *
+ ****************************************************************************/
+
+static void nxbe_clipfill(FAR struct nxbe_clipops_s *cops,
+ FAR struct nxbe_plane_s *plane,
+ FAR const struct nxgl_rect_s *rect)
+{
+ struct nxbe_setpixel_s *fillinfo = (struct nxbe_setpixel_s *)cops;
+ plane->setpixel(&plane->pinfo, &rect->pt1, fillinfo->color);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxbe_fill
+ *
+ * Description:
+ * Fill the specified rectangle in the window with the specified color
+ *
+ * Input Parameters:
+ * wnd - The window structure reference
+ * rect - The location to be filled
+ * col - The color to use in the fill
+ *
+ * Return:
+ * None
+ *
+ ****************************************************************************/
+
+void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
+ FAR const struct nxgl_point_s *pos,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ struct nxbe_setpixel_s info;
+ struct nxgl_rect_s rect;
+ int i;
+
+#ifdef CONFIG_DEBUG
+ if (!wnd || !pos)
+ {
+ return;
+ }
+#endif
+
+ /* Offset the position by the window origin */
+
+ nxgl_vectoradd(&rect.pt1, pos, &wnd->bounds.pt1);
+
+ /* Make sure that the point is within the limits of the window
+ * and of the background screen
+ */
+
+ if (!nxgl_rectinside(&wnd->bounds, &rect.pt1) ||
+ !nxgl_rectinside(&wnd->be->bkgd.bounds, &rect.pt1))
+ {
+ return;
+ }
+
+ /* Then create a bounding box and render the point if there it
+ * is exposed.
+ */
+
+ rect.pt2.x = rect.pt1.x;
+ rect.pt2.y = rect.pt1.y;
+
+#if CONFIG_NX_NPLANES > 1
+ for (i = 0; i < wnd->be->vinfo.nplanes; i++)
+#else
+ i = 0;
+#endif
+ {
+ info.cops.visible = nxbe_clipfill;
+ info.cops.obscured = nxbe_clipnull;
+ info.color = color[i];
+
+ nxbe_clipper(wnd->above, &rect, NX_CLIPORDER_DEFAULT,
+ &info.cops, &wnd->be->plane[i]);
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 01:15:58 +0000