devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

The calendar couldn't handle a non-default font in some occasions

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4047 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2003-11-20 00:47:16 +00:00
parent aaa99e70ba
commit ce69548eee
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/calendar.c
View file

@ -46,6 +46,9 @@ struct shown {
int firstday; /* first (w)day of month */ int firstday; /* first (w)day of month */
int lastday; /* last (w)day of month */ int lastday; /* last (w)day of month */
}; };
static bool use_system_font = false;
/* leap year -- account for gregorian reformation in 1752 */ /* leap year -- account for gregorian reformation in 1752 */
static int is_leap_year(int yr) static int is_leap_year(int yr)
{ {
@ -69,7 +72,10 @@ static void calendar_init(struct today *today, struct shown *shown)
#endif #endif
rb->lcd_getstringsize("A",&w,&h); rb->lcd_getstringsize("A",&w,&h);
if ( ((w * 14) > LCD_WIDTH) || ((h * 7) > LCD_HEIGHT) ) if ( ((w * 14) > LCD_WIDTH) || ((h * 7) > LCD_HEIGHT) )
{
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
use_system_font = true;
}
rb->lcd_clear_display(); rb->lcd_clear_display();
#ifdef HAVE_RTC #ifdef HAVE_RTC
tm = rb->get_time(); tm = rb->get_time();
@ -390,6 +396,8 @@ static void add_memo(struct shown *shown, int type)
} }
} }
rb->lcd_clear_display(); rb->lcd_clear_display();
if(use_system_font)
rb->lcd_setfont(FONT_SYSFIXED);
if (saved) if (saved)
rb->lcd_puts(0,0,"Event added"); rb->lcd_puts(0,0,"Event added");
else else
@ -407,18 +415,18 @@ static bool edit_memo(int change, struct shown *shown)
rb->lcd_puts(0,0,"Remove : Up"); rb->lcd_puts(0,0,"Remove : Up");
rb->lcd_puts(0,1,"Edit : Down"); rb->lcd_puts(0,1,"Edit : Down");
rb->lcd_puts(0,2,"New :"); rb->lcd_puts(0,2,"New :");
rb->lcd_puts(6,3,"weekly : Left"); rb->lcd_puts(2,3,"weekly : Left");
rb->lcd_puts(6,4,"monthly : Play"); rb->lcd_puts(2,4,"monthly : Play");
rb->lcd_puts(6,5,"annually : Right"); rb->lcd_puts(2,5,"annually : Right");
rb->lcd_puts(6,6,"one off : On"); rb->lcd_puts(2,6,"one off : On");
} }
else else
{ {
rb->lcd_puts(0,0,"New :"); rb->lcd_puts(0,0,"New :");
rb->lcd_puts(6,1,"weekly : Left"); rb->lcd_puts(2,1,"weekly : Left");
rb->lcd_puts(6,2,"monthly : Play"); rb->lcd_puts(2,2,"monthly : Play");
rb->lcd_puts(6,3,"anualy : Right"); rb->lcd_puts(2,3,"anualy : Right");
rb->lcd_puts(6,4,"one off : On"); rb->lcd_puts(2,4,"one off : On");
} }
rb->lcd_update(); rb->lcd_update();
while (!exit) while (!exit)
@ -430,19 +438,19 @@ static bool edit_memo(int change, struct shown *shown)
case BUTTON_LEFT: case BUTTON_LEFT:
add_memo(shown,0); add_memo(shown,0);
return false; return false;
case BUTTON_PLAY: case BUTTON_PLAY:
add_memo(shown,1); add_memo(shown,1);
return false; return false;
case BUTTON_RIGHT: case BUTTON_RIGHT:
add_memo(shown,2); add_memo(shown,2);
return false; return false;
case BUTTON_ON: case BUTTON_ON:
add_memo(shown,3); add_memo(shown,3);
return false; return false;
case BUTTON_DOWN: case BUTTON_DOWN:
if (memos_in_shown_memory > 0) if (memos_in_shown_memory > 0)
@ -450,6 +458,8 @@ static bool edit_memo(int change, struct shown *shown)
if(rb->kbd_input(memos[pointer_array[change]].message, if(rb->kbd_input(memos[pointer_array[change]].message,
sizeof memos[pointer_array[change]].message) != -1) sizeof memos[pointer_array[change]].message) != -1)
save_memo(pointer_array[change],true,shown); save_memo(pointer_array[change],true,shown);
if(use_system_font)
rb->lcd_setfont(FONT_SYSFIXED);
exit = true; exit = true;
} }
break; break;