Release 0.4.7
Mon Nov 1 14:40:21 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [if1632/user.spec]
Removed some duplicate entries.
* [include/dialog.h] [windows/dialog.c]
Implemented dialog units and fonts.
Added preliminary loading of dialog resources.
Preliminary implementation of DialogBox().
Implemented Get/SetDlgItem* functions.
* [windows/win.c]
Implemented WM_PARENTNOTIFY message.
Implemented CreateWindowEx() and GetWindow().
Completed DestroyWindow().
Mon Nov 1 18:19:34 1993 Erik Bos
* [loader/signal.c]
Added support for int 0x11 & 0x12.
* [loader/int21.c]
Improved function handling.
Sun Oct 31 12:38:09 1993 David Metcalfe <david@prism.demon.co.uk>
* [objects/font.c]
Implemented GetCharWidth().
Wed Oct 27 09:56:06 1993 John Brezak <brezak@ch.hp.com>
* [Makefile]
Use GNU malloc.
* [include/int21.h include/wine.h]
Change sc_eflags to sc_efl .
* [include/wine.h]
Fix misplaced #endif
Include <signal.h> for NetBSD
* [loader/int21.c]
Don't include <sys/vfs.h> in NetBSD
Do include <sys/mount.h> in NetBSD
Cleanup some lint.
Mon Oct 26 17:59:01 1993 Erik Bos
* [include/int21.h]
Added.
* [loader/int21.c]
Added support for many dos ints.
* [misc/file.c] [include/files.h]
Moved OPEN_MAX and DosDriveStruct to files.h.
Sun Oct 24 13:36:50 1993 David Metcalfe <david@prism.demon.co.uk>
* [controls/button.c]
Implemented CHECKBOX, AUTOCHECKBOX, 3STATE, AUTO3STATE,
RADIOBUTTON, AUTORADIOBUTTON, GROUPBOX controls, together with
a preliminary USERBUTTON control.
* [objects/text.c]
Corrected bugs in TEXT_NextLine() and added handling of prefix
character.
* [controls/button.c]
Disabled focus handling by commenting out SetFocus() calls until
serious bug can be found.
Oct 20, 93 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [controls/listbox.c]
Listbox control window
Painting cleanup, new messages processed.
* [controls/scroll.c]
Scroll bar control window
Painting cleanup.
* [controls/combo.c]
Combo box control window
Painting cleanup.
Tue Oct 12 17:50:11 1993 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c] [objects/palette.c] [windows/syscolor.c]
Better support for the private color map.
Using a private map is now the default.
* [windows/win.c]
Bug fix.
* [include/dialog.h] [windows/dialog.c]
Implemented CreateDialog*() and IsDialogMessage().
* [misc/xt.c] [windows/defwnd.c]
Moved DefWindowProc() to defwnd.c.
Added WM_NCCREATE, WM_NCDESTROY and WM_CTLCOLOR handling.
* [windows/defdlg.c]
Started the implementation of DefDlgProc().
* [windows/win.c]
Added WM_NCCREATE and WM_NCDESTROY messages.
Implemented IsChild().
Tue Oct 12 17:50:20 1993 David Metcalfe <david@prism.demon.co.uk>
* [windows/focus.c]
Implemented GetFocus() and SetFocus().
* [windows/event.c]
Added processing of FocusIn and FocusOut events.
* [windows/graphics.c]
Added DrawFocusRect().
Sat Oct 9 14:36:57 1993 Erik Bos
* [loader/int1a.c]
Added more function handling.
Wed Oct 6 12:21:22 1993 Erik Bos
* [loader/signal.c]
Split signal.c into int1a.c, int21.c and signal.c.
Tue Oct 5 22:12:40 1993 David Metcalfe
* [controls/static.c] [control/widgets.c]
Static control class.
* [objects/text.c]
Added processing of additional DT_ flags to DrawText().
* [windows/win.c] [misc/xt.c]
Added SetWindowText() and WM_SETTEXT processing.
Tue Oct 5 22:12:40 1993 Martin Ayotte
* [controls/listbox.c]
Listbox control window
* [controls/scroll.c]
Scroll bar control window
* [controls/combo.c]
Combo box control window
* [include/combo.h]
Combo box definitions
* [include/listbox.h]
Listbox definitions
* [include/scroll.h]
Scroll bar definitions
Sat Oct 2 09:35:54 1993 Bob Amstadt (bob at pooh)
* [if1632/callback.c]
Fixed bug in MakeProcInstance().
* [debugger/info.c]
Changed x/w and x/b to display in hex.
* [debugger/i386-pinsn.c]
Added code to properly unassemble 16-bit indexing.
Fri Oct 1 08:29:05 1993 Bob Amstadt (bob at pooh)
* [loader/files.c] [misc/profile.c]
System initialization file is now called "wine.ini" and can
be located in the current directory, the user's home directory,
or any directories specified in the WINEPATH environment variable.
* [tools/build.c] [if1632/call.S] [include/regfunc.h]
Changed register function stack to match sigcontext structure.
Thu Sep 30 22:30:21 1993 Bob Amstadt (bob at pooh)
* [loader/files.c]
Created function to search a path for files to load.
* [loader/wine.c]
Modified exe and dll file loading to search through path
specified by the environment variable WINEPATH.
Thu Sep 30 22:30:21 1993 Eric Youngdale
* [loader/signal.c]
Bug fix.
Thu Sep 30 22:30:21 1993 John Brezak
* [debugger/dbg.y] [debugger/debug.l] [debugger/dtest.c]
[debugger/obstack.h]
Updates to allow debugger to function under NetBSD.
diff --git a/objects/Makefile b/objects/Makefile
index f1dcd06..cb70d89 100644
--- a/objects/Makefile
+++ b/objects/Makefile
@@ -9,7 +9,7 @@
$(LD) -r -o objects.o $(OBJS)
clean:
- rm -f *.o *~ *.s dll_* *.a
+ rm -f *.o *~ *.s dll_* *.a *#
depend:
$(CC) $(CFLAGS) -M *.c > .depend
diff --git a/objects/color.c b/objects/color.c
index a57b46e..0215d47 100644
--- a/objects/color.c
+++ b/objects/color.c
@@ -19,6 +19,7 @@
* We try to use a private color map if possible, because Windows programs
* assume that palette(0) == Black and palette(max-1) == White.
*/
+#define USE_PRIVATE_MAP
Colormap COLOR_WinColormap = 0;
@@ -71,11 +72,39 @@
*
* Fill the private colormap.
*/
+#ifdef USE_PRIVATE_MAP
+
static BOOL COLOR_BuildMap( Colormap map, int depth, int size )
{
XColor color;
int i;
+ /* Fill the whole map with a range of colors */
+
+ if ((1 << depth) > NB_SYS_COLORS)
+ {
+ int red_incr, green_incr, blue_incr;
+ int r, g, b;
+
+ blue_incr = 0x10000 >> (depth / 3);
+ red_incr = 0x10000 >> ((depth + 1) / 3);
+ green_incr = 0x10000 >> ((depth + 2) / 3);
+
+ for (i = 0, r = red_incr - 1; r < 0x10000; r += red_incr)
+ for (g = green_incr - 1; g < 0x10000; g += green_incr)
+ for (b = blue_incr - 1; b < 0x10000; b += blue_incr)
+ {
+ if (i >= size) break;
+ color.pixel = i++;
+ color.red = r;
+ color.green = g;
+ color.blue = b;
+ XStoreColor( XT_display, map, &color );
+ }
+ }
+
+ /* Store the system palette colors */
+
for (i = 0; i < NB_SYS_COLORS; i++)
{
if (!XParseColor( XT_display, map, SysColors[i], &color ))
@@ -86,7 +115,7 @@
}
return TRUE;
}
-
+#endif /* USE_PRIVATE_MAP */
/***********************************************************************
* COLOR_Init
@@ -117,7 +146,7 @@
case StaticColor:
case TrueColor:
COLOR_FillDefaultMap();
- COLOR_WinColormap = CopyFromParent;
+ COLOR_WinColormap = DefaultColormapOfScreen( XT_screen );
break;
}
return TRUE;
diff --git a/objects/font.c b/objects/font.c
index c30fcec..1299a26 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -330,3 +330,38 @@
return TRUE;
}
+
+/***********************************************************************
+ * GetCharWidth (GDI.350)
+ */
+BOOL GetCharWidth(HDC hdc, WORD wFirstChar, WORD wLastChar, LPINT lpBuffer)
+{
+ int i, j;
+ XFontStruct *xfont;
+ XCharStruct *charPtr;
+ int default_width;
+
+ DC *dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC);
+ if (!dc) return FALSE;
+ xfont = dc->u.x.font.fstruct;
+
+ /* fixed font? */
+ if (xfont->per_char == NULL)
+ {
+ for (i = wFirstChar, j = 0; i <= wLastChar; i++, j++)
+ *(lpBuffer + j) = xfont->max_bounds.width;
+ return TRUE;
+ }
+
+ charPtr = xfont->per_char;
+ default_width = (charPtr + xfont->default_char)->width;
+
+ for (i = wFirstChar, j = 0; i <= wLastChar; i++, j++)
+ {
+ if (i < xfont->min_char_or_byte2 || i > xfont->max_char_or_byte2)
+ *(lpBuffer + j) = default_width;
+ else
+ *(lpBuffer + j) = charPtr->width;
+ }
+ return TRUE;
+}
diff --git a/objects/palette.c b/objects/palette.c
index ec69700..3b101b2 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -33,7 +33,6 @@
{
int i, size;
XColor color;
- Colormap map;
HPALETTE hpalette;
LOGPALETTE * palPtr;
@@ -44,13 +43,10 @@
palPtr->palNumEntries = size;
memset( palPtr->palPalEntry, 0xff, size*sizeof(PALETTEENTRY) );
- if ((map = COLOR_WinColormap) == CopyFromParent)
- map = DefaultColormapOfScreen( XT_screen );
-
for (i = 0; i < size; i++)
{
color.pixel = i;
- XQueryColor( XT_display, map, &color );
+ XQueryColor( XT_display, COLOR_WinColormap, &color );
palPtr->palPalEntry[i].peRed = color.red >> 8;
palPtr->palPalEntry[i].peGreen = color.green >> 8;
palPtr->palPalEntry[i].peBlue = color.blue >> 8;
@@ -136,7 +132,8 @@
palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hpalette, PALETTE_MAGIC );
if (!palPtr) return 0;
- if (COLOR_WinColormap && (hpalette == STOCK_DEFAULT_PALETTE))
+ if ((COLOR_WinColormap != DefaultColormapOfScreen(XT_screen)) &&
+ (hpalette == STOCK_DEFAULT_PALETTE))
{
if ((color & 0xffffff) == 0) return 0; /* Entry 0 is black */
if ((color & 0xffffff) == 0xffffff) /* Max entry is white */
diff --git a/objects/text.c b/objects/text.c
index 97ff35b..bbb2740 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -17,6 +17,159 @@
#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)
@@ -24,17 +177,77 @@
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;
- 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;
+ GetTextMetrics(hdc, &tm);
+ if (flags & DT_EXTERNALLEADING)
+ lh = tm.tmHeight + tm.tmExternalLeading;
+ else
+ lh = tm.tmHeight;
- if (!TextOut( hdc, x, y, str, count )) return 0;
+ 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 (!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);
+
return 1;
}
