Thu Apr 30 16:28:12 1998 James Juran <jrj120@psu.edu> * [scheduler/process.c] Implemented GetExitCodeProcess. The code is a direct translation of GetExitCodeThread. Mon Apr 27 22:20:25 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [loader/pe_image.c] Unload dummy module when PE_LoadLibraryEx32A fails with PE_LoadImage (makes Encarta 98 installer proceed). * [files/drive.c] Make GetDriveType16 return DRIVE_REMOVABLE for TYPE_CDROM. Make GetCurrentDirectory32 behave like the code does and not like the help describes. * [files/profile.c] Revoke recent change in PROFILE_GetSection and try better handling of special case. * [include/windows.h] Change definition of ACCEL32. * [misc/commdlg.c] Replace the GetXXXFilename32 macros by normal code. Fix two reported bugs in my changes to commdlg. * [windows/win.c] Add a hook to catch bogus WM_SIZE messages by emitting a warning in the appropriate case. * [objects/bitmap.c] Reject unreasonbable large size arguments in CreateCompatibleBitmap32 and add an fixme for that situation. Sun Apr 26 18:30:07 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [include/ldt.h] [debugger/*.c] [miscemu/instr.c] Added IS_SELECTOR_SYSTEM and IS_SELECTOR_32BIT macros. Make instruction emulation support system selectors. * [loader/*.c] Started moving NE specific functions to the new loader/ne directory. * [memory/environ.c] Enforce the 127 chars limit only when creating the environment of a Win16 process. Sun Apr 26 12:22:23 1998 Andreas Mohr <100.30936@germany.net> * [files/file.c] Fixed an incredible typo in CopyFile32A that made it unusable since a rewrite in 970112 (!!). * [files/directory.c] Fixed GetTempPath32A/W to include trailing backslash. * [misc/ver.c] Make find_pe_resource "work" with corrupt files. * [misc/wsprintf.c] Altered WPRINTF_ParseFormatA/W to treat invalid format chars as normal output, too. * [msdos/dpmi.c] Implemented "Allocate/Free real mode callback" (0x0303/0x0304). Cross your fingers if you need to use it ;) (completely untested) Implemented "Call real mode proc with far return" (0x0301, tested). * [msdos/int21.c] Fixed ioctlGenericBlkDevReq/0x60. * [relay32/dplayx.spec] [relay32/builtin32.c] [relay32/Makefile.in] Added built-in DPLAYX.DLL. * [windows/win.c] Fixed GetWindowWord()/GWW_HWNDPARENT to return the window's owner if it has no parent (SDK). Sat Apr 25 15:09:53 1998 M.T.Fortescue <mark@mtfhpc.demon.co.uk> * [debugger/db_disasm.c] Fixed disassemble bug for no-display option and 'lock', 'repne' and 'repe' prefixes. * [debugger/registers.c] Added textual flag description output on 'info regs'. Sat Apr 25 14:18:26 1998 Matthew Becker <mbecker@glasscity.net> * [*/*.c] Added stubs and/or documentation for the following functions: LookupPrivilegeValue, OpenService, ControlService, RegGetKeySecurity, StartService, SetComputerName, DeleteService, CloseServiceHandle, OpenProcessToken, OpenSCManager, DeregisterEventSource, WaitForDebugEvent, WaitForInputIdle, RegisterEventSource, SetDebugErrorLevel, SetConsoleCursorPosition, ChoosePixelFormat, SetPixelFormat, GetPixelFormat, DescribePixelFormat, SwapBuffers, PolyBezier, AbortPath, DestroyAcceleratorTable, HeapWalk, DdeInitialize, DdeUninitialize, DdeConnectList, DdeDisconnectList, DdeCreateStringHandle, DdePostAdvise, DdeGetData, DdeNameService, DdeGetLastError, WNetGetDirectoryType, EnumPrinters, RegFlushKey, RegGetKeySecurity, DllGetClassObject, DllCanUnloadNow, CreateBitmap, CreateCompatibleBitmap, CreateBitmapIndirect, GetBitmapBits, SetBitmapBits, LoadImage, CopyImage, LoadBitmap, DrawIcon, CreateDiscardableBitmap, SetDIBits, GetCharABCWidths, LoadTypeLib, SetConsoleCtrlHandler, CreateConsoleScreenBuffer, ReadConsoleInput, GetConsoleCursorInfo, SetConsoleCursorInfo, SetConsoleWindowInfo, SetConsoleTextAttribute, SetConsoleScreenBufferSize, FillConsoleOutputCharacter, FillConsoleOutputAttribute, CreateMailslot, GetMailslotInfo, GetCompressedFileSize, GetProcessWindowStation, GetThreadDesktop, SetDebugErrorLevel, WaitForDebugEvent, SetComputerName, CreateMDIWindow. Thu Apr 23 23:54:04 1998 Douglas Ridgway <ridgway@winehq.com> * [include/windows.h] [objects/enhmetafile.c] [relay32/gdi32.spec] Implement CopyEnhMetaFile, Get/SetEnhMetaFileBits, other fixes. * [include/windows.h] [objects/metafile.c] [relay32/gdi32.spec] 32-bit metafile fixes, implement EnumMetaFile32, GetMetaFileBitsEx. * [objects/font.c] [graphics/x11drv/xfont.c] [graphics/x11drv/text.c] Some rotated text support for X11R6 displays. * [win32/newfns.c] [ole/ole2nls.c] Moved GetNumberFormat32A. Wed Apr 22 17:38:20 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [misc/network.c] Changed some function documentation to the new style. * [misc/network.c] [include/windows.h] [if1632/user.spec] [relay32/mpr.spec] [misc/mpr.c] Added stubs for some Win32 network functions; renamed some 16-bit ones with 32-bit counterparts, as well as WNetGetDirectoryType; moved the stubs in misc/mpr.c (three of them!) to misc/network.c. * [ole/compobj.c] [ole/storage.c] [ole/ole2disp.c] [ole/ole2nls.c] [ole/folders.c] [ole/moniker.c] [ole/ole2.c] [graphics/fontengine.c] [graphics/ddraw.c] [graphics/env.c] [graphics/driver.c] [graphics/escape.c] Changed fprintf's to proper debug-macros. * [include/winnls.h] Added some flags (for internal use). * [ole/ole2nls.c] Added the Unicode core function, and worked out a way to hide the commonality of the core. * [relay32/kernel32.spec] Added support for GetDate/Time32A/W. Wed Apr 22 09:16:03 1998 Gordon Chaffee <chaffee@cs.berkeley.edu> * [win32/code_page.c] Fixed problem with MultiByteToWideChar that was introduced in last release. Made MultiByteToWideChar more compatible with Win32. * [graphics/x11drv/graphics.c] Fixed problem with drawing arcs. Tue Apr 21 11:24:58 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu> * [ole/ole2nls.c] Move stuff from 0x409 case to Lang_En. * [relay32/user32.spec] [windows/winpos.c] Added stubs for GetWindowRgn32 and SetWindowRgn32. Makes Office Paperclip happy. Tue Apr 21 11:16:16 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu> * [loader/pe_image.c] If image is relocated, TLS addresses need to be adjusted. * [debugger/*.c] Generalized tests for 32-bit segments. Tue Apr 21 02:04:59 1998 James Juran <jrj120@psu.edu> * [misc/*.c] [miscemu/*.c] [msdos/*.c] [if1632/*.c] [include/*.h] [loader/*.c] [memory/*.c] [multimedia/*.c] [objects/*.c] Almost all fprintf statements converted to appropriate debug messages. * [README] Updated "GETTING MORE INFORMATION" section to include WineHQ. * [documentation/debugger] Fixed typo. * [windows/defwnd.c] Added function documentation. Sun Apr 19 16:30:58 1998 Marcus Meissner <marcus@mud.de> * [Make.rules.in] Added lint target (using lclint). * [relay32/oleaut32.spec][relay32/Makefile.in][ole/typelib.c] [ole/ole2disp.c] Added oleaut32 spec, added some SysString functions. * [if1632/signal.c] Added printing of faultaddress in Linux (using CR2 debug register). * [configure.in] Added <sys/types.h> for statfs checks. * [loader/*.c][debugger/break.c][debugger/hash.c] Started to split win32/win16 module handling, preparing support for other binary formats (like ELF). Sat Apr 18 10:07:41 1998 Rein Klazes <rklazes@casema.net> * [misc/registry.c] Fixed a bug that made RegQueryValuexxx returning incorrect registry values. Fri Apr 17 22:59:22 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [misc/lstr.c] FormatMessage32*: remove linefeed when nolinefeed set; check for target underflow. Fri Apr 17 00:38:14 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [misc/crtdll.c] Implement xlat_file_ptr for CRT stdin/stdout/stderr address translation. Wed Apr 15 20:43:56 1998 Jim Peterson <jspeter@birch.ee.vt.edu> * [controls/menu.c] Added 'odaction' parameter to MENU_DrawMenuItem() and redirected WM_DRAWITEM messages to GetWindow(hwnd,GW_OWNER). Tue Apr 14 16:17:55 1998 Berend Reitsma <berend@united-info.com> * [graphics/metafiledrv/init.c] [graphics/painting.c] [graphics/win16drv/init.c] [graphics/x11drv/graphics.c] [graphics/x11drv/init.c] [include/gdi.h] [include/x11drv.h] [relay32/gdi32.spec] Added PolyPolyline routine. * [windows/winproc.c] Changed WINPROC_GetProc() to return proc instead of &(jmp proc).
318 lines
9.5 KiB
C
318 lines
9.5 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 <math.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; }
|
|
#define IROUND(x) (int)((x)>0? (x)+0.5 : (x) - 0.5)
|
|
|
|
/***********************************************************************
|
|
* 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)
|
|
{
|
|
if (!pfo->lf.lfOrientation) /* angled baseline? */
|
|
{
|
|
TSXDrawString( display, dc->u.x.drawable, dc->u.x.gc,
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y, str, count );
|
|
}
|
|
else
|
|
{
|
|
/* have to render character by character. */
|
|
double offset = 0.0;
|
|
int i;
|
|
/* tenths of degrees to radians */
|
|
double theta = M_PI*pfo->lf.lfOrientation/1800.;
|
|
/* components of pointsize matrix */
|
|
double xc = pfo->fi->lfd_decipoints*cos(theta)/10.;
|
|
double yc = pfo->fi->lfd_decipoints*sin(theta)/10.;
|
|
|
|
for(i=0; i<count; i++) {
|
|
int char_metric_offset = (unsigned char) str[i]
|
|
- font->min_char_or_byte2;
|
|
int x_i = IROUND((double) (dc->w.DCOrgX + x) + offset*xc/1000. );
|
|
int y_i = IROUND((double) (dc->w.DCOrgY + y) - offset*yc/1000. );
|
|
|
|
TSXDrawString( display, dc->u.x.drawable, dc->u.x.gc,
|
|
x_i, y_i, &str[i], 1);
|
|
offset += (double) (font->per_char ?
|
|
font->per_char[char_metric_offset].attributes:
|
|
font->min_bounds.attributes);
|
|
}
|
|
}
|
|
}
|
|
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;
|
|
}
|