1997-06-16 17:43:53 +00:00
|
|
|
/*
|
|
|
|
* X11 physical font definitions
|
|
|
|
*
|
|
|
|
* Copyright 1997 Alex Korobka
|
2002-03-09 23:29:33 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
1997-06-16 17:43:53 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __WINE_X11FONT_H
|
|
|
|
#define __WINE_X11FONT_H
|
|
|
|
|
|
|
|
#include "gdi.h"
|
1998-11-25 12:36:03 +00:00
|
|
|
#include "x11drv.h"
|
1999-04-25 12:36:53 +00:00
|
|
|
#include "pshpack1.h"
|
1997-06-16 17:43:53 +00:00
|
|
|
|
2002-05-31 23:06:46 +00:00
|
|
|
/* this is a part of the font resource header, should
|
1997-06-16 17:43:53 +00:00
|
|
|
* make it easier to implement dynamic softfont loading */
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
INT16 dfType;
|
|
|
|
INT16 dfPoints;
|
|
|
|
INT16 dfVertRes;
|
|
|
|
INT16 dfHorizRes;
|
|
|
|
INT16 dfAscent;
|
|
|
|
INT16 dfInternalLeading;
|
|
|
|
INT16 dfExternalLeading;
|
|
|
|
CHAR dfItalic;
|
|
|
|
CHAR dfUnderline;
|
|
|
|
CHAR dfStrikeOut;
|
|
|
|
INT16 dfWeight;
|
1999-01-01 18:41:22 +00:00
|
|
|
BYTE dfCharSet;
|
1997-06-16 17:43:53 +00:00
|
|
|
INT16 dfPixWidth;
|
|
|
|
INT16 dfPixHeight;
|
|
|
|
CHAR dfPitchAndFamily;
|
|
|
|
INT16 dfAvgWidth;
|
|
|
|
INT16 dfMaxWidth;
|
|
|
|
CHAR dfFirstChar;
|
|
|
|
CHAR dfLastChar;
|
|
|
|
CHAR dfDefaultChar;
|
|
|
|
CHAR dfBreakChar;
|
|
|
|
INT16 dfWidthBytes;
|
|
|
|
LPCSTR dfDevice;
|
|
|
|
LPCSTR dfFace;
|
|
|
|
} IFONTINFO16, *LPIFONTINFO16;
|
|
|
|
|
1999-04-25 12:36:53 +00:00
|
|
|
#include "poppack.h"
|
1997-06-16 17:43:53 +00:00
|
|
|
|
|
|
|
/* internal flags */
|
|
|
|
|
|
|
|
#define FI_POLYWEIGHT 0x0001
|
|
|
|
#define FI_POLYSLANT 0x0002
|
|
|
|
#define FI_OBLIQUE 0x0004
|
|
|
|
#define FI_SCALABLE 0x0008
|
|
|
|
#define FI_FW_BOOK 0x0010
|
|
|
|
#define FI_FW_DEMI 0x0020
|
|
|
|
#define FI_VARIABLEPITCH 0x0040
|
|
|
|
#define FI_FIXEDPITCH 0x0080
|
|
|
|
|
|
|
|
#define FI_FIXEDEX 0x1000
|
|
|
|
#define FI_NORMAL 0x2000
|
|
|
|
#define FI_SUBSET 0x4000
|
|
|
|
#define FI_TRUETYPE 0x8000
|
|
|
|
|
1998-12-26 19:42:02 +00:00
|
|
|
/* code pages */
|
|
|
|
|
|
|
|
#define FI_ENC_ANSI 0
|
|
|
|
#define FI_ENC_ISO8859 1
|
|
|
|
#define FI_ENC_ISO646 2
|
|
|
|
#define FI_ENC_MICROSOFT 3
|
|
|
|
#define FI_ENC_KOI8 4
|
|
|
|
#define FI_ENC_ASCII 5
|
|
|
|
#define FI_ENC_VISCII 6
|
|
|
|
#define FI_ENC_TCVN 7
|
|
|
|
#define FI_ENC_TIS620 8
|
|
|
|
|
2000-08-14 17:25:13 +00:00
|
|
|
enum X11DRV_CPTABLE
|
|
|
|
{
|
|
|
|
X11DRV_CPTABLE_SBCS,
|
|
|
|
X11DRV_CPTABLE_UNICODE,
|
|
|
|
X11DRV_CPTABLE_CP932,
|
|
|
|
X11DRV_CPTABLE_CP936,
|
|
|
|
X11DRV_CPTABLE_CP949,
|
|
|
|
X11DRV_CPTABLE_CP950,
|
2001-10-23 19:54:27 +00:00
|
|
|
X11DRV_CPTABLE_SYMBOL,
|
2000-08-14 17:25:13 +00:00
|
|
|
X11DRV_CPTABLE_COUNT
|
|
|
|
};
|
|
|
|
|
1997-06-16 17:43:53 +00:00
|
|
|
typedef struct tagFontInfo
|
|
|
|
{
|
|
|
|
struct tagFontInfo* next;
|
|
|
|
UINT16 fi_flags;
|
1998-12-26 19:42:02 +00:00
|
|
|
UINT16 fi_encoding;
|
2000-06-10 04:44:12 +00:00
|
|
|
UINT16 codepage;
|
2000-08-14 17:25:13 +00:00
|
|
|
UINT16 cptable;
|
2000-08-20 19:04:04 +00:00
|
|
|
WORD internal_charset;
|
1997-06-16 17:43:53 +00:00
|
|
|
|
|
|
|
/* LFD parameters can be quite different from the actual metrics */
|
|
|
|
|
|
|
|
UINT16 lfd_height;
|
|
|
|
UINT16 lfd_resolution;
|
|
|
|
IFONTINFO16 df;
|
|
|
|
} fontInfo;
|
|
|
|
|
|
|
|
/* Font resource list for EnumFont() purposes */
|
|
|
|
|
|
|
|
#define FR_SOFTFONT 0x1000 /* - .FON or .FOT file */
|
|
|
|
#define FR_SOFTRESOURCE 0x2000 /* - resource handle */
|
|
|
|
#define FR_REMOVED 0x4000 /* delayed remove */
|
|
|
|
#define FR_NAMESET 0x8000
|
|
|
|
|
1999-09-05 12:18:57 +00:00
|
|
|
#define LFD_FIELDS 14
|
|
|
|
typedef struct
|
|
|
|
{
|
2000-08-14 17:25:13 +00:00
|
|
|
const char* foundry;
|
|
|
|
const char* family;
|
|
|
|
const char* weight;
|
|
|
|
const char* slant;
|
|
|
|
const char* set_width;
|
|
|
|
const char* add_style;
|
|
|
|
const char* pixel_size;
|
|
|
|
const char* point_size;
|
|
|
|
const char* resolution_x;
|
|
|
|
const char* resolution_y;
|
|
|
|
const char* spacing;
|
|
|
|
const char* average_width;
|
|
|
|
const char* charset_registry;
|
|
|
|
const char* charset_encoding;
|
1999-09-05 12:18:57 +00:00
|
|
|
} LFD;
|
|
|
|
|
1997-06-16 17:43:53 +00:00
|
|
|
typedef struct tagFontResource
|
|
|
|
{
|
|
|
|
struct tagFontResource* next;
|
|
|
|
UINT16 fr_flags;
|
1998-12-26 19:42:02 +00:00
|
|
|
UINT16 fr_penalty;
|
|
|
|
UINT16 fi_count;
|
|
|
|
UINT16 fo_count;
|
1997-06-16 17:43:53 +00:00
|
|
|
fontInfo* fi;
|
1999-09-05 12:18:57 +00:00
|
|
|
LFD* resource;
|
1999-02-26 11:11:13 +00:00
|
|
|
HANDLE hOwner; /* For FR_SOFTFONT/FR_SOFTRESOURCE fonts */
|
1997-06-16 17:43:53 +00:00
|
|
|
CHAR lfFaceName[LF_FACESIZE];
|
|
|
|
} fontResource;
|
|
|
|
|
Release 980712
Sun Jul 12 16:23:36 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/*] [scheduler/client.c] (new files)
[scheduler/sysdeps.c] [scheduler/thread.c] [scheduler/process.c]
Beginnings of client/server communication for inter-process
synchronisation.
Sat Jul 11 19:45:45 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/bitmap.h] [objects/bitmap.c] [objects/dib.c]
[objects/oembitmap.c]
Speed up DIB section handling by using pre-allocated colormap and
XImage. Moved DIB section data out of general BITMAPOBJ structure.
Bugfix: GetDIBits32 would overwrite one byte beyond bitmap data.
* [if1632/shell.spec] [if1632/kernel.spec] [win32/kernel32.c]
More verbose error message if ThunkConnect fails.
Implemented KERNEL_475.
* [files/profile.c] [ole/ole2nls.c]
Minor bugfixes.
* [if1632/builtin.c] [if1632/kernel.spec] [include/task.h]
[loader/ne/module.c] [loader/task.c]
Implemented KERNEL.THHOOK.
* [if1632/wprocs.spec] [include/process.h] [msdos/dpmi.c] [msdos/vxd.c]
Implemented Win32s VxD services (W32S.386).
Sat Jul 11 17:52:23 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
[include/x11font.h]
Improve handling of rotated X11 fonts. Metrics/extents should now be
correct. ExtTextOut should behave better (still doesn't handle lpDx).
* [graphics/painting.c]
DrawFocusRect32: Don't do anything if width or height are zero.
Sat Jul 11 15:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/profile.c] [include/windows.h]
The length arguments of *Profile*() need to be treated
as UINTxx instead of INTxx.
* [graphics/env.c] [graphics/win16drv/init.c] [include/print.h]
[misc/printdrv.c]
Many printer driver fixes/changes (many thanks go to Huw !).
Most printers should work again ;)
* [memory/atom.c]
Fixed ATOM_AddAtom to store atoms exactly like Windows.
* [*/*]
Fixed misc compiler warnings.
Fri Jul 10 15:58:36 1998 Marcus Meissner <marcus@jet.franken.de>
* [files/drive.c]
Fixed GetDriveType16 to return DRIVE_REMOTE again.
* [loader/pe_image.c][loader/module.c]
Look for modules that have the same modulename or the same
filename (they sometimes differ).
Fixed up fixup_imports, removed one of the loops.
* [windows/winpos.c]
Added some NULL ptr checks. Needs more.
* [graphics/ddraw.c]
Some stubs added.
* [if1632/snoop.c]
Updated, made WINELIB compatible.
Fri Jul 10 04:39:56 1998 Douglas Ridgway <ridgway@winehq.com>
* [objects/enhmetafile.c] [relay32/gdi32.spec]
Small tweaks for documentation system.
Thu Jul 9 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Fixed GetEffectiveClientRect, CreateToolbarEx and CreateMappedBitmap.
Added stub for ShowHideMenuCtl. Added some documentation.
* [documentation/common_controls]
Added and updated some information.
* [controls/toolbar.c][include/toolbar.h]
Added string support.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Changed names of undocumented functions to their real names and
fixed the export table.
* [controls/imagelist.c][relay32/comctl32.spec]
Added stub for ImageList_SetFilter.
Fixed some minor bugs and typos.
* [objects/font.c][include/windows.h][relay32/gdi32.spec]
Added stubs for GetCharacterPlacement32[A/W].
* [objects/region.c][relay32/gdi32.spec]
Added stub for UNDOCUMENTED GetRandomRgn.
* [controls/commctrl.c][controls/*.c][include/*.h]
Added dummy listview, pager, rebar, tooltips, trackbar and
treeview control. This keeps some programs from complaining.
Thu Jul 9 11:23:58 1998 Rein Klazes <rklazes@casema.net>
* [graphics/painting.c] [graphics/*/init.c]
[graphics/x11drv/graphics.c] [relay32/gdi32.spec]
[if1632/gdi.spec] [include/gdi.h] [include/x11drv.h]
Implemented drawing bezier curves: PolyBezier16/32 and
PolyBezierTo16/32.
* [graphics/x11drv/graphics.c]
Improved accuracy of several graphic routines, especially the
drawing of pie's.
* [include/windows.h] [misc/spy.c]
Added 25 window messages related to programs based on MFC and/or OLE.
Wed Jul 8 22:00:00 1998 James Juran <jrj120@psu.edu>
* [documentation/wine.man]
Updated manpage.
* [wine.ini]
Added section for Win95Look=true (commented out by default).
Wed Jul 8 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Fixed a crash in RegEnumValue32A when the dwType parameter is
NULL.
* [programs/regtest/regtest.c]
Improved the printing of errors.
* [misc/ntdll.c]
Added stub for RtlFormatCurrentUserKeyPath.
* [win32/console.c]
Added stub for ScrollConsoleScreenBuffer.
Mon Jul 6 16:41:47 1998 Per Lindstrm <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel.spec] [win32/newfns.c]
Added stubs for SleepEx and TerminateProcess.
* [rc/README]
Corrected a grammatical error.
Mon Jul 3 12:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [misc/shellord.c]
Put some TRACE in.
* [memory/string.c]
Deleted unused variable in lstrcmpi32A.
* [include/windows.h][memory/string.c]
Added functions WideCharToLocal32 LocalToWideChar32 for
OLE-strings
* [include/shlobj.h][include/winerror.h][misc/shell.c]
[ole/folders.c]
Added definition of internal class pidlmgr.
Changed definitions of EnumIDList, IShellFolder.
Added some OLE error constants.
Implemented EnumIDList, IShellFolder, IClassFactory,
PidlMgr, SHELL32_DllGetClassObject, SHGetDesktopFolder,
SHGetSpecialFolderLocation (half), SHGetPathFromIDList
(!!This stuff is not finished yet!!)
* [include/windows.h][misc/network][reley32/mpr.spec]
Added stubs for WNetConnectionDialog32[A|W|API].
Added struct LPCONNECTDLGSTRUCT32[A|W] and some constants.
Added some SetLastError(WN_NO_NETWORK) to the stubs.
Fixed bufferhandling in WNetCancelConnection
Added stub for MultinetGetErrorText[A|W]
* [ole/ole2nls.c]
Rewrote GetTimeFormat32A.
Fri Jul 3 10:27:30 1998 Michael Poole <poole+@andrew.cmu.edu>
* [graphics/ddraw.c] [tsx11/X11_calls]
Implement IDirectDrawPalette_GetEntries.
Use CopyColormapAndFree to avoid erasing previously-set
palette entries.
* [graphics/ddraw.c] [include/ddraw.h]
[tools/make_X11wrappers] [tsx11/X11_calls]
Provide a preliminary, not-yet-working framework for doing
DirectDraw via Xlib or XShm as well as DGA.
Tue Jun 30 00:16:09 1998 Marcel Baur <mbaur@g26.ethz.ch>
* [ole/nls/*.nls]
Added remaining 22 locales (including arabic locales).
1998-07-12 19:29:36 +00:00
|
|
|
typedef struct {
|
1998-12-26 19:42:02 +00:00
|
|
|
float a,b,c,d; /* pixelsize matrix, FIXME: switch to MAT2 format */
|
Release 980712
Sun Jul 12 16:23:36 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/*] [scheduler/client.c] (new files)
[scheduler/sysdeps.c] [scheduler/thread.c] [scheduler/process.c]
Beginnings of client/server communication for inter-process
synchronisation.
Sat Jul 11 19:45:45 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/bitmap.h] [objects/bitmap.c] [objects/dib.c]
[objects/oembitmap.c]
Speed up DIB section handling by using pre-allocated colormap and
XImage. Moved DIB section data out of general BITMAPOBJ structure.
Bugfix: GetDIBits32 would overwrite one byte beyond bitmap data.
* [if1632/shell.spec] [if1632/kernel.spec] [win32/kernel32.c]
More verbose error message if ThunkConnect fails.
Implemented KERNEL_475.
* [files/profile.c] [ole/ole2nls.c]
Minor bugfixes.
* [if1632/builtin.c] [if1632/kernel.spec] [include/task.h]
[loader/ne/module.c] [loader/task.c]
Implemented KERNEL.THHOOK.
* [if1632/wprocs.spec] [include/process.h] [msdos/dpmi.c] [msdos/vxd.c]
Implemented Win32s VxD services (W32S.386).
Sat Jul 11 17:52:23 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
[include/x11font.h]
Improve handling of rotated X11 fonts. Metrics/extents should now be
correct. ExtTextOut should behave better (still doesn't handle lpDx).
* [graphics/painting.c]
DrawFocusRect32: Don't do anything if width or height are zero.
Sat Jul 11 15:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/profile.c] [include/windows.h]
The length arguments of *Profile*() need to be treated
as UINTxx instead of INTxx.
* [graphics/env.c] [graphics/win16drv/init.c] [include/print.h]
[misc/printdrv.c]
Many printer driver fixes/changes (many thanks go to Huw !).
Most printers should work again ;)
* [memory/atom.c]
Fixed ATOM_AddAtom to store atoms exactly like Windows.
* [*/*]
Fixed misc compiler warnings.
Fri Jul 10 15:58:36 1998 Marcus Meissner <marcus@jet.franken.de>
* [files/drive.c]
Fixed GetDriveType16 to return DRIVE_REMOTE again.
* [loader/pe_image.c][loader/module.c]
Look for modules that have the same modulename or the same
filename (they sometimes differ).
Fixed up fixup_imports, removed one of the loops.
* [windows/winpos.c]
Added some NULL ptr checks. Needs more.
* [graphics/ddraw.c]
Some stubs added.
* [if1632/snoop.c]
Updated, made WINELIB compatible.
Fri Jul 10 04:39:56 1998 Douglas Ridgway <ridgway@winehq.com>
* [objects/enhmetafile.c] [relay32/gdi32.spec]
Small tweaks for documentation system.
Thu Jul 9 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Fixed GetEffectiveClientRect, CreateToolbarEx and CreateMappedBitmap.
Added stub for ShowHideMenuCtl. Added some documentation.
* [documentation/common_controls]
Added and updated some information.
* [controls/toolbar.c][include/toolbar.h]
Added string support.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Changed names of undocumented functions to their real names and
fixed the export table.
* [controls/imagelist.c][relay32/comctl32.spec]
Added stub for ImageList_SetFilter.
Fixed some minor bugs and typos.
* [objects/font.c][include/windows.h][relay32/gdi32.spec]
Added stubs for GetCharacterPlacement32[A/W].
* [objects/region.c][relay32/gdi32.spec]
Added stub for UNDOCUMENTED GetRandomRgn.
* [controls/commctrl.c][controls/*.c][include/*.h]
Added dummy listview, pager, rebar, tooltips, trackbar and
treeview control. This keeps some programs from complaining.
Thu Jul 9 11:23:58 1998 Rein Klazes <rklazes@casema.net>
* [graphics/painting.c] [graphics/*/init.c]
[graphics/x11drv/graphics.c] [relay32/gdi32.spec]
[if1632/gdi.spec] [include/gdi.h] [include/x11drv.h]
Implemented drawing bezier curves: PolyBezier16/32 and
PolyBezierTo16/32.
* [graphics/x11drv/graphics.c]
Improved accuracy of several graphic routines, especially the
drawing of pie's.
* [include/windows.h] [misc/spy.c]
Added 25 window messages related to programs based on MFC and/or OLE.
Wed Jul 8 22:00:00 1998 James Juran <jrj120@psu.edu>
* [documentation/wine.man]
Updated manpage.
* [wine.ini]
Added section for Win95Look=true (commented out by default).
Wed Jul 8 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Fixed a crash in RegEnumValue32A when the dwType parameter is
NULL.
* [programs/regtest/regtest.c]
Improved the printing of errors.
* [misc/ntdll.c]
Added stub for RtlFormatCurrentUserKeyPath.
* [win32/console.c]
Added stub for ScrollConsoleScreenBuffer.
Mon Jul 6 16:41:47 1998 Per Lindstrm <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel.spec] [win32/newfns.c]
Added stubs for SleepEx and TerminateProcess.
* [rc/README]
Corrected a grammatical error.
Mon Jul 3 12:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [misc/shellord.c]
Put some TRACE in.
* [memory/string.c]
Deleted unused variable in lstrcmpi32A.
* [include/windows.h][memory/string.c]
Added functions WideCharToLocal32 LocalToWideChar32 for
OLE-strings
* [include/shlobj.h][include/winerror.h][misc/shell.c]
[ole/folders.c]
Added definition of internal class pidlmgr.
Changed definitions of EnumIDList, IShellFolder.
Added some OLE error constants.
Implemented EnumIDList, IShellFolder, IClassFactory,
PidlMgr, SHELL32_DllGetClassObject, SHGetDesktopFolder,
SHGetSpecialFolderLocation (half), SHGetPathFromIDList
(!!This stuff is not finished yet!!)
* [include/windows.h][misc/network][reley32/mpr.spec]
Added stubs for WNetConnectionDialog32[A|W|API].
Added struct LPCONNECTDLGSTRUCT32[A|W] and some constants.
Added some SetLastError(WN_NO_NETWORK) to the stubs.
Fixed bufferhandling in WNetCancelConnection
Added stub for MultinetGetErrorText[A|W]
* [ole/ole2nls.c]
Rewrote GetTimeFormat32A.
Fri Jul 3 10:27:30 1998 Michael Poole <poole+@andrew.cmu.edu>
* [graphics/ddraw.c] [tsx11/X11_calls]
Implement IDirectDrawPalette_GetEntries.
Use CopyColormapAndFree to avoid erasing previously-set
palette entries.
* [graphics/ddraw.c] [include/ddraw.h]
[tools/make_X11wrappers] [tsx11/X11_calls]
Provide a preliminary, not-yet-working framework for doing
DirectDraw via Xlib or XShm as well as DGA.
Tue Jun 30 00:16:09 1998 Marcel Baur <mbaur@g26.ethz.ch>
* [ole/nls/*.nls]
Added remaining 22 locales (including arabic locales).
1998-07-12 19:29:36 +00:00
|
|
|
unsigned long RAW_ASCENT;
|
|
|
|
unsigned long RAW_DESCENT;
|
|
|
|
float pixelsize;
|
|
|
|
float ascent;
|
|
|
|
float descent;
|
|
|
|
} XFONTTRANS;
|
|
|
|
|
1997-06-16 17:43:53 +00:00
|
|
|
#define FO_RESOURCE_MASK 0x000F
|
|
|
|
#define FO_SYSTEM 0x0001 /* resident in cache */
|
|
|
|
#define FO_SOFTFONT 0x0002 /* installed at runtime */
|
|
|
|
#define FO_SHARED 0x0004 /* MITSHM */
|
|
|
|
#define FO_REMOVED 0x0008 /* remove when count falls to 0 */
|
|
|
|
|
|
|
|
#define FO_MATCH_MASK 0x00F0
|
|
|
|
#define FO_MATCH_NORASTER 0x0010
|
|
|
|
#define FO_MATCH_PAF 0x0020
|
|
|
|
#define FO_MATCH_XYINDEP 0x0040
|
|
|
|
|
|
|
|
#define FO_SYNTH_MASK 0xFF00
|
|
|
|
#define FO_SYNTH_HEIGHT 0x2000
|
|
|
|
#define FO_SYNTH_WIDTH 0x4000
|
|
|
|
#define FO_SYNTH_ROTATE 0x8000
|
|
|
|
#define FO_SYNTH_BOLD 0x0100
|
|
|
|
#define FO_SYNTH_ITALIC 0x0200
|
|
|
|
#define FO_SYNTH_UNDERLINE 0x0400
|
|
|
|
#define FO_SYNTH_STRIKEOUT 0x0800
|
|
|
|
|
|
|
|
/* Realized screen font */
|
|
|
|
|
2000-08-15 12:01:47 +00:00
|
|
|
#define X11FONT_REFOBJS_MAX 4
|
|
|
|
|
|
|
|
typedef struct
|
1997-06-16 17:43:53 +00:00
|
|
|
{
|
|
|
|
XFontStruct* fs; /* text metrics */
|
|
|
|
fontResource* fr; /* font family */
|
|
|
|
fontInfo* fi; /* font instance info */
|
|
|
|
Pixmap* lpPixmap; /* optional character bitmasks for synth fonts */
|
2000-08-15 12:01:47 +00:00
|
|
|
X_PHYSFONT prefobjs[X11FONT_REFOBJS_MAX]; /* font objects for DBCS charsets */
|
1997-06-16 17:43:53 +00:00
|
|
|
|
Release 980712
Sun Jul 12 16:23:36 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/*] [scheduler/client.c] (new files)
[scheduler/sysdeps.c] [scheduler/thread.c] [scheduler/process.c]
Beginnings of client/server communication for inter-process
synchronisation.
Sat Jul 11 19:45:45 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/bitmap.h] [objects/bitmap.c] [objects/dib.c]
[objects/oembitmap.c]
Speed up DIB section handling by using pre-allocated colormap and
XImage. Moved DIB section data out of general BITMAPOBJ structure.
Bugfix: GetDIBits32 would overwrite one byte beyond bitmap data.
* [if1632/shell.spec] [if1632/kernel.spec] [win32/kernel32.c]
More verbose error message if ThunkConnect fails.
Implemented KERNEL_475.
* [files/profile.c] [ole/ole2nls.c]
Minor bugfixes.
* [if1632/builtin.c] [if1632/kernel.spec] [include/task.h]
[loader/ne/module.c] [loader/task.c]
Implemented KERNEL.THHOOK.
* [if1632/wprocs.spec] [include/process.h] [msdos/dpmi.c] [msdos/vxd.c]
Implemented Win32s VxD services (W32S.386).
Sat Jul 11 17:52:23 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
[include/x11font.h]
Improve handling of rotated X11 fonts. Metrics/extents should now be
correct. ExtTextOut should behave better (still doesn't handle lpDx).
* [graphics/painting.c]
DrawFocusRect32: Don't do anything if width or height are zero.
Sat Jul 11 15:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/profile.c] [include/windows.h]
The length arguments of *Profile*() need to be treated
as UINTxx instead of INTxx.
* [graphics/env.c] [graphics/win16drv/init.c] [include/print.h]
[misc/printdrv.c]
Many printer driver fixes/changes (many thanks go to Huw !).
Most printers should work again ;)
* [memory/atom.c]
Fixed ATOM_AddAtom to store atoms exactly like Windows.
* [*/*]
Fixed misc compiler warnings.
Fri Jul 10 15:58:36 1998 Marcus Meissner <marcus@jet.franken.de>
* [files/drive.c]
Fixed GetDriveType16 to return DRIVE_REMOTE again.
* [loader/pe_image.c][loader/module.c]
Look for modules that have the same modulename or the same
filename (they sometimes differ).
Fixed up fixup_imports, removed one of the loops.
* [windows/winpos.c]
Added some NULL ptr checks. Needs more.
* [graphics/ddraw.c]
Some stubs added.
* [if1632/snoop.c]
Updated, made WINELIB compatible.
Fri Jul 10 04:39:56 1998 Douglas Ridgway <ridgway@winehq.com>
* [objects/enhmetafile.c] [relay32/gdi32.spec]
Small tweaks for documentation system.
Thu Jul 9 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Fixed GetEffectiveClientRect, CreateToolbarEx and CreateMappedBitmap.
Added stub for ShowHideMenuCtl. Added some documentation.
* [documentation/common_controls]
Added and updated some information.
* [controls/toolbar.c][include/toolbar.h]
Added string support.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Changed names of undocumented functions to their real names and
fixed the export table.
* [controls/imagelist.c][relay32/comctl32.spec]
Added stub for ImageList_SetFilter.
Fixed some minor bugs and typos.
* [objects/font.c][include/windows.h][relay32/gdi32.spec]
Added stubs for GetCharacterPlacement32[A/W].
* [objects/region.c][relay32/gdi32.spec]
Added stub for UNDOCUMENTED GetRandomRgn.
* [controls/commctrl.c][controls/*.c][include/*.h]
Added dummy listview, pager, rebar, tooltips, trackbar and
treeview control. This keeps some programs from complaining.
Thu Jul 9 11:23:58 1998 Rein Klazes <rklazes@casema.net>
* [graphics/painting.c] [graphics/*/init.c]
[graphics/x11drv/graphics.c] [relay32/gdi32.spec]
[if1632/gdi.spec] [include/gdi.h] [include/x11drv.h]
Implemented drawing bezier curves: PolyBezier16/32 and
PolyBezierTo16/32.
* [graphics/x11drv/graphics.c]
Improved accuracy of several graphic routines, especially the
drawing of pie's.
* [include/windows.h] [misc/spy.c]
Added 25 window messages related to programs based on MFC and/or OLE.
Wed Jul 8 22:00:00 1998 James Juran <jrj120@psu.edu>
* [documentation/wine.man]
Updated manpage.
* [wine.ini]
Added section for Win95Look=true (commented out by default).
Wed Jul 8 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Fixed a crash in RegEnumValue32A when the dwType parameter is
NULL.
* [programs/regtest/regtest.c]
Improved the printing of errors.
* [misc/ntdll.c]
Added stub for RtlFormatCurrentUserKeyPath.
* [win32/console.c]
Added stub for ScrollConsoleScreenBuffer.
Mon Jul 6 16:41:47 1998 Per Lindstrm <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel.spec] [win32/newfns.c]
Added stubs for SleepEx and TerminateProcess.
* [rc/README]
Corrected a grammatical error.
Mon Jul 3 12:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [misc/shellord.c]
Put some TRACE in.
* [memory/string.c]
Deleted unused variable in lstrcmpi32A.
* [include/windows.h][memory/string.c]
Added functions WideCharToLocal32 LocalToWideChar32 for
OLE-strings
* [include/shlobj.h][include/winerror.h][misc/shell.c]
[ole/folders.c]
Added definition of internal class pidlmgr.
Changed definitions of EnumIDList, IShellFolder.
Added some OLE error constants.
Implemented EnumIDList, IShellFolder, IClassFactory,
PidlMgr, SHELL32_DllGetClassObject, SHGetDesktopFolder,
SHGetSpecialFolderLocation (half), SHGetPathFromIDList
(!!This stuff is not finished yet!!)
* [include/windows.h][misc/network][reley32/mpr.spec]
Added stubs for WNetConnectionDialog32[A|W|API].
Added struct LPCONNECTDLGSTRUCT32[A|W] and some constants.
Added some SetLastError(WN_NO_NETWORK) to the stubs.
Fixed bufferhandling in WNetCancelConnection
Added stub for MultinetGetErrorText[A|W]
* [ole/ole2nls.c]
Rewrote GetTimeFormat32A.
Fri Jul 3 10:27:30 1998 Michael Poole <poole+@andrew.cmu.edu>
* [graphics/ddraw.c] [tsx11/X11_calls]
Implement IDirectDrawPalette_GetEntries.
Use CopyColormapAndFree to avoid erasing previously-set
palette entries.
* [graphics/ddraw.c] [include/ddraw.h]
[tools/make_X11wrappers] [tsx11/X11_calls]
Provide a preliminary, not-yet-working framework for doing
DirectDraw via Xlib or XShm as well as DGA.
Tue Jun 30 00:16:09 1998 Marcel Baur <mbaur@g26.ethz.ch>
* [ole/nls/*.nls]
Added remaining 22 locales (including arabic locales).
1998-07-12 19:29:36 +00:00
|
|
|
XFONTTRANS *lpX11Trans; /* Info for X11R6 transform */
|
1999-07-24 12:10:23 +00:00
|
|
|
float rescale; /* Rescale for large fonts */
|
1997-06-16 17:43:53 +00:00
|
|
|
INT16 foInternalLeading;
|
|
|
|
INT16 foAvgCharWidth;
|
Release 980712
Sun Jul 12 16:23:36 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/*] [scheduler/client.c] (new files)
[scheduler/sysdeps.c] [scheduler/thread.c] [scheduler/process.c]
Beginnings of client/server communication for inter-process
synchronisation.
Sat Jul 11 19:45:45 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/bitmap.h] [objects/bitmap.c] [objects/dib.c]
[objects/oembitmap.c]
Speed up DIB section handling by using pre-allocated colormap and
XImage. Moved DIB section data out of general BITMAPOBJ structure.
Bugfix: GetDIBits32 would overwrite one byte beyond bitmap data.
* [if1632/shell.spec] [if1632/kernel.spec] [win32/kernel32.c]
More verbose error message if ThunkConnect fails.
Implemented KERNEL_475.
* [files/profile.c] [ole/ole2nls.c]
Minor bugfixes.
* [if1632/builtin.c] [if1632/kernel.spec] [include/task.h]
[loader/ne/module.c] [loader/task.c]
Implemented KERNEL.THHOOK.
* [if1632/wprocs.spec] [include/process.h] [msdos/dpmi.c] [msdos/vxd.c]
Implemented Win32s VxD services (W32S.386).
Sat Jul 11 17:52:23 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/x11drv/xfont.c] [graphics/x11drv/text.c]
[include/x11font.h]
Improve handling of rotated X11 fonts. Metrics/extents should now be
correct. ExtTextOut should behave better (still doesn't handle lpDx).
* [graphics/painting.c]
DrawFocusRect32: Don't do anything if width or height are zero.
Sat Jul 11 15:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/profile.c] [include/windows.h]
The length arguments of *Profile*() need to be treated
as UINTxx instead of INTxx.
* [graphics/env.c] [graphics/win16drv/init.c] [include/print.h]
[misc/printdrv.c]
Many printer driver fixes/changes (many thanks go to Huw !).
Most printers should work again ;)
* [memory/atom.c]
Fixed ATOM_AddAtom to store atoms exactly like Windows.
* [*/*]
Fixed misc compiler warnings.
Fri Jul 10 15:58:36 1998 Marcus Meissner <marcus@jet.franken.de>
* [files/drive.c]
Fixed GetDriveType16 to return DRIVE_REMOTE again.
* [loader/pe_image.c][loader/module.c]
Look for modules that have the same modulename or the same
filename (they sometimes differ).
Fixed up fixup_imports, removed one of the loops.
* [windows/winpos.c]
Added some NULL ptr checks. Needs more.
* [graphics/ddraw.c]
Some stubs added.
* [if1632/snoop.c]
Updated, made WINELIB compatible.
Fri Jul 10 04:39:56 1998 Douglas Ridgway <ridgway@winehq.com>
* [objects/enhmetafile.c] [relay32/gdi32.spec]
Small tweaks for documentation system.
Thu Jul 9 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/commctrl.c][include/commctrl.h][relay32/comctl32.spec]
Fixed GetEffectiveClientRect, CreateToolbarEx and CreateMappedBitmap.
Added stub for ShowHideMenuCtl. Added some documentation.
* [documentation/common_controls]
Added and updated some information.
* [controls/toolbar.c][include/toolbar.h]
Added string support.
* [misc/shell.c][misc/shellord.c][relay32/shell.spec]
Changed names of undocumented functions to their real names and
fixed the export table.
* [controls/imagelist.c][relay32/comctl32.spec]
Added stub for ImageList_SetFilter.
Fixed some minor bugs and typos.
* [objects/font.c][include/windows.h][relay32/gdi32.spec]
Added stubs for GetCharacterPlacement32[A/W].
* [objects/region.c][relay32/gdi32.spec]
Added stub for UNDOCUMENTED GetRandomRgn.
* [controls/commctrl.c][controls/*.c][include/*.h]
Added dummy listview, pager, rebar, tooltips, trackbar and
treeview control. This keeps some programs from complaining.
Thu Jul 9 11:23:58 1998 Rein Klazes <rklazes@casema.net>
* [graphics/painting.c] [graphics/*/init.c]
[graphics/x11drv/graphics.c] [relay32/gdi32.spec]
[if1632/gdi.spec] [include/gdi.h] [include/x11drv.h]
Implemented drawing bezier curves: PolyBezier16/32 and
PolyBezierTo16/32.
* [graphics/x11drv/graphics.c]
Improved accuracy of several graphic routines, especially the
drawing of pie's.
* [include/windows.h] [misc/spy.c]
Added 25 window messages related to programs based on MFC and/or OLE.
Wed Jul 8 22:00:00 1998 James Juran <jrj120@psu.edu>
* [documentation/wine.man]
Updated manpage.
* [wine.ini]
Added section for Win95Look=true (commented out by default).
Wed Jul 8 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/registry.c]
Fixed a crash in RegEnumValue32A when the dwType parameter is
NULL.
* [programs/regtest/regtest.c]
Improved the printing of errors.
* [misc/ntdll.c]
Added stub for RtlFormatCurrentUserKeyPath.
* [win32/console.c]
Added stub for ScrollConsoleScreenBuffer.
Mon Jul 6 16:41:47 1998 Per Lindstrm <pelinstr@algonet.se>
* [include/windows.h] [relay32/kernel.spec] [win32/newfns.c]
Added stubs for SleepEx and TerminateProcess.
* [rc/README]
Corrected a grammatical error.
Mon Jul 3 12:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [misc/shellord.c]
Put some TRACE in.
* [memory/string.c]
Deleted unused variable in lstrcmpi32A.
* [include/windows.h][memory/string.c]
Added functions WideCharToLocal32 LocalToWideChar32 for
OLE-strings
* [include/shlobj.h][include/winerror.h][misc/shell.c]
[ole/folders.c]
Added definition of internal class pidlmgr.
Changed definitions of EnumIDList, IShellFolder.
Added some OLE error constants.
Implemented EnumIDList, IShellFolder, IClassFactory,
PidlMgr, SHELL32_DllGetClassObject, SHGetDesktopFolder,
SHGetSpecialFolderLocation (half), SHGetPathFromIDList
(!!This stuff is not finished yet!!)
* [include/windows.h][misc/network][reley32/mpr.spec]
Added stubs for WNetConnectionDialog32[A|W|API].
Added struct LPCONNECTDLGSTRUCT32[A|W] and some constants.
Added some SetLastError(WN_NO_NETWORK) to the stubs.
Fixed bufferhandling in WNetCancelConnection
Added stub for MultinetGetErrorText[A|W]
* [ole/ole2nls.c]
Rewrote GetTimeFormat32A.
Fri Jul 3 10:27:30 1998 Michael Poole <poole+@andrew.cmu.edu>
* [graphics/ddraw.c] [tsx11/X11_calls]
Implement IDirectDrawPalette_GetEntries.
Use CopyColormapAndFree to avoid erasing previously-set
palette entries.
* [graphics/ddraw.c] [include/ddraw.h]
[tools/make_X11wrappers] [tsx11/X11_calls]
Provide a preliminary, not-yet-working framework for doing
DirectDraw via Xlib or XShm as well as DGA.
Tue Jun 30 00:16:09 1998 Marcel Baur <mbaur@g26.ethz.ch>
* [ole/nls/*.nls]
Added remaining 22 locales (including arabic locales).
1998-07-12 19:29:36 +00:00
|
|
|
INT16 foMaxCharWidth;
|
1997-06-16 17:43:53 +00:00
|
|
|
UINT16 fo_flags;
|
|
|
|
|
|
|
|
/* font cache housekeeping */
|
|
|
|
|
|
|
|
UINT16 count;
|
|
|
|
UINT16 lru;
|
|
|
|
UINT16 lfchecksum;
|
|
|
|
LOGFONT16 lf;
|
|
|
|
} fontObject;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
fontResource* pfr;
|
|
|
|
fontInfo* pfi;
|
|
|
|
UINT16 height;
|
|
|
|
UINT16 flags;
|
|
|
|
LPLOGFONT16 plf;
|
2000-08-20 19:04:04 +00:00
|
|
|
WORD internal_charset;
|
1997-06-16 17:43:53 +00:00
|
|
|
} fontMatch;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
LPLOGFONT16 lpLogFontParam;
|
|
|
|
FONTENUMPROC16 lpEnumFunc;
|
|
|
|
LPARAM lpData;
|
|
|
|
|
|
|
|
LPNEWTEXTMETRICEX16 lpTextMetric;
|
|
|
|
LPENUMLOGFONTEX16 lpLogFont;
|
|
|
|
SEGPTR segTextMetric;
|
|
|
|
SEGPTR segLogFont;
|
|
|
|
} fontEnum16;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
1999-02-26 11:11:13 +00:00
|
|
|
LPLOGFONTW lpLogFontParam;
|
1999-10-24 17:26:45 +00:00
|
|
|
FONTENUMPROCEXW lpEnumFunc;
|
1997-06-16 17:43:53 +00:00
|
|
|
LPARAM lpData;
|
|
|
|
|
1999-02-26 11:11:13 +00:00
|
|
|
LPNEWTEXTMETRICEXW lpTextMetric;
|
|
|
|
LPENUMLOGFONTEXW lpLogFont;
|
1997-06-16 17:43:53 +00:00
|
|
|
DWORD dwFlags;
|
|
|
|
} fontEnum32;
|
|
|
|
|
|
|
|
extern fontObject* XFONT_GetFontObject( X_PHYSFONT pFont );
|
|
|
|
extern XFontStruct* XFONT_GetFontStruct( X_PHYSFONT pFont );
|
|
|
|
extern LPIFONTINFO16 XFONT_GetFontInfo( X_PHYSFONT pFont );
|
|
|
|
|
2000-08-20 19:04:04 +00:00
|
|
|
/* internal charset(hibyte must be set) */
|
|
|
|
/* lobyte is DEFAULT_CHARSET(=0). */
|
|
|
|
#define X11FONT_JISX0201_CHARSET 0x100
|
|
|
|
#define X11FONT_JISX0212_CHARSET 0x200
|
|
|
|
|
2000-08-14 17:25:13 +00:00
|
|
|
typedef struct tagX11DRV_CP
|
|
|
|
{
|
2000-08-20 19:04:04 +00:00
|
|
|
WORD (*penum_subfont_charset)( UINT index );
|
2000-08-14 17:25:13 +00:00
|
|
|
XChar2b* (*punicode_to_char2b)( fontObject* pfo,
|
|
|
|
LPCWSTR lpwstr, UINT count );
|
|
|
|
void (*pDrawString)( fontObject* pfo, Display* pdisp, Drawable d, GC gc,
|
|
|
|
int x, int y, XChar2b* pstr, int count );
|
|
|
|
int (*pTextWidth)( fontObject* pfo, XChar2b* pstr, int count );
|
|
|
|
void (*pDrawText)( fontObject* pfo, Display* pdisp, Drawable d, GC gc,
|
|
|
|
int x, int y, XTextItem16* pitems, int count );
|
|
|
|
void (*pTextExtents)( fontObject* pfo, XChar2b* pstr, int count,
|
|
|
|
int* pdir, int* pascent, int* pdescent,
|
|
|
|
int* pwidth );
|
2000-08-18 23:44:58 +00:00
|
|
|
void (*pGetTextMetricsA)( fontObject* pfo, LPTEXTMETRICA pTM );
|
2000-08-14 17:25:13 +00:00
|
|
|
} X11DRV_CP;
|
|
|
|
|
|
|
|
extern const X11DRV_CP X11DRV_cptable[X11DRV_CPTABLE_COUNT];
|
|
|
|
|
1999-04-22 16:27:50 +00:00
|
|
|
#endif /* __WINE_X11FONT_H */
|