Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Abandon attempt to get common data structures for NX and the raw framebuffer cursor interface. This backs out several changes.

Browse Source
This commit is contained in:
Gregory Nutt
2019-04-07 18:00:40 -06:00
parent e5c56aaab6
commit 2c2729521b
12 changed files with 95 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe.h
+3 -3
View File
@@ -196,7 +196,7 @@ struct nxbe_cursor_s
struct nxbe_cursor_s
{
bool visible; /* True: the cursor is visible */
struct cursor_pos_s pos; /* The current cursor position */
struct nxgl_point_s pos; /* The current cursor position */
};
#endif
@@ -321,7 +321,7 @@ void nxbe_cursor_enable(FAR struct nxbe_state_s *be, bool enable);
#if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR)
void nxbe_cursor_setimage(FAR struct nxbe_state_s *be,
FAR struct cursor_image_s *image);
FAR struct nx_cursorimage_s *image);
#endif
/****************************************************************************
@@ -340,7 +340,7 @@ void nxbe_cursor_setimage(FAR struct nxbe_state_s *be,
****************************************************************************/
void nxcursor_setposition(FAR struct nxbe_state_s *be,
FAR const struct cursor_pos_s *pos);
FAR const struct nxgl_point_s *pos);
#endif /* CONFIG_NX_SWCURSOR || CONFIG_NX_HWCURSOR */
/****************************************************************************
graphics/nxbe/nxbe_cursor.c
+2 -2
View File
@@ -300,7 +300,7 @@ void nxbe_cursor_enable(FAR struct nxbe_state_s *be, bool enable)
#if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR)
void nxbe_cursor_setimage(FAR struct nxbe_state_s *be,
FAR struct cursor_image_s *image);
FAR struct nx_cursorimage_s *image);
{
#warning Missing logic
}
@@ -322,7 +322,7 @@ void nxbe_cursor_setimage(FAR struct nxbe_state_s *be,
****************************************************************************/
void nxcursor_setposition(FAR struct nxbe_state_s *be,
FAR const struct cursor_pos_s *pos)
FAR const struct nxgl_point_s *pos)
{
#warning Missing logic
}
graphics/vnc/server/vnc_fbdev.c
+2 -2
View File
@@ -132,12 +132,12 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
/* Current cursor position */
#ifdef CONFIG_FB_HWCURSOR
static struct cursor_pos_s g_cpos;
static struct fb_cursorpos_s g_cpos;
/* Current cursor size */
#ifdef CONFIG_FB_HWCURSORSIZE
static struct cursor_size_s g_csize;
static struct fb_cursorsize_s g_csize;
#endif
#endif