5 files changed, 109 insertions, 37 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 3629813595..0347c03507 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -25,7 +25,7 @@ TARGET = -DARCHOS_PLAYER_OLD=1
 # store output files in this directory:
 OBJDIR = .
 
-CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\"
+CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES)
 AFLAGS += -small -relax
 
 ifdef DEBUG
diff --git a/apps/main.c b/apps/main.c
index 895f79af3b..887c85b64e 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -44,10 +44,11 @@
 #include "backlight.h"
 #include "status.h"
 #include "debug_menu.h"
-
 #include "version.h"
-
 #include "sprintf.h"
+#ifdef LOADABLE_FONTS
+#include "unicode.h"
+#endif
 
 char appsversion[]=APPSVERSION;
 
@@ -64,6 +65,9 @@ void app_main(void)
 void init(void)
 {
     init_threads();
+#ifdef LOADABLE_FONTS
+    unicode_init();
+#endif
     lcd_init();
     show_logo();
     settings_reset();
@@ -153,8 +157,11 @@ void init(void)
 
     status_init();
     usb_start_monitoring();
-    
     power_init();
+#ifdef LOADABLE_FONTS
+    unicode_init();
+    lcd_init_fonts();
+#endif
 }
 
 int main(void)
diff --git a/apps/menu.c b/apps/menu.c
index c8a5d0e73d..7267afe193 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -22,11 +22,14 @@
 #include "button.h"
 #include "kernel.h"
 #include "debug.h"
+#include "panic.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "icons.h"
 #endif
-
+#ifdef LOADABLE_FONTS
+#include "ajf.h"
+#endif
 struct menu {
     int top;
     int cursor;
@@ -54,11 +57,19 @@ static bool inuse[MAX_MENUS] = { false };
 /* count in letter posistions, NOT pixels */
 void put_cursorxy(int x, int y, bool on)
 {
+#ifdef LOADABLE_FONTS
+    int fh;
+    unsigned char* font = lcd_getcurrentldfont();
+    fh = ajf_get_fontheight(font);
+#else 
+    int fh = 8;
+#endif
+
     /* place the cursor */
     if(on) {
 #ifdef HAVE_LCD_BITMAP
         lcd_bitmap ( bitmap_icons_6x8[Cursor], 
-                     x*6, y*8, 4, 8, true);
+                     x*6, y*fh, 4, 8, true);
 #elif defined(SIMULATOR)
         /* player simulator */
         unsigned char cursor[] = { 0x7f, 0x3e, 0x1c, 0x08 };
@@ -70,7 +81,7 @@ void put_cursorxy(int x, int y, bool on)
     else {
 #if defined(HAVE_LCD_BITMAP)
         /* I use xy here since it needs to disregard the margins */
-        lcd_clearrect (x*6, y*8, 4, 8);
+        lcd_clearrect (x*6, y*fh, 4, 8);
 #elif defined(SIMULATOR)
         /* player simulator in action */
         lcd_clearrect (x*6, 12+y*16, 4, 8);
@@ -83,6 +94,15 @@ void put_cursorxy(int x, int y, bool on)
 static void menu_draw(int m)
 {
     int i = 0;
+#ifdef LOADABLE_FONTS
+    int menu_lines;
+    int fh;
+    unsigned char* font = lcd_getcurrentldfont();
+    fh = ajf_get_fontheight(font);
+    menu_lines = LCD_HEIGHT/fh;
+#else
+    int menu_lines = MENU_LINES;
+#endif
 
     lcd_clear_display(); 
     lcd_stop_scroll();
@@ -91,7 +111,7 @@ static void menu_draw(int m)
     lcd_setfont(0);
 #endif
     for (i = menus[m].top; 
-         (i < menus[m].itemcount) && (i<menus[m].top+MENU_LINES);
+         (i < menus[m].itemcount) && (i<menus[m].top+menu_lines);
          i++) {
         if((menus[m].cursor - menus[m].top)==(i-menus[m].top))
             lcd_puts_scroll(1, i-menus[m].top, menus[m].items[i].desc);
@@ -111,7 +131,15 @@ static void menu_draw(int m)
 static void put_cursor(int m, int target)
 {
     bool do_update = true;
-
+#ifdef LOADABLE_FONTS
+    int menu_lines;
+    int fh;
+    unsigned char* font = lcd_getcurrentldfont();
+    fh = ajf_get_fontheight(font);
+    menu_lines = LCD_HEIGHT/fh;
+#else
+    int menu_lines = MENU_LINES;
+#endif
     put_cursorxy(0, menus[m].cursor - menus[m].top, false);
     menus[m].cursor = target;
     menu_draw(m);
@@ -121,7 +149,7 @@ static void put_cursor(int m, int target)
         menu_draw(m);
         do_update = false;
     }
-    else if ( target-menus[m].top > MENU_LINES-1 ) {
+    else if ( target-menus[m].top > menu_lines-1 ) {
         menus[m].top++;
         menu_draw(m);
         do_update = false;
diff --git a/apps/tree.c b/apps/tree.c
index cbb19fc2bd..80af6e01d6 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -43,6 +43,10 @@
 #include "icons.h"
 #endif
 
+#ifdef LOADABLE_FONTS
+#include "ajf.h"
+#endif
+
 #define MAX_FILES_IN_DIR 200
 #define TREE_MAX_FILENAMELEN MAX_PATH
 #define MAX_DIR_LEVELS 10
@@ -152,8 +156,20 @@ static int showdir(char *path, int start)
 {
 #ifdef HAVE_LCD_BITMAP
     int icon_type = 0;
+    int line_height = LINE_HEIGTH;
 #endif
     int i;
+    int tree_max_on_screen;
+#ifdef LOADABLE_FONTS
+    int fh;
+    unsigned char *font = lcd_getcurrentldfont();
+    fh  = ajf_get_fontheight(font);
+    tree_max_on_screen =  ((LCD_HEIGHT-MARGIN_Y)/fh)-LINE_Y;
+    line_height = fh;
+#else
+    tree_max_on_screen = TREE_MAX_ON_SCREEN;
+#endif
+
 
     /* new dir? cache it */
     if (strncmp(path,lastdir,sizeof(lastdir))) {
@@ -217,7 +233,7 @@ static int showdir(char *path, int start)
     lcd_setfont(0);
 #endif
 
-    for ( i=start; i < start+TREE_MAX_ON_SCREEN; i++ ) {
+    for ( i=start; i < start+tree_max_on_screen; i++ ) {
         int len;
 
         if ( i >= filesindir )
@@ -235,9 +251,10 @@ static int showdir(char *path, int start)
                 icon_type = File;
         }
         lcd_bitmap(bitmap_icons_6x8[icon_type], 
-                   6, MARGIN_Y+(LINE_Y+i-start)*LINE_HEIGTH, 6, 8, true);
+                   6, MARGIN_Y+(LINE_Y+i-start)*line_height, 6, 8, true);
 #endif
 
+
         /* if MP3 filter is on, cut off the extension */
         if (global_settings.mp3filter && 
             (dircacheptr[i]->attr & (TREE_ATTR_M3U|TREE_ATTR_MP3)))
@@ -270,6 +287,15 @@ bool dirbrowse(char *root)
     int rc;
     int button;
     int start_index;
+    int tree_max_on_screen;
+#ifdef LOADABLE_FONTS
+    int fh;
+    unsigned char *font = lcd_getcurrentldfont();
+    fh  = ajf_get_fontheight(font);
+    tree_max_on_screen =  ((LCD_HEIGHT-MARGIN_Y)/fh)-LINE_Y;
+#else
+    tree_max_on_screen = TREE_MAX_ON_SCREEN;
+#endif
 
     memcpy(currdir,root,sizeof(currdir));
     numentries = showdir(root, start);
@@ -379,7 +405,7 @@ bool dirbrowse(char *root)
                             put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor, true);
                         }
                         else {
-                            if (numentries < TREE_MAX_ON_SCREEN) {
+                            if (numentries < tree_max_on_screen) {
                                 put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
                                              false);
                                 dircursor = numentries - 1;
@@ -387,11 +413,11 @@ bool dirbrowse(char *root)
                                              true);
                             }
                             else {
-                                start = numentries - TREE_MAX_ON_SCREEN;
-                                dircursor = TREE_MAX_ON_SCREEN - 1;
+                                start = numentries - tree_max_on_screen;
+                                dircursor = tree_max_on_screen - 1;
                                 numentries = showdir(currdir, start);
                                 put_cursorxy(0, CURSOR_Y + LINE_Y +
-                                             TREE_MAX_ON_SCREEN - 1, true);
+                                             tree_max_on_screen - 1, true);
                             }
                         }
                     }
@@ -404,7 +430,7 @@ bool dirbrowse(char *root)
                 if(filesindir)
                 {
                     if (dircursor + start + 1 < numentries ) {
-                        if(dircursor+1 < TREE_MAX_ON_SCREEN) {
+                        if(dircursor+1 < tree_max_on_screen) {
                             put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
                                          false);
                             dircursor++;
@@ -417,7 +443,7 @@ bool dirbrowse(char *root)
                         }
                     }
                     else {
-                        if(numentries < TREE_MAX_ON_SCREEN) {
+                        if(numentries < tree_max_on_screen) {
                             put_cursorxy(0, CURSOR_Y + LINE_Y+dircursor,
                                          false);
                             start = dircursor = 0;
@@ -512,7 +538,7 @@ bool dirbrowse(char *root)
             /* restore display */
             /* We need to adjust if the number of lines on screen have
                changed because of a status bar change */
-            if(CURSOR_Y+LINE_Y+dircursor>TREE_MAX_ON_SCREEN) {
+            if(CURSOR_Y+LINE_Y+dircursor>tree_max_on_screen) {
                 start++;
                 dircursor--;
             }
diff --git a/apps/wps.c b/apps/wps.c
index 53458ca140..2bf384b20c 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -39,6 +39,10 @@
 #include "widgets.h"
 #endif
 
+#ifdef LOADABLE_FONTS
+#include "ajf.h"
+#endif
+
 #ifdef HAVE_LCD_BITMAP
 #define LINE_Y      (global_settings.statusbar&&statusbar_enabled?1:0) /* Y position the entry-list starts at */
 #else /* HAVE_LCD_BITMAP */
@@ -59,6 +63,15 @@ bool keys_locked = false;
 
 static void draw_screen(struct mp3entry* id3)
 {
+    int font_height;
+#ifdef LOADABLE_FONTS
+    unsigned char *font = lcd_getcurrentldfont();
+    font_height  = ajf_get_fontheight(font);
+#else
+    font_height = 8;
+#endif
+
+
     lcd_clear_display();
     if(!id3)
     {
@@ -125,7 +138,7 @@ static void draw_screen(struct mp3entry* id3)
                 lcd_puts(0, l++, id3->album?id3->album:"");
                 lcd_puts(0, l++, id3->artist?id3->artist:"");
 
-                if(LINE_Y==0) {
+                if(LINE_Y==0&&font_height<=8) {
                     if(id3->vbr)
                         snprintf(buffer, sizeof(buffer), "%d kbit (avg)",
                                  id3->bitrate);
@@ -133,7 +146,6 @@ static void draw_screen(struct mp3entry* id3)
                         snprintf(buffer, sizeof(buffer), "%d kbit", id3->bitrate);
 
                     lcd_puts(0, l++, buffer);
-
                     snprintf(buffer,sizeof(buffer), "%d Hz", id3->frequency);
                     lcd_puts(0, l++, buffer);
                 }
@@ -148,7 +160,6 @@ static void draw_screen(struct mp3entry* id3)
                     lcd_puts(0, l++, buffer);
                 }
 #else
-
                 lcd_puts(0, l++, id3->artist?id3->artist:"<no artist>");
                 lcd_puts_scroll(0, l++, id3->title?id3->title:"<no title>");
 #endif
@@ -444,13 +455,13 @@ int wps_show(void)
                 if(!keys_locked && !dont_go_to_menu && menu_button_is_down)
                 {
 #ifdef HAVE_LCD_BITMAP
-                        bool laststate=statusbar(false);
+                    bool laststate=statusbar(false);
 #endif
                     lcd_stop_scroll();
                     button_set_release(old_release_mask);
                     main_menu();
 #ifdef HAVE_LCD_BITMAP
-                        statusbar(laststate);
+                    statusbar(laststate);
 #endif
                     old_release_mask = button_set_release(RELEASE_MASK);
                     id3 = mpeg_current_track();
@@ -464,14 +475,14 @@ int wps_show(void)
                 break;
 
 #ifdef HAVE_RECORDER_KEYPAD
-                case BUTTON_F3:
+            case BUTTON_F3:
 #ifdef HAVE_LCD_BITMAP
-                    if(global_settings.statusbar) {
-                        statusbar_toggle();
-                        draw_screen(id3);
-                    }
+                if(global_settings.statusbar) {
+                    statusbar_toggle();
+                    draw_screen(id3);
+                }
 #endif
-                    break;
+                break;
 #endif
 
 #ifdef HAVE_RECORDER_KEYPAD
@@ -504,19 +515,19 @@ int wps_show(void)
                 usb_wait_for_disconnect(&button_queue);
 
 #ifdef HAVE_LCD_BITMAP
-                        statusbar(laststate);
+                statusbar(laststate);
 #endif
                 /* Signal to our caller that we have been in USB mode */
                 return SYS_USB_CONNECTED;
                 break;
-                }
+            }
 #endif
             case BUTTON_NONE: /* Timeout */
                 if (mpeg_is_playing() && id3)
                 {
 #ifdef HAVE_LCD_BITMAP
                     snprintf(buffer,sizeof(buffer),
-                                     "Time:%3d:%02d/%d:%02d",
+                             "Time:%3d:%02d/%d:%02d",
                              id3->elapsed / 60000,
                              id3->elapsed % 60000 / 1000,
                              id3->length / 60000,
@@ -524,9 +535,9 @@ int wps_show(void)
                         
                     lcd_puts(0, 6, buffer);
                         
-                            slidebar(0, LCD_HEIGHT-6, LCD_WIDTH, 6,
-                                 id3->elapsed*100/id3->length,
-                                     Grow_Right);
+                    slidebar(0, LCD_HEIGHT-6, LCD_WIDTH, 6,
+                             id3->elapsed*100/id3->length,
+                             Grow_Right);
                         
                     lcd_update();
 #else
@@ -535,7 +546,7 @@ int wps_show(void)
                     if (global_settings.wps_display ==
                         PLAY_DISPLAY_FILENAME_SCROLL)
                     { 
-                                snprintf(buffer,sizeof(buffer), "%d:%02d/%d:%02d  ",
+                        snprintf(buffer,sizeof(buffer), "%d:%02d/%d:%02d  ",
                                  id3->elapsed / 60000,
                                  id3->elapsed % 60000 / 1000,
                                  id3->length / 60000,