From bc4d0f11678c9636aedcd03fe31d675d1578a6c2 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 24 Jul 2011 20:49:01 +0000 Subject: [PATCH] Move NX header files to include/nuttx/nx git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3816 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 4 +- Documentation/NXGraphicsSubsystem.html | 291 +++++++++++---------- arch/arm/src/dm320/dm320_framebuffer.c | 2 +- graphics/README.txt | 26 +- graphics/nxbe/nxbe.h | 4 +- graphics/nxbe/nxbe_bitmap.c | 2 +- graphics/nxbe/nxbe_clipper.c | 2 +- graphics/nxbe/nxbe_closewindow.c | 2 +- graphics/nxbe/nxbe_fill.c | 4 +- graphics/nxbe/nxbe_filltrapezoid.c | 2 +- graphics/nxbe/nxbe_lower.c | 4 +- graphics/nxbe/nxbe_move.c | 2 +- graphics/nxbe/nxbe_raise.c | 4 +- graphics/nxbe/nxbe_redraw.c | 4 +- graphics/nxbe/nxbe_setposition.c | 4 +- graphics/nxbe/nxbe_setsize.c | 4 +- graphics/nxbe/nxbe_visible.c | 4 +- graphics/nxfonts/nxfonts_bitmaps.c | 2 +- graphics/nxfonts/nxfonts_convert.c | 4 +- graphics/nxfonts/nxfonts_getfont.c | 4 +- graphics/nxfonts/nxfonts_internal.h | 2 +- graphics/nxglib/fb/nxglib_copyrectangle.c | 4 +- graphics/nxglib/fb/nxglib_fillrectangle.c | 4 +- graphics/nxglib/fb/nxglib_filltrapezoid.c | 4 +- graphics/nxglib/fb/nxglib_moverectangle.c | 4 +- graphics/nxglib/lcd/nxglib_copyrectangle.c | 4 +- graphics/nxglib/lcd/nxglib_fillrectangle.c | 4 +- graphics/nxglib/lcd/nxglib_filltrapezoid.c | 4 +- graphics/nxglib/lcd/nxglib_moverectangle.c | 4 +- graphics/nxglib/nxglib_bitblit.h | 4 +- graphics/nxglib/nxglib_colorcopy.c | 4 +- graphics/nxglib/nxglib_nonintersecting.c | 4 +- graphics/nxglib/nxglib_nullrect.c | 4 +- graphics/nxglib/nxglib_rectcopy.c | 4 +- graphics/nxglib/nxglib_rectinside.c | 4 +- graphics/nxglib/nxglib_rectintersect.c | 4 +- graphics/nxglib/nxglib_rectoffset.c | 4 +- graphics/nxglib/nxglib_rectoverlap.c | 4 +- graphics/nxglib/nxglib_rectsize.c | 4 +- graphics/nxglib/nxglib_rectunion.c | 4 +- graphics/nxglib/nxglib_rgb2yuv.c | 4 +- graphics/nxglib/nxglib_runcopy.c | 4 +- graphics/nxglib/nxglib_runoffset.c | 4 +- graphics/nxglib/nxglib_trapcopy.c | 4 +- graphics/nxglib/nxglib_trapoffset.c | 4 +- graphics/nxglib/nxglib_vectoradd.c | 4 +- graphics/nxglib/nxglib_vectsubtract.c | 4 +- graphics/nxglib/nxglib_yuv2rgb.c | 4 +- graphics/nxmu/nx_bitmap.c | 4 +- graphics/nxmu/nx_closewindow.c | 4 +- graphics/nxmu/nx_connect.c | 4 +- graphics/nxmu/nx_disconnect.c | 4 +- graphics/nxmu/nx_eventhandler.c | 4 +- graphics/nxmu/nx_eventnotify.c | 4 +- graphics/nxmu/nx_fill.c | 6 +- graphics/nxmu/nx_filltrapezoid.c | 4 +- graphics/nxmu/nx_getposition.c | 4 +- graphics/nxmu/nx_kbdchin.c | 4 +- graphics/nxmu/nx_kbdin.c | 4 +- graphics/nxmu/nx_lower.c | 4 +- graphics/nxmu/nx_mousein.c | 4 +- graphics/nxmu/nx_move.c | 4 +- graphics/nxmu/nx_openwindow.c | 4 +- graphics/nxmu/nx_raise.c | 4 +- graphics/nxmu/nx_releasebkgd.c | 4 +- graphics/nxmu/nx_requestbkgd.c | 4 +- graphics/nxmu/nx_setbgcolor.c | 4 +- graphics/nxmu/nx_setposition.c | 4 +- graphics/nxmu/nx_setsize.c | 4 +- graphics/nxmu/nxfe.h | 4 +- graphics/nxmu/nxmu_constructwindow.c | 4 +- graphics/nxmu/nxmu_kbdin.c | 4 +- graphics/nxmu/nxmu_mouse.c | 6 +- graphics/nxmu/nxmu_openwindow.c | 4 +- graphics/nxmu/nxmu_redrawreq.c | 4 +- graphics/nxmu/nxmu_releasebkgd.c | 4 +- graphics/nxmu/nxmu_reportposition.c | 6 +- graphics/nxmu/nxmu_requestbkgd.c | 4 +- graphics/nxmu/nxmu_semtake.c | 4 +- graphics/nxmu/nxmu_server.c | 4 +- graphics/nxsu/nx_bitmap.c | 2 +- graphics/nxsu/nx_close.c | 2 +- graphics/nxsu/nx_closewindow.c | 2 +- graphics/nxsu/nx_fill.c | 2 +- graphics/nxsu/nx_filltrapezoid.c | 2 +- graphics/nxsu/nx_getposition.c | 2 +- graphics/nxsu/nx_kbdchin.c | 2 +- graphics/nxsu/nx_kbdin.c | 2 +- graphics/nxsu/nx_lower.c | 2 +- graphics/nxsu/nx_mousein.c | 6 +- graphics/nxsu/nx_move.c | 2 +- graphics/nxsu/nx_open.c | 2 +- graphics/nxsu/nx_openwindow.c | 2 +- graphics/nxsu/nx_raise.c | 2 +- graphics/nxsu/nx_releasebkgd.c | 2 +- graphics/nxsu/nx_requestbkgd.c | 2 +- graphics/nxsu/nx_setbgcolor.c | 2 +- graphics/nxsu/nx_setposition.c | 2 +- graphics/nxsu/nx_setsize.c | 2 +- graphics/nxsu/nxfe.h | 2 +- graphics/nxsu/nxsu_constructwindow.c | 2 +- graphics/nxsu/nxsu_redrawreq.c | 2 +- graphics/nxsu/nxsu_reportposition.c | 2 +- graphics/nxtk/nxtk_bitmaptoolbar.c | 4 +- graphics/nxtk/nxtk_bitmapwindow.c | 4 +- graphics/nxtk/nxtk_closetoolbar.c | 4 +- graphics/nxtk/nxtk_closewindow.c | 4 +- graphics/nxtk/nxtk_containerclip.c | 4 +- graphics/nxtk/nxtk_drawframe.c | 8 +- graphics/nxtk/nxtk_events.c | 2 +- graphics/nxtk/nxtk_filltoolbar.c | 4 +- graphics/nxtk/nxtk_filltraptoolbar.c | 4 +- graphics/nxtk/nxtk_filltrapwindow.c | 4 +- graphics/nxtk/nxtk_fillwindow.c | 4 +- graphics/nxtk/nxtk_getposition.c | 4 +- graphics/nxtk/nxtk_internal.h | 4 +- graphics/nxtk/nxtk_lower.c | 4 +- graphics/nxtk/nxtk_movetoolbar.c | 4 +- graphics/nxtk/nxtk_movewindow.c | 4 +- graphics/nxtk/nxtk_opentoolbar.c | 4 +- graphics/nxtk/nxtk_openwindow.c | 2 +- graphics/nxtk/nxtk_raise.c | 4 +- graphics/nxtk/nxtk_setposition.c | 4 +- graphics/nxtk/nxtk_setsize.c | 4 +- graphics/nxtk/nxtk_setsubwindows.c | 2 +- graphics/nxtk/nxtk_subwindowclip.c | 4 +- graphics/nxtk/nxtk_subwindowmove.c | 4 +- include/nuttx/{ => nx}/nx.h | 12 +- include/nuttx/{ => nx}/nxfonts.h | 12 +- include/nuttx/{ => nx}/nxglib.h | 10 +- include/nuttx/{ => nx}/nxtk.h | 12 +- tools/README.txt | 6 +- 132 files changed, 415 insertions(+), 400 deletions(-) rename include/nuttx/{ => nx}/nx.h (99%) rename include/nuttx/{ => nx}/nxfonts.h (97%) rename include/nuttx/{ => nx}/nxglib.h (99%) rename include/nuttx/{ => nx}/nxtk.h (98%) diff --git a/ChangeLog b/ChangeLog index 605c9f7675..396f3ae88b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1942,4 +1942,6 @@ * tools/bdf-converter.c. This C file is used to build the bdf-converter program. The bdf-converter program be used to convert fonts in Bitmap Distribution Format (BDF) into fonts that can be used in the NX graphics - system. \ No newline at end of file + system. + * include/nuttx/nx: Move all NX header files from include/nuttx to + include/nuttx/nx. \ No newline at end of file diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 99ffda846f..1c3305be57 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@

NX Graphics Subsystem

-

Last Updated: July 23, 2011

+

Last Updated: July 24, 2011

@@ -332,7 +332,7 @@ graphics memory). NX includes both a small-footprint, single user implementaton (NXSU) and a somewhat larger multi-user implentation (NXMU as described below). - Both conform to the same APIs as defined in include/nuttx/nx.h and, hence, + Both conform to the same APIs as defined in include/nuttx/nx/nx.h and, hence, are interchangable1. NX can be used without NXWIDGETS and without NXTOOLKIT for raw window displays.

@@ -404,15 +404,15 @@

2.1 NX Header Files

@@ -422,7 +422,7 @@ NXGL provides many APIs, some available for use internally by NX and others for use by applications as well. Only those APIs intended for application usage are documented here - See include/nuttx/nxglib.h for the full set of APIs; + See include/nuttx/nx/nxglib.h for the full set of APIs; those APIs might be of interest if you are rendering directly into framebuffer or LCD memory.

@@ -512,7 +512,7 @@ struct nxgl_trapezoid_s

2.2.1 nxgl_rgb2yuv()

Function Prototype:

@@ -523,7 +523,7 @@ void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8

2.2.2 nxgl_yuv2rgb()

Function Prototype:

@@ -534,7 +534,7 @@ void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8

2.2.3 nxgl_rectcopy()

Function Prototype:

@@ -547,7 +547,7 @@ void nxgl_rectcopy(FAR struct nxgl_rect_s *dest,

2.2.4 nxgl_rectoffset()

Function Prototype: