diff --git a/graphics/Kconfig b/graphics/Kconfig index a9a5520a5fa..3190325f685 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -77,11 +77,10 @@ config NX_NOCURSOR config NX_SWCURSOR bool "Software cursor support" - depends on !NX_LCDDRIVER && NX_DISABLE_1BPP && NX_DISABLE_2BPP && NX_DISABLE_4BPP && !BUILD_KERNEL && EXPERIMENTAL + depends on !NX_LCDDRIVER && NX_DISABLE_1BPP && NX_DISABLE_2BPP && NX_DISABLE_4BPP && !BUILD_KERNEL ---help--- - Software cursors are a work in progress hence the EXPERIMENTAL - dependency. The other dependencies are due to implemented - capabilities. This assumes that: + Software cursor support has several dependencies are due to un- + implemented cursor capabilities. This assumes the following: 1. You are using a framebuffer hardware interface. This is because the logic to implement this feature on top of the LCD @@ -96,7 +95,6 @@ config NX_SWCURSOR generally available. In that case, we could keep the image in a shared memory region or perhaps copy the image into a kernel internal buffer. Neither of those are implemented. - 4. Only a single color plane is supported at present. config NX_HWCURSOR bool "Software cursor support" diff --git a/graphics/nxbe/nxbe_cursor.c b/graphics/nxbe/nxbe_cursor.c index 6231008c2a1..9e3b667a36c 100644 --- a/graphics/nxbe/nxbe_cursor.c +++ b/graphics/nxbe/nxbe_cursor.c @@ -161,8 +161,8 @@ void nxbe_cursor_enable(FAR struct nxbe_state_s *be, bool enable) * Description: * Set the cursor image. * - * The image is provided a a 2-bits-per-pixel image. The two bit incoding - * is as followings: + * The image is provided a a 2-bits-per-pixel image. The two bit encoding + * is as follows: * * 00 - The transparent background * 01 - Color1: The main color of the cursor diff --git a/include/nuttx/nx/nxcursor.h b/include/nuttx/nx/nxcursor.h index ad842839121..b817d0f2bab 100644 --- a/include/nuttx/nx/nxcursor.h +++ b/include/nuttx/nx/nxcursor.h @@ -79,13 +79,12 @@ extern "C" * a process space and will not be generally available. In that case, * we could keep the image in a shared memory region or perhaps copy the * image into a kernel internal buffer. Neither of those are implemented. - * 4. Only a single color plane is supported at present. */ #if (defined(CONFIG_NX_SWCURSOR) && \ (defined(CONFIG_NX_LCDDRIVER) || !defined(CONFIG_NX_DISABLE_1BPP) || \ !defined(CONFIG_NX_DISABLE_2BPP) || !defined(CONFIG_NX_DISABLE_4BPP) || \ - defined(CONFIG_BUILD_KERNEL) || CONFIG_NX_NPLANES > 1)) + defined(CONFIG_BUILD_KERNEL))) # undef CONFIG_NX_NOCURSOR # undef CONFIG_NX_SWCURSOR # define CONFIG_NX_NOCURSOR 1 @@ -143,8 +142,8 @@ int nxcursor_enable(NXHANDLE hnd, bool enable); * Description: * Set the cursor image. * - * The image is provided a a 2-bits-per-pixel image. The two bit incoding - * is as followings: + * The image is provided a a 2-bits-per-pixel image. The two bit encoding + * is as follows: * * 00 - The transparent background. * 01 - Color1: The main color of the cursor. diff --git a/libs/libnx/nxmu/nx_cursor.c b/libs/libnx/nxmu/nx_cursor.c index ed4d61cd4cd..13e044fc6da 100644 --- a/libs/libnx/nxmu/nx_cursor.c +++ b/libs/libnx/nxmu/nx_cursor.c @@ -97,8 +97,8 @@ int nxcursor_enable(NXHANDLE hnd, bool enable) * Description: * Set the cursor image. * - * The image is provided a a 2-bits-per-pixel image. The two bit incoding - * is as followings: + * The image is provided a a 2-bits-per-pixel image. The two bit encoding + * is as follows: * * 00 - The transparent background * 01 - Color1: The main color of the cursor