Tue Jun 7 08:41:27 1994 Bob Amstadt (bob@pooh) * loader/selector.c (FixupFunctionPrologs): New function to fixup loaded DLL function prologs. It replaces the do nothing code with code that loads DS with the appropriate data segment for the DLL. * misc/cursor.c (LoadCursor): Disabled cursor loading from .EXE or .DLL. The code needs to handle the possibility of multiple cursors in a single directory. Also, it should check to see if the cursor is the right size. * objects/font.c (EnumFonts): Checked for lpLogFontList[i] == NULL * objects/gdiobj.c (SetObjectOwner): Removed stub. Replaced with simple return in gdi.spec. This function is not defined for the retail version of Windows. * memory/heap.c (WIN16_LocalHandleDelta): New function. This is really a dummy that imitates the proper return values. * loader/library.c (GetProcAddress): Fixed definition of IS_BUILTIN_DLL() macro. Mon Jun 6 18:15:40 1994 Bob Amstadt (bob@pooh) * miscemu/int21.c (SeekFile): Needed to return current position in DX:AX. * windows/utility.c (windows_wsprintf): Added support for '#' in format, and fixed bug with "ptr" being incremented too many times. * miscemu/int21.c (OpenExistingFile): Add code to handle opening files read-only and write-only. * loader/wine.c: Segment fixups now done in LoadImage instead of _WinMain. This is necessary to support LoadLibrary(). Sun Jun 5 17:34:24 1994 Erik Bos (erik@hacktic.nl) * [loader/*] - fixed: GetModuleHandle() sometimes returned a wrong handle. - don't init dlls when cs == 0 (lzexpand, doesn't seem to have a init function) - LoadLibrary & LoadImage now return error instead of stopping wine. - moved most of NE-functions into one file. - LoadLibrary() uses w_files list instead of its own list. - NE exectables are now fixed-up and initialised when loaded instead of only once before calling InitTask. * [miscemu/int15.c] [miscemu/int31.c] Added. * [loader/selector.c] Stubs added for {Get|Set}SelectorLimit(), {Get|Set}SelectorBase(). * [misc/main.c] Stub added for IsRomModule(). * [miscemu/int21.c] Some cleanup, added heap for returning data. Jun 6, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [tools/build.c] Change MAX_ORDINALS define to higher value, 1299 entries. (MMSYSTEM doesn't have succesive numbers, some are around 1200). * [windows/utility.c] Bug fix in windows_wsprintf(), (twice increments ...). * [windows/winpos.c] Bug fix in SetWindowPos(), redraw was done if flag was set to SWP_NOREDRAW while SWP_SHOWWINDOW). * [misc/message.c] [controls/combo.c] Add an InvalidateRect() in WM_SHOWWINDOW to statisfy the new 'saveunder'. * [windows/win.c] In CreateWindowEx(), do SetMenu() calls after window creation, just before sending to WM_NCCALCSIZE. * [controls/menu.c] In function SetMenu(), now use SetWindowPos() with flags SWP_FRAMECHANGED to readjust menu area. Function MenuBarCalcSize() redone. Sun May 29 11:08:24 1994 David B. Thomas (dt@yenta.abq.nm.us) * [objects/text.c] Fixed problems associated with DT_WORDBREAK flag. String length was not being properly decremented when lines were folded, and wrapping was not performed when DT_NOCLIP and DT_NOPREFIX were both on in addition to DT_WORDBREAK. Windows does wrapping in this case, and now so does wine. Sun Jun 5 19:17:49 1994 Olaf Flebbe (olaf@dragon) * [edit.c] cp1 was uninitialized iff lineno == 0 * FindFile tests for existance of file even if a full filename was supplied. What about unix file names? * [controls/listbox ] wndPtr was uninitialized for LB_SETTOPINDEX * [misc/property.c] Do not free lpProp. Is it really allocated by malloc? {edited by Bob Amstadt: changed free() to GlobalFree()}
434 lines
10 KiB
C
434 lines
10 KiB
C
/*
|
|
* text functions
|
|
*
|
|
* Copyright 1993 Alexandre Julliard
|
|
*/
|
|
|
|
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
|
|
|
|
#include <X11/Xatom.h>
|
|
#include "windows.h"
|
|
#include "gdi.h"
|
|
#include "metafile.h"
|
|
|
|
#define TAB 9
|
|
#define LF 10
|
|
#define CR 13
|
|
#define SPACE 32
|
|
#define PREFIX 38
|
|
|
|
static int tabstop = 8;
|
|
static int tabwidth;
|
|
static int spacewidth;
|
|
static int prefix_offset;
|
|
|
|
|
|
static char *TEXT_NextLine(HDC hdc, char *str, int *count, char *dest,
|
|
int *len, int width, WORD format)
|
|
{
|
|
/* Return next line of text from a string.
|
|
*
|
|
* hdc - handle to DC.
|
|
* str - string to parse into lines.
|
|
* count - length of str.
|
|
* dest - destination in which to return line.
|
|
* len - length of resultant line in dest in chars.
|
|
* width - maximum width of line in pixels.
|
|
* format - format type passed to DrawText.
|
|
*
|
|
* Returns pointer to next char in str after end of the line
|
|
* or NULL if end of str reached.
|
|
*/
|
|
|
|
int i = 0, j = 0, k;
|
|
int plen = 0;
|
|
int numspaces;
|
|
SIZE size;
|
|
int lasttab = 0;
|
|
int wb_i = 0, wb_j = 0, wb_count;
|
|
|
|
while (*count)
|
|
{
|
|
switch (str[i])
|
|
{
|
|
case CR:
|
|
case LF:
|
|
if (!(format & DT_SINGLELINE))
|
|
{
|
|
i++;
|
|
if (str[i] == CR || str[i] == LF)
|
|
i++;
|
|
*len = j;
|
|
return (&str[i]);
|
|
}
|
|
dest[j++] = str[i++];
|
|
if (!(format & DT_NOCLIP) || !(format & DT_NOPREFIX) ||
|
|
(format & DT_WORDBREAK))
|
|
{
|
|
if (!GetTextExtentPoint(hdc, &dest[j-1], 1, &size))
|
|
return NULL;
|
|
plen += size.cx;
|
|
}
|
|
break;
|
|
|
|
case PREFIX:
|
|
if (!(format & DT_NOPREFIX))
|
|
{
|
|
prefix_offset = j + 1;
|
|
i++;
|
|
}
|
|
else
|
|
{
|
|
dest[j++] = str[i++];
|
|
if (!(format & DT_NOCLIP) || (format & DT_WORDBREAK))
|
|
{
|
|
if (!GetTextExtentPoint(hdc, &dest[j-1], 1, &size))
|
|
return NULL;
|
|
plen += size.cx;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case TAB:
|
|
if (format & DT_EXPANDTABS)
|
|
{
|
|
wb_i = ++i;
|
|
wb_j = j;
|
|
wb_count = *count;
|
|
|
|
if (!GetTextExtentPoint(hdc, &dest[lasttab], j - lasttab,
|
|
&size))
|
|
return NULL;
|
|
|
|
numspaces = (tabwidth - size.cx) / spacewidth;
|
|
for (k = 0; k < numspaces; k++)
|
|
dest[j++] = SPACE;
|
|
plen += tabwidth - size.cx;
|
|
lasttab = wb_j + numspaces;
|
|
}
|
|
else
|
|
{
|
|
dest[j++] = str[i++];
|
|
if (!(format & DT_NOCLIP) || !(format & DT_NOPREFIX) ||
|
|
(format & DT_WORDBREAK))
|
|
{
|
|
if (!GetTextExtentPoint(hdc, &dest[j-1], 1, &size))
|
|
return NULL;
|
|
plen += size.cx;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SPACE:
|
|
dest[j++] = str[i++];
|
|
if (!(format & DT_NOCLIP) || !(format & DT_NOPREFIX) ||
|
|
(format & DT_WORDBREAK))
|
|
{
|
|
wb_i = i;
|
|
wb_j = j - 1;
|
|
wb_count = *count;
|
|
if (!GetTextExtentPoint(hdc, &dest[j-1], 1, &size))
|
|
return NULL;
|
|
plen += size.cx;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
dest[j++] = str[i++];
|
|
if (!(format & DT_NOCLIP) || !(format & DT_NOPREFIX) ||
|
|
(format & DT_WORDBREAK))
|
|
{
|
|
if (!GetTextExtentPoint(hdc, &dest[j-1], 1, &size))
|
|
return NULL;
|
|
plen += size.cx;
|
|
}
|
|
}
|
|
|
|
(*count)--;
|
|
if (!(format & DT_NOCLIP) || (format & DT_WORDBREAK))
|
|
{
|
|
if (plen > width)
|
|
{
|
|
if (format & DT_WORDBREAK)
|
|
{
|
|
*len = wb_j;
|
|
*count = wb_count - 1;
|
|
return (&str[wb_i]);
|
|
}
|
|
else
|
|
{
|
|
*len = j;
|
|
return (&str[i]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
*len = j;
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* DrawText (USER.85)
|
|
*/
|
|
int DrawText( HDC hdc, LPSTR str, int count, LPRECT rect, WORD flags )
|
|
{
|
|
SIZE size;
|
|
char *strPtr;
|
|
static char line[1024];
|
|
int len, lh, prefix_x, prefix_len;
|
|
TEXTMETRIC tm;
|
|
int x = rect->left, y = rect->top;
|
|
int width = rect->right - rect->left;
|
|
|
|
#ifdef DEBUG_TEXT
|
|
printf( "DrawText: '%s', %d , [(%d,%d),(%d,%d)]\n", str, count,
|
|
rect->left, rect->top, rect->right, rect->bottom);
|
|
#endif
|
|
|
|
if (count == -1) count = strlen(str);
|
|
strPtr = str;
|
|
|
|
GetTextMetrics(hdc, &tm);
|
|
if (flags & DT_EXTERNALLEADING)
|
|
lh = tm.tmHeight + tm.tmExternalLeading;
|
|
else
|
|
lh = tm.tmHeight;
|
|
|
|
if (flags & DT_TABSTOP)
|
|
tabstop = flags >> 8;
|
|
|
|
if (flags & DT_EXPANDTABS)
|
|
{
|
|
GetTextExtentPoint(hdc, " ", 1, &size);
|
|
spacewidth = size.cx;
|
|
GetTextExtentPoint(hdc, "o", 1, &size);
|
|
tabwidth = size.cx * tabstop;
|
|
}
|
|
|
|
do
|
|
{
|
|
prefix_offset = -1;
|
|
strPtr = TEXT_NextLine(hdc, strPtr, &count, line, &len, width, flags);
|
|
|
|
if (prefix_offset != -1)
|
|
{
|
|
GetTextExtentPoint(hdc, line, prefix_offset - 1, &size);
|
|
prefix_x = size.cx;
|
|
GetTextExtentPoint(hdc, line + prefix_offset, 1, &size);
|
|
prefix_len = size.cx;
|
|
}
|
|
|
|
if (!GetTextExtentPoint(hdc, line, len, &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_SINGLELINE)
|
|
{
|
|
if (flags & DT_VCENTER) y = rect->top +
|
|
(rect->bottom - rect->top) / 2 - size.cy / 2;
|
|
else if (flags & DT_BOTTOM) y = rect->bottom - size.cy;
|
|
}
|
|
if (!(flags & DT_CALCRECT))
|
|
if (!TextOut(hdc, x, y, line, len)) return 0;
|
|
if (prefix_offset != -1)
|
|
{
|
|
MoveTo(hdc, x + prefix_x, y + size.cy);
|
|
LineTo(hdc, x + prefix_x + prefix_len, y + size.cy);
|
|
}
|
|
|
|
if (strPtr)
|
|
{
|
|
y += lh;
|
|
if (!(flags & DT_NOCLIP))
|
|
{
|
|
if (y > rect->bottom - lh)
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
while (strPtr);
|
|
if (flags & DT_CALCRECT) rect->bottom = y;
|
|
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)
|
|
{
|
|
dc = (DC *)GDI_GetObjPtr(hdc, METAFILE_DC_MAGIC);
|
|
if (!dc) return FALSE;
|
|
MF_TextOut(dc, x, y, str, count);
|
|
return TRUE;
|
|
}
|
|
|
|
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', %d\n", x, y, str, count );
|
|
#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,
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + y, str, count );
|
|
else
|
|
XDrawImageString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
dc->w.DCOrgX + x, dc->w.DCOrgY + 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,
|
|
dc->w.DCOrgX + xchar, dc->w.DCOrgY + y, p, 1 );
|
|
else
|
|
{
|
|
XDrawImageString( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
dc->w.DCOrgX + xchar, dc->w.DCOrgY + y, p, 1 );
|
|
XSetForeground( XT_display, dc->u.x.gc, dc->w.backgroundPixel);
|
|
XFillRectangle( XT_display, dc->u.x.drawable, dc->u.x.gc,
|
|
dc->w.DCOrgX + xchar + charStr->width,
|
|
dc->w.DCOrgY + 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,
|
|
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( XT_display, dc->u.x.gc, lineAscent + lineDescent,
|
|
LineSolid, CapRound, JoinBevel );
|
|
XDrawLine( XT_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 );
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* GrayString (USER.185)
|
|
*/
|
|
BOOL GrayString(HDC hdc, HBRUSH hbr, FARPROC gsprc, LPARAM lParam,
|
|
INT cch, INT x, INT y, INT cx, INT cy)
|
|
{
|
|
int s, current_color;
|
|
|
|
if (gsprc) {
|
|
return CallGrayStringProc(gsprc, hdc, lParam,
|
|
cch ? cch : lstrlen((LPCSTR) lParam) );
|
|
} else {
|
|
current_color = GetTextColor(hdc);
|
|
SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT) );
|
|
s = TextOut(hdc, x, y, (LPSTR) lParam,
|
|
cch ? cch : lstrlen((LPCSTR) lParam) );
|
|
SetTextColor(hdc, current_color);
|
|
|
|
return s;
|
|
}
|
|
}
|
|
|
|
/***********************************************************************
|
|
* ExtTextOut [GDI.351]
|
|
*/
|
|
BOOL ExtTextOut(HDC hDC, short x, short y, WORD wOptions, LPRECT lprect,
|
|
LPSTR str, WORD count, LPINT lpDx)
|
|
{
|
|
printf("EMPTY STUB !!! ExtTextOut(); ! call TextOut() for now !\n");
|
|
TextOut(hDC, x, y, str, count);
|
|
return FALSE;
|
|
}
|
|
|