Mercurial > dwindows

changeset 67:ab9b0fa6c66e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Focus fixes and removal of several hack in the OS/2 code base.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 22 Jan 2002 10:55:20 +0000
parents 664a274a46a6
children 8d6100960adf
files dw.h gtk/dw.c os2/dw.c win/dw.c
diffstat 4 files changed, 80 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/dw.h	Mon Jan 14 02:10:31 2002 +0000
+++ b/dw.h	Tue Jan 22 10:55:20 2002 +0000
@@ -118,6 +118,7 @@
 	PFNWP oldproc;
 	HWND clickdefault;
 	ULONG flags;
+	void *data;
 } WindowData;
 
 typedef struct _hpixmap {
--- a/gtk/dw.c	Mon Jan 14 02:10:31 2002 +0000
+++ b/gtk/dw.c	Tue Jan 22 10:55:20 2002 +0000
@@ -485,7 +485,7 @@
 	if(slider && work)
 	{
 		int (*valuechangedfunc)(HWND, int, void *) = work->func;
-		int max = _round_value(adjustment->upper) - 1;
+		int max = _round_value(adjustment->upper);
 		int val = _round_value(adjustment->value);
 		static int lastval = -1;
 		static GtkWidget *lastwidget = 0;
@@ -493,9 +493,9 @@
 		if(lastval != val || lastwidget != slider)
 		{
 			if(GTK_IS_VSCALE(slider))
-				valuechangedfunc(work->window, max - val,  work->data);
+				valuechangedfunc(work->window, (max - val) - 1,  work->data);
 			else
-				valuechangedfunc(work->window, val,  work->data);
+				valuechangedfunc(work->window, val - 1,  work->data);
 		}
 	}
 }
@@ -2094,7 +2094,7 @@
 	int _locked_by_me = FALSE;
 
 	DW_MUTEX_LOCK;
-	adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)(increments + 1), 1, 1, 1);
+	adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1);
 	if(vertical)
 		tmp = gtk_vscale_new(adjustment);
 	else
--- a/os2/dw.c	Mon Jan 14 02:10:31 2002 +0000
+++ b/os2/dw.c	Tue Jan 22 10:55:20 2002 +0000
@@ -170,6 +170,21 @@
 } CNRITEM, *PCNRITEM;
 
 
+/* Find the desktop window handle */
+HWND _toplevel_window(HWND handle)
+{
+	HWND box, lastbox = WinQueryWindow(handle, QW_PARENT);
+
+	/* Find the toplevel window */
+	while((box = WinQueryWindow(lastbox, QW_PARENT)) > 0x80000001 && box > 0)
+	{
+		lastbox = box;
+	}
+	if(box > 0)
+		return lastbox;
+	return handle;
+}
+
 /* This function changes the owner of buttons in to the
  * dynamicwindows handle to fix a problem in notebooks.
  */
@@ -638,13 +653,7 @@
 void _shift_focus(HWND handle)
 {
 	Box *thisbox;
-	HWND box, lastbox = WinQueryWindow(handle, QW_PARENT);
-
-	/* Find the toplevel window */
-	while((box = WinQueryWindow(lastbox, QW_PARENT)) > 0x80000001)
-	{
-		lastbox = box;
-	}
+	HWND box, lastbox = _toplevel_window(handle);
 
 	box = WinWindowFromID(lastbox, FID_CLIENT);
 	if(box)
@@ -665,13 +674,7 @@
 void _shift_focus_back(HWND handle)
 {
 	Box *thisbox;
-	HWND box, lastbox = WinQueryWindow(handle, QW_PARENT);
-
-	/* Find the toplevel window */
-	while((box = WinQueryWindow(lastbox, QW_PARENT)) > 0x80000001)
-	{
-		lastbox = box;
-	}
+	HWND box, lastbox = _toplevel_window(handle);
 
 	box = WinWindowFromID(lastbox, FID_CLIENT);
 	if(box)
@@ -699,22 +702,6 @@
 	WinSetWindowPos(hwndFrame, HWND_TOP, 0, 0, swp.cx, swp.cy, SWP_SIZE);
 }
 
-/* Focus toplevel window */
-void _toplevel_focus(HWND handle)
-{
-	HWND box, lastbox = WinQueryWindow(handle, QW_PARENT);
-
-	/* Find the toplevel window */
-	while((box = WinQueryWindow(lastbox, QW_PARENT)) > 0x80000001)
-	{
-		lastbox = box;
-	}
-
-	box = WinWindowFromID(lastbox, FID_CLIENT);
-	if(box)
-		WinSetActiveWindow(HWND_DESKTOP, lastbox);
-}
-
 /* This function will recursively search a box and add up the total height of it */
 void _count_size(HWND box, int type, int *xsize, int *xorigsize)
 {
@@ -1431,7 +1418,6 @@
 	switch(msg)
 	{
 	case WM_SETFOCUS:
-		_toplevel_focus(hWnd);
 		_run_event(hWnd, msg, mp1, mp2);
 		break;
 	}
@@ -1478,7 +1464,6 @@
 		}
 		break;
 	case WM_SETFOCUS:
-		_toplevel_focus(hWnd);
 		_run_event(hWnd, msg, mp1, mp2);
 		break;
 	case WM_CHAR:
@@ -1533,7 +1518,6 @@
 		_run_event(hWnd, WM_SETFOCUS, (MPARAM)FALSE, (MPARAM)TRUE);
 		break;
 	case WM_SETFOCUS:
-		_toplevel_focus(hWnd);
 		_run_event(hWnd, msg, mp1, mp2);
 		break;
 	case WM_PAINT:
@@ -1991,40 +1975,6 @@
 }
 #endif
 
-int _warp4_focus_fix(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
-{
-	/* This is a hack to stop an infinite loop in the
-	 * Warp 4 default window procedure.  It seems that
-	 * under very rare circumstances, the same WM_FOCUSCHANGE
-	 * message will bounce between an entryfield and
-	 * the frame it sits on, this will stop duplicate
-	 * messages and thus prevent the infinite loop.
-	 */
-	if(msg == WM_FOCUSCHANGE && SHORT1FROMMP(mp2))
-	{
-		static HWND lastfocus = 0;
-		static time_t lasttime = 0;
-		static int count = 0;
-		time_t currtime = time(NULL);
-
-		if(lastfocus == (HWND)mp1 && currtime == lasttime)
-		{
-			if(count > 5)
-			{
-				count = 0;
-				return 1;
-			}
-			count++;
-			return 0;
-		}
-
-		count = 0;
-		lastfocus = (HWND)mp1;
-		lasttime = currtime;
-	}
-	return 0;
-}
-
 /* Handles control messages sent to the box (owner). */
 MRESULT EXPENTRY _controlproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
@@ -2039,11 +1989,6 @@
 	}
 #endif
 
-	if(_warp4_focus_fix(hWnd, msg, mp1, mp2))
-		return (MRESULT)0;
-	if(msg == WM_SETFOCUS)
-		_toplevel_focus(hWnd);
-
 	if(blah && blah->oldproc)
 		return blah->oldproc(hWnd, msg, mp1, mp2);
 
@@ -2241,9 +2186,6 @@
 		break;
 	}
 
-	if(_warp4_focus_fix(hWnd, msg, mp1, mp2))
-		return (MRESULT)0;
-
 	if(result != -1)
 		return (MRESULT)result;
 	else
@@ -2785,22 +2727,43 @@
 	case WM_BUTTON1DOWN:
 	case WM_BUTTON2DOWN:
 	case WM_BUTTON3DOWN:
-		if(!res)
-			_toplevel_focus(hwnd);
-		return (MPARAM)TRUE;
+		if(res)
+			return (MPARAM)TRUE;
 	}
 	return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
 
 MRESULT EXPENTRY _TreeProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-	Box *blah = WinQueryWindowPtr(hwnd, QWP_USER);
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(hwnd, QWP_USER);
+	PFNWP oldproc = 0;
+
+	if(blah)
+		oldproc = blah->oldproc;
+
+	switch(msg)
+	{
+	case WM_SETFOCUS:
+		_run_event(hwnd, msg, mp1, mp2);
+		break;
+	case WM_CHAR:
+		if(SHORT1FROMMP(mp2) == '\t')
+		{
+			if(CHARMSG(&msg)->fs & KC_SHIFT)
+				_shift_focus_back(hwnd);
+			else
+				_shift_focus(hwnd);
+			return FALSE;
+		}
+		break;
+	}
 
 #ifndef NO_SIGNALS
 	_run_event(hwnd, msg, mp1, mp2);
 #endif
-	if(blah && blah->oldproc)
-		return blah->oldproc(hwnd, msg, mp1, mp2);
+	if(oldproc)
+		return oldproc(hwnd, msg, mp1, mp2);
+
 	return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
 
@@ -3025,7 +2988,7 @@
 	HSWITCH hswitch;
 	SWCNTRL swcntrl;
 
-	_fix_button_owner(handle, 0);
+	_fix_button_owner(_toplevel_window(handle), 0);
 	WinSetFocus(HWND_DESKTOP, handle);
 	_initial_focus(handle);
 
@@ -3699,6 +3662,7 @@
  */
 HWND dw_container_new(ULONG id)
 {
+	WindowData *blah = calloc(1, sizeof(WindowData));
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_CONTAINER,
 							   NULL,
@@ -3710,6 +3674,8 @@
 							   id,
 							   NULL,
 							   NULL);
+	blah->oldproc = WinSubclassWindow(tmp, _TreeProc);
+	WinSetWindowPtr(tmp, QWP_USER, blah);
 	dw_window_set_font(tmp, DefaultFont);
 	return tmp;
 }
@@ -3723,7 +3689,7 @@
 HWND dw_tree_new(ULONG id)
 {
 	CNRINFO cnrinfo;
-	Box *newbox = calloc(1, sizeof(Box));
+	WindowData *blah = calloc(1, sizeof(WindowData));
 	HWND tmp = WinCreateWindow(HWND_OBJECT,
 							   WC_CONTAINER,
 							   NULL,
@@ -3741,8 +3707,8 @@
 	cnrinfo.slBitmapOrIcon.cy = 16;
 
 	WinSendMsg(tmp, CM_SETCNRINFO, &cnrinfo, MPFROMLONG(CMA_FLWINDOWATTR | CMA_SLBITMAPORICON));
-	newbox->oldproc = WinSubclassWindow(tmp, _TreeProc);
-	WinSetWindowPtr(tmp, QWP_USER, newbox);
+	blah->oldproc = WinSubclassWindow(tmp, _TreeProc);
+	WinSetWindowPtr(tmp, QWP_USER, blah);
 	dw_window_set_font(tmp, DefaultFont);
 	return tmp;
 }
@@ -3818,7 +3784,7 @@
 							   NULL,
 							   NULL);
 	dw_window_set_font(tmp, DefaultFont);
-	blah->oldproc = WinSubclassWindow(tmp, _comboentryproc);
+	blah->oldproc = WinSubclassWindow(tmp, _entryproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 }
@@ -5277,7 +5243,8 @@
 	ULONG size = sizeof(RECORDCORE);
 	ULONG *offStruct = malloc(count * sizeof(ULONG));
 	ULONG *tempflags = malloc((count+1) * sizeof(ULONG));
-	ULONG *oldflags = (ULONG *)WinQueryWindowPtr(handle, 0);
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(handle, QWP_USER);
+	ULONG *oldflags = blah ? blah->data : 0;
 
 	if(!offStruct || !tempflags)
 		return FALSE;
@@ -5285,7 +5252,7 @@
 	memcpy(tempflags, flags, count * sizeof(ULONG));
 	tempflags[count] = 0;
 
-	WinSetWindowPtr(handle, 0, tempflags);
+	blah->data = tempflags;
 
 	if(oldflags)
 		free(oldflags);
@@ -5411,7 +5378,8 @@
  */
 void *dw_container_alloc(HWND handle, int rowcount)
 {
-	ULONG *flags = (ULONG *)WinQueryWindowPtr(handle, 0);
+	WindowData *wd = (WindowData *)WinQueryWindowPtr(handle, QWP_USER);
+	ULONG *flags = wd ? wd->data : 0;
 	int z, size = 0, totalsize, count = 0;
 	PRECORDCORE temp;
 	ContainerInfo *ci;
@@ -5481,7 +5449,8 @@
  */
 void dw_container_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
-	ULONG totalsize, size = 0, *flags = (ULONG *)WinQueryWindowPtr(handle, 0);
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(handle, QWP_USER);
+	ULONG totalsize, size = 0, *flags = blah ? blah->data : 0;
 	int z, currentcount;
 	ContainerInfo *ci = (ContainerInfo *)pointer;
 	PRECORDCORE temp;
--- a/win/dw.c	Mon Jan 14 02:10:31 2002 +0000
+++ b/win/dw.c	Tue Jan 22 10:55:20 2002 +0000
@@ -3005,7 +3005,7 @@
 	SetParent(handle, newparent);
 }
 
-HFONT _aquire_font(char *fontname)
+HFONT _acquire_font(HWND handle, char *fontname)
 {
 	HFONT hfont;
 	int z, size = 9;
@@ -3015,6 +3015,9 @@
 		hfont = GetStockObject(DEFAULT_GUI_FONT);
 	else
 	{
+#if 0
+		HDC hDC = GetDC(handle);
+#endif
 		for(z=0;z<strlen(fontname);z++)
 		{
 			if(fontname[z]=='.')
@@ -3022,6 +3025,9 @@
 		}
 		size = atoi(fontname) + 5;
 
+#if 0
+		lf.lfHeight = -MulDiv(size, GetDeviceCaps(hDC, LOGPIXELSY), 72);
+#endif
 		lf.lfHeight = size;
 		lf.lfWidth = 0;
 		lf.lfEscapement = 0;
@@ -3038,6 +3044,9 @@
 		strcpy(lf.lfFaceName, &fontname[z+1]);
 
 		hfont = CreateFontIndirect(&lf);
+#if 0
+		ReleaseDC(handle, hDC);
+#endif
 	}
 	return hfont;
 }
@@ -3050,7 +3059,7 @@
  */
 int dw_window_set_font(HWND handle, char *fontname)
 {
-	HFONT hfont = _aquire_font(fontname);
+	HFONT hfont = _acquire_font(handle, fontname);
 	ColorInfo *cinfo;
 
 	cinfo = (ColorInfo *)GetWindowLong(handle, GWL_USERDATA);
@@ -3073,7 +3082,7 @@
 			SetWindowLong(handle, GWL_USERDATA, (ULONG)cinfo);
 		}
 	}
-	SendMessage(handle, WM_SETFONT, (WPARAM)hfont, FALSE);
+	SendMessage(handle, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE);
 	return 0;
 }
 
@@ -5421,8 +5430,8 @@
 
 	if(!hSmall || !hLarge)
 	{
-		hSmall = ImageList_Create(16, 16, ILC_COLOR16, ICON_INDEX_LIMIT, 0);
-		hLarge = ImageList_Create(32, 32, ILC_COLOR16, ICON_INDEX_LIMIT, 0);
+		hSmall = ImageList_Create(16, 16, ILC_COLOR16 | ILC_MASK, ICON_INDEX_LIMIT, 0);
+		hLarge = ImageList_Create(32, 32, ILC_COLOR16 | ILC_MASK, ICON_INDEX_LIMIT, 0);
 	}
 	for(z=0;z<ICON_INDEX_LIMIT;z++)
 	{
@@ -5939,7 +5948,7 @@
 
 		if(cinfo)
 		{
-			hFont = _aquire_font(cinfo->fontname);
+			hFont = _acquire_font(handle, cinfo->fontname);
 			mustdelete = 1;
 		}
 	}
@@ -5986,7 +5995,7 @@
 
 		if(cinfo)
 		{
-			hFont = _aquire_font(cinfo->fontname);
+			hFont = _acquire_font(handle, cinfo->fontname);
 			mustdelete = 1;
 		}
 	}