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/controls/scroll.c b/controls/scroll.c
new file mode 100644
index 0000000..83816f5
--- /dev/null
+++ b/controls/scroll.c
@@ -0,0 +1,379 @@
+/*
+ * Interface code to SCROLLBAR widget
+ *
+ * Copyright Martin Ayotte, 1993
+ *
+ */
+
+/*
+#define DEBUG_SCROLL
+*/
+
+static char Copyright[] = "Copyright Martin Ayotte, 1993";
+
+#include <X11/Intrinsic.h>
+#include <X11/StringDefs.h>
+#include "windows.h"
+#include "scroll.h"
+#include "heap.h"
+#include "win.h"
+#include "dirent.h"
+#include <sys/stat.h>
+
+LPHEADSCROLL ScrollBarGetWindowAndStorage(HWND hwnd, WND **wndPtr);
+LPHEADSCROLL ScrollBarGetStorageHeader(HWND hwnd);
+void StdDrawScrollBar(HWND hwnd);
+int CreateScrollBarStruct(HWND hwnd);
+
+
+void SCROLLBAR_CreateScrollBar(LPSTR className, LPSTR scrollLabel, HWND hwnd)
+{
+ WND *wndPtr = WIN_FindWndPtr(hwnd);
+ WND *parentPtr = WIN_FindWndPtr(wndPtr->hwndParent);
+ DWORD style;
+ char widgetName[15];
+
+#ifdef DEBUG_SCROLLBAR
+ printf("scroll: label = %s, x = %d, y = %d\n", scrollLabel,
+ wndPtr->rectClient.left, wndPtr->rectClient.top);
+ printf(" width = %d, height = %d\n",
+ wndPtr->rectClient.right - wndPtr->rectClient.left,
+ wndPtr->rectClient.bottom - wndPtr->rectClient.top);
+#endif
+
+ if (!wndPtr)
+ return;
+
+ style = wndPtr->dwStyle & 0x0000FFFF;
+/*
+ if ((style & SBS_NOTIFY) == SBS_NOTIFY)
+*/
+ sprintf(widgetName, "%s%d", className, wndPtr->wIDmenu);
+ wndPtr->winWidget = XtVaCreateManagedWidget(widgetName,
+ compositeWidgetClass,
+ parentPtr->winWidget,
+ XtNx, wndPtr->rectClient.left,
+ XtNy, wndPtr->rectClient.top,
+ XtNwidth, wndPtr->rectClient.right -
+ wndPtr->rectClient.left,
+ XtNheight, wndPtr->rectClient.bottom -
+ wndPtr->rectClient.top,
+ NULL );
+ GlobalUnlock(hwnd);
+ GlobalUnlock(wndPtr->hwndParent);
+}
+
+
+
+/***********************************************************************
+ * WIDGETS_ScrollBarWndProc
+ */
+LONG SCROLLBAR_ScrollBarWndProc( HWND hwnd, WORD message,
+ WORD wParam, LONG lParam )
+{
+ WORD wRet;
+ short x, y;
+ WND *wndPtr;
+ LPHEADSCROLL lphs;
+ RECT rect;
+ static RECT rectsel;
+ switch(message)
+ {
+ case WM_CREATE:
+ CreateScrollBarStruct(hwnd);
+#ifdef DEBUG_SCROLL
+ printf("ScrollBar Creation up=%X down=%X!\n", lphs->hWndUp, lphs->hWndDown);
+#endif
+ return 0;
+ case WM_DESTROY:
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ DestroyWindow(lphs->hWndUp);
+ DestroyWindow(lphs->hWndDown);
+ free(lphs);
+ printf("ScrollBar WM_DESTROY !\n");
+ return 0;
+
+ case WM_COMMAND:
+#ifdef DEBUG_SCROLL
+ printf("ScrollBar WM_COMMAND wParam=%X lParam=%lX !\n", wParam, lParam);
+#endif
+ lphs = ScrollBarGetWindowAndStorage(hwnd, &wndPtr);
+ if (HIWORD(lParam) != BN_CLICKED) return 0;
+ if (LOWORD(lParam) == lphs->hWndUp)
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_LINEUP, MAKELONG(0, hwnd));
+ if (LOWORD(lParam) == lphs->hWndDown)
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_LINEDOWN, MAKELONG(0, hwnd));
+ return 0;
+
+ case WM_LBUTTONDOWN:
+ lphs = ScrollBarGetWindowAndStorage(hwnd, &wndPtr);
+ GetClientRect(hwnd, &rect);
+ if (lphs->Direction == WM_VSCROLL) {
+ y = HIWORD(lParam);
+#ifdef DEBUG_SCROLL
+ printf("WM_LBUTTONDOWN y=%d cur+right=%d %d\n",
+ y, lphs->CurPix + rect.right, lphs->CurPix + (rect.right << 1));
+#endif
+ if (y < (lphs->CurPix + rect.right))
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_PAGEUP, MAKELONG(0, hwnd));
+ if (y > (lphs->CurPix + (rect.right << 1)))
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_PAGEDOWN, MAKELONG(0, hwnd));
+ if ((y > (lphs->CurPix + rect.right)) &&
+ (y < (lphs->CurPix + (rect.right << 1)))) {
+ lphs->ThumbActive = TRUE;
+#ifdef DEBUG_SCROLL
+ printf("THUMB DOWN !\n");
+#endif
+ }
+ }
+ else {
+ x = LOWORD(lParam);
+#ifdef DEBUG_SCROLL
+ printf("WM_LBUTTONDOWN x=%d Cur+bottom=%d %d\n",
+ x, lphs->CurPix + rect.bottom, lphs->CurPix + (rect.bottom << 1));
+#endif
+ if (x < (lphs->CurPix + rect.bottom))
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_PAGEUP, MAKELONG(0, hwnd));
+ if (x > (lphs->CurPix + (rect.bottom << 1)))
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_PAGEDOWN, MAKELONG(0, hwnd));
+ if ((x > (lphs->CurPix + rect.bottom)) &&
+ (x < (lphs->CurPix + (rect.bottom << 1)))) {
+ lphs->ThumbActive = TRUE;
+#ifdef DEBUG_SCROLL
+ printf("THUMB DOWN !\n");
+#endif
+ }
+ }
+ break;
+ case WM_LBUTTONUP:
+ lphs->ThumbActive = FALSE;
+ break;
+
+ case WM_KEYDOWN:
+ printf("ScrollBar WM_KEYDOWN wParam %X!\n", wParam);
+ break;
+ case WM_PAINT:
+ StdDrawScrollBar(hwnd);
+ break;
+ case WM_MOUSEMOVE:
+ if ((wParam & MK_LBUTTON) != 0) {
+ lphs = ScrollBarGetWindowAndStorage(hwnd, &wndPtr);
+ if (lphs->ThumbActive == 0) break;
+ GetClientRect(hwnd, &rect);
+ if (lphs->Direction == WM_VSCROLL)
+ y = HIWORD(lParam) - rect.right - (rect.right >> 1);
+ else
+ y = LOWORD(lParam) - rect.bottom - (rect.bottom >> 1);
+ x = (y * (lphs->MaxVal - lphs->MinVal) /
+ lphs->MaxPix) + lphs->MinVal;
+#ifdef DEBUG_SCROLL
+ printf("WM_MOUSEMOVE val=%d pix=%d\n", x, y);
+#endif
+ SendMessage(wndPtr->hwndParent, lphs->Direction,
+ SB_THUMBTRACK, MAKELONG(x, hwnd));
+ }
+ break;
+ default:
+ return DefWindowProc( hwnd, message, wParam, lParam );
+ }
+return(0);
+}
+
+
+
+LPHEADSCROLL ScrollBarGetWindowAndStorage(HWND hwnd, WND **wndPtr)
+{
+ WND *Ptr;
+ LPHEADSCROLL lphs;
+ *(wndPtr) = Ptr = WIN_FindWndPtr(hwnd);
+ lphs = *((LPHEADSCROLL *)&Ptr->wExtra[1]);
+ return lphs;
+}
+
+
+LPHEADSCROLL ScrollBarGetStorageHeader(HWND hwnd)
+{
+ WND *wndPtr;
+ LPHEADSCROLL lphs;
+ wndPtr = WIN_FindWndPtr(hwnd);
+ lphs = *((LPHEADSCROLL *)&wndPtr->wExtra[1]);
+ return lphs;
+}
+
+
+void StdDrawScrollBar(HWND hwnd)
+{
+ LPHEADSCROLL lphs;
+ PAINTSTRUCT ps;
+ HBRUSH hBrush;
+ HDC hdc;
+ RECT rect;
+ UINT i, w, h, siz;
+ char C[128];
+ hdc = BeginPaint( hwnd, &ps );
+ hBrush = SendMessage(GetParent(hwnd), WM_CTLCOLOR, (WORD)hdc,
+ MAKELONG(hwnd, CTLCOLOR_SCROLLBAR));
+ if (hBrush == (HBRUSH)NULL) hBrush = GetStockObject(LTGRAY_BRUSH);
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) goto EndOfPaint;
+ GetClientRect(hwnd, &rect);
+ w = rect.right - rect.left;
+ h = rect.bottom - rect.top;
+ if (lphs->Direction == WM_VSCROLL) {
+ rect.top += w;
+ rect.bottom -= w;
+ }
+ else {
+ rect.left += h;
+ rect.right -= h;
+ }
+ FillRect(hdc, &rect, hBrush);
+ if (lphs->Direction == WM_VSCROLL)
+ SetRect(&rect, 0, lphs->CurPix + w,
+ w, lphs->CurPix + (w << 1));
+ else
+ SetRect(&rect, lphs->CurPix + h,
+ 0, lphs->CurPix + (h << 1), h);
+ FrameRect(hdc, &rect, GetStockObject(BLACK_BRUSH));
+ InflateRect(&rect, -1, -1);
+ FillRect(hdc, &rect, GetStockObject(LTGRAY_BRUSH));
+ DrawReliefRect(hdc, rect, 2, 0);
+ InflateRect(&rect, -3, -3);
+ DrawReliefRect(hdc, rect, 1, 1);
+EndOfPaint:
+ EndPaint( hwnd, &ps );
+ InvalidateRect(lphs->hWndUp, NULL, TRUE);
+ UpdateWindow(lphs->hWndUp);
+ InvalidateRect(lphs->hWndDown, NULL, TRUE);
+ UpdateWindow(lphs->hWndDown);
+}
+
+
+
+int CreateScrollBarStruct(HWND hwnd)
+{
+ RECT rect;
+ int width, height;
+ WND *wndPtr;
+ LPHEADSCROLL lphs;
+ wndPtr = WIN_FindWndPtr(hwnd);
+ lphs = (LPHEADSCROLL)malloc(sizeof(HEADSCROLL));
+ *((LPHEADSCROLL *)&wndPtr->wExtra[1]) = lphs;
+ lphs->ThumbActive;
+ lphs->MinVal = 0;
+ lphs->MaxVal = 100;
+ lphs->CurVal = 0;
+ lphs->CurPix = 0;
+ width = wndPtr->rectClient.right - wndPtr->rectClient.left;
+ height = wndPtr->rectClient.bottom - wndPtr->rectClient.top;
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) return 0;
+ if (width <= height)
+ {
+ lphs->MaxPix = height - 3 * width;
+ lphs->Direction = WM_VSCROLL;
+ lphs->hWndUp = CreateWindow("BUTTON", "",
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ 0, 0, width, width, hwnd, 1, wndPtr->hInstance, 0L);
+ lphs->hWndDown = CreateWindow("BUTTON", "",
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ 0, height - width, width, width, hwnd, 2,
+ wndPtr->hInstance, 0L);
+ }
+ else
+ {
+ lphs->MaxPix = width - 3 * height;
+ lphs->Direction = WM_HSCROLL;
+ lphs->hWndUp = CreateWindow("BUTTON", "",
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ 0, 0, height, height, hwnd, 0, wndPtr->hInstance, 0L);
+ lphs->hWndDown = CreateWindow("BUTTON", "",
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ width - height, 0, height, height, hwnd, 0,
+ wndPtr->hInstance, 0L);
+ }
+ if (lphs->MaxPix < 1) lphs->MaxPix = 1;
+ return TRUE;
+}
+
+
+
+int GetScrollPos(HWND hwnd, int nBar)
+{
+ LPHEADSCROLL lphs;
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) return;
+ return lphs->CurVal;
+}
+
+
+
+void GetScrollRange(HWND hwnd, int nBar, LPINT lpMin, LPINT lpMax)
+{
+ LPHEADSCROLL lphs;
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) return;
+ *lpMin = lphs->MinVal;
+ *lpMax = lphs->MaxVal;
+}
+
+
+
+int SetScrollPos(HWND hwnd, int nBar, int nPos, BOOL bRedraw)
+{
+ int nRet;
+ LPHEADSCROLL lphs;
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) return;
+ nRet = lphs->CurVal;
+ lphs->CurVal = (short)nPos;
+ if (lphs->MaxVal != lphs->MinVal)
+ lphs->CurPix = lphs->MaxPix * (abs((short)nPos) - abs(lphs->MinVal)) /
+ (abs(lphs->MaxVal) - abs(lphs->MinVal));
+ if (lphs->CurPix > lphs->MaxPix) lphs->CurPix = lphs->MaxPix;
+#ifdef DEBUG_SCROLL
+ printf("SetScrollPos val=%d pixval=%d pixmax%d\n",
+ (short)nPos, lphs->CurPix, lphs->MaxPix);
+ printf("SetScrollPos min=%d max=%d\n",
+ lphs->MinVal, lphs->MaxVal);
+#endif
+ if (bRedraw) {
+ InvalidateRect(hwnd, NULL, TRUE);
+ UpdateWindow(hwnd);
+ }
+ return nRet;
+}
+
+
+
+void SetScrollRange(HWND hwnd, int nBar, int MinPos, int MaxPos, BOOL bRedraw)
+{
+ LPHEADSCROLL lphs;
+ lphs = ScrollBarGetStorageHeader(hwnd);
+ if (lphs == NULL) return;
+ lphs->MinVal = (short)MinPos;
+ lphs->MaxVal = (short)MaxPos;
+ if (lphs->MaxVal != lphs->MinVal)
+ lphs->CurPix = abs(lphs->MaxVal) *
+ (abs(lphs->CurVal) - abs(lphs->MinVal)) /
+ (abs(lphs->MaxVal) - abs(lphs->MinVal));
+ if (lphs->CurPix > lphs->MaxPix) lphs->CurPix = lphs->MaxPix;
+#ifdef DEBUG_SCROLL
+ printf("SetScrollRange min=%d max=%d\n", lphs->MinVal, lphs->MaxVal);
+#endif
+ if (bRedraw) {
+ InvalidateRect(hwnd, NULL, TRUE);
+ UpdateWindow(hwnd);
+ }
+}
+
+
+
+
+
