From 1831b06f1fb64aec30ac1aca9e7bf072b8df1c54 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 14 Oct 2011 16:58:44 +0000 Subject: Add logic to set individual pixels git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4047 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/graphics/nxbe/Make.defs | 2 +- nuttx/graphics/nxbe/nxbe.h | 28 ++++++- nuttx/graphics/nxbe/nxbe_configure.c | 9 +- nuttx/graphics/nxbe/nxbe_setpixel.c | 158 +++++++++++++++++++++++++++++++++++ nuttx/graphics/nxmu/Make.defs | 9 +- nuttx/graphics/nxmu/nx_setpixel.c | 123 +++++++++++++++++++++++++++ nuttx/graphics/nxmu/nxfe.h | 13 ++- nuttx/graphics/nxmu/nxmu_server.c | 9 +- nuttx/graphics/nxsu/Make.defs | 8 +- nuttx/graphics/nxsu/nx_setpixel.c | 104 +++++++++++++++++++++++ nuttx/include/nuttx/nx/nx.h | 22 ++++- nuttx/include/nuttx/nx/nxglib.h | 2 +- 12 files changed, 471 insertions(+), 16 deletions(-) create mode 100644 nuttx/graphics/nxbe/nxbe_setpixel.c create mode 100644 nuttx/graphics/nxmu/nx_setpixel.c create mode 100644 nuttx/graphics/nxsu/nx_setpixel.c 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 + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * 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); @@ -287,6 +290,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 * 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 + * Author: Gregory Nutt * * 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 + * + * 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 + +#include + +#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]); + } +} diff --git a/nuttx/graphics/nxmu/Make.defs b/nuttx/graphics/nxmu/Make.defs index f661198d5..00feec64a 100644 --- a/nuttx/graphics/nxmu/Make.defs +++ b/nuttx/graphics/nxmu/Make.defs @@ -1,8 +1,8 @@ ############################################################################ # graphics/nxmu/Make.defs # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,8 +38,9 @@ NXAPI_CSRCS = nx_bitmap.c nx_closewindow.c nx_connect.c nx_disconnect.c \ nx_eventhandler.c nx_eventnotify.c nx_fill.c nx_filltrapezoid.c \ nx_getposition.c nx_kbdchin.c nx_kbdin.c nx_lower.c \ nx_mousein.c nx_move.c nx_openwindow.c nx_raise.c \ - nx_releasebkgd.c nx_requestbkgd.c nx_setsize.c nx_setbgcolor.c \ - nx_setposition.c nx_drawcircle.c nx_drawline.c nx_fillcircle.c + nx_releasebkgd.c nx_requestbkgd.c nx_setpixel.c nx_setsize.c \ + nx_setbgcolor.c nx_setposition.c nx_drawcircle.c nx_drawline.c + nx_fillcircle.c NXMU_CSRCS = nxmu_constructwindow.c nxmu_kbdin.c nxmu_mouse.c \ nxmu_openwindow.c nxmu_redrawreq.c nxmu_releasebkgd.c \ nxmu_requestbkgd.c nxmu_reportposition.c nxmu_semtake.c \ diff --git a/nuttx/graphics/nxmu/nx_setpixel.c b/nuttx/graphics/nxmu/nx_setpixel.c new file mode 100644 index 000000000..f4cc17053 --- /dev/null +++ b/nuttx/graphics/nxmu/nx_setpixel.c @@ -0,0 +1,123 @@ +/**************************************************************************** + * graphics/nxmu/nx_setpixel.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include +#include +#include + +#include +#include + +#include "nxfe.h" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nx_setpixel + * + * Description: + * Set a single pixel in the window to the specified color. This is simply + * a degenerate case of nx_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 + * + ****************************************************************************/ + +void nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) +{ + FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd; + struct nxsvrmsg_setpixel_s outmsg; + int ret; + +#ifdef CONFIG_DEBUG + if (!wnd || !wnd->conn || !pos || !color) + { + errno = EINVAL; + return ERROR; + } +#endif + + /* Format the fill command */ + + outmsg.msgid = NX_SVRMSG_SETPIXEL; + outmsg.wnd = wnd; + + nxgl_vectcopy(&outmsg.pos, pos); + nxgl_colorcopy(outmsg.color, color); + + /* Forward the fill command to the server */ + + ret = mq_send(wnd->conn->cwrmq, &outmsg, sizeof(struct nxsvrmsg_setpixel_s), NX_SVRMSG_PRIO); + if (ret < 0) + { + gdbg("mq_send failed: %d\n", errno); + } + return ret; +} diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index 340f772a3..1445b9fb5 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/graphics/nxmu/nxfe.h @@ -2,7 +2,7 @@ * graphics/nxmu/nxfe.h * * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -160,6 +160,7 @@ enum nxmsg_e NX_SVRMSG_GETPOSITION, /* Get the current window position and size */ NX_SVRMSG_RAISE, /* Move the window to the top */ NX_SVRMSG_LOWER, /* Move the window to the bottom */ + NX_SVRMSG_SETPIXEL, /* Set a single pixel in the window with a color */ NX_SVRMSG_FILL, /* Fill a rectangle in the window with a color */ NX_SVRMSG_FILLTRAP, /* Fill a trapezoidal region in the window with a color */ NX_SVRMSG_MOVE, /* Move a rectangular region within the window */ @@ -334,6 +335,16 @@ struct nxsvrmsg_lower_s FAR struct nxbe_window_s *wnd; /* The window to be lowered */ }; +/* Set a single pixel in the window with a color */ + +struct nxsvrmsg_setpixel_s +{ + uint32_t msgid; /* NX_SVRMSG_SETPIXEL */ + FAR struct nxbe_window_s *wnd; /* The window to fill */ + struct nxgl_point_s pos; /* The position of the pixel in the window */ + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the fill */ +}; + /* Fill a rectangle in the window with a color */ struct nxsvrmsg_fill_s diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 38df277e0..47f855d31 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/graphics/nxmu/nxmu_server.c @@ -2,7 +2,7 @@ * graphics/nxmu/nxmu_server.c * * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -433,6 +433,13 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) } break; + case NX_SVRMSG_SETPIXEL: /* Set a single pixel in the window with a color */ + { + FAR struct nxsvrmsg_setpixel_s *setmsg = (FAR struct nxsvrmsg_fill_s *)buffer; + nxbe_setpixel(fillmsg->wnd, &setmsg->pos, setmsg->color); + } + break; + case NX_SVRMSG_FILL: /* Fill a rectangular region in the window with a color */ { FAR struct nxsvrmsg_fill_s *fillmsg = (FAR struct nxsvrmsg_fill_s *)buffer; diff --git a/nuttx/graphics/nxsu/Make.defs b/nuttx/graphics/nxsu/Make.defs index e87f6d035..12885ebf1 100644 --- a/nuttx/graphics/nxsu/Make.defs +++ b/nuttx/graphics/nxsu/Make.defs @@ -1,8 +1,8 @@ ############################################################################ # graphics/nxsu/Make.defs # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,7 +38,7 @@ NXAPI_CSRCS = nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c \ nx_filltrapezoid.c nx_getposition.c nx_kbdchin.c \ nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c \ nx_openwindow.c nx_raise.c nx_releasebkgd.c nx_requestbkgd.c \ - nx_setsize.c nx_setbgcolor.c nx_setposition.c nx_drawcircle.c \ - nx_drawline.c nx_fillcircle.c + nx_setpixel.c nx_setsize.c nx_setbgcolor.c nx_setposition.c \ + nx_drawcircle.c nx_drawline.c nx_fillcircle.c NXSU_CSRCS = nxsu_constructwindow.c nxsu_redrawreq.c nxsu_reportposition.c NX_CSRCS = $(NXAPI_CSRCS) $(NXSU_CSRCS) diff --git a/nuttx/graphics/nxsu/nx_setpixel.c b/nuttx/graphics/nxsu/nx_setpixel.c new file mode 100644 index 000000000..533e3b623 --- /dev/null +++ b/nuttx/graphics/nxsu/nx_setpixel.c @@ -0,0 +1,104 @@ +/**************************************************************************** + * graphics/nxsu/nx_setpixel.c + * + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include +#include +#include + +#include + +#include "nxfe.h" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nx_setpixel + * + * Description: + * Set a single pixel in the window to the specified color. This is simply + * a degenerate case of nx_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 + * + ****************************************************************************/ + +int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]) +{ +#ifdef CONFIG_DEBUG + if (!hwnd || !pos || !color) + { + errno = EINVAL; + return ERROR; + } +#endif + + nxbe_setpixel((FAR struct nxbe_window_s *)hwnd, pos, color); + return 0; +} diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 3198baf7f..9e070b6ee 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -2,7 +2,7 @@ * include/nuttx/nx/nx.h * * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -574,6 +574,26 @@ EXTERN int nx_raise(NXWINDOW hwnd); EXTERN int nx_lower(NXWINDOW hwnd); +/**************************************************************************** + * Name: nx_setpixel + * + * Description: + * Set a single pixel in the window to the specified color. This is simply + * a degenerate case of nx_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: + * OK on success; ERROR on failure with errno set appropriately + * + ****************************************************************************/ + +EXTERN int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); + /**************************************************************************** * Name: nx_fill * diff --git a/nuttx/include/nuttx/nx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h index 95b33772b..22aa51ef4 100644 --- a/nuttx/include/nuttx/nx/nxglib.h +++ b/nuttx/include/nuttx/nx/nxglib.h @@ -2,7 +2,7 @@ * include/nuttx/nx/nxglib.h * * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- cgit v1.2.3