Skip to content

graphics/pdcurs34: Build fixes for wide characters code path #3731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 18, 2026
+16 −11
Merged

graphics/pdcurs34: Build fixes for wide characters code path #3731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions graphics/pdcurs34/pdcurses/pdc_getstr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/pdcurses/pdc_getstr.c
* apps/graphics/pdcurs34/pdcurses/pdc_getstr.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -112,7 +112,7 @@
return ERR;
}

return PDC_wcstombs(str, wstr, n);

Check failure on line 115 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#else
int ch;
int i;
Expand All @@ -125,7 +125,7 @@
bool oldcbreak;
bool oldnodelay;
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 128 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif

PDC_LOG(("wgetnstr() - called\n"));
Expand Down Expand Up @@ -273,7 +273,6 @@
}

break;

}

wrefresh(win);
Expand All @@ -292,7 +291,7 @@
int getstr(char *str)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 294 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("getstr() - called\n"));

Expand All @@ -309,7 +308,7 @@
int mvgetstr(int y, int x, char *str)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 311 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("mvgetstr() - called\n"));

Expand All @@ -336,7 +335,7 @@
int getnstr(char *str, int n)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 338 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("getnstr() - called\n"));

Expand All @@ -346,7 +345,7 @@
int mvgetnstr(int y, int x, char *str, int n)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 348 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("mvgetnstr() - called\n"));

Expand Down Expand Up @@ -378,13 +377,13 @@
int num;
int x;
int chars;
char *p;
wint_t *p;
bool stop;
bool oldecho;
bool oldcbreak;
bool oldnodelay;
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 386 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif

PDC_LOG(("wgetn_wstr() - called\n"));
Expand Down Expand Up @@ -548,7 +547,7 @@
int get_wstr(wint_t *wstr)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 550 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("get_wstr() - called\n"));

Expand All @@ -565,7 +564,7 @@
int mvget_wstr(int y, int x, wint_t *wstr)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 567 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("mvget_wstr() - called\n"));

Expand All @@ -592,7 +591,7 @@
int getn_wstr(wint_t *wstr, int n)
{
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();

Check failure on line 594 in graphics/pdcurs34/pdcurses/pdc_getstr.c

View workflow job for this annotation

GitHub Actions / check 

Mixed case identifier found
#endif
PDC_LOG(("getn_wstr() - called\n"));

Expand Down
4 changes: 2 additions & 2 deletions graphics/pdcurs34/pdcurses/pdc_keyname.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
* Private Data
****************************************************************************/

static const char *key_name[] =
static const char *names[] =
{
"KEY_BREAK", "KEY_DOWN", "KEY_UP", "KEY_LEFT", "KEY_RIGHT",
"KEY_HOME", "KEY_BACKSPACE", "KEY_F0", "KEY_F(1)", "KEY_F(2)",
Expand Down Expand Up @@ -138,7 +138,7 @@ const char *keyname(int key)
return unctrl((chtype) key);
}

return has_key(key) ? key_name[key - KEY_MIN] : "UNKNOWN KEY";
return has_key(key) ? names[key - KEY_MIN] : "UNKNOWN KEY";
}

bool has_key(int key)
Expand Down
4 changes: 2 additions & 2 deletions graphics/pdcurs34/pdcurses/pdc_slk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* These functions manipulate a window that contain Soft Label Keys
* (SLK). To use the SLK functions, a call to slk_init() must be
* made BEFORE initscr() or newterm(). slk_init() removes 1 or 2
* lines from the useable screen, depending on the format selected.
* lines from the usable screen, depending on the format selected.
*
* The line(s) removed from the screen are used as a separate
* window, in which SLKs are displayed.
Expand Down Expand Up @@ -362,7 +362,7 @@ char *slk_label(int labnum)
#ifdef CONFIG_PDCURSES_WIDE
wchar_t *wtemp = slk_wlabel(labnum);

PDC_wcstombs(temp, wtemp, 32);
PDC_wcstombs(slk_temp2, wtemp, 32);
#else
chtype *p;
int i;
Expand Down
14 changes: 10 additions & 4 deletions graphics/pdcurs34/pdcurses/pdc_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/pdcurses/util.c
* apps/graphics/pdcurs34/pdcurses/pdc_util.c
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -114,7 +114,10 @@ char *unctrl(chtype c)
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();
#else
static char strbuf[3] = { 0, 0, 0 };
static char strbuf[3] =
{
0, 0, 0
};
#endif

chtype ic;
Expand Down Expand Up @@ -210,7 +213,10 @@ wchar_t *wunctrl(cchar_t *wc)
#ifdef CONFIG_PDCURSES_MULTITHREAD
FAR struct pdc_context_s *ctx = PDC_ctx();
#else
static wchar_t strbuf2[3] = { 0, 0, 0 };
static wchar_t strbuf2[3] =
{
0, 0, 0
};
#endif

cchar_t ic;
Expand All @@ -223,7 +229,7 @@ wchar_t *wunctrl(cchar_t *wc)
{
strbuf2[0] = (wchar_t) ic;
strbuf2[1] = L'\0';
return strbuf;
return strbuf2;
}

strbuf2[0] = '^'; /* '^' prefix */
Expand Down
Loading