diff --git a/graphics/nxglyphs/include/cursor-arrow1-30x30.h b/graphics/nxglyphs/include/cursor-arrow1-30x30.h index e125f01ec..817161c08 100644 --- a/graphics/nxglyphs/include/cursor-arrow1-30x30.h +++ b/graphics/nxglyphs/include/cursor-arrow1-30x30.h @@ -1,5 +1,26 @@ +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include + +#include - * - * 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 - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -struct rgb_s -{ - unsigned char r; - unsigned char g; - unsigned char b; -}; - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -static struct rgb_s pixels[1024]; -static int npixels = 0; - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -static int rgb2gray2(unsigned char r, unsigned char g, unsigned char b) -{ - uint32_t rgb = ((uint32_t)r << 16) | ((uint32_t)g << 8) | (uint32_t)b; - - if (rgb == BGCOLOR) - { - return 0; - } - else if (rgb == FGCOLOR1) - { - return 1; - } - else if (rgb == FGCOLOR2) - { - return 2; - } - else if (rgb == FGCOLOR3) - { - return 3; - } - else - { - fprintf(stderr, "ERROR: Unrecognized color (%u,%u,%u), 0x%06lx\n", - r, g, b, (unsigned long)rgb); - fprintf(stderr, " Using BGCOLOR\n"); - return 0; - } -} - -int main(int argc, char **argv, char **envp) -{ - const unsigned char *ptr; - unsigned char r; - unsigned char g; - unsigned char b; - unsigned int stride; - uint32_t code; - int i; - int j; - - printf("#include > 3; - - printf("}\n\n"); - printf("struct cursor_image_s g_cursor\n"); - printf("{\n"); - printf(" .width = %u\n", gimp_image.width); - printf(" .height = %u\n", gimp_image.height); - printf(" .stride = %u,\n", stride); - printf(" .image = g_cursorImage,\n"); - printf("};\n\n"); - - return 0; -} +/**************************************************************************** + * libs/libnx/nxmu/nx_fill.c + * + * Copyright (C) 2008-2009, 2011-2013 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 + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +struct rgb_s +{ + unsigned char r; + unsigned char g; + unsigned char b; +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static struct rgb_s pixels[1024]; +static int npixels = 0; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static int rgb2gray2(unsigned char r, unsigned char g, unsigned char b) +{ + uint32_t rgb = ((uint32_t)r << 16) | ((uint32_t)g << 8) | (uint32_t)b; + + if (rgb == BGCOLOR) + { + return 0; + } + else if (rgb == FGCOLOR1) + { + return 1; + } + else if (rgb == FGCOLOR2) + { + return 2; + } + else if (rgb == FGCOLOR3) + { + return 3; + } + else + { + fprintf(stderr, "ERROR: Unrecognized color (%u,%u,%u), 0x%06lx\n", + r, g, b, (unsigned long)rgb); + fprintf(stderr, " Using BGCOLOR\n"); + return 0; + } +} + +int main(int argc, char **argv, char **envp) +{ + const unsigned char *ptr; + unsigned char r; + unsigned char g; + unsigned char b; + unsigned int stride; + uint32_t code; + int i; + int j; + + printf("#include \n\n"); + printf("#include \n\n"); + printf("#include > 3; + + printf("}\n\n"); + printf("const struct cursor_image_s g_cursor\n"); + printf("{\n"); + printf(" .width = %u\n", gimp_image.width); + printf(" .height = %u\n", gimp_image.height); + printf(" .stride = %u,\n", stride); + printf(" .color1 =\n"); + printf(" {\n"); + printf(" FGCOLOR1\n"); + printf(" },\n"); + printf(" .color2 =\n"); + printf(" {\n"); + printf(" FGCOLOR1\n"); + printf(" },\n"); + printf(" .color3 =\n"); + printf(" {\n"); + printf(" FGCOLOR3\n"); + printf(" },\n"); + printf(" .image = g_cursorImage,\n"); + printf("};\n\n"); + + return 0; +} diff --git a/graphics/nxglyphs/include/mkcursor.sh b/graphics/nxglyphs/include/mkcursor.sh index 3c974249a..86ac25875 100644 --- a/graphics/nxglyphs/include/mkcursor.sh +++ b/graphics/nxglyphs/include/mkcursor.sh @@ -35,7 +35,7 @@ # Get the input parameter list # # - A 4-color image exported as a GIMP C-source file. -# - A 2-bpp cursor image in NuttX cursor format +# - A 2-bpp cursor image in NuttX cursor format # - Treated as the transparent background color (default, 0x000000) # - Usually the primary color of the image (default, 0xff0000) # - Usually the outline color of the image (default, 0x00007f)