diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 95405ecd0a4..9d19b9e3909 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@
Last Updated: April 11, 2019
+Last Updated: May 8, 2019
@@ -123,17 +123,19 @@ 2.3.18nx_setsize()nx_raise()nx_lower()nx_fill()nx_getrectangle()nx_filltrapezoid()nx_drawline()nx_drawcircle()nx_fillcircle()nx_setbgcolor()nx_move()nx_bitmap()nx_kbdin()nx_mousein()nx_modal()nx_setvisibility()nx_fill()nx_getrectangle()nx_filltrapezoid()nx_drawline()nx_drawcircle()nx_fillcircle()nx_setbgcolor()nx_move()nx_bitmap()nx_kbdin()nx_mousein()nxtk_setsize()nxtk_raise()nxtk_lower()nxtk_fillwindow()nxtk_getwindow()nxtk_filltrapwindow()nxtk_drawlinewindow()nxtk_drawcirclewindow()nxtk_fillcirclewindow()nxtk_movewindow()nxtk_bitmapwindow()nxtk_opentoolbar()nxtk_closetoolbar()nxtk_filltoolbar()nxtk_gettoolbar()nxtk_filltraptoolbar()nxtk_drawlinetoolbar()nxtk_drawcircletoolbar()nxtk_fillcircletoolbar()nxtk_movetoolbar()nxtk_bitmaptoolbar()
+ 2.4.11 nxtk_modal()nxtk_setvisibility()nxtk_fillwindow()nxtk_getwindow()nxtk_filltrapwindow()nxtk_drawlinewindow()nxtk_drawcirclewindow()nxtk_fillcirclewindow()nxtk_movewindow()nxtk_bitmapwindow()nxtk_opentoolbar()nxtk_closetoolbar()nxtk_filltoolbar()nxtk_gettoolbar()nxtk_filltraptoolbar()nxtk_drawlinetoolbar()nxtk_drawcircletoolbar()nxtk_fillcircletoolbar()nxtk_movetoolbar()nxtk_bitmaptoolbar()
@@ -1592,6 +1596,8 @@ int nx_requestbkgd(NXHANDLE handle,
nx_setsize(),
nx_raise(), or
nx_lower().
+ nx_modal().
+ nx_setvisibility().
nx_requestbkgd() nor
@@ -1788,7 +1794,64 @@ int nx_lower(NXWINDOW hwnd);
ERROR on failure with errno set appropriately
-nx_fill()nx_modal()Function Prototype:
++#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +int nx_modal(NXWINDOW hwnd, bool modal); ++
+ Description: May be used to either (1) raise a window to the top of the display and select modal behavior, or (2) disable modal behavior. +
++ Input Parameters: +
hwnd
+ nx_openwindow().
+ This handle must not have been created by
+ nx_requestbkgd().
+ modal
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nx_setvisibility()Function Prototype:
++#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +int nx_setvisibility(NXWINDOW hwnd, bool hide); ++
+ Description: Select if the window is visible or hidden. + A hidden window is still present and will update normally, but will not be visible on the display until it is unhidden. +
++ Input Parameters: +
hwnd
+ nx_openwindow().
+ This handle must not have been created by
+ nx_requestbkgd().
+ hide
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nx_fill()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1819,7 +1882,7 @@ int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.3.22
+nx_getrectangle()2.3.24
nx_getrectangle()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1859,7 +1922,7 @@ void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.3.23
+nx_filltrapezoid()2.3.25
nx_filltrapezoid()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1893,7 +1956,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,ERRORon failure witherrnoset appropriately -2.3.24
+nx_drawline()2.3.26
nx_drawline()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1941,7 +2004,7 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,ERRORon failure witherrnoset appropriately -2.3.25
+nx_drawcircle()2.3.27
nx_drawcircle()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1977,7 +2040,7 @@ int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,ERRORon failure witherrnoset appropriately -2.3.26
+nx_fillcircle()2.3.28
nx_fillcircle()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2010,7 +2073,7 @@ int nx_fillcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,ERRORon failure witherrnoset appropriately -2.3.27
+nx_setbgcolor()2.3.29
nx_setbgcolor()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2038,7 +2101,7 @@ int nx_setbgcolor(NXHANDLE handle,ERRORon failure witherrnoset appropriately -2.3.28
+nx_move()2.3.30
nx_move()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2069,7 +2132,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.3.29
+nx_bitmap()2.3.31
nx_bitmap()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2111,7 +2174,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,ERRORon failure witherrnoset appropriately -2.3.30
+nx_kbdin()2.3.32
nx_kbdin()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2134,7 +2197,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);ERRORon failure witherrnoset appropriately -2.3.31
+nx_mousein()2.3.33
nx_mousein()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2520,7 +2583,62 @@ int nxtk_lower(NXTKWINDOW hfwnd);ERRORon failure witherrnoset appropriately -2.4.11
+nxtk_fillwindow()2.4.11
+nxtk_modal()Function Prototype:
+
+#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> + +int nxtk_modal(NXWINDOW hwnd, bool modal); ++
+ Description: May be used to either (1) raise a window to the top of the display and select modal behavior, or (2) disable modal behavior. +
++ Input Parameters: +
hwnd
+ nxtk_openwindow() specifying the window to be modified.
+ modal
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_setvisibility()Function Prototype:
++#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> + +int nxtk_setvisibility(NXWINDOW hwnd, bool hide); ++
+ Description: Select if the window is visible or hidden. + A hidden window is still present and will update normally, but will not be visible on the display until it is unhidden. +
++ Input Parameters: +
hwnd
+ nxtk_openwindow() specifying the window to be modified.
+ hide
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_fillwindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2552,7 +2670,7 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.12
+nxtk_getwindow()2.4.14
nxtk_getwindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2592,7 +2710,7 @@ void nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.13
+nxtk_filltrapwindow()2.4.15
nxtk_filltrapwindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2625,7 +2743,7 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd,ERRORon failure witherrnoset appropriately -2.4.14
+nxtk_drawlinewindow()2.4.16
nxtk_drawlinewindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2674,7 +2792,7 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,ERRORon failure witherrnoset appropriately -2.4.15
+nxtk_drawcirclewindow()2.4.17
nxtk_drawcirclewindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2710,7 +2828,7 @@ int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *centeERRORon failure witherrnoset appropriately -2.4.16
+nxtk_fillcirclewindow()2.4.18
nxtk_fillcirclewindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2743,7 +2861,7 @@ int nxtk_fillcirclewindow(NXWINDOW hfwnd, FAR const struct nxgl_point_s *center,ERRORon failure witherrnoset appropriately -2.4.17
+nxtk_movewindow()2.4.19
nxtk_movewindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2776,7 +2894,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.18
+nxtk_bitmapwindow()2.4.20
nxtk_bitmapwindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2821,7 +2939,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd,ERRORon failure witherrnoset appropriately -2.4.19
+nxtk_opentoolbar()2.4.21
nxtk_opentoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2856,7 +2974,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,ERRORon failure witherrnoset appropriately -2.4.20
+nxtk_closetoolbar()2.4.22
nxtk_closetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2885,7 +3003,7 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd);ERRORon failure witherrnoset appropriately -2.4.21
+nxtk_filltoolbar()2.4.23
nxtk_filltoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2917,7 +3035,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.22
+nxtk_gettoolbar()2.4.24
nxtk_gettoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2958,7 +3076,7 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.23
+nxtk_filltraptoolbar()2.4.25
nxtk_filltraptoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2990,7 +3108,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trERRORon failure witherrnoset appropriately -2.4.24
+nxtk_drawlinetoolbar()2.4.26
nxtk_drawlinetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -3039,7 +3157,7 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,ERRORon failure witherrnoset appropriately -2.4.25
+nxtk_drawcircletoolbar()2.4.27
nxtk_drawcircletoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -3075,7 +3193,7 @@ int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *centERRORon failure witherrnoset appropriately -2.4.26
+nxtk_fillcircletoolbar()2.4.28
nxtk_fillcircletoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -3108,7 +3226,7 @@ int nxtk_fillcircletoolbar(NXWINDOW hfwnd, FAR const struct nxgl_point_s *centerERRORon failure witherrnoset appropriately -2.4.27
+nxtk_movetoolbar()2.4.29
nxtk_movetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -3142,7 +3260,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.28
+nxtk_bitmaptoolbar()2.4.30
nxtk_bitmaptoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -4353,6 +4471,18 @@ sudo ln -s libXext.so.6.4.0 libXext.so
<NuttX-Directory>/.config file
YES
+
+
+ nx_modal()
+
+ NO
+
+
+ nx_setvisibility()
+ Exercized using Twm4Nx
+ YES, Informally
+
+
nx_fill()
Change to CONFIG_EXAMPLES_NX_RAWWINDOWS=y in the
@@ -4464,6 +4594,16 @@ sudo ln -s libXext.so.6.4.0 libXext.so
YES
+
+ nxtk_modal()
+
+ NO
+
+
+ nxtk_setvisibility()
+ Exercized using Twm4Nx
+ YES, informally
+
nxtk_fillwindow()
diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h
index 7b2d22aab8e..5ef3a7c3079 100644
--- a/include/nuttx/nx/nx.h
+++ b/include/nuttx/nx/nx.h
@@ -686,7 +686,7 @@ int nx_modal(NXWINDOW hwnd, bool modal);
*
* Description:
* Select if the window is visible or hidden. A hidden window is still
- * present will will update normally, but will be on the visiable on the
+ * present and will update normally, but will not be visible on the
* display until it is unhidden.
*
* Input Parameters:
diff --git a/include/nuttx/nx/nxtk.h b/include/nuttx/nx/nxtk.h
index b6399056a65..1b44a330744 100644
--- a/include/nuttx/nx/nxtk.h
+++ b/include/nuttx/nx/nxtk.h
@@ -354,7 +354,7 @@ int nxtk_modal(NXTKWINDOW hfwnd, bool modal);
*
* Description:
* Select if the window is visible or hidden. A hidden window is still
- * present will will update normally, but will be on the visiable on the
+ * present and will update normally, but will not be on visible on the
* display until it is unhidden.
*
* Input Parameters:
diff --git a/libs/libnx/nxmu/nx_setvisibility.c b/libs/libnx/nxmu/nx_setvisibility.c
index 211a38be893..3e3c25def4e 100644
--- a/libs/libnx/nxmu/nx_setvisibility.c
+++ b/libs/libnx/nxmu/nx_setvisibility.c
@@ -55,7 +55,7 @@
*
* Description:
* Select if the window is visible or hidden. A hidden window is still
- * present will will update normally, but will be on the visiable on the
+ * present and will update normally, but will not be visible on the
* display until it is unhidden.
*
* Input Parameters:
diff --git a/libs/libnx/nxtk/nxtk_setvisibility.c b/libs/libnx/nxtk/nxtk_setvisibility.c
index 912ebaea082..f92626e58d4 100644
--- a/libs/libnx/nxtk/nxtk_setvisibility.c
+++ b/libs/libnx/nxtk/nxtk_setvisibility.c
@@ -57,7 +57,7 @@
*
* Description:
* Select if the window is visible or hidden. A hidden window is still
- * present will will update normally, but will be on the visiable on the
+ * present and will update normally, but will not be visible on the
* display until it is unhidden.
*
* Input Parameters: