This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 6be063a7f graphics/microwindows: nanoxcalc fix and upstream update to
fix warnings
6be063a7f is described below
commit 6be063a7fc97c1acf506b9d37dcc70ca7686d789
Author: Pavel Pisa <[email protected]>
AuthorDate: Thu Sep 3 20:52:23 2026 +0200
graphics/microwindows: nanoxcalc fix and upstream update to fix warnings
This update introduces the following changes in mw:
- Fixed all idetified -Werror warnings in CI.
- Fixed the issue where the backspace key was not working in QEMU
Signed-off-by: Pavel Pisa <[email protected]>
---
examples/nanoxcalc/nxcalc.c | 27 +++++++++++++++++++++------
graphics/microwindows/Makefile | 2 +-
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/examples/nanoxcalc/nxcalc.c b/examples/nanoxcalc/nxcalc.c
index 8a7936dcf..73cdf029c 100644
--- a/examples/nanoxcalc/nxcalc.c
+++ b/examples/nanoxcalc/nxcalc.c
@@ -176,6 +176,7 @@ int main(int argc, char **argv)
{
int x = grid_x + c * cell_w;
int y = grid_y + r * cell_h;
+
btn_rects[r][c].x = x;
btn_rects[r][c].y = y;
btn_rects[r][c].width = cell_w - 6;
@@ -204,11 +205,13 @@ int main(int argc, char **argv)
int mx = event.button.x;
int my = event.button.y;
int found = 0;
+
for (r = 0; r < ROWS && !found; r++)
{
for (c = 0; c < COLS && !found; c++)
{
GR_RECT *rc = &btn_rects[r][c];
+
if (mx >= rc->x && mx <= rc->x + rc->width &&
my >= rc->y && my <= rc->y + rc->height)
{
@@ -226,11 +229,13 @@ int main(int argc, char **argv)
int mx = event.button.x;
int my = event.button.y;
int found = 0;
+
for (r = 0; r < ROWS && !found; r++)
{
for (c = 0; c < COLS && !found; c++)
{
GR_RECT *rc = &btn_rects[r][c];
+
if (mx >= rc->x && mx <= rc->x + rc->width &&
my >= rc->y && my <= rc->y + rc->height)
{
@@ -239,6 +244,7 @@ int main(int argc, char **argv)
(int)(sizeof(btn_labels) /
sizeof(btn_labels[0]))?
btn_labels[idx] : NULL);
+
if (lbl)
{
press_button(lbl);
@@ -287,13 +293,14 @@ static void redraw(void)
&th, &tb);
int x = WIN_W - 12 - tw;
+
if (x < 10)
{
x = 10;
}
- GrText(win, gc_text, x, 5 + (DISP_H / 2) - 10, display, strlen(display),
- GR_TFTOP);
+ GrText(win, gc_text, x, 5 + (DISP_H / 2) - 10, display, strlen(display),
+ GR_TFTOP);
/* draw buttons */
@@ -332,7 +339,6 @@ static void redraw(void)
static void press_button(const char *label)
{
- char tmp[128];
double val;
if (strcmp(label, "C") == 0)
@@ -349,6 +355,7 @@ static void press_button(const char *label)
if (strcmp(label, "<-") == 0)
{
int l = strlen(display);
+
if (l > 0)
{
if (display[l - 1] == '.')
@@ -375,13 +382,21 @@ static void press_button(const char *label)
}
else
{
- if (strlen(display) == 0 || strcmp(display, "0") == 0)
+ int len = strlen(display);
+
+ if (len == 0 || strcmp(display, "0") == 0)
{
return;
}
- snprintf(tmp, sizeof(tmp), "-%s", display);
- strncpy(display, tmp, sizeof(display) - 1);
+ if (len > sizeof(display) - 2)
+ {
+ len = sizeof(display) - 2;
+ display[len] = '\0';
+ }
+
+ memmove(display + 1, display, len + 1);
+ display[0] = '-';
}
return;
diff --git a/graphics/microwindows/Makefile b/graphics/microwindows/Makefile
index cb7fc58f3..434798619 100644
--- a/graphics/microwindows/Makefile
+++ b/graphics/microwindows/Makefile
@@ -31,7 +31,7 @@ MICROWINDOWS_DIR_NAME = microwindows
WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
-MICROWINDOWS_COMMIT_HASH := 19d1890f67f7e099c17b2fd4529c5160327eedba
+MICROWINDOWS_COMMIT_HASH := ac1063aec73d341db04d5f08aa8eb601215a69bc
CONFIG_GRAPH_MICROWINDOWS_URL ?=
https://codeload.github.com/ghaerr/microwindows/zip/$(MICROWINDOWS_COMMIT_HASH)
