Mon Sep 13 05:00:11 1993 Eric Youngdale * [Makefile] [if1632/relay.c] [include/dlls.h] [selector.c] [loader/wine.c] [tools/build.c] Added ability to generate missing functions statistics. Mon Sep 13 12:09:47 1993 Scott A. Laird (scott@curly) * [WIN31-APPLETS] Added new file. * [if1632/kernel.spec] Added definitions for GetProfile{Int,String} and SetHandleCount. * [if1632/keyboard.spec] Created interface specification for Keyboard driver DLL. * [if1632/relay.c] Added keyboard.dll to list of included DLLs. * [if1632/user.spec] Added LoadAccelerators definition. * [loader/resource.c] Added LoadAccelerators stub. * [misc/file.c] Changed OpenFile, and added SetHandleCount (for winfile.exe) * [misc/keyboard.c] Added keyboard code. * [misc/profile.c] [misc/xt.c] Moved GetPrivateProfile* commands here, and added GetProfile* commands. Mon Sep 13 10:24:37 1993 Andrew Bulhak * [windows/utility.c] Implemented MulDiv(), OutputDebugString() and wvsprintf() Fri Sep 10 09:13:30 1993 John Brezak * [*/Makefile] Created patch to allow BSD make to build wine. * [windows/win.c] Fixed NULL pointer reference. * [windows/message.c] [misc/xt.c] Defined HZ to handle system specific timing. * [windows/graphics.c] Use M_PI is PI * [objects/pallete.c] NetBSD does not have /usr/include/values.h and MAXINT is INT_MAX. * [dump.c] [ldt.c] [wine.c] ifdef'ed linux headers for linux compile. * [loader/ldtlib.c] Add NetBSD system calls when compiled on that system. * [loader/selector.c] Use mmap(MAP_ANON, ...) for NetBSD. * [if1632/call.S] Fixed selector assumptions. Thu Sep 9 20:01:37 1993 David Metcalfe * [controls/WinButton*] [controls/button.c] [controls/widget.c] [windows/win.c] [windows/class.c] Added 3D button control and tied into CreateWindow() Thu Sep 9 07:35:24 1993 Scott Laird * [if1632/sound.spec] Created interface specification for SOUND DLL. * [if1632/win87em.spec] Added more functions to the WIN87EM DLL interface specification * [misc/emulate.c] Created stubs for the new math emulation functions. * [misc/sound.c] Created stubs for the SOUND DLL. Sun Sep 5 21:02:10 1993 John Burton * [if1632/kernel.spec] Added interface specifications for OpenFile, _lclose, _lread, _lopen, and _lwrite. * [include/windows.h] Added OF_ macros * [misc/file.c] Implemented OpenFile, _lclose, _lread, _lopen and _lwrite. Fri Sep 3 18:47:03 1993 Alexandre Julliard * [windows/dc.c] Bug fix * [objects/text.c] Bug fix Fri Sep 3 18:47:03 1993 Bob Amstadt * [objects/linedda.c] Finished LineDDA().
174 lines
4.8 KiB
C
174 lines
4.8 KiB
C
/*
|
|
* text functions
|
|
*
|
|
* Copyright 1993 Alexandre Julliard
|
|
*/
|
|
|
|
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
|
|
|
|
#include <X11/Intrinsic.h>
|
|
#include <X11/StringDefs.h>
|
|
#include <X11/Core.h>
|
|
#include <X11/Shell.h>
|
|
#include <X11/Xatom.h>
|
|
|
|
#include "message.h"
|
|
#include "callback.h"
|
|
#include "win.h"
|
|
#include "gdi.h"
|
|
|
|
|
|
/***********************************************************************
|
|
* DrawText (USER.85)
|
|
*/
|
|
int DrawText( HDC hdc, LPSTR str, int count, LPRECT rect, WORD flags )
|
|
{
|
|
SIZE size;
|
|
int x = rect->left, y = rect->top;
|
|
if (count == -1) count = strlen(str);
|
|
|
|
if (!GetTextExtentPoint( hdc, str, count, &size )) return 0;
|
|
|
|
if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2;
|
|
else if (flags & DT_RIGHT) x = rect->right - size.cx;
|
|
if (flags & DT_VCENTER) y = (rect->top + rect->bottom - size.cy) / 2;
|
|
else if (flags & DT_BOTTOM) y = rect->bottom - size.cy;
|
|
|
|
if (!TextOut( hdc, x, y, str, count )) return 0;
|
|
return 1;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* TextOut (GDI.33)
|
|
*/
|
|
BOOL TextOut( HDC hdc, short x, short y, LPSTR str, short count )
|
|
{
|
|
int dir, ascent, descent, i;
|
|
XCharStruct info;
|
|
XFontStruct *font;
|
|
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
if (!dc) return FALSE;
|
|
if (!DC_SetupGCForText( dc )) return TRUE;
|
|
font = dc->u.x.font.fstruct;
|
|
|
|
if (dc->w.textAlign & TA_UPDATECP)
|
|
{
|
|
x = dc->w.CursPosX;
|
|
y = dc->w.CursPosY;
|
|
}
|
|
#ifdef DEBUG_TEXT
|
|
printf( "TextOut: %d,%d '%s'\n", x, y, str );
|
|
#endif
|
|
x = XLPTODP( dc, x );
|
|
y = YLPTODP( dc, y );
|
|
|
|
XTextExtents( font, str, count, &dir, &ascent, &descent, &info );
|
|
info.width += count*dc->w.charExtra + dc->w.breakExtra*dc->w.breakCount;
|
|
|
|
/* Compute starting position */
|
|
|
|
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;
|
|
}
|
|
|
|
/* Draw text */
|
|
|
|
if (!dc->w.charExtra && !dc->w.breakExtra)
|
|
{
|
|
if (dc->w.backgroundMode == TRANSPARENT)
|
|
XDrawString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
x, y, str, count );
|
|
else
|
|
XDrawImageString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
x, y, str, count );
|
|
}
|
|
else
|
|
{
|
|
char * p = str;
|
|
int xchar = x;
|
|
for (i = 0; i < count; i++, p++)
|
|
{
|
|
XCharStruct * charStr;
|
|
unsigned char ch = *p;
|
|
int extraWidth;
|
|
|
|
if ((ch < font->min_char_or_byte2)||(ch > font->max_char_or_byte2))
|
|
ch = font->default_char;
|
|
if (!font->per_char) charStr = &font->min_bounds;
|
|
else charStr = font->per_char + ch - font->min_char_or_byte2;
|
|
|
|
extraWidth = dc->w.charExtra;
|
|
if (ch == dc->u.x.font.metrics.tmBreakChar)
|
|
extraWidth += dc->w.breakExtra;
|
|
|
|
if (dc->w.backgroundMode == TRANSPARENT)
|
|
XDrawString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
xchar, y, p, 1 );
|
|
else
|
|
{
|
|
XDrawImageString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
xchar, y, p, 1 );
|
|
XSetForeground( XT_display, dc->u.x.gc, dc->w.backgroundPixel);
|
|
XFillRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
xchar + charStr->width, y - font->ascent,
|
|
extraWidth, font->ascent + font->descent );
|
|
XSetForeground( XT_display, dc->u.x.gc, dc->w.textPixel );
|
|
}
|
|
xchar += charStr->width + extraWidth;
|
|
}
|
|
}
|
|
|
|
/* 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( XT_display, dc->u.x.gc, lineWidth,
|
|
LineSolid, CapRound, JoinBevel );
|
|
XDrawLine( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
x, y + linePos, x + info.width, 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( XT_display, dc->u.x.gc, lineAscent + lineDescent,
|
|
LineSolid, CapRound, JoinBevel );
|
|
XDrawLine( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
x, y - lineAscent, x + info.width, y - lineAscent );
|
|
}
|
|
|
|
return TRUE;
|
|
}
|