Ticket #1685: app-server-unicode-font.diff

src/servers/app/FontEngine.cpp

@@ -331 +331 @@
     }
     for (i = 0; i < bitmap.rows; i++) {
         sl.reset_spans();
-        const uint8* p = buf;
-        for (j = 0; j < bitmap.width; j++) {
-            if (*p)
-                sl.add_cell(x + j, *p);
-            ++p;
+
+        if (bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
+            // font has built-in mono bitmap
+            agg::bitset_iterator bits(buf, 0);
+            int j;
+            for (j = 0; j < bitmap.width; j++) {
+                if (bits.bit())
+                    sl.add_cell(x + j, agg::cover_full);
+                ++bits;
+            }
+        } else {
+            const uint8* p = buf;
+            for (j = 0; j < bitmap.width; j++) {
+                if (*p)
+                    sl.add_cell(x + j, *p);
+                ++p;
+            }
         }
+
         buf += pitch;
         if (sl.num_spans()) {
             sl.finalize(y - i - 1);
@@ -579 +592 @@
             break;
     }
 
-    FT_Set_Pixel_Sizes(fFace,
-        unsigned(size * 64.0) >> 6, // pixel_width
-        unsigned(size * 64.0) >> 6);  // pixel_height
+    bool fixed_size = false;
+    for(int i = 0; i < fFace->num_fixed_sizes; i++) {
+        if (fFace->available_sizes[i].height == (FT_Short)size) {
+            fixed_size = true;
+            break;
+        }
+    }
+    if (fixed_size) {
+        FT_Set_Pixel_Sizes(fFace, 0, (FT_UInt)size);
+    } else {
+        FT_Set_Char_Size(fFace, 0, (FT_F26Dot6)(size * 64.f), 0, 0);
+    }
 
-    if (charMap != FT_ENCODING_NONE)
+    if (charMap != FT_ENCODING_NONE) {
         fLastError = FT_Select_Charmap(fFace, charMap);
+    } else {
+        if (FT_Select_Charmap(fFace, FT_ENCODING_UNICODE) != 0)
+            fLastError = FT_Select_Charmap(fFace, FT_ENCODING_NONE);
+    }
 
     return fLastError == 0;
 }

src/servers/app/Desktop.cpp

@@ -371 +371 @@
     if (fSharedReadOnlyArea < B_OK)
         return fSharedReadOnlyArea;
 
+    gFontManager->AttachUser(fUserID);
+
     fSettings = new DesktopSettingsPrivate(fServerReadOnlyMemory);
 
     for (int32 i = 0; i < kMaxWorkspaces; i++) {
@@ -408 +410 @@
     _RebuildClippingForAllWindows(stillAvailableOnScreen);
     _SetBackground(stillAvailableOnScreen);
 
-    gFontManager->AttachUser(fUserID);
-
     SetCursor(NULL);
         // this will set the default cursor