summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2021-04-23 08:42:10 -0400
committerSolomon Peachy <pizza@shaftnet.org>2021-04-23 08:42:10 -0400
commitebb9090004d332a66255e024e9e44f1ff2e7ee6e (patch)
tree7f6378e6256d785303648fffde93f0dfca7875a8
parent03695429cf20af095468d9aaed092fdb483240dc (diff)
downloadrockbox-ebb9090004d332a66255e024e9e44f1ff2e7ee6e.tar.gz
rockbox-ebb9090004d332a66255e024e9e44f1ff2e7ee6e.zip
xzbox: Fix misleading indentation that triggered GCC11 warnings
Change-Id: Ice462ef188dba3bc8ffc46c32142fc29d70e1a68
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c57
1 files changed, 29 insertions, 28 deletions
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index dd517e01e7..63f74c7664 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -512,27 +512,27 @@ int zx_kbd_input(char* text/*, int buflen*/)
512 len_utf8 = rb->utf8length(text); 512 len_utf8 = rb->utf8length(text);
513#endif 513#endif
514 FOR_NB_SCREENS(l) 514 FOR_NB_SCREENS(l)
515 {
515 rb->screens[l]->clear_display(); 516 rb->screens[l]->clear_display();
517 }
516 518
517 519 /* draw page */
518 /* draw page */ 520 FOR_NB_SCREENS(l)
519 FOR_NB_SCREENS(l) 521 {
520 { 522 rb->screens[l]->setfont(param[l].curfont);
521 rb->screens[l]->setfont(param[l].curfont); 523 k = param[l].page*param[l].max_chars*param[l].lines;
522 k = param[l].page*param[l].max_chars*param[l].lines; 524 for (i=j=0; j < param[l].lines && k < param[l].nchars; k++) {
523 for (i=j=0; j < param[l].lines && k < param[l].nchars; k++) { 525 utf8 = rb->utf8encode(param[l].kbd_buf[k], outline);
524 utf8 = rb->utf8encode(param[l].kbd_buf[k], outline); 526 *utf8 = 0;
525 *utf8 = 0; 527 rb->screens[l]->getstringsize(outline, &w, NULL);
526 rb->screens[l]->getstringsize(outline, &w, NULL); 528 rb->screens[l]->putsxy(i*param[l].font_w + (param[l].font_w-w)/2, j*param[l].font_h
527 rb->screens[l]->putsxy(i*param[l].font_w + (param[l].font_w-w)/2, j*param[l].font_h 529 + statusbar_size, outline);
528 + statusbar_size, outline); 530 if (++i == param[l].max_chars) {
529 if (++i == param[l].max_chars) { 531 i = 0;
530 i = 0; 532 j++;
531 j++;
532 }
533 } 533 }
534 } 534 }
535 535 }
536 536
537 /* separator */ 537 /* separator */
538 FOR_NB_SCREENS(l) 538 FOR_NB_SCREENS(l)
@@ -581,19 +581,20 @@ int zx_kbd_input(char* text/*, int buflen*/)
581 } 581 }
582 cur_blink = !cur_blink; 582 cur_blink = !cur_blink;
583 583
584 584 /* highlight the key that has focus */
585 /* highlight the key that has focus */ 585 FOR_NB_SCREENS(l)
586 FOR_NB_SCREENS(l) 586 {
587 { 587 rb->screens[l]->set_drawmode(DRMODE_COMPLEMENT);
588 rb->screens[l]->set_drawmode(DRMODE_COMPLEMENT); 588 rb->screens[l]->fillrect(param[l].font_w * param[l].x,
589 rb->screens[l]->fillrect(param[l].font_w * param[l].x, 589 statusbar_size + param[l].font_h * param[l].y,
590 statusbar_size + param[l].font_h * param[l].y, 590 param[l].font_w, param[l].font_h);
591 param[l].font_w, param[l].font_h); 591 rb->screens[l]->set_drawmode(DRMODE_SOLID);
592 rb->screens[l]->set_drawmode(DRMODE_SOLID); 592 }
593 }
594 593
595 FOR_NB_SCREENS(l) 594 FOR_NB_SCREENS(l)
596 rb->screens[l]->update(); 595 {
596 rb->screens[l]->update();
597 }
597 598
598 button = rb->button_get_w_tmo(HZ/2); 599 button = rb->button_get_w_tmo(HZ/2);
599 600