sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/nglyphs/include: Fixes to mkcursor.c. Update all cursor images to hangle extensions to the cursor image structure.

Browse Source
This commit is contained in:
Gregory Nutt 2019-04-07 13:23:43 -06:00
parent 34da66f51e
commit f907270cd4
8 changed files with 418 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
graphics/nxglyphs/include/cursor-arrow1-30x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_arrow1Image[] =
{
0x2c 0x00 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 0 */
@ -34,11 +55,23 @@ static const uint8_t g_arrow1Image[] =
0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00 /* Row 29 */
}
struct cursor_image_s g_arrow1Cursor
const struct cursor_image_s g_arrow1Cursor
{
.width = 30
.height = 30
.stride = 8,
.image = g_arrow1Image,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_arrow1Image
};

38
graphics/nxglyphs/include/cursor-arrow2-30x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_arrow2Image[] =
{
0x2c 0x00 0x00 0x00 0x00 0x00 0x00 0x00 /* Row 0 */
@ -34,11 +55,22 @@ static const uint8_t g_arrow2Image[] =
0x00 0x00 0x00 0xe0 0x00 0x00 0x00 0x00 /* Row 29 */
}
struct cursor_image_s g_arrow2Cursor
const struct cursor_image_s g_arrow2Cursor
{
.width = 30
.height = 30
.stride = 8,
.image = g_arrow2Image,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_arrow2Image
};

38
graphics/nxglyphs/include/cursor-grab-25x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_grabImage[] =
{
0x00 0x00 0x02 0xc0 0x00 0x00 0x00 /* Row 0 */
@ -34,11 +55,22 @@ static const uint8_t g_grabImage[] =
0x00 0x2a 0xaa 0xaa 0xaa 0xb0 0x00 /* Row 29 */
}
struct cursor_image_s g_grabCursor
const struct cursor_image_s g_grabCursor
{
.width = 25
.height = 30
.stride = 7,
.image = g_grabImage,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_grabImage
};

38
graphics/nxglyphs/include/cursor-wait-23x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_waitImage[] =
{
0xaa 0xaa 0xaa 0xaa 0xaa 0xa8 /* Row 0 */
@ -34,11 +55,22 @@ static const uint8_t g_waitImage[] =
0xaa 0xaa 0xaa 0xaa 0xaa 0xa8 /* Row 29 */
}
struct cursor_image_s g_waitCursor
const struct cursor_image_s g_waitCursor
{
.width = 23
.height = 30
.stride = 6,
.image = g_waitImage,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_waitImage
};

37
graphics/nxglyphs/include/cursor-zoomin-30x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_zoomInImage[] =
{
0x00 0x03 0xaa 0xa8 0x00 0x00 0x00 0x00 /* Row 0 */
@ -34,11 +55,23 @@ static const uint8_t g_zoomInImage[] =
0x00 0x00 0x00 0x00 0x00 0x00 0x2a 0x80 /* Row 29 */
}
struct cursor_image_s g_zoomInCursor
const struct cursor_image_s g_zoomInCursor
{
.width = 30
.height = 30
.stride = 8,
.image = g_zoomInImage,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_zoomInImage
};

38
graphics/nxglyphs/include/cursor-zoomout-30x30.h
View File

@ -1,5 +1,26 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/video/rgbcolors.h
#include <nuttx/video/cursor.h
#if CONFIG_NXWIDGETS_BPP == 8
# define FGCOLOR1 RGB8WHITE
# define FGCOLOR2 RGB8BLACK
# define FGCOLOR3 RGB8GRAY
#elif CONFIG_NXWIDGETS_BPP == 16
# define FGCOLOR1 RGB16WHITE
# define FGCOLOR2 RGB18BLACK
# define FGCOLOR3 RGB16GRAY
#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32
# define FGCOLOR1 RGB24WHITE
# define FGCOLOR2 RGB24BLACK
# define FGCOLOR3 RGB24GRAY
#else
# error "Pixel depth not supported (CONFIG_NXWIDGETS_BPP)"
#endif
static const uint8_t g_zoomOutImage[] =
{
0x00 0x03 0xaa 0xab 0x00 0x00 0x00 0x00 /* Row 0 */
@ -34,11 +55,22 @@ static const uint8_t g_zoomOutImage[] =
0x00 0x00 0x00 0x00 0x00 0x00 0x3a 0x80 /* Row 29 */
}
struct cursor_image_s g_zoomOutCursor
const struct cursor_image_s g_zoomOutCursor
{
.width = 30
.height = 30
.stride = 8,
.image = g_zoomOutImage,
.color1 =
{
FGCOLOR1
},
.color2 =
{
FGCOLOR1
},
.color3 =
{
FGCOLOR3
},
.image = g_zoomOutImage
};

33
graphics/nxglyphs/include/mkcursor.c
View File

@ -103,8 +103,27 @@ int main(int argc, char **argv, char **envp)
int i;
int j;
printf("#include <nuttx/config.h>\n\n");
printf("#include <stdint.h>\n\n");
printf("#include <nuttx/video/rgbcolors.h\n");
printf("#include <nuttx/video/cursor.h\n\n");
printf("#if CONFIG_NXWIDGETS_BPP == 8\n");
printf("# define FGCOLOR1 RGB8WHITE\n");
printf("# define FGCOLOR2 RGB8BLACK\n");
printf("# define FGCOLOR3 RGB8GRAY\n");
printf("#elif CONFIG_NXWIDGETS_BPP == 16\n");
printf("# define FGCOLOR1 RGB16WHITE\n");
printf("# define FGCOLOR2 RGB18BLACK\n");
printf("# define FGCOLOR3 RGB16GRAY\n");
printf("#elif CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32\n");
printf("# define FGCOLOR1 RGB24WHITE\n");
printf("# define FGCOLOR2 RGB24BLACK\n");
printf("# define FGCOLOR3 RGB24GRAY\n");
printf("#else\n");
printf("# error \"Pixel depth not supported (CONFIG_NXWIDGETS_BPP)\"\n");
printf("#endif\n\n");
printf("static const uint8_t g_cursorImage[] =\n");
printf("{\n");
@ -164,11 +183,23 @@ int main(int argc, char **argv, char **envp)
stride = (2 * gimp_image.width + 7) >> 3;
printf("}\n\n");
printf("struct cursor_image_s g_cursor\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");

2
graphics/nxglyphs/include/mkcursor.sh
View File

@ -35,7 +35,7 @@
# Get the input parameter list
#
# <input-file> - A 4-color image exported as a GIMP C-source file.
# <output-file> - A 2-bpp cursor image in NuttX cursor format
# <output-file> - A 2-bpp cursor image in NuttX cursor format
# <back-ground> - Treated as the transparent background color (default, 0x000000)
# <color1> - Usually the primary color of the image (default, 0xff0000)
# <color2> - Usually the outline color of the image (default, 0x00007f)