len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use pointer to viewport

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22980 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-06 08:20:12 +00:00
parent a1dfe6441d
commit fafd18c0f2
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/screens.c
View file

@ -544,10 +544,10 @@ bool set_time_screen(const char* title, struct tm *tm)
unsigned int statusbar_height = 0; unsigned int statusbar_height = 0;
unsigned int separator_width, weekday_width; unsigned int separator_width, weekday_width;
unsigned int prev_line_height; unsigned int prev_line_height;
static unsigned char daysinmonth[] = static unsigned char daysinmonth[] =
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
unsigned char buffer[20]; unsigned char buffer[20];
struct viewport vp[NB_SCREENS]; struct viewport viewports[NB_SCREENS];
int nb_lines; int nb_lines;
/* 6 possible cursor possitions, 2 values stored for each: x, y */ /* 6 possible cursor possitions, 2 values stored for each: x, y */
@ -602,17 +602,19 @@ bool set_time_screen(const char* title, struct tm *tm)
FOR_NB_SCREENS(s) FOR_NB_SCREENS(s)
{ {
viewport_set_defaults(&vp[s], s); struct viewport *vp = &viewports[s];
screens[s].set_viewport(&vp[s]);
nb_lines = viewport_get_nb_lines(&vp[s]); viewport_set_defaults(vp, s);
screens[s].set_viewport(vp);
nb_lines = viewport_get_nb_lines(vp);
/* minimum lines needed is 2 + title line */ /* minimum lines needed is 2 + title line */
if (nb_lines < 4) if (nb_lines < 4)
{ {
vp[s].font = FONT_SYSFIXED; vp->font = FONT_SYSFIXED;
nb_lines = viewport_get_nb_lines(&vp[s]); nb_lines = viewport_get_nb_lines(vp);
} }
/* recalculate the positions and offsets */ /* recalculate the positions and offsets */
if (nb_lines >= 3) if (nb_lines >= 3)
screens[s].getstringsize(title, NULL, &prev_line_height); screens[s].getstringsize(title, NULL, &prev_line_height);
@ -640,7 +642,7 @@ bool set_time_screen(const char* title, struct tm *tm)
} }
/* draw the screen */ /* draw the screen */
screens[s].set_viewport(&vp[s]); screens[s].set_viewport(vp);
screens[s].clear_viewport(); screens[s].clear_viewport();
/* display the screen title */ /* display the screen title */
screens[s].puts_scroll(0, 0, title); screens[s].puts_scroll(0, 0, title);
@ -656,12 +658,12 @@ bool set_time_screen(const char* title, struct tm *tm)
for(i=0; i<6; i++) for(i=0; i<6; i++)
{ {
if (cursorpos == (int)i) if (cursorpos == (int)i)
vp[s].drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); vp->drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
screens[s].putsxy(cursor[i][INDEX_X], screens[s].putsxy(cursor[i][INDEX_X],
cursor[i][INDEX_Y], ptr[i]); cursor[i][INDEX_Y], ptr[i]);
vp[s].drawmode = DRMODE_SOLID; vp->drawmode = DRMODE_SOLID;
screens[s].putsxy(cursor[i/4 +1][INDEX_X] - separator_width, screens[s].putsxy(cursor[i/4 +1][INDEX_X] - separator_width,
cursor[0][INDEX_Y], SEPARATOR); cursor[0][INDEX_Y], SEPARATOR);