Release 0.6
Tue Jan 4 13:01:33 1994 David Metcalfe <david@prism.demon.co.uk>
* [window/caret.c]
Modified code to use system timer.
Jan 9, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [windows/win.c]
Windows create if required new XLIB MenuBar & CaptionBar.
* [windows/defwnd.c]
WM_CALCSIZE Move & Resize caption, menubar & scrollbars.
(I'm not sure it's the good place for it, but it work...)
* [loader/resource.c]
optimize in FindResourceByNumber, make lseek() if next type ...
* [controls/scroll.c]
scrollbar buttons are now using system resources bitmaps.
* [controls/caption.c] - new file ...
captionbar showing title, close button with SysMenu,
and other buttons using system resources bitmaps.
* [controls/menu.c]
New functions: SetMenuItemBitmaps() with 'glues',
Make new version of LoadMenu() & ParseMenu(),
( put #define USE_POPUPMENU ).
Implementation of MenuBar functions.
* [sysres.dll]
New bitmaps for system such OBM_CLOSE, OBM_MINIMIZE, OBM_UPARROWI.
New SYSMENU menu, it don't work yet ! :-((
Tue Jan 11 05:27:45 1994 julliard@di.epfl.ch (Alexandre Julliard
* [memory/atom.c]
Fixed a bug that could cause atoms to be case-sensitive.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/clipping.c]
Bug fix when setting the clip mask to an empty region.
* [windows/dce.c]
Bug fix in ReleaseDC().
* [windows/dialog.c]
Call AdjustWindowRectEx() before creating the dialog window.
Added support for DS_MODALFRAME style.
* [windows/event.c]
Cleaned up event handling and removed old Xt stuff.
Moved double-click handling to windows/message.c
* [windows/focus.c]
Bug fix: only set the X focus when the window is viewable.
* [windows/graphics.c]
Rewritten DrawReliefRect() to use brush instead of pen, and
to use the system colors.
* [windows/message.c]
Implemented WM_NCHITTEST message sending, and non-client
mouse messages.
Cleaned up double-click handling, and removed the Xt code.
* [windows/nonclient.c] (New file)
Implemented AdjustWindowRect().
Implemented WM_NCCALCSIZE, WM_NCHITTEST and WM_NCPAINT handling.
* [windows/painting.c]
Added sending of the WM_NCPAINT message in BeginPaint().
* [windows/sysmetrics.c] [include/sysmetrics.h] (New files)
Implemented system metrics.
* [windows/win.c]
Bug fix in setting the parent and owner in CreateWindow().
Removed the Xt code.
* [windows/winpos.c]
Added sending of the WM_NCPAINT message in SetWindowPos().
Removed the Xt code.
diff --git a/windows/caret.c b/windows/caret.c
index eb78dc8..566e321 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -6,12 +6,8 @@
static char Copyright[] = "Copyright David Metcalfe, 1993";
-#include <X11/Intrinsic.h>
-
#include "windows.h"
-extern XtAppContext XT_app_context;
-
typedef struct
{
HWND hwnd;
@@ -23,49 +19,46 @@
short height;
COLORREF color;
WORD timeout;
- XtIntervalId xtid;
+ WORD timerid;
} CARET;
static CARET Caret;
static BOOL LockCaret;
-static void CARET_Callback(XtPointer data, XtIntervalId *xtid);
-static void CARET_HideCaret(CARET *pCaret);
+static WORD CARET_Callback(HWND hwnd, WORD msg, WORD timerid, LONG ctime);
+static void CARET_HideCaret();
/*****************************************************************
* CARET_Callback
*/
-static void CARET_Callback(XtPointer data, XtIntervalId *xtid)
+static WORD CARET_Callback(HWND hwnd, WORD msg, WORD timerid, LONG ctime)
{
- CARET *pCaret = (CARET *)data;
HDC hdc;
HBRUSH hBrush;
HRGN rgn;
#ifdef DEBUG_CARET
- printf("CARET_Callback: LockCaret=%d, hidden=%d, on=%d\n",
- LockCaret, pCaret->hidden, pCaret->on);
+ printf("CARET_Callback: id=%d: LockCaret=%d, hidden=%d, on=%d\n",
+ timerid, LockCaret, Caret.hidden, Caret.on);
#endif
- if (!LockCaret && (!pCaret->hidden || pCaret->on))
+ if (!LockCaret && (!Caret.hidden || Caret.on))
{
- pCaret->on = (pCaret->on ? FALSE : TRUE);
- hdc = GetDC(pCaret->hwnd);
- hBrush = CreateSolidBrush(pCaret->color);
+ Caret.on = (Caret.on ? FALSE : TRUE);
+ hdc = GetDC(Caret.hwnd);
+ hBrush = CreateSolidBrush(Caret.color);
SelectObject(hdc, (HANDLE)hBrush);
SetROP2(hdc, R2_XORPEN);
- rgn = CreateRectRgn(pCaret->x, pCaret->y,
- pCaret->x + pCaret->width,
- pCaret->y + pCaret->height);
+ rgn = CreateRectRgn(Caret.x, Caret.y,
+ Caret.x + Caret.width,
+ Caret.y + Caret.height);
FillRgn(hdc, rgn, hBrush);
DeleteObject((HANDLE)rgn);
DeleteObject((HANDLE)hBrush);
- ReleaseDC(pCaret->hwnd, hdc);
+ ReleaseDC(Caret.hwnd, hdc);
}
-
- pCaret->xtid = XtAppAddTimeOut(XT_app_context, pCaret->timeout,
- CARET_Callback, pCaret);
+ return 0;
}
@@ -73,24 +66,24 @@
* CARET_HideCaret
*/
-static void CARET_HideCaret(CARET *pCaret)
+static void CARET_HideCaret()
{
HDC hdc;
HBRUSH hBrush;
HRGN rgn;
- pCaret->on = FALSE;
- hdc = GetDC(pCaret->hwnd);
- hBrush = CreateSolidBrush(pCaret->color);
+ Caret.on = FALSE;
+ hdc = GetDC(Caret.hwnd);
+ hBrush = CreateSolidBrush(Caret.color);
SelectObject(hdc, (HANDLE)hBrush);
SetROP2(hdc, R2_XORPEN);
- rgn = CreateRectRgn(pCaret->x, pCaret->y,
- pCaret->x + pCaret->width,
- pCaret->y + pCaret->height);
+ rgn = CreateRectRgn(Caret.x, Caret.y,
+ Caret.x + Caret.width,
+ Caret.y + Caret.height);
FillRgn(hdc, rgn, hBrush);
DeleteObject((HANDLE)rgn);
DeleteObject((HANDLE)hBrush);
- ReleaseDC(pCaret->hwnd, hdc);
+ ReleaseDC(Caret.hwnd, hdc);
}
@@ -102,6 +95,7 @@
{
if (!hwnd) return;
+
/* if cursor already exists, destroy it */
/* if (Caret.hwnd)
DestroyCaret();
@@ -131,8 +125,11 @@
Caret.timeout = 750;
LockCaret = FALSE;
- Caret.xtid = XtAppAddTimeOut(XT_app_context, Caret.timeout,
- CARET_Callback, &Caret);
+ Caret.timerid = SetSystemTimer(NULL, 0, Caret.timeout, CARET_Callback);
+
+#ifdef DEBUG_CARET
+ printf("CreateCaret: hwnd=%d, timerid=%d\n", hwnd, Caret.timerid);
+#endif
}
@@ -144,10 +141,14 @@
{
/* if (!Caret.hwnd) return;
*/
- XtRemoveTimeOut(Caret.xtid);
+#ifdef DEBUG_CARET
+ printf("DestroyCaret: timerid\n", Caret.timerid);
+#endif
+
+ KillSystemTimer(NULL, Caret.timerid);
if (Caret.on)
- CARET_HideCaret(&Caret);
+ CARET_HideCaret();
Caret.hwnd = 0; /* cursor marked as not existing */
}
@@ -171,7 +172,7 @@
LockCaret = TRUE;
if (Caret.on)
- CARET_HideCaret(&Caret);
+ CARET_HideCaret();
Caret.x = x;
Caret.y = y;
@@ -189,7 +190,7 @@
LockCaret = TRUE;
if (Caret.on)
- CARET_HideCaret(&Caret);
+ CARET_HideCaret();
++Caret.hidden;
LockCaret = FALSE;
@@ -221,7 +222,9 @@
{
if (!Caret.hwnd) return;
+ KillSystemTimer(NULL, Caret.timerid);
Caret.timeout = msecs;
+ Caret.timerid = SetSystemTimer(NULL, 0, Caret.timeout, CARET_Callback);
}
