mirror of
https://github.com/reactos/wine.git
synced 2024-11-26 21:20:25 +00:00
60ce85c965
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [files/drive.c] Added Device= parameter to drive configuration. * [if1632/relay.c] Throw() and Catch() now use the correct CATCHBUF layout (untested). * [tools/build.c] [include/stackframe.h] [loader/task.c] Moved 16-bit stack pointer into thread database. Save current %fs while running 16-bit code. Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] Made DPtoLP32 and LPtoDP32 respect world transforms. * [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec] [include/path.h] More path support. * [include/gdi.h] [include/windows.h] [objects/dc.c] [relay/gdi32.spec] Support for Get/SetArcDirection and Get/SetWorldTransform * [windows/hook.c] Fixed a bug in HOOK_Map16To32Common. Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com> * [graphics/metafiledrv/init.c] [objects/metafile.c] Documentation for metafile related API calls. Fixed a bug to avoid documenting it. * [include/windows.h] Declaration for LoadImage. Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [graphics/win16drv/*] Changes to printing code to enable use of printer fonts with the win3.1 postscript driver. Remember to add printer=on to [wine] section of wine.conf . You will also need to disable truetype fonts from control panel. Winword 6.0 and Write seem to be happy with this... * [include/bitmap.h] Fix Widthbytes for 15bpp displays. Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [tsx11/*] [include/ts*] [tools/make_X11wrappers] Implemented thread-safe X11 wrappers. Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu> * [windows/queue.c] Forgot to convert thdb to thread_id. * [misc/registry.c] Sped up Windows 95 registry reading. Changed code to traverse registry as a tree rather than read in all possible keys (including dead ones). Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [loader/pe_image.c][Makefile.in][scheduler/thread.c] [libtest/hello5.c] Don't exit() on failed to load referenced dlls. Fixed static tls allocation for multiple threads. WINELIB should now be able to load PE dlls. A sample winelib program, that dynamically loads a internal dll is included. * [graphics/ddraw.c][include/ddraw.h][include/d3d.h] Cleaned up and enhanced further. Added several DirectX5 interface definitions and DirectSurface3 implementation. Stubs for D3D (NOT coming soon, just there so it fails safely). * [multimedia/dsound.c][include/dsound.h] Actually works now for a lot of cases. Some DirectX5 stuff added. Still lacking several features. * [windows/dinput.c][include/dinput.h] Started implementing DirectInput. Doesn't work yet, don't know why. * [if1632/thunk.c][misc/callbacks.c] [win32/kernel.c][include/callbacks.h] Added WOWCallback16Ex, WOWHandle32. * [misc/cpu.c] Fixed GetSystemInfo, IsProcessorFeaturePresent. * [multimedia/joystick.c][multimedia/time.c] Several fixes. Small hack to get timerevents in timeGetTime() loops. Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de> * [configure.in] Fixed check for union semun on FreeBSD systems. Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com> * [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc] [resources/sysres_Sw.rc] Added/updated Swedish language support. Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu> * [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c] [windows/win.c] [windows/dce.c] [windows/winpos.c] Bug fixes. Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net> * [msdos/int25.c] [msdos/int26.c] Implemented "native" absolute disk read/write access. * [msdos/int13.c] [msdos/ioports.c] Enhanced GET DRIVE PARAMETERS (int13 AH=08). * [graphics/win16drv/prtdrv.c] [if1632/gdi.spec] Fixed typos, implemented dmEnumDFonts, Started implementation of dmRealizeObject. * [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec] Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented CoFileTimeNow. * [if1632/kernel.spec] [include/windows.h] [memory/global.c] [memory/string.c] [misc/kernel.c] [misc/Makefile.in] [misc/toolhelp.c] [msdos/int21.c] Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer, stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook (Undocumented Windows). * [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c] Misc stubs. * [if1632/winaspi.spec] [misc/aspi.c] Implemented GetASPIDLLVersion. * [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in] Added handler for Int 0x20 (terminate program, _very_ old-fashioned). * [misc/w32scomb.c] Implemented Get16DLLAddress() partially (big thanks to Marcus and Alexandre). * [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec] Added built-in DPLAY.DLL. * [relay32/winmm.spec] [multimedia/joystick.c] Added joySetThreshold. * [misc/windebug.c] Added WinNotify. * [win32/console.c] Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer, WriteConsoleOutput32A. * [windows/user.c] Stub SetEventHook. Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com> * [windows/painting.c] Fixed broken restore-to-maximized. Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es> * [documentation/wine.man] [include/options.h] [misc/main.c] [ole/ole2nls.c] [resources/sysres.c] [resources/sysres_Ca.rc] [resources/Makefile.in] Added language catalan. (Afegit l'idioma català).
286 lines
8.4 KiB
C
286 lines
8.4 KiB
C
/*
|
|
* X11 graphics driver text functions
|
|
*
|
|
* Copyright 1993,1994 Alexandre Julliard
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include "ts_xlib.h"
|
|
#include <X11/Xatom.h>
|
|
#include "windows.h"
|
|
#include "dc.h"
|
|
#include "gdi.h"
|
|
/*#include "callback.h"*/
|
|
#include "heap.h"
|
|
#include "x11font.h"
|
|
#include "stddebug.h"
|
|
/* #define DEBUG_TEXT */
|
|
#include "debug.h"
|
|
|
|
#define SWAP_INT(a,b) { int t = a; a = b; b = t; }
|
|
|
|
|
|
/***********************************************************************
|
|
* 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;
|
|
fontObject* pfo;
|
|
XCharStruct info;
|
|
XFontStruct* font;
|
|
RECT32 rect;
|
|
char dfBreakChar, lfUnderline, lfStrikeOut;
|
|
|
|
if (!DC_SetupGCForText( dc )) return TRUE;
|
|
|
|
pfo = XFONT_GetFontObject( dc->u.x.font );
|
|
font = pfo->fs;
|
|
|
|
dfBreakChar = (char)pfo->fi->df.dfBreakChar;
|
|
lfUnderline = (pfo->fo_flags & FO_SYNTH_UNDERLINE) ? 1 : 0;
|
|
lfStrikeOut = (pfo->fo_flags & FO_SYNTH_STRIKEOUT) ? 1 : 0;
|
|
|
|
dprintf_text(stddeb,"ExtTextOut: hdc=%04x df=%04x %d,%d '%.*s', %d flags=%d\n",
|
|
dc->hSelf, (UINT16)(dc->u.x.font), x, y, (int)count, str, count, flags);
|
|
|
|
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)
|
|
{
|
|
TSXSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
TSXFillRectangle( 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 */
|
|
|
|
if (lpDx) /* have explicit character cell x offsets in logical coordinates */
|
|
{
|
|
int extra = dc->wndExtX / 2;
|
|
for (i = info.width = 0; i < count; i++) info.width += lpDx[i];
|
|
info.width = (info.width * dc->vportExtX + extra ) / dc->wndExtX;
|
|
}
|
|
else
|
|
{
|
|
TSXTextExtents( font, str, count, &dir, &ascent, &descent, &info );
|
|
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))
|
|
{
|
|
TSXSetForeground( display, dc->u.x.gc, dc->w.backgroundPixel );
|
|
TSXFillRectangle( 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) */
|
|
|
|
TSXSetForeground( display, dc->u.x.gc, dc->w.textPixel );
|
|
if (!dc->w.charExtra && !dc->w.breakExtra && !lpDx)
|
|
{
|
|
TSXDrawString( 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 = HEAP_xalloc( GetProcessHeap(), 0,
|
|
count * sizeof(XTextItem) );
|
|
delta = i = 0;
|
|
if( lpDx ) /* explicit character widths */
|
|
{
|
|
int extra = dc->wndExtX / 2;
|
|
|
|
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;
|
|
|
|
/* add characters to the same XTextItem until new delta
|
|
* becomes non-zero */
|
|
|
|
do
|
|
{
|
|
delta += (lpDx[i] * dc->vportExtX + extra) / dc->wndExtX
|
|
- TSXTextWidth( font, str + i, 1);
|
|
pitem->nchars++;
|
|
} while ((++i < count) && !delta);
|
|
pitem++;
|
|
}
|
|
}
|
|
else /* charExtra or breakExtra */
|
|
{
|
|
while (i < count)
|
|
{
|
|
pitem->chars = (char *)str + i;
|
|
pitem->delta = delta;
|
|
pitem->nchars = 0;
|
|
pitem->font = None;
|
|
delta = 0;
|
|
|
|
do
|
|
{
|
|
delta += dc->w.charExtra;
|
|
if (str[i] == (char)dfBreakChar) delta += dc->w.breakExtra;
|
|
pitem->nchars++;
|
|
} while ((++i < count) && !delta);
|
|
pitem++;
|
|
}
|
|
}
|
|
|
|
TSXDrawText( display, dc->u.x.drawable, dc->u.x.gc,
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y, items, pitem - items );
|
|
HeapFree( GetProcessHeap(), 0, items );
|
|
}
|
|
|
|
/* Draw underline and strike-out if needed */
|
|
|
|
if (lfUnderline)
|
|
{
|
|
long linePos, lineWidth;
|
|
|
|
if (!TSXGetFontProperty( font, XA_UNDERLINE_POSITION, &linePos ))
|
|
linePos = font->descent-1;
|
|
if (!TSXGetFontProperty( font, XA_UNDERLINE_THICKNESS, &lineWidth ))
|
|
lineWidth = 0;
|
|
else if (lineWidth == 1) lineWidth = 0;
|
|
TSXSetLineAttributes( display, dc->u.x.gc, lineWidth,
|
|
LineSolid, CapRound, JoinBevel );
|
|
TSXDrawLine( 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 (lfStrikeOut)
|
|
{
|
|
long lineAscent, lineDescent;
|
|
if (!TSXGetFontProperty( font, XA_STRIKEOUT_ASCENT, &lineAscent ))
|
|
lineAscent = font->ascent / 2;
|
|
if (!TSXGetFontProperty( font, XA_STRIKEOUT_DESCENT, &lineDescent ))
|
|
lineDescent = -lineAscent * 2 / 3;
|
|
TSXSetLineAttributes( display, dc->u.x.gc, lineAscent + lineDescent,
|
|
LineSolid, CapRound, JoinBevel );
|
|
TSXDrawLine( 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 );
|
|
DeleteObject32( hRgnClip );
|
|
}
|
|
return TRUE;
|
|
}
|