Integrating font capabilities; debug bitmap logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1415 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2008-12-04 23:03:33 +00:00
parent 6956b4543e
commit acaffaf715
10 changed files with 43 additions and 73 deletions
+2 -1
View File
@@ -659,7 +659,8 @@ EXTERN int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* hwnd - The window that will receive the bitmap image
* dest - Describes the rectangular on the display that will receive the
* the bit map.
* src - The start of the source image.
* src - The start of the source image. This is an array source
* images of size CONFIG_NX_NPLANES.
* origin - The origin of the upper, left-most corner of the full bitmap.
* Both dest and origin are in window coordinates, however, origin
* may lie outside of the display.
+1
View File
@@ -43,6 +43,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <fixedmath.h>
#include <nuttx/fb.h>
/****************************************************************************
* Pre-processor definitions
+8 -6
View File
@@ -273,10 +273,11 @@ EXTERN int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
* hfwnd The client sub0window that will receive the bitmap image
* dest - Describes the rectangular region on in the client sub-window
* will receive the bit map.
* src - The start of the source image.
* src - The start of the source image(s). This is an array source
* images of size CONFIG_NX_NPLANES.
* origin - The origin of the upper, left-most corner of the full bitmap.
* Both dest and origin are in window coordinates, however, origin
* may lie outside of the display.
* Both dest and origin are in sub-window coordinates, however, the
* origin may lie outside of the sub-window display.
* stride - The width of the full source image in pixels.
*
* Return:
@@ -286,7 +287,7 @@ EXTERN int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
EXTERN int nxtk_bitmapwindow(NXTKWINDOW hfwnd,
FAR const struct nxgl_rect_s *dest,
FAR const void **src,
FAR const void *src[CONFIG_NX_NPLANES],
FAR const struct nxgl_point_s *origin,
unsigned int stride);
@@ -364,6 +365,7 @@ EXTERN int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect
EXTERN int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
/****************************************************************************
* Name: nxtk_movetoolbar
*
@@ -399,8 +401,8 @@ EXTERN int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect
* will receive the bit map.
* src - The start of the source image.
* origin - The origin of the upper, left-most corner of the full bitmap.
* Both dest and origin are in window coordinates, however, origin
* may lie outside of the display.
* Both dest and origin are in sub-window coordinates, however, the
* origin may lie outside of the sub-window display.
* stride - The width of the full source image in pixels.
*
* Return: