Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 18:32:19 +00:00
|
|
|
/*
|
|
|
|
* X11 graphics driver text functions
|
|
|
|
*
|
|
|
|
* Copyright 1993,1994 Alexandre Julliard
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include <X11/Xatom.h>
|
|
|
|
#include "windows.h"
|
|
|
|
#include "dc.h"
|
|
|
|
#include "gdi.h"
|
|
|
|
/*#include "callback.h"*/
|
|
|
|
#include "heap.h"
|
|
|
|
#include "x11drv.h"
|
|
|
|
#include "stddebug.h"
|
|
|
|
/* #define DEBUG_TEXT */
|
|
|
|
#include "debug.h"
|
|
|
|
#include "xmalloc.h"
|
|
|
|
|
|
|
|
#define SWAP_INT(a,b) { int t = a; a = b; b = t; }
|
|
|
|
|
|
|
|
|
|
|
|
extern int CLIPPING_IntersectClipRect( DC * dc, short left, short top,
|
|
|
|
short right, short bottom, UINT16 flags);
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* X11DRV_ExtTextOut
|
|
|
|
*/
|
|
|
|
BOOL32
|
|
|
|
X11DRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
|
|
|
|
const RECT32 *lprect, LPCSTR str, UINT32 count,
|
|
|
|
const INT32 *lpDx )
|
|
|
|
{
|
|
|
|
HRGN32 hRgnClip = 0;
|
|
|
|
int dir, ascent, descent, i;
|
|
|
|
XCharStruct info;
|
|
|
|
XFontStruct *font;
|
|
|
|
RECT32 rect;
|
|
|
|
|
|
|
|
if (!DC_SetupGCForText( dc )) return TRUE;
|
|
|
|
font = dc->u.x.font.fstruct;
|
|
|
|
|
Release 970120
Sun Jan 19 11:46:48 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/module.c]
Fixed LoadModule() to always call the DLL initialization code.
* [windows/event.c]
Moved all the keyboard stuff to windows/keyboard.c
* [tools/build.c]
Fixed Win32 register functions.
Sat Jan 18 22:24:41 1997 David Makepeace <D.Makepeace@mailbox.uq.oz.au>
* [tools/makedep.c]
Fixed bug which causes SEGV on Solaris x86.
Fri Jan 17 18:32:27 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c]
Implemented WM_UNDO, WM_CONTEXTMENU (temporary using WM_RBUTTONUP),
WM_COMMAND, WM_INITPOPUPMENU, WM_SYSKEYDOWN.
Fixed EM_SETSEL and some minor bugs (features).
Hence: fully functional undo and a win95 menu with the right mouse
button.
* [include/resources.h] [resources/TODO] [resources/sysres_??.rc]
Added a context menu for the edit control.
Translations, please ...
Fri Jan 17 08:29:52 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Move EVENT_ToAscii to windows/keyboard.c (where name ToAscii)
Fixed Keypad keys 0-9 and . in EVENT_event_to_vkey.
Added 3-state handling of toggle keys (CapsLock, NumLock) in order
to make them work with any X server.
Toggle keys now generate WM_KEYDOWN and WM_KEYUP on each pressing.
* [include/keyboard.h]
Totally replaced the file (formerly containing the vkcase definitions)
by the declaration of 'extern' variables contained by event.c and used
by keyboard.c
* [windows/keyboard.c]
Started to rewrite VkKeyScan and MapVirtualKey, to make them use the
table keyc2vkey or X functions only.
ToAscii : added keypad 0-9 and . special case.
Changed toggle keys active mask from 0x80 to 0x1.
* [misc/keyboard.c]
File deleted. Contents moved to windows/keyboard.c.
* [misc/main.c]
Added putenv XKB_DISABLE to disable XKB extension (which, when
present, causes AltGr to change keyboard group instead of being a
modifier).
Tue Jan 14 22:56:43 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [windows/event.c]
Do not assume NumLockMask is Mod2Mask, but compute it by scanning
output of XGetModifierMapping for XK_Num_Lock.
Tue Jan 14 15:49:49 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_*.c] [include/peexe.h] [include/resource32.h]
[debugger/*.c]
General clean up.
Changed defines/structures to match Windows NT SDK.
* [loader/main.c]
Don't crash on empty command-line.
* [windows/winpos.c]
winpos.c made win32 clean.
* [misc/ntdll.c]
Some string conversion additions.
* [files/file.c]
GetFileAttributes/GetTempFileName fixed.
* [misc/ver.c]
VerInstallFile implemented.
Mon Jan 13 15:03:11 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [tools/build.c]: Use PREFIX also in stabs messages.
Mon Jan 13 10:40:33 1997 John Harvey <john@division.co.uk>
* [graphics/win16drv/*] [include/win16drv.h]
Many fixes and some new features.
* [graphics/x11drv/font.c] [graphics/x11drv/init.c]
[include/x11drv.h] [objects/font.c]
GetTextMetrics() moved to graphics driver.
* [if1632/gdi.spec] [misc/fontengine.c] [misc/Makefile.in]
New dummy EngineEnumerateFont, EngineRealizeFont functions.
* [include/windows.h]
TEXTFORM16 and FONTINFO16 structure definitions moved here from
include/win16drv.h
1997-01-20 19:43:45 +00:00
|
|
|
dprintf_text(stddeb,"ExtTextOut: hdc=%04x %d,%d '%.*s', %d flags=%d\n",
|
|
|
|
dc->hSelf, x, y, (int)count, str, count, flags);
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 18:32:19 +00:00
|
|
|
if (lprect != NULL) dprintf_text(stddeb, "\trect=(%d,%d- %d,%d)\n",
|
|
|
|
lprect->left, lprect->top,
|
|
|
|
lprect->right, lprect->bottom );
|
|
|
|
|
|
|
|
/* Setup coordinates */
|
|
|
|
|
|
|
|
if (dc->w.textAlign & TA_UPDATECP)
|
|
|
|
{
|
|
|
|
x = dc->w.CursPosX;
|
|
|
|
y = dc->w.CursPosY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & (ETO_OPAQUE | ETO_CLIPPED)) /* there's a rectangle */
|
|
|
|
{
|
|
|
|
if (!lprect) /* not always */
|
|
|
|
{
|
|
|
|
SIZE32 sz;
|
|
|
|
if (flags & ETO_CLIPPED) /* Can't clip with no rectangle */
|
|
|
|
return FALSE;
|
|
|
|
if (!X11DRV_GetTextExtentPoint( dc, str, count, &sz ))
|
|
|
|
return FALSE;
|
|
|
|
rect.left = XLPTODP( dc, x );
|
|
|
|
rect.right = XLPTODP( dc, x+sz.cx );
|
|
|
|
rect.top = YLPTODP( dc, y );
|
|
|
|
rect.bottom = YLPTODP( dc, y+sz.cy );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rect.left = XLPTODP( dc, lprect->left );
|
|
|
|
rect.right = XLPTODP( dc, lprect->right );
|
|
|
|
rect.top = YLPTODP( dc, lprect->top );
|
|
|
|
rect.bottom = YLPTODP( dc, lprect->bottom );
|
|
|
|
}
|
|
|
|
if (rect.right < rect.left) SWAP_INT( rect.left, rect.right );
|
|
|
|
if (rect.bottom < rect.top) SWAP_INT( rect.top, rect.bottom );
|
|
|
|
}
|
|
|
|
|
|
|
|
x = XLPTODP( dc, x );
|
|
|
|
y = YLPTODP( dc, y );
|
|
|
|
|
|
|
|
dprintf_text(stddeb,"\treal coord: x=%i, y=%i, rect=(%d,%d-%d,%d)\n",
|
|
|
|
x, y, rect.left, rect.top, rect.right, rect.bottom);
|
|
|
|
|
|
|
|
/* Draw the rectangle */
|
|
|
|
|
|
|
|
if (flags & ETO_OPAQUE)
|
|
|
|
{
|
|
|
|
XSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + rect.left, dc->w.DCOrgY + rect.top,
|
|
|
|
rect.right-rect.left, rect.bottom-rect.top );
|
|
|
|
}
|
|
|
|
if (!count) return TRUE; /* Nothing more to do */
|
|
|
|
|
|
|
|
/* Compute text starting position */
|
|
|
|
|
|
|
|
XTextExtents( font, str, count, &dir, &ascent, &descent, &info );
|
|
|
|
|
|
|
|
if (lpDx) /* have explicit character cell x offsets */
|
|
|
|
{
|
|
|
|
/* sum lpDx array and add the width of last character */
|
|
|
|
|
|
|
|
info.width = XTextWidth( font, str + count - 1, 1) + dc->w.charExtra;
|
|
|
|
if (str[count-1] == (char)dc->u.x.font.metrics.tmBreakChar)
|
|
|
|
info.width += dc->w.breakExtra;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++) info.width += lpDx[i];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info.width += count*dc->w.charExtra + dc->w.breakExtra*dc->w.breakCount;
|
|
|
|
|
|
|
|
switch( dc->w.textAlign & (TA_LEFT | TA_RIGHT | TA_CENTER) )
|
|
|
|
{
|
|
|
|
case TA_LEFT:
|
|
|
|
if (dc->w.textAlign & TA_UPDATECP)
|
|
|
|
dc->w.CursPosX = XDPTOLP( dc, x + info.width );
|
|
|
|
break;
|
|
|
|
case TA_RIGHT:
|
|
|
|
x -= info.width;
|
|
|
|
if (dc->w.textAlign & TA_UPDATECP) dc->w.CursPosX = XDPTOLP( dc, x );
|
|
|
|
break;
|
|
|
|
case TA_CENTER:
|
|
|
|
x -= info.width / 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch( dc->w.textAlign & (TA_TOP | TA_BOTTOM | TA_BASELINE) )
|
|
|
|
{
|
|
|
|
case TA_TOP:
|
|
|
|
y += font->ascent;
|
|
|
|
break;
|
|
|
|
case TA_BOTTOM:
|
|
|
|
y -= font->descent;
|
|
|
|
break;
|
|
|
|
case TA_BASELINE:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the clip region */
|
|
|
|
|
|
|
|
if (flags & ETO_CLIPPED)
|
|
|
|
{
|
|
|
|
hRgnClip = dc->w.hClipRgn;
|
|
|
|
CLIPPING_IntersectClipRect( dc, rect.left, rect.top, rect.right,
|
|
|
|
rect.bottom, CLIP_INTERSECT|CLIP_KEEPRGN );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Draw the text background if necessary */
|
|
|
|
|
|
|
|
if (dc->w.backgroundMode != TRANSPARENT)
|
|
|
|
{
|
|
|
|
/* If rectangle is opaque and clipped, do nothing */
|
|
|
|
if (!(flags & ETO_CLIPPED) || !(flags & ETO_OPAQUE))
|
|
|
|
{
|
|
|
|
/* Only draw if rectangle is not opaque or if some */
|
|
|
|
/* text is outside the rectangle */
|
|
|
|
if (!(flags & ETO_OPAQUE) ||
|
|
|
|
(x < rect.left) ||
|
|
|
|
(x + info.width >= rect.right) ||
|
|
|
|
(y-font->ascent < rect.top) ||
|
|
|
|
(y+font->descent >= rect.bottom))
|
|
|
|
{
|
|
|
|
XSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
|
|
XFillRectangle( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + x,
|
|
|
|
dc->w.DCOrgY + y - font->ascent,
|
|
|
|
info.width,
|
|
|
|
font->ascent + font->descent );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Draw the text (count > 0 verified) */
|
|
|
|
|
|
|
|
XSetForeground( display, dc->u.x.gc, dc->w.textPixel );
|
|
|
|
if (!dc->w.charExtra && !dc->w.breakExtra && !lpDx)
|
|
|
|
{
|
|
|
|
XDrawString( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y, str, count );
|
|
|
|
}
|
|
|
|
else /* Now the fun begins... */
|
|
|
|
{
|
|
|
|
XTextItem *items, *pitem;
|
|
|
|
int delta;
|
|
|
|
|
|
|
|
/* allocate max items */
|
|
|
|
|
|
|
|
pitem = items = xmalloc( count * sizeof(XTextItem) );
|
|
|
|
delta = i = 0;
|
|
|
|
while (i < count)
|
|
|
|
{
|
|
|
|
/* initialize text item with accumulated delta */
|
|
|
|
|
|
|
|
pitem->chars = (char *)str + i;
|
|
|
|
pitem->delta = delta;
|
|
|
|
pitem->nchars = 0;
|
|
|
|
pitem->font = None;
|
|
|
|
delta = 0;
|
|
|
|
|
|
|
|
/* stuff characters into the same XTextItem until new delta
|
|
|
|
* becomes non-zero */
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (lpDx) delta += lpDx[i] - XTextWidth( font, str + i, 1);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
delta += dc->w.charExtra;
|
|
|
|
if (str[i] == (char)dc->u.x.font.metrics.tmBreakChar)
|
|
|
|
delta += dc->w.breakExtra;
|
|
|
|
}
|
|
|
|
pitem->nchars++;
|
|
|
|
}
|
|
|
|
while ((++i < count) && !delta);
|
|
|
|
pitem++;
|
|
|
|
}
|
|
|
|
|
|
|
|
XDrawText( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y, items, pitem - items );
|
|
|
|
free( items );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Draw underline and strike-out if needed */
|
|
|
|
|
|
|
|
if (dc->u.x.font.metrics.tmUnderlined)
|
|
|
|
{
|
|
|
|
long linePos, lineWidth;
|
|
|
|
if (!XGetFontProperty( font, XA_UNDERLINE_POSITION, &linePos ))
|
|
|
|
linePos = font->descent-1;
|
|
|
|
if (!XGetFontProperty( font, XA_UNDERLINE_THICKNESS, &lineWidth ))
|
|
|
|
lineWidth = 0;
|
|
|
|
else if (lineWidth == 1) lineWidth = 0;
|
|
|
|
XSetLineAttributes( display, dc->u.x.gc, lineWidth,
|
|
|
|
LineSolid, CapRound, JoinBevel );
|
|
|
|
XDrawLine( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y + linePos,
|
|
|
|
dc->w.DCOrgX + x + info.width, dc->w.DCOrgY + y + linePos );
|
|
|
|
}
|
|
|
|
if (dc->u.x.font.metrics.tmStruckOut)
|
|
|
|
{
|
|
|
|
long lineAscent, lineDescent;
|
|
|
|
if (!XGetFontProperty( font, XA_STRIKEOUT_ASCENT, &lineAscent ))
|
|
|
|
lineAscent = font->ascent / 3;
|
|
|
|
if (!XGetFontProperty( font, XA_STRIKEOUT_DESCENT, &lineDescent ))
|
|
|
|
lineDescent = -lineAscent;
|
|
|
|
XSetLineAttributes( display, dc->u.x.gc, lineAscent + lineDescent,
|
|
|
|
LineSolid, CapRound, JoinBevel );
|
|
|
|
XDrawLine( display, dc->u.x.drawable, dc->u.x.gc,
|
|
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y - lineAscent,
|
|
|
|
dc->w.DCOrgX + x + info.width, dc->w.DCOrgY + y - lineAscent );
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & ETO_CLIPPED) SelectClipRgn32( dc->hSelf, hRgnClip );
|
|
|
|
return TRUE;
|
|
|
|
}
|