sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix NXTEST strings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3767 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-07-10 19:56:07 +00:00
parent 189716cd84
commit 0cfb54eff4
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/nxtext/nxtext_bkgd.c
View File

@ -45,8 +45,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <semaphore.h> #include <semaphore.h>
#include <debug.h>
#include <errno.h> #include <errno.h>
#include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx.h>
#include <nuttx/nxfonts.h> #include <nuttx/nxfonts.h>
@ -122,7 +122,7 @@ NXHANDLE g_bgwnd;
static void nxbg_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, static void nxbg_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bool more, FAR void *arg) bool more, FAR void *arg)
{ {
message("nxbg_redraw: hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
more ? "true" : "false"); more ? "true" : "false");
@ -142,7 +142,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
/* Report the position */ /* Report the position */
message("nxbg_position: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
hwnd, size->w, size->h, pos->x, pos->y, hwnd, size->w, size->h, pos->x, pos->y,
bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
@ -166,7 +166,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
b_haveresolution = true; b_haveresolution = true;
sem_post(&g_semevent); sem_post(&g_semevent);
message("nxbg_position: Have xres=%d yres=%d\n", g_xres, g_yres); gvdbg("Have xres=%d yres=%d\n", g_xres, g_yres);
} }
} }
@ -191,7 +191,7 @@ static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
FAR void *arg) FAR void *arg)
{ {
message("nxbg_kbdin: hwnd=%p nch=%d\n", hwnd, nch); gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
nxbg_write(hwnd, ch, nch); nxbg_write(hwnd, ch, nch);
} }
#endif #endif

28
examples/nxtext/nxtext_main.c
View File

@ -108,20 +108,20 @@ static const char *g_bgmsg[BGMSG_LINES] =
" of thine ear;\n", " of thine ear;\n",
"Nightly she sings\n", "Nightly she sings\n",
" on yon pomegranate-tree:\n", " on yon pomegranate-tree:\n",
"Believe me, love,\n" "Believe me, love,\n",
" it was the nightingale.\n" " it was the nightingale.\n",
"\nROMEO\n" "\nROMEO\n",
"It was the lark,\n" "It was the lark,\n",
" the herald of the morn,\n" " the herald of the morn,\n",
"No nightingale:\n" "No nightingale:\n",
" look, love, what envious streaks\n" " look, love, what envious streaks\n",
"Do lace the severing clouds\n" "Do lace the severing clouds\n",
" in yonder east:\n" " in yonder east:\n",
"Night's candles are burnt out,\n" "Night's candles are burnt out,\n",
" and jocund day\n" " and jocund day\n",
"Stands tiptoe\n" "Stands tiptoe\n",
" on the misty mountain tops.\n" " on the misty mountain tops.\n",
"I must be gone and live,\n" "I must be gone and live,\n",
" or stay and die.\n" " or stay and die.\n"
}; };
#endif #endif

14
examples/nxtext/nxtext_popup.c
View File

@ -44,8 +44,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <semaphore.h> #include <semaphore.h>
#include <debug.h>
#include <errno.h> #include <errno.h>
#include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx.h>
#include <nuttx/nxfonts.h> #include <nuttx/nxfonts.h>
@ -209,7 +209,7 @@ static void nxpu_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bool more, FAR void *arg) bool more, FAR void *arg)
{ {
FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg; FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg;
message("nxpu_redraw: hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
more ? "true" : "false"); more ? "true" : "false");
@ -229,7 +229,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
/* Report the position */ /* Report the position */
message("nxpu_position: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
hwnd, size->w, size->h, pos->x, pos->y, hwnd, size->w, size->h, pos->x, pos->y,
bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
@ -278,7 +278,7 @@ static void nxpu_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
FAR void *arg) FAR void *arg)
{ {
FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg; FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg;
message("nxpu_kbdin: hwnd=%p nch=%d\n", hwnd, nch); gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
nxpu_puts(hwnd, st, nch, ch); nxpu_puts(hwnd, st, nch, ch);
} }
#endif #endif
@ -343,7 +343,7 @@ NXWINDOW nxpu_open(void)
nxpu_initstate(); nxpu_initstate();
hwnd = nx_openwindow(g_hnx, &g_pucb, (FAR void *)&g_pustate); hwnd = nx_openwindow(g_hnx, &g_pucb, (FAR void *)&g_pustate);
message("nxpu_open: hwnd=%p\n", hwnd); gvdbg("hwnd=%p\n", hwnd);
if (!hwnd) if (!hwnd)
{ {
@ -373,7 +373,7 @@ NXWINDOW nxpu_open(void)
/* Set the size of the pop-up window */ /* Set the size of the pop-up window */
message("nxpu_open: Set pop-up size to (%d,%d)\n", size.w, size.h); gvdbg("Set pop-up size to (%d,%d)\n", size.w, size.h);
ret = nxpu_setsize(hwnd, &size); ret = nxpu_setsize(hwnd, &size);
if (ret < 0) if (ret < 0)
{ {
@ -415,7 +415,7 @@ int nxpu_close(NXWINDOW hwnd)
rect.pt1.y = g_pustate.wpos.y; rect.pt1.y = g_pustate.wpos.y;
rect.pt2.x = g_pustate.wpos.x + g_pustate.wsize.w - 1; rect.pt2.x = g_pustate.wpos.x + g_pustate.wsize.w - 1;
rect.pt2.y = g_pustate.wpos.y + g_pustate.wsize.h - 1; rect.pt2.y = g_pustate.wpos.y + g_pustate.wsize.h - 1;
gvdbg("Redraw: pt1(%d,%d) pt2(%d,%d)\n", gvdbg("pt1(%d,%d) pt2(%d,%d)\n",
rect.pt1.x, rect.pt1.y, rect.pt2.x, rect.pt2.y); rect.pt1.x, rect.pt1.y, rect.pt2.x, rect.pt2.y);
nxbg_redrawrect(g_bgwnd, &rect); nxbg_redrawrect(g_bgwnd, &rect);

4
examples/nxtext/nxtext_putc.c
View File

@ -44,8 +44,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <debug.h>
#include <errno.h> #include <errno.h>
#include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx.h>
#include <nuttx/nxtk.h> #include <nuttx/nxtk.h>
@ -234,7 +234,7 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
/* Make sure that there is room for another glyph */ /* Make sure that there is room for another glyph */
message("nxtext_renderglyph: ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch); gvdbg("ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch);
/* Allocate the glyph (always succeeds) */ /* Allocate the glyph (always succeeds) */

2
examples/nxtext/nxtext_server.c
View File

@ -145,7 +145,7 @@ int nxtext_server(int argc, char *argv[])
/* Then start the server */ /* Then start the server */
ret = nx_run(dev); ret = nx_run(dev);
message("nxtext_server: nx_run returned: %d\n", errno); gvdbg("nx_run returned: %d\n", errno);
return 3; return 3;
} }