mirror of
https://github.com/reactos/wine.git
synced 2024-11-30 07:00:30 +00:00
c7c217b31c
Sun Apr 12 12:22:23 1997 Andreas Mohr <100.30936@germany.net> * [files/drive.c] Fixed "no free space" problem with partition sizes between 1 and 2 GB (cluster_sectors may not exceed 0x40). * [windows/msgbox.c] [if1632/user.spec] [include/windows.h] Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16. * [loader/task.c] DOS environment strings may never exceed 127 chars -> truncate Unix environment strings if necessary. Sun Apr 12 02:51:44 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [files/*.c] All fprintf statements were converted to appropriate debug messages. * [tools/find_debug_channels] Updated comments at the beginning of the file. Sat Apr 11 15:27:21 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [loader/module.c] [loader/task.c] [scheduler/process.c] Moved some code around to prepare the ground for CreateProcess(). * [memory/environ.c] [loader/task.c] Moved Win32 environment strings functions to environ.c. Unified Win16 and Win32 environment management. * [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c] Implemented handle inheritance and DuplicateHandle(). * [scheduler/thread.c] Create a 16-bit stack for all threads. * [windows/dialog.c] Implemented DIALOGEX resource format. Fri Apr 10 20:21:51 1998 Marcus Meissner <marcus@mud.de> * [configure.in][include/acconfig.h][*/*][multimedia/*] Cleaned up the OSS detection stuff, added some more checks for headerfiles/functions. Removed a lot of OS specific #ifdefs. Lots of dependend multimedia cleanups. * [loader/pe_image.c] Enhanced comment, added missing reference count increase. * [ole/compobj.c] Replaced broken StringFromGUID2 by working one. * [misc/winsock.c] SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned int (32bit) for UNIX. * [memory/global.c] Allow realloc for lockcount 1 too. Fri Apr 10 15:27:34 1998 Morten Welinder <terra@diku.dk> * [graphics/x11drv/text.c] Handle control characters in trace. Ignore terminating newline. * [multimedia/init.c] (MULTIMEDIA_Init): Correct allocations. * [tools/examine-relay] Tidy up. * [windows/syscolor.c] Change highlight colour from lightblue to lightgray. This looks correct for menus. Fri Apr 10 01:49:58 1998 Douglas Ridgway <ridgway@winehq.com> * [configure.in] [Make.rules.in] Add check for c2man before using it. Fri Apr 10 02:59:21 1998 Douglas Ridgway <ridgway@winehq.com> * [DEVELOPERS-HINTS] Simple description of adding API calls. * [include/wintypes.h] [include/windows.h] Get rid of Winelib16, avoid declaring some illegal functions in Winelib, add prototypes for some enhanced metafile functions, fix GetTextExtentPoint32 declarations. * [relay32/gdi32.spec] [objects/enhmetafile.c] Cosmetic and functional improvements. * [include/wincon.h] [programs/view/*] Fixes, improved compatibility with native compilers. Thu Apr 9 15:48:49 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [win32/kernel32.c] Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime. Fixed Common32ThkLS thunk function. * [tools/build.c] [relay32/relay386.c] [if1632/relay.c] Changed relay code to allow register functions to modify stack layout. * [memory/selector.c] Implemented AllocMappedBuffer / FreeMappedBuffer. * [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c] Added names for undocumented functions. * [loader/module.c] Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL. Thu Apr 9 03:54:58 1998 Jim Peterson <jspeter@birch.ee.vt.edu> * [windows/keyboard.c] Fix an erroneous test in TranslateAccelerator{16,32} for the end of the accelerator table. Thu Apr 8 20:36:28 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [misc/crtdll.c] Implement getenv. * [misc/commdlg.c] Make Get[Save/Open]FileName work in most situations. * [misc/lstr.c] Use wvsprintf32A instead of vsprintf in FormatMessage32X * [misc/version] Make NT3.50 a recognised version * [graphics/x11drv/graphics.c] Change the algorithme to draw arcs * [loader/resource.c] Return an empty buffer in LoadString32A if no resource found. * [win32/code_page.c] Try harder to get the right size in MultiByteToWideChar. * [win32/process.c] Call WinExec32 for CreateProcess32A. * [windows/user.c] Install default Int0 Handler in InitApp(). Thu Apr 8 19:29:48 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [misc/imagelist.c] Preliminary fix for drawing selected images. Various improvements. * [controls/progress.c][include/progress.c][include/commctrl.h] Added progress bar messages and styles for IE4.01 (dll version 4.72) compatibility. Fixed led size problem. * [controls/updown.c][include/commctrl.h] Added UDM_GETRANGE32 and UDM_SETRANGE32. * [objects/oembitmaps.c][include/windows.h][include/bitmaps/*] Added Win95 icons and fixed Win95 cursor and restore button bug. Now they should be visible. Sorry!!! * [relay32/comctl32.spec] Added most missing function names. Tue Apr 6 18:48:36 1998 Matthew Becker <mbecker@glasscity.net> * [objects/font.c] [if1632/gdi.spec] GetOutlineTextMetrics: stub * [objects/text.c] GetTextCharset should just call GetTextCharsetInfo. * [misc/mpr.c] [relay32/mpr.spec] WNetCachePassword: stub * [scheduler/thread.c] [relay32/user32.spec] AttachThreadInput: stub Updated documentation. * [objects/palette.c] Updated documentation. Tue Mar 31 17:06:30 1998 James Juran <jrj120@psu.edu> * [*/*.c] Finished fixing USER32 ordinal numbers in function documentation. Mon Mar 30 20:27:38 1998 Morten Welinder <terra@diku.dk> * [misc/debugstr.c] [include/debugstr.h] Moved _dumpstr from relay32/relay386.c. Improved control character handling. * [msdos/int21.c] Implement 215E00 -- get machine name. * [windows/winpos.c] SetWindowPos32: Make an extra sync when mapping managed windows. This makes sure the reconfigure event has been handled. See Mshearts' what's-your-name window. Mon Mar 30 01:13:50 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [Makefile.in] Install includes from TOPSRCDIR.
291 lines
8.6 KiB
C
291 lines
8.6 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 "debugstr.h"
|
|
#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;
|
|
|
|
TRACE(text,"hdc=%04x df=%04x %d,%d %s, %d flags=%d\n",
|
|
dc->hSelf, (UINT16)(dc->u.x.font), x, y,
|
|
debugstr_an (str, count), count, flags);
|
|
|
|
/* some strings sent here end in a newline for whatever reason. I have no
|
|
clue what the right treatment should be in general, but ignoring
|
|
terminating newlines seems ok. MW, April 1998. */
|
|
if (count > 0 && str[count - 1] == '\n') count--;
|
|
|
|
if (lprect != NULL) TRACE(text, "\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 );
|
|
|
|
TRACE(text,"\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;
|
|
}
|