6 files changed, 105 insertions, 188 deletions

diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index fd09bff0da..559d00b2b9 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -28,6 +28,7 @@
 #include "system.h"
 #include "timefuncs.h"
 #include "kernel.h"
+#include "rbunicode.h"
 
 #define BYTES2INT16(array,pos) \
           (array[pos] | (array[pos+1] << 8 ))
@@ -115,74 +116,6 @@
 #define FAT_BAD_MARK         0x0ffffff7
 #define FAT_EOF_MARK         0x0ffffff8
 
-/* filename charset conversion table */
-static const unsigned char unicode2iso8859_2[] = {
-    0x00, 0x00, 0xc3, 0xe3, 0xa1, 0xb1, 0xc6, 0xe6,  /* 0x0100 */
-    0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0xcf, 0xef,  /* 0x0108 */
-    0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0110 */
-    0xca, 0xea, 0xcc, 0xec, 0x00, 0x00, 0x00, 0x00,  /* 0x0118 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0120 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0128 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0130 */
-    0x00, 0xc5, 0xe5, 0x00, 0x00, 0xa5, 0xb5, 0x00,  /* 0x0138 */
-    0x00, 0xa3, 0xb3, 0xd1, 0xf1, 0x00, 0x00, 0xd2,  /* 0x0140 */
-    0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0148 */
-    0xd5, 0xf5, 0x00, 0x00, 0xc0, 0xe0, 0x00, 0x00,  /* 0x0150 */
-    0xd8, 0xf8, 0xa6, 0xb6, 0x00, 0x00, 0xaa, 0xba,  /* 0x0158 */
-    0xa9, 0xb9, 0xde, 0xfe, 0xab, 0xbb, 0x00, 0x00,  /* 0x0160 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd9, 0xf9,  /* 0x0168 */
-    0xdb, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0170 */
-    0x00, 0xac, 0xbc, 0xaf, 0xbf, 0xae, 0xbe, 0x00,  /* 0x0178 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0180 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0188 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0190 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0198 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01a0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01a8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01b0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01b8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01c0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01c8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01d0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01d8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01e0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01e8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01f0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x01f8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0200 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0208 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0210 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0218 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0220 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0228 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0230 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0238 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0240 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0248 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0250 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0258 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0260 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0268 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0270 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0278 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0280 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0288 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0290 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x0298 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02a0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02a8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02b0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02b8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7,  /* 0x02c0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02c8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02d0 */
-    0xa2, 0xff, 0x00, 0xb2, 0x00, 0xbd, 0x00, 0x00,  /* 0x02d8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02e0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02e8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 0x02f0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00   /* 0x02f8 */
-};
-
 struct fsinfo {
     unsigned long freecount; /* last known free cluster count */
     unsigned long nextfree;  /* first cluster to start looking for free
@@ -1106,10 +1039,11 @@ static int write_long_name(struct fat_file* file,
     unsigned char* entry;
     unsigned int idx = firstentry % DIR_ENTRIES_PER_SECTOR;
     unsigned int sector = firstentry / DIR_ENTRIES_PER_SECTOR;
-    unsigned int i, j=0;
     unsigned char chksum = 0;
-    int nameidx=0, namelen = strlen(name);
+    unsigned int i, j=0;
+    unsigned int nameidx=0, namelen = utf8length(name);
     int rc;
+    unsigned short name_utf16[namelen + 1];
 
     LDEBUGF("write_long_name(file:%lx, first:%d, num:%d, name:%s)\n",
             file->firstcluster, firstentry, numentries, name);
@@ -1132,6 +1066,11 @@ static int write_long_name(struct fat_file* file,
              nameidx < (namelen - NAME_BYTES_PER_ENTRY);
              nameidx += NAME_BYTES_PER_ENTRY);
 
+    /* we need to convert the name first    */
+    /* since it is written in reverse order */
+    for (i = 0; i <= namelen; i++)
+        name = utf8decode(name, &name_utf16[i]);
+
     for (i=0; i < numentries; i++) {
         /* new sector? */
         if ( idx >= DIR_ENTRIES_PER_SECTOR ) {
@@ -1170,7 +1109,7 @@ static int write_long_name(struct fat_file* file,
         memset(entry, 0, DIR_ENTRY_SIZE);
         if ( i+1 < numentries ) {
             /* longname entry */
-            int k, l = nameidx;
+            unsigned int k, l = nameidx;
 
             entry[FATLONG_ORDER] = numentries-i-1;
             if (i==0) {
@@ -1178,22 +1117,22 @@ static int write_long_name(struct fat_file* file,
                 entry[FATLONG_ORDER] |= 0x40;
 
                 /* pad name with 0xffff  */
-                for (k=1; k<12; k++) entry[k] = 0xff;
+                for (k=1; k<11; k++) entry[k] = 0xff;
                 for (k=14; k<26; k++) entry[k] = 0xff;
                 for (k=28; k<32; k++) entry[k] = 0xff;
             };
             /* set name */
             for (k=0; k<5 && l <= namelen; k++) {
-                entry[k*2 + 1] = name[l++];
-                entry[k*2 + 2] = 0;
+                entry[k*2 + 1] = (unsigned char)(name_utf16[l] & 0xff);
+                entry[k*2 + 2] = (unsigned char)(name_utf16[l++] >> 8);
             }
             for (k=0; k<6 && l <= namelen; k++) {
-                entry[k*2 + 14] = name[l++];
-                entry[k*2 + 15] = 0;
+                entry[k*2 + 14] = (unsigned char)(name_utf16[l] & 0xff);
+                entry[k*2 + 15] = (unsigned char)(name_utf16[l++] >> 8);
             }
             for (k=0; k<2 && l <= namelen; k++) {
-                entry[k*2 + 28] = name[l++];
-                entry[k*2 + 29] = 0;
+                entry[k*2 + 28] = (unsigned char)(name_utf16[l] & 0xff);
+                entry[k*2 + 29] = (unsigned char)(name_utf16[l++] >> 8);
             }
 
             entry[FATDIR_ATTR] = FAT_ATTR_LONG_NAME;
@@ -1291,7 +1230,7 @@ static int add_dir_entry(struct fat_dir* dir,
 
         /* one dir entry needed for every 13 bytes of filename,
            plus one entry for the short name */
-        entries_needed = (strlen(name) + (NAME_BYTES_PER_ENTRY-1))
+        entries_needed = (utf8length(name) + (NAME_BYTES_PER_ENTRY-1))
                          / NAME_BYTES_PER_ENTRY + 1;
     }
 
@@ -2226,58 +2165,6 @@ int fat_opendir(IF_MV2(int volume,)
     return 0;
 }
 
-/* convert from unicode to a single-byte charset */
-static void unicode2iso(const unsigned char* unicode, unsigned char* iso,
-                        int count)
-{
-    int i;
-
-    for (i=0; i<count; i++) {
-        int x = i*2;
-        switch (unicode[x+1]) {
-            case 0x01: /* latin extended. convert to ISO 8859-2 */
-            case 0x02:
-                iso[i] = unicode2iso8859_2[unicode[x]];
-                break;
-
-            case 0x03: /* greek, convert to ISO 8859-7 */
-                iso[i] = unicode[x] + 0x30;
-                break;
-
-                /* Sergei says most russians use Win1251, so we will too.
-                   Win1251 differs from ISO 8859-5 by an offset of 0x10. */
-            case 0x04: /* cyrillic, convert to Win1251 */
-                switch (unicode[x]) {
-                    case 1:
-                        iso[i] = 168;
-                        break;
-
-                    case 81:
-                        iso[i] = 184;
-                        break;
-
-                    default:
-                        iso[i] = unicode[x] + 0xb0; /* 0xa0 for ISO 8859-5 */
-                        break;
-                }
-                break;
-
-            case 0x05: /* hebrew, convert to ISO 8859-8 */
-                iso[i] = unicode[x] + 0x10;
-                break;
-
-            case 0x06: /* arabic, convert to ISO 8859-6 */
-            case 0x0e: /* thai, convert to ISO 8859-11 */
-                iso[i] = unicode[x] + 0xa0;
-                break;
-
-            default:
-                iso[i] = unicode[x];
-                break;
-        }
-    }
-}
-
 int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
 {
     bool done = false;
@@ -2348,7 +2235,8 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
 
                     /* replace shortname with longname? */
                     if ( longs ) {
-                        int j,l=0;
+                        int j;
+                        unsigned char* utf8 = entry->name;
                         /* iterate backwards through the dir entries */
                         for (j=longs-1; j>=0; j--) {
                             unsigned char* ptr = cached_buf;
@@ -2370,16 +2258,11 @@ int fat_getnext(struct fat_dir *dir, struct fat_direntry *entry)
                                 index &= SECTOR_SIZE-1;
                             }
 
-                            /* names are stored in unicode, but we
-                               only grab the low byte (iso8859-1). */
-                            unicode2iso(ptr + index + 1, entry->name + l, 5);
-                            l+= 5;
-                            unicode2iso(ptr + index + 14, entry->name + l, 6);
-                            l+= 6;
-                            unicode2iso(ptr + index + 28, entry->name + l, 2);
-                            l+= 2;
+                            utf8 = utf16LEdecode(ptr + index + 1, utf8, 5);
+                            utf8 = utf16LEdecode(ptr + index + 14, utf8, 6);
+                            utf8 = utf16LEdecode(ptr + index + 28, utf8, 2);
                         }
-                        entry->name[l]=0;
+                        *utf8 = 0;
                     }
                     done = true;
                     sectoridx = 0;
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index a4ae6cd553..582050c878 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "system.h"
 #include "font.h"
+#include "rbunicode.h"
 #include "bidi.h"
 
 #define SCROLLABLE_LINES 26
@@ -542,13 +543,13 @@ void lcd_bitmap(const fb_data *src, int x, int y, int width, int height)
 /* put a string at a given pixel position, skipping first ofs pixel columns */
 static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
 {
-    int ch;
+    unsigned short ch;
+    unsigned short *ucs;
     struct font* pf = font_get(curfont);
 
-    if (bidi_support_enabled)
-        str = bidi_l2v(str, 1);
+    ucs = bidi_l2v(str, 1);
 
-    while ((ch = *str++) != '\0' && x < LCD_WIDTH)
+    while ((ch = *ucs++) != 0 && x < LCD_WIDTH)
     {
         int width;
         const unsigned char *bits;
@@ -559,7 +560,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
         ch -= pf->firstchar;
 
         /* get proportional width and glyph bits */
-        width = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = font_get_width(pf,ch);
 
         if (ofs > width)
         {
@@ -567,8 +568,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
             continue;
         }
 
-        bits = pf->bits + (pf->offset ?
-               pf->offset[ch] : ((pf->height + 7) / 8 * pf->maxwidth * ch));
+        bits = font_get_bits(pf, ch);
 
         lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height);
         
@@ -597,7 +597,7 @@ void lcd_puts_style(int x, int y, const unsigned char *str, int style)
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen(str);
+    xpos = xmargin + x*w / utf8length(str);
     ypos = ymargin + y*h;
     lcd_putsxy(xpos, ypos, str);
     drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
@@ -707,7 +707,7 @@ void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
         end = strchr(s->line, '\0');
         strncpy(end, string, LCD_WIDTH/2);
 
-        s->len = strlen(string);
+        s->len = utf8length(string);
         s->offset = 0;
         s->startx = x;
         s->backward = false;
@@ -765,9 +765,11 @@ static void scroll_thread(void)
                 }
             }
             else {
-                /* scroll forward the whole time */
-                if (s->offset >= s->width)
-                    s->offset %= s->width;
+                /* pause at beginning of line */
+                if (s->offset >= s->width) {
+                    s->offset = 0;
+                    s->start_tick = current_tick + scroll_delay * 2;
+                }
             }
 
             lastmode = drawmode;
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 33a8b3790d..a2fe63ee97 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -29,6 +29,7 @@
 #include "debug.h"
 #include "system.h"
 #include "font.h"
+#include "rbunicode.h"
 #include "bidi.h"
 
 /*** definitions ***/
@@ -1091,13 +1092,13 @@ void lcd_remote_bitmap(const unsigned char *src, int x, int y, int width,
 /* put a string at a given pixel position, skipping first ofs pixel columns */
 static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str)
 {
-    int ch;
+    unsigned short ch;
+    unsigned short *ucs;
     struct font* pf = font_get(curfont);
 
-    if (bidi_support_enabled)
-        str = bidi_l2v(str, 1);
+    ucs = bidi_l2v(str, 1);
 
-    while ((ch = *str++) != '\0' && x < LCD_REMOTE_WIDTH)
+    while ((ch = *ucs++) != 0 && x < LCD_REMOTE_WIDTH)
     {
         int width;
         const unsigned char *bits;
@@ -1108,7 +1109,7 @@ static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str
         ch -= pf->firstchar;
 
         /* get proportional width and glyph bits */
-        width = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = font_get_width(pf, ch);
 
         if (ofs > width)
         {
@@ -1116,8 +1117,7 @@ static void lcd_remote_putsxyofs(int x, int y, int ofs, const unsigned char *str
             continue;
         }
 
-        bits = pf->bits + (pf->offset ?
-               pf->offset[ch] : ((pf->height + 7) / 8 * pf->maxwidth * ch));
+        bits = font_get_bits(pf, ch);
 
         lcd_remote_bitmap_part(bits, ofs, 0, width, x, y, width - ofs,
                                pf->height);
@@ -1153,7 +1153,7 @@ void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style)
         return;
 
     lcd_remote_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen((char *)str);
+    xpos = xmargin + x*w / utf8length((char *)str);
     ypos = ymargin + y*h;
     lcd_remote_putsxy(xpos, ypos, str);
     drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
@@ -1256,7 +1256,7 @@ void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *string, int
         end = strchr(s->line, '\0');
         strncpy(end, (char *)string, LCD_REMOTE_WIDTH/2);
 
-        s->len = strlen((char *)string);
+        s->len = utf8length((char *)string);
         s->offset = 0;
         s->startx = x;
         s->backward = false;
@@ -1323,9 +1323,11 @@ static void scroll_thread(void)
                 }
             }
             else {
-                /* scroll forward the whole time */
-                if (s->offset >= s->width)
-                    s->offset %= s->width;
+                /* pause at beginning of line */
+                if (s->offset >= s->width) {
+                    s->offset = 0;
+                    s->start_tick = current_tick + scroll_delay * 2;
+                }
             }
 
             lastmode = drawmode;
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index ba959d23de..1199bf04a1 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -28,6 +28,7 @@
 #include "debug.h"
 #include "system.h"
 #include "font.h"
+#include "rbunicode.h"
 #include "bidi.h"
 
 /*** definitions ***/
@@ -1014,13 +1015,13 @@ void lcd_bitmap(const unsigned char *src, int x, int y, int width, int height)
 /* put a string at a given pixel position, skipping first ofs pixel columns */
 static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
 {
-    int ch;
+    unsigned short ch;
+    unsigned short *ucs;
     struct font* pf = font_get(curfont);
 
-    if (bidi_support_enabled)
-        str = bidi_l2v(str, 1);
+    ucs = bidi_l2v(str, 1);
 
-    while ((ch = *str++) != '\0' && x < LCD_WIDTH)
+    while ((ch = *ucs++) != 0 && x < LCD_WIDTH)
     {
         int width;
         const unsigned char *bits;
@@ -1031,7 +1032,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
         ch -= pf->firstchar;
 
         /* get proportional width and glyph bits */
-        width = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = font_get_width(pf,ch);
 
         if (ofs > width)
         {
@@ -1039,8 +1040,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
             continue;
         }
 
-        bits = pf->bits + (pf->offset ?
-               pf->offset[ch] : ((pf->height + 7) / 8 * pf->maxwidth * ch));
+        bits = font_get_bits(pf, ch);
 
         lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height);
         
@@ -1069,7 +1069,7 @@ void lcd_puts_style(int x, int y, const unsigned char *str, int style)
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen((char *)str);
+    xpos = xmargin + x*w / utf8length((char *)str);
     ypos = ymargin + y*h;
     lcd_putsxy(xpos, ypos, str);
     drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
@@ -1178,7 +1178,7 @@ void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
         end = strchr(s->line, '\0');
         strncpy(end, (char *)string, LCD_WIDTH/2);
 
-        s->len = strlen((char *)string);
+        s->len = utf8length((char *)string);
         s->offset = 0;
         s->startx = x;
         s->backward = false;
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index 566c868d7f..d01ec3447f 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -31,6 +31,7 @@
 #include "system.h"
 #include "font.h"
 #include "lcd-player-charset.h"
+#include "rbunicode.h"
 
 /*** definitions ***/
 
@@ -323,9 +324,24 @@ static void lcd_puts_cont_scroll(int x, int y, const unsigned char *string)
 }
 void lcd_puts(int x, int y, const unsigned char *string)
 {
+    int i=0;
+    unsigned short ucs;
+    const unsigned char *utf8 = string;
+    unsigned char tmp[12];
+
+    while (*utf8 && i<11) {
+        utf8 = utf8decode(utf8, &ucs);
+        if (ucs < 256)
+            tmp[i++] = ucs;
+        else
+            tmp[i++] = '?';
+    }
+
+    tmp[i] = 0;
+
     DEBUGF("lcd_puts(%d, %d) -> ", x, y);
     scroll[y].mode=SCROLL_MODE_OFF;
-    return lcd_puts_cont_scroll(x, y, string);
+    return lcd_puts_cont_scroll(x, y, tmp);
 }
 
 void lcd_put_cursor(int x, int y, char cursor_char)
@@ -627,14 +643,28 @@ void lcd_bidir_scroll(int percent)
 void lcd_puts_scroll(int x, int y, const unsigned char* string )
 {
     struct scrollinfo* s;
-    int i;
+    int i=0;
+    unsigned short ucs;
+    const unsigned char *utf8 = string;
+    unsigned char tmp[utf8length(string)+1];
+
+    while (*utf8) {
+        utf8 = utf8decode(utf8, &ucs);
+        if (ucs < 256)
+            tmp[i++] = ucs;
+        else
+            tmp[i++] = '?';
+    }
+
+    tmp[i] = 0;
+
 
     DEBUGF("lcd_puts_scroll(%d, %d, %s)\n", x, y, string);
 
     s = &scroll[y];
 
-    lcd_puts_cont_scroll(x,y,string);
-    s->textlen = strlen(string);
+    lcd_puts_cont_scroll(x,y,tmp);
+    s->textlen = strlen(tmp);
 
     if ( s->textlen > 11-x ) {
         s->mode = SCROLL_MODE_RUN;
@@ -649,7 +679,7 @@ void lcd_puts_scroll(int x, int y, const unsigned char* string )
             s->jump_scroll_steps=11-x;
             s->jump_scroll=jump_scroll;
         }
-        strncpy(s->text,string,sizeof s->text);
+        strncpy(s->text,tmp,sizeof s->text);
         s->turn_offset=-1;
         if (bidir_limit && (s->textlen < ((11-x)*(100+bidir_limit))/100)) {
             s->turn_offset=s->textlen+x-11;
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 7e064b8001..081a7a5267 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -28,6 +28,7 @@
 #include "system.h"
 #include "font.h"
 #include "hwcompat.h"
+#include "rbunicode.h"
 #include "bidi.h"
 
 /*** definitions ***/
@@ -844,13 +845,13 @@ void lcd_bitmap(const unsigned char *src, int x, int y, int width, int height)
 /* put a string at a given pixel position, skipping first ofs pixel columns */
 static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
 {
-    int ch;
+    unsigned short ch;
+    unsigned short *ucs;
     struct font* pf = font_get(curfont);
 
-    if (bidi_support_enabled)
-        str = bidi_l2v(str, 1);
+    ucs = bidi_l2v(str, 1);
 
-    while ((ch = *str++) != '\0' && x < LCD_WIDTH)
+    while ((ch = *ucs++) != 0 && x < LCD_WIDTH)
     {
         int width;
         const unsigned char *bits;
@@ -861,7 +862,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
         ch -= pf->firstchar;
 
         /* get proportional width and glyph bits */
-        width = pf->width ? pf->width[ch] : pf->maxwidth;
+        width = font_get_width(pf,ch);
 
         if (ofs > width)
         {
@@ -869,8 +870,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str)
             continue;
         }
 
-        bits = pf->bits + (pf->offset ?
-               pf->offset[ch] : ((pf->height + 7) / 8 * pf->maxwidth * ch));
+        bits = font_get_bits(pf, ch);
 
         lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height);
         
@@ -898,7 +898,7 @@ void lcd_puts_style(int x, int y, const unsigned char *str, int style)
         return;
 
     lcd_getstringsize(str, &w, &h);
-    xpos = xmargin + x*w / strlen(str);
+    xpos = xmargin + x*w / utf8length(str);
     ypos = ymargin + y*h;
     lcd_putsxy(xpos, ypos, str);
     drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
@@ -1007,7 +1007,7 @@ void lcd_puts_scroll_style(int x, int y, const unsigned char *string, int style)
         end = strchr(s->line, '\0');
         strncpy(end, string, LCD_WIDTH/2);
 
-        s->len = strlen(string);
+        s->len = utf8length(string);
         s->offset = 0;
         s->startx = x;
         s->backward = false;