dwindows: win/dw.c comparison

comparison win/dw.c @ 527:e0ea29c3d1eb

Fixed dw_window_pointer() so it works on Windows. Tried to fix the timer problems on Windows, but only managed to reduce the problem and eliminate obsolete timer code. Fixed a calling convention problem caused by incorrect placement of the definition of API in the compat.h header. Make dw_beep() not block on OS/2 and Windows.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 23 Mar 2004 11:00:04 +0000
parents	d3ce0afa6cf5
children	79696a852401

comparison

equal deleted inserted replaced

-:d3ce0afa6cf5
+:e0ea29c3d1eb
 #include <stdio.h>
 #include <process.h>
 #include <time.h>
 #include "dw.h"
-HWND popup = (HWND)NULL, hwndBubble = (HWND)NULL, hwndBubbleLast, DW_HWND_OBJECT = (HWND)NULL;
+HWND popup = (HWND)NULL, hwndBubble = (HWND)NULL, DW_HWND_OBJECT = (HWND)NULL;
 HINSTANCE DWInstance = NULL;
 DWORD dwVersion = 0, dwComctlVer = 0;
 DWTID _dwtid = -1;
 			if(tmp->message == msg || msg == WM_COMMAND || msg == WM_NOTIFY || tmp->message == WM_USER+1)
 			{
 				switch(msg)
 				{
 				case WM_TIMER:
-				{
-					int (*timerfunc)(void *) = tmp->signalfunction;
-					if(tmp->id == (int)mp1)
 					{
-						if(!timerfunc(tmp->data))
+						if(!hWnd)
-							dw_timer_disconnect(tmp->id);
+						{
-						tmp = NULL;
+							int (*timerfunc)(void *) = tmp->signalfunction;
+							if(tmp->id == (int)mp1)
+							{
+								if(!timerfunc(tmp->data))
+									dw_timer_disconnect(tmp->id);
+								tmp = NULL;
+							}
+						}
+						result = 0;
 					}
-					result = 0;
+					break;
-				}
-				break;
 				case WM_SETFOCUS:
 					{
 						int (*setfocusfunc)(HWND, void *) = (int (*)(HWND, void *))tmp->signalfunction;
 						if(hWnd == tmp->window)
 			/* Free memory before destroying */
 			_free_window_memory(hWnd, 0);
 			EnumChildWindows(hWnd, _free_window_memory, 0);
 		}
 		break;
+	case WM_MOUSEMOVE:
+		{
+			HCURSOR cursor;
+			if((cursor = (HCURSOR)dw_window_get_data(hWnd, "_dw_cursor")) ||
+			   (cursor = (HCURSOR)dw_window_get_data(_toplevel_window(hWnd), "_dw_cursor")))
+			{
+				SetCursor(cursor);
+			}
+		}
+		break;
 	case WM_CTLCOLORSTATIC:
 	case WM_CTLCOLORLISTBOX:
 	case WM_CTLCOLORBTN:
 	case WM_CTLCOLOREDIT:
 	case WM_CTLCOLORMSGBOX:
 		SetActiveWindow(hWnd);
 		SetFocus(hWnd);
 		break;
 	case WM_COMMAND:
 	case WM_NOTIFY:
+	case WM_MOUSEMOVE:
 		_wndproc(hWnd, msg, mp1, mp2);
 		break;
 #if 0
 	case WM_ERASEBKGND:
 		{
 {
 	ColorInfo *cinfo;
 	cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	if(msg == WM_MOUSEMOVE)
+		_wndproc(hWnd, msg, mp1, mp2);
 	if(cinfo)
 	{
 		switch( msg )
 		{
 		case WM_LBUTTONDOWN:
 	cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 	GetClassName(hWnd, tmpbuf, 99);
 	if(strcmp(tmpbuf, FRAMECLASSNAME) == 0)
 		cinfo = &(((Box *)cinfo)->cinfo);
+	if(msg == WM_MOUSEMOVE)
+		_wndproc(hWnd, msg, mp1, mp2);
 	if(cinfo)
 	{
 		pOldProc = cinfo->pOldProc;
 	switch( msg )
 	{
 	case WM_COMMAND:
 	case WM_NOTIFY:
+	case WM_MOUSEMOVE:
 		_wndproc(hWnd, msg, mp1, mp2);
 		break;
 	case WM_LBUTTONDBLCLK:
 	case WM_CHAR:
 		{
 	cinfo = (ContainerInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 	switch( msg )
 	{
+	case WM_MOUSEMOVE:
+		_wndproc(hWnd, msg, mp1, mp2);
+		break;
 	case WM_CHAR:
 		if(LOWORD(mp1) == '\t')
 		{
 			if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
 				_shift_focus_back(hWnd);
 /* This handles drawing the status text areas */
 BOOL CALLBACK _statuswndproc(HWND hwnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
 	switch (msg)
 	{
+	case WM_MOUSEMOVE:
+		_wndproc(hwnd, msg, mp1, mp2);
+		break;
 	case WM_SETTEXT:
 		{
 			/* Make sure the control redraws when there is a text change */
 			int ret = (int)DefWindowProc(hwnd, msg, mp1, mp2);
 		if(mp1 == VK_LEFT || mp1 == VK_UP)
 			_shift_focus_back(hwnd);
 		if(mp1 == VK_RIGHT || mp1 == VK_DOWN)
 			_shift_focus(hwnd);
 		break;
-	case WM_TIMER:
-		if (hwndBubble)
-		{
-			_free_window_memory(hwndBubble, 0);
-			DestroyWindow(hwndBubble);
-			hwndBubble = 0;
-			KillTimer(hwnd, 1);
-		}
-		break;
 	case WM_MOUSEMOVE:
 		GetCursorPos(&point);
 		GetWindowRect(hwnd, &rect);
 		if(PtInRect(&rect, point))
 				if(hwndBubble)
 				{
 					_free_window_memory(hwndBubble, 0);
 					DestroyWindow(hwndBubble);
 					hwndBubble = 0;
-					KillTimer(hwndBubbleLast, 1);
 				}
 				if(!hwndBubble)
 				{
 					POINTL ptlWork = {0,0};
 												NULL);
 					dw_window_set_font(hwndBubble, DefaultFont);
 					dw_window_set_color(hwndBubble, DW_CLR_BLACK, DW_CLR_YELLOW);
-					hwndBubbleLast = hwnd;
 					SetTimer(hwnd, 1, 3000, NULL);
 					hFont = (HFONT)SendMessage(hwndBubble, WM_GETFONT, 0, 0);
 					hdc = GetDC(hwndBubble);
 			{
 				bMouseOver = 0;
 				_free_window_memory(hwndBubble, 0);
 				DestroyWindow(hwndBubble);
 				hwndBubble = 0;
-				KillTimer(hwndBubbleLast, 1);
 			}
 		}
+		_wndproc(hwnd, msg, mp1, mp2);
 		break;
 	case WM_CAPTURECHANGED:
 		/* This message means we are losing the capture for some reason
 		 * Either because we intentionally lost it or another window
 		 * stole it
 		{
 			bMouseOver = 0;
 			_free_window_memory(hwndBubble, 0);
 			DestroyWindow(hwndBubble);
 			hwndBubble = 0;
-			KillTimer(hwndBubbleLast, 1);
 		}
 		break;
 	}
 	if(!pOldProc)
 *       handle: Handle to widget for which to change.
 *       cursortype: ID of the pointer you want.
 */
 void API dw_window_set_pointer(HWND handle, int pointertype)
 {
-/*
+	HCURSOR cursor = pointertype < 65536 ? LoadCursor(NULL, MAKEINTRESOURCE(pointertype)) : (HCURSOR)pointertype;
-	if(pointertype == DW_POINTER_ARROW)
-		SetClassLong( handle, GCL_HCURSOR, LoadCursor( NULL, IDC_ARROW));
+	dw_window_set_data(handle, "_dw_cursor", (void *)cursor);
-	else if(pointertype == DW_POINTER_CLOCK)
+	SetCursor(cursor);
-		SetClassLong( handle, GCL_HCURSOR, LoadCursor( NULL, IDC_WAIT));
-	else
-*/
-	SetCursor(pointertype < 65536 ? LoadCursor(NULL, MAKEINTRESOURCE(pointertype)) : (HCURSOR)pointertype);
 }
 /*
 * Create a new Window Frame.
 * Parameters:
 		ReleaseDC(dest, hdcdest);
 	if(!srcp)
 		ReleaseDC(src, hdcsrc);
 }
+/* Run Beep() in a separate thread so it doesn't block */
+void _beepthread(void *data)
+{
+	int *info = (int *)data;
+	if(data)
+	{
+		Beep(info[0], info[1]);
+		free(data);
+	}
+}
 /*
 * Emits a beep.
 * Parameters:
 *       freq: Frequency.
 *       dur: Duration.
 */
 void API dw_beep(int freq, int dur)
 {
-	Beep(freq, dur);
+	int *info = malloc(sizeof(int) * 2);
+	if(info)
+	{
+		info[0] = freq;
+		info[1] = dur;
+		_beginthread(_beepthread, 100, (void *)info);
+	}
 }
 /* Open a shared library and return a handle.
 * Parameters:
 *         name: Base name of the shared library.

Mercurial > dwindows

comparison win/dw.c @ 527:e0ea29c3d1eb