Mercurial > pidgin
diff src/gtkimhtml.c @ 2734:9fc65bb80596
[gaim-migrate @ 2747]
it's 6am
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Sat, 17 Nov 2001 13:57:30 +0000 |
parents | 16df889d81e2 |
children | 367d19133917 |
line wrap: on
line diff
--- a/src/gtkimhtml.c Sat Nov 17 03:18:40 2001 +0000 +++ b/src/gtkimhtml.c Sat Nov 17 13:57:30 2001 +0000 @@ -1902,76 +1902,81 @@ xflds = g_strsplit (xname, "-", -1); -#define NAME 2 -#define BOLD 3 -#define ITALICS 4 -#define SIZE 6 -#define PTSZ 7 +#define FNDRY 1 +#define FMLY 2 +#define WGHT 3 +#define SLANT 4 +#define SWDTH 5 +#define ADSTYL 6 +#define PXLSZ 7 +#define PTSZ 8 +#define RESX 9 +#define RESY 10 +#define SPC 11 +#define AVGWDTH 12 +#define RGSTRY 13 +#define ENCDNG 14 for (i = 0; xflds [i]; i++); newvals = g_memdup (xflds, (i + 1) * sizeof (xflds)); + if (!xflds [ADSTYL][0]) + newvals [ADSTYL] = "*"; if (bold) - newvals [BOLD] = "bold"; + newvals [WGHT] = "bold"; if (italics) - newvals [ITALICS] = "i"; + newvals [SLANT] = "i"; if (fontsize) { g_snprintf (fs, sizeof (fs), "%d", font_sizes [MIN (fontsize, MAX_SIZE) - 1]); - newvals [SIZE] = fs; - newvals [PTSZ] = ""; + newvals [PXLSZ] = "*"; + newvals [PTSZ] = fs; } if (name) names = g_strsplit (name, ",", -1); else { names = g_new0 (gchar *, 2); - names [0] = g_strdup (xflds [NAME]); + names [0] = g_strdup (xflds [FMLY]); } for (i = 0; names [i]; i++) { - newvals [NAME] = names [i]; + newvals [FMLY] = names [i]; TRY_FONT; } for (i = 0; italics && names [i]; i++) { - newvals [NAME] = names [i]; - - newvals [ITALICS] = "o"; + newvals [FMLY] = names [i]; + + newvals [SLANT] = "o"; TRY_FONT; - newvals [ITALICS] = xflds [ITALICS]; + newvals [SLANT] = xflds [SLANT]; TRY_FONT; } for (i = 0; fontsize && names [i]; i++) { - newvals [NAME] = names [i]; - - if (xflds [PTSZ][0]) { - g_snprintf (fs, sizeof (fs), "%d", - font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10); - newvals [PTSZ] = fs; - newvals [SIZE] = ""; - TRY_FONT; - - newvals [PTSZ] = xflds [PTSZ]; - } else - newvals [SIZE] = xflds [SIZE]; + newvals [FMLY] = names [i]; + + g_snprintf (fs, sizeof (fs), "%d", + font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10); + newvals [PXLSZ] = fs; + newvals [PTSZ] = "*"; + + TRY_FONT; + + newvals [PXLSZ] = xflds [PXLSZ]; + newvals [PTSZ] = xflds [PTSZ]; + TRY_FONT; } for (i = 0; bold && names [i]; i++) { - newvals [NAME] = names [i]; - - newvals [BOLD] = xflds [BOLD]; + newvals [FMLY] = names [i]; + + newvals [WGHT] = xflds [WGHT]; TRY_FONT; } -#undef NAME -#undef BOLD -#undef ITALICS -#undef SIZE -#undef PTSZ - g_free (newvals); g_strfreev (xflds); g_strfreev (names);