mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix STR #2566: under Xft, the PostScript font size is set at value between the FLTK size

Browse Source 
and the Xft-reported font height.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8440 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-02-17 14:29:44 +00:00
parent 30fd2c5bdf
commit dea2763983
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Fl_PostScript.cxx
View File

@ -32,8 +32,11 @@
#include <stdio.h> #include <stdio.h>
#include <FL/Fl_PostScript.H> #include <FL/Fl_PostScript.H>
#include <FL/Fl_Native_File_Chooser.H> #include <FL/Fl_Native_File_Chooser.H>
#if defined(USE_X11) && !USE_XFT #if defined(USE_X11)
#include "Fl_Font.H" #include "Fl_Font.H"
#if USE_XFT
#include <X11/Xft/Xft.h>
#endif
#endif #endif
const char *Fl_PostScript_Graphics_Driver::class_id = "Fl_PostScript_Graphics_Driver"; const char *Fl_PostScript_Graphics_Driver::class_id = "Fl_PostScript_Graphics_Driver";
@ -937,18 +940,26 @@ void Fl_PostScript_Graphics_Driver::font(int f, int s) {
Fl_Font_Descriptor *desc = driver->font_descriptor(); Fl_Font_Descriptor *desc = driver->font_descriptor();
this->font_descriptor(desc); this->font_descriptor(desc);
if (f < FL_FREE_FONT) { if (f < FL_FREE_FONT) {
int ps_size = s; float ps_size = s;
fprintf(output, "/%s SF\n" , _fontNames[f]); fprintf(output, "/%s SF\n" , _fontNames[f]);
#if defined(USE_X11) && !USE_XFT #if defined(USE_X11)
// Non-Xft fonts can have a different size from that required. #if USE_XFT
// Give to the PostScript font the same size as that used on the display // Xft font height is sometimes larger than the size required (see STR 2566).
// Increase the PostScript font size by 15% without exceeding the display font height
int max = desc->font->height;
ps_size = s * 1.15;
if (ps_size > max) ps_size = max;
#else
// Non-Xft fonts can be smaller than required.
// Set the PostScript font size to the display font height
char *name = desc->font->font_name_list[0]; char *name = desc->font->font_name_list[0];
char *p = strstr(name, "--"); char *p = strstr(name, "--");
if (p) { if (p) {
sscanf(p + 2, "%d", &ps_size); sscanf(p + 2, "%f", &ps_size);
} }
#endif #endif // USE_XFT
fprintf(output,"%i FS\n", ps_size); #endif // USE_X11
fprintf(output,"%.1f FS\n", ps_size);
} }
} }