Sun Jan 2 12:38:53 1994 David Metcalfe <david@prism.demon.co.uk> * [windows/class.c] Implemented GetClassName and GetClassInfo. * [windows/caret.c] Various improvements to text caret code. Fri Dec 31 15:22:22 1993 John Brezak <brezak@apollo.hp.com> * [misc/comm.c] Patches to work with NetBSD. Thu Dec 30 12:11:55 1993 John Richardson <jrichard@cs.uml.edu> * [objects/bitblt.c] Added StretchBlt(). Tue Jan 4 05:22:07 1994 julliard@di.epfl.ch (Alexandre Julliard) * [misc/user.c] Added creation of system message queue. * [objects/bitmap.c] [objects/dcvalues.c] [windows/dc.c] Added DC size fields into DC structure. * [objects/clipping.c] Bug fix in CLIPPING_IntersectRect(). * [windows/class.c] Allocate a DCE instead of a DC for CS_CLASSDC classes. * [windows/clipping.c] Fixed GetUpdateRect() and GetUpdateRgn() to clip to the client area. * [windows/dce.c] Implemented GetDCEx() and GetWindowDC(). * [windows/defwnd.c] Implemented WM_WINDOWPOSCHANGED handling. * [windows/event.c] Preliminary support for Xlib event handling instead of Xt callbacks. Changed MSG_AddMsg() calls to hardware_event() or PostMessage(). * [windows/message.c] Preliminary support for multiple message queues. Implemented hardware_event() to store messages into the system queue. Implemented Get/SetTaskQueue(). Better WM_PAINT and WM_TIMER handling. Changes to use Xlib instead of Xt for events. * [windows/painting.c] Use GetDCEx() to retrieve the DC, to get a correct visible region. * [windows/timer.c] Moved the timer procedure callback into DispatchMessage(). Changed implementation to get rid of Xt timeouts. Timer checking is now done inside GetMessage(). * [windows/win.c] Allocate a DCE instead of a DC for CS_OWNDC windows. Replaced Xt calls with Xlib calls. Moved window positioning functions into windows/winpos.c * [windows/winpos.c] (New file) Rewritten most of the window positioning functions. Implemented SetWindowPos() and MapWindowPoints(). Jan 3, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [if1632/user.spec] Bad arguments description for function SetDlgItemText. * [objects/text.c] Function DrawText now handle DT_CALCRECT request. * [misc/message.c] Message boxes now use DrawText with DT_CALCRECT. * [windows/graphics.c] Bug fix in function FrameRect, (it was using PEN instead of BRUSH). * [windows/win.c] Bug fix for flags in function ShowWindow. More accurate WM_SIZE generated by function ShowWindow. * [controls/listbox.c] More code for LBS_MULTIPLESEL. More code for LBS_MULTICOLUMN. * [include/windows.h] Bad define for MF_SEPARATOR. * [controls/menu.c] New functions: PopMenuWndProc() with 'glues', CreatePopupMenu(), AppendMenu(), InsertMenu(), RemoveMenu(), DeleteMenu(), ModifyMenu(), TrackPopupMenu(). Code in stubs: CreateMenu(), DestroyMenu(). Sat Jan 1 10:22:43 1994 Bob Amstadt (bob@pooh) * loader/wine.c: Added support for relocation types 5 and 6. Mon Dec 27 11:06:03 1993 Erik Bos (erik@trashcan.hacktic.nl) * [misc/comm.c] new functions: BuildCommDCB(), OpenComm(), CloseComm(), SetCommBreak(), ClearCommBreak(), EscapeCommFunction(), FlushComm(), GetCommError(), SetCommEventMask(), GetCommEventMask(), SetCommState(), GetCommState(), TransmitCommChar(), ReadComm(), WriteComm(). Wed Dec 22 13:00:15 1993 David Metcalfe <david@prism.demon.co.uk> * [windows/caret.c] Implemented text caret functions. Tue Dec 21 06:13:58 1993 julliard@di.epfl.ch (Alexandre Julliard) * [loader/wine.c] Bug fix in LoadImage(). * [objects/bitblt.c] [objects/clipping.c] [objects/text.c] [windows/dc.c] [windows/dce.c] [windows/graphics.c] Modified graphics calls to take into account the DC origin. * [windows/defwnd.c] Added preliminary WM_NCCALCSIZE handling. * [windows/event.c] Send WM_NCCALCSIZE message on resize event. * [windows/win.c] Send WM_NCCALCSIZE message in CreateWindow(). Realize widgets at creation time (should prevent problems with unrealized widgets). Dec 19, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [controls/static.c] Send mouse & keyboard message received to its parent. * [controls/scroll.c] Send keyboard message received to its parent. * [controls/listbox.c] Add Navigation keys . ListBox now use VSCROLL & HSCROLL instead of children. Alpha version of LBS_MULTIPLESEL. Alpha version of LBS_MULTICOLUMN. * [controls/combo.c] Add Navigation keys on closed ComboBox. Remove useless 'COMBOBOX_CreateComboBox' function. Mon Dec 19 20:39:34 1993 Erik Bos (erik@trashcan.hacktic.nl) * [loader/wine. LoadImage() modified to use FindFile(). * [misc/file.c] SetErrorMode added * [misc/dos_fs.c] bug fixes. Dec 13, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [memory/global.c] bug fix in GlobalGetFreeSegment : good ptr in 'g_prev'. * [sysres.dll] preliminary version of a 'glass of wine' bitmap * [windows/event.c] New function 'GetCapture'. * [controls/scroll.c] Remove useless 'SCROLLBAR_CreateScrollBar' function. * [controls/listbox.c] Remove useless 'LISTBOX_CreateListBox' function. Mon Dec 13 13:51:00 1993 David Metcalfe <david@prism.demon.co.uk> * [objects/font.c] Corrected bugs in GetCharWidth(). * [windows/event.c] Modified EVENT_key to send Windows virtual key codes for WM_KEYDOWN and WM_KEYUP messages, and a WM_CHAR message for printable characters. Wed Dec 08 19:20:00 1993 Karl Guenter Wuensch (hn324wu@unidui.uni-duisburg.de) * [windows/graphics.c] Added Polyline and Polygon Mon Dec 13 14:51:54 1993 Erik Bos (erik@trashcan.hacktic.nl) * [controls/listbox.c] ListBoxDirectory() modified to use dos_fs.c's functions to access files&|drives. Sat Dec 04 17:04:23 1993 Erik Bos (erik@trashcan.hacktic.nl) * [misc/dos_fs.c] Added FindFile() to search a file in a dos/unix style path. * [misc/file.c] New Win31 functions: OpenFile, _lcreate, _llseek, GetTempDrive, GetTempFileName, GetWindowsDirectory, GetSystemDirectory, GetDriveType. * [misc/int21.c] Modified. Wed Dec 1 16:20:45 1993 Miguel de Icaza (miguel@roxanne.nuclecu.unam.mx) * [misc/profile.c] The Profile functions now return the correct values. They now implement all the features described in the SDK. Tue Nov 30 13:55:27 1993 Bob Amstadt (bob at amscons) * [loader/selector.c] Rewrote selector aliasing routines to use System V IPC routine to alias memory segments. Nov 28, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [controls/listbox.c] More consistency in functions using wIndexes * [controls/scroll.c] New function : ShowScrollBar(). * [loader/cursor.c] ... New file Move cursor functions from [loader/resource.c]. New function : ClipCursor(). New function : GetClipCursor(). New function : CreateCursor(). SetCursor() now working using gloabal variable 'winHasCursor'. *[object/palette.c] New stub only : SelectPalette(). New stub only : RealizePalette(). *[win/event.c] New function : EVENT_enter_notify(), update 'winHasCursor' and send WM_SETCURSOR. *[win/defwnd.c] Add processing of WM_SETCURSOR message. *[win/win.c] New members in WND structure : hCursor, hWndVScroll & hWndHScroll. CreateWindowEx() now create children for WM_HSCROLL & WM_VSCROLL. New function ClientToScreen(). New function ScreenToClient(). Mon Nov 25 18:25:40 1993 Erik Bos (erik@trashcan.hacktic.nl) * [files.h / regfunc.h / misc/dos.c] Removed. * [misc/dos_fs.c] Added support for loading dosdrive cfg from wine.ini. * [misc/int21.c] Modified. Wed Nov 24 11:37:33 1993 julliard@disuns2.epfl.ch (Alexandre Julliard) * [include/atom.h] [memory/atom.c] Implemented atoms. * [windows/class.c] Modified RegisterClass() to use atoms. Implemented CS_GLOBALCLASS style. * [windows/message.c] Implemented RegisterWindowMessage(). * [loader/resource.c] Bug fix in LoadResource(). * [windows/dialog.c] Modified CreateDialogParam() to use Find/LoadResource().
391 lines
9.3 KiB
C
391 lines
9.3 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"
|
|
|
|
#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))
|
|
{
|
|
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))
|
|
{
|
|
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))
|
|
{
|
|
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))
|
|
{
|
|
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))
|
|
{
|
|
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;
|
|
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;
|
|
|
|
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 -
|
|
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) 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,
|
|
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;
|
|
}
|