fonts: Prefer a bigger font for high resolution screens

[linux-2.6-block.git] / lib / fonts / fonts.c

diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c
index a8e31e9d6fc5d7e7dc7e5efee1e2e0303190f001..e7258d8c252b272b56222ca662ccb197f3bbdf23 100644 (file)
--- a/lib/fonts/fonts.c
+++ b/lib/fonts/fonts.c
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(find_font);
 const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
                                         u32 font_h)
 {
-       int i, c, cc;
+       int i, c, cc, res;
        const struct font_desc *f, *g;
 
        g = NULL;
@@ -127,6 +127,11 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
                if ((yres < 400) == (f->height <= 8))
                        c += 1000;
 
+               /* prefer a bigger font for high resolution */
+               res = (xres / f->width) * (yres / f->height) / 1000;
+               if (res > 20)
+                       c += 20 - res;
+
                if ((font_w & (1 << (f->width - 1))) &&
                    (font_h & (1 << (f->height - 1))))
                        c += 1000;