diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-03 15:27:40 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-03 15:27:40 +0000 |
| commit | 148215506db4a47326caf083d90ffed788583061 (patch) | |
| tree | 2a6cf811d1e1c86821e0cd284c056bb2e7f531f7 /nuttx/examples/nx/nx_internal.h | |
| parent | 37b3d65d15fa5e041a5cdb03d404505ae293e38e (diff) | |
| download | px4-nuttx-148215506db4a47326caf083d90ffed788583061.tar.gz px4-nuttx-148215506db4a47326caf083d90ffed788583061.tar.bz2 px4-nuttx-148215506db4a47326caf083d90ffed788583061.zip | |
Modify examples/nx to use NXTK; fix related bugs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1407 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples/nx/nx_internal.h')
| -rw-r--r-- | nuttx/examples/nx/nx_internal.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/nuttx/examples/nx/nx_internal.h b/nuttx/examples/nx/nx_internal.h index 32164eac3..58febc5b7 100644 --- a/nuttx/examples/nx/nx_internal.h +++ b/nuttx/examples/nx/nx_internal.h @@ -88,6 +88,20 @@ # endif #endif +#ifndef CONFIG_EXAMPLES_NX_TBCOLOR +# if CONFIG_SIM_FBBPP == 24 || CONFIG_SIM_FBBPP == 32 +# define CONFIG_EXAMPLES_NX_TBCOLOR 0x00a9a9a9 +# elif CONFIG_SIM_FBBPP = 16 +# define CONFIG_EXAMPLES_NX_TBCOLOR 0xad55 +# else +# define CONFIG_EXAMPLES_NX_TBCOLOR '3' +# endif +#endif + +#ifndef CONFIG_TOOLBAR_HEIGHT +# define CONFIG_TOOLBAR_HEIGHT 16 +#endif + #ifdef CONFIG_NX_MULTIUSER # ifdef CONFIG_DISABLE_MQUEUE # error "The multi-threaded example requires MQ support (CONFIG_DISABLE_MQUEUE=n)" @@ -153,11 +167,14 @@ enum exitcode_e NXEXIT_FBINITIALIZE, NXEXIT_FBGETVPLANE, NXEXIT_NXOPEN, + NXEXIT_NXOPENTOOLBAR, NXEXIT_NXCONNECT, NXEXIT_NXSETBGCOLOR, NXEXIT_NXOPENWINDOW, NXEXIT_NXSETSIZE, NXEXIT_NXSETPOSITION, + NXEXIT_NXLOWER, + NXEXIT_NXRAISE, NXEXIT_NXCLOSEWINDOW, NXEXIT_LOSTSERVERCONN }; @@ -172,8 +189,10 @@ extern NXHANDLE g_hnx; /* NX callback vtables */ -extern const struct nx_callback_s g_nxcb1; -extern const struct nx_callback_s g_nxcb2; +extern const struct nx_callback_s g_nxcb; +#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS +extern const struct nx_callback_s g_tbcb; +#endif /* The screen resolution */ @@ -190,6 +209,9 @@ extern sem_t g_semevent; extern nxgl_mxpixel_t g_color1[CONFIG_NX_NPLANES]; extern nxgl_mxpixel_t g_color2[CONFIG_NX_NPLANES]; +#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS +extern nxgl_mxpixel_t g_tbcolor[CONFIG_NX_NPLANES]; +#endif /**************************************************************************** * Public Function Prototypes |