ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various fixes for the X11 font mapper, particularly: 

- size fonts with negative heights correctly
- calculate average width correctly.
This commit is contained in:
Richard Cohen 1999-09-05 12:18:57 +00:00 committed by Alexandre Julliard
parent 699900bdb3
commit 8dde3c7f60
2 changed files with 1958 additions and 1537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3472
graphics/x11drv/xfont.c
View File

File diff suppressed because it is too large Load Diff

23
include/x11font.h
View File

@ -81,8 +81,6 @@ typedef struct tagFontInfo
/* LFD parameters can be quite different from the actual metrics */ /* LFD parameters can be quite different from the actual metrics */
UINT16 lfd_height; UINT16 lfd_height;
UINT16 lfd_width;
UINT16 lfd_decipoints;
UINT16 lfd_resolution; UINT16 lfd_resolution;
IFONTINFO16 df; IFONTINFO16 df;
} fontInfo; } fontInfo;
@ -94,6 +92,25 @@ typedef struct tagFontInfo
#define FR_REMOVED 0x4000 /* delayed remove */ #define FR_REMOVED 0x4000 /* delayed remove */
#define FR_NAMESET 0x8000 #define FR_NAMESET 0x8000
#define LFD_FIELDS 14
typedef struct
{
char* foundry;
char* family;
char* weight;
char* slant;
char* set_width;
char* add_style;
char* pixel_size;
char* point_size;
char* resolution_x;
char* resolution_y;
char* spacing;
char* average_width;
char* charset_registry;
char* charset_encoding;
} LFD;
typedef struct tagFontResource typedef struct tagFontResource
{ {
struct tagFontResource* next; struct tagFontResource* next;
@ -102,7 +119,7 @@ typedef struct tagFontResource
UINT16 fi_count; UINT16 fi_count;
UINT16 fo_count; UINT16 fo_count;
fontInfo* fi; fontInfo* fi;
char* resource; LFD* resource;
HANDLE hOwner; /* For FR_SOFTFONT/FR_SOFTRESOURCE fonts */ HANDLE hOwner; /* For FR_SOFTFONT/FR_SOFTRESOURCE fonts */
CHAR lfFaceName[LF_FACESIZE]; CHAR lfFaceName[LF_FACESIZE];
} fontResource; } fontResource;