len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xzbox: Fix misleading indentation that triggered GCC11 warnings

Browse source 
Change-Id: Ice462ef188dba3bc8ffc46c32142fc29d70e1a68
This commit is contained in:
Solomon Peachy 2021-04-23 08:42:10 -04:00
parent 03695429cf
commit ebb9090004
1 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

57
apps/plugins/zxbox/zxbox_keyb.c
View file

@ -512,27 +512,27 @@ int zx_kbd_input(char* text/*, int buflen*/)
len_utf8 = rb->utf8length(text); len_utf8 = rb->utf8length(text);
#endif #endif
FOR_NB_SCREENS(l) FOR_NB_SCREENS(l)
{
rb->screens[l]->clear_display(); rb->screens[l]->clear_display();
}
/* draw page */
/* draw page */ FOR_NB_SCREENS(l)
FOR_NB_SCREENS(l) {
{ rb->screens[l]->setfont(param[l].curfont);
rb->screens[l]->setfont(param[l].curfont); k = param[l].page*param[l].max_chars*param[l].lines;
k = param[l].page*param[l].max_chars*param[l].lines; for (i=j=0; j < param[l].lines && k < param[l].nchars; k++) {
for (i=j=0; j < param[l].lines && k < param[l].nchars; k++) { utf8 = rb->utf8encode(param[l].kbd_buf[k], outline);
utf8 = rb->utf8encode(param[l].kbd_buf[k], outline); *utf8 = 0;
*utf8 = 0; rb->screens[l]->getstringsize(outline, &w, NULL);
rb->screens[l]->getstringsize(outline, &w, NULL); rb->screens[l]->putsxy(i*param[l].font_w + (param[l].font_w-w)/2, j*param[l].font_h
rb->screens[l]->putsxy(i*param[l].font_w + (param[l].font_w-w)/2, j*param[l].font_h + statusbar_size, outline);
+ statusbar_size, outline); if (++i == param[l].max_chars) {
if (++i == param[l].max_chars) { i = 0;
i = 0; j++;
j++;
}
} }
} }
}
/* separator */ /* separator */
FOR_NB_SCREENS(l) FOR_NB_SCREENS(l)
@ -581,19 +581,20 @@ int zx_kbd_input(char* text/*, int buflen*/)
} }
cur_blink = !cur_blink; cur_blink = !cur_blink;
/* highlight the key that has focus */
/* highlight the key that has focus */ FOR_NB_SCREENS(l)
FOR_NB_SCREENS(l) {
{ rb->screens[l]->set_drawmode(DRMODE_COMPLEMENT);
rb->screens[l]->set_drawmode(DRMODE_COMPLEMENT); rb->screens[l]->fillrect(param[l].font_w * param[l].x,
rb->screens[l]->fillrect(param[l].font_w * param[l].x, statusbar_size + param[l].font_h * param[l].y,
statusbar_size + param[l].font_h * param[l].y, param[l].font_w, param[l].font_h);
param[l].font_w, param[l].font_h); rb->screens[l]->set_drawmode(DRMODE_SOLID);
rb->screens[l]->set_drawmode(DRMODE_SOLID); }
}
FOR_NB_SCREENS(l) FOR_NB_SCREENS(l)
rb->screens[l]->update(); {
rb->screens[l]->update();
}
button = rb->button_get_w_tmo(HZ/2); button = rb->button_get_w_tmo(HZ/2);