dwindows: os2/dw.c comparison

comparison os2/dw.c @ 34:b03b24bb95f8

Added dw_window_default() to set the default focus widget in a dialog. Also some fixes for containers on OS/2.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 03 Sep 2001 23:30:43 +0000
parents	72675de7d229
children	360bc6a5f1c9

comparison

equal deleted inserted replaced

-:72675de7d229
+:b03b24bb95f8
 	}
 	return 0L;
 }
 #endif
+/* This function changes the owner of buttons in to the
+* dynamicwindows handle to fix a problem in notebooks.
+*/
+void _fix_button_owner(HWND handle, HWND dw)
+{
+	HENUM henum;
+	HWND child;
+	henum = WinBeginEnumWindows(handle);
+	while((child = WinGetNextWindow(henum)) != NULLHANDLE)
+	{
+		char tmpbuf[100];
+		WinQueryClassName(child, 99, tmpbuf);
+		if(strncmp(tmpbuf, "#3", 3)==0 && dw)  /* Button */
+			WinSetOwner(child, dw);
+		else if(strncmp(tmpbuf, "dynamicwindows", 14) == 0)
+			dw = child;
+		_fix_button_owner(child, dw);
+	}
+	WinEndEnumWindows(henum);
+	return;
+}
 /* This function removes and handlers on windows and frees
 * the user memory allocated to it.
 */
 void _free_window_memory(HWND handle)
 {
 	WinQueryClassName(handle, 99, tmpbuf);
 	/* These are the window classes which can
 	 * obtain input focus.
 	 */
-	if(strncmp(tmpbuf, "#2", 2)==0 ||  /* Entryfield */
+	if(strncmp(tmpbuf, "#2", 3)==0 ||  /* Entryfield */
-	   strncmp(tmpbuf, "#3", 2)==0 ||  /* Button */
+	   strncmp(tmpbuf, "#3", 3)==0 ||  /* Button */
-	   strncmp(tmpbuf, "#6", 2)==0 ||  /* Combobox */
+	   strncmp(tmpbuf, "#6", 3)==0 ||  /* Combobox */
-	   strncmp(tmpbuf, "#7", 2)==0 ||  /* List box */
+	   strncmp(tmpbuf, "#7", 3)==0 ||  /* List box */
 	   strncmp(tmpbuf, "#10", 3)==0 || /* MLE */
 	   strncmp(tmpbuf, "#32", 3)==0 || /* Spinbutton */
 	   strncmp(tmpbuf, "#37", 3)== 0)  /* Container */
 		return 1;
 	return 0;
 }
-int _focus_check_box(Box *box, HWND handle, int start)
+int _focus_check_box(Box *box, HWND handle, int start, HWND defaultitem)
 {
 	int z;
 	static HWND lasthwnd, firsthwnd;
 static int finish_searching;
 		{
 			if(box->items[z].type == TYPEBOX)
 			{
 				Box *thisbox = WinQueryWindowPtr(box->items[z].hwnd, QWP_USER);
-				if(thisbox && _focus_check_box(thisbox, handle, start == 3 ? 3 : 0))
+				if(thisbox && _focus_check_box(thisbox, handle, start == 3 ? 3 : 0, defaultitem))
 					return 1;
 			}
 			else
 			{
 				if(box->items[z].hwnd == handle)
 					/* Start is 3 when we are looking for the
 					 * first valid item in the layout.
 					 */
 					if(start == 3)
 					{
-						WinSetFocus(HWND_DESKTOP, box->items[z].hwnd);
+						if(!defaultitem || (defaultitem && defaultitem == box->items[z].hwnd))
-						return 1;
+						{
+							WinSetFocus(HWND_DESKTOP, box->items[z].hwnd);
+							return 1;
+						}
 					}
 					if(!firsthwnd)
 						firsthwnd = box->items[z].hwnd;
 						if(page)
 						{
 							notebox = (Box *)WinQueryWindowPtr(page, QWP_USER);
-							if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0))
+							if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0, defaultitem))
 								return 1;
 						}
 					}
 				}
 			}
 		{
 			if(box->items[z].type == TYPEBOX)
 			{
 				Box *thisbox = WinQueryWindowPtr(box->items[z].hwnd, QWP_USER);
-				if(thisbox && _focus_check_box(thisbox, handle, start == 3 ? 3 : 0))
+				if(thisbox && _focus_check_box(thisbox, handle, start == 3 ? 3 : 0, defaultitem))
 					return 1;
 			}
 			else
 			{
 				if(box->items[z].hwnd == handle)
 					/* Start is 3 when we are looking for the
 					 * first valid item in the layout.
 					 */
 					if(start == 3)
 					{
-						WinSetFocus(HWND_DESKTOP, box->items[z].hwnd);
+						if(!defaultitem || (defaultitem && defaultitem == box->items[z].hwnd))
-						return 1;
+						{
+							WinSetFocus(HWND_DESKTOP, box->items[z].hwnd);
+							return 1;
+						}
 					}
 					if(!firsthwnd)
 						firsthwnd = box->items[z].hwnd;
 						if(page)
 						{
 							notebox = (Box *)WinQueryWindowPtr(page, QWP_USER);
-							if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0))
+							if(notebox && _focus_check_box(notebox, handle, start == 3 ? 3 : 0, defaultitem))
 								return 1;
 						}
 					}
 				}
 			}
 	if(box)
 		thisbox = WinQueryWindowPtr(box, QWP_USER);
 	if(thisbox)
 	{
-		_focus_check_box(thisbox, handle, 3);
+		_focus_check_box(thisbox, handle, 3, thisbox->defaultitem);
 	}
 }
 /* This function finds the current widget in the
 * layout and moves the current focus to the next item.
 else
 		thisbox = WinQueryWindowPtr(lastbox, QWP_USER);
 	if(thisbox)
 	{
-		if(_focus_check_box(thisbox, handle, 1)  == 0)
+		if(_focus_check_box(thisbox, handle, 1, 0)  == 0)
-			_focus_check_box(thisbox, handle, 2);
+			_focus_check_box(thisbox, handle, 2, 0);
 	}
 }
 /* ResetWindow:
 *         Resizes window to the exact same size to trigger
 				if(thisbox->items[z].hsize != SIZEEXPAND)
 					vectorx = 0;
 				WinQueryClassName(handle, 99, tmpbuf);
-				if(strncmp(tmpbuf, "#2", 2)==0)
+				if(strncmp(tmpbuf, "#2", 3)==0)
 				{
 					/* Make the combobox big enough to drop down. :) */
 					WinSetWindowPos(handle, HWND_TOP, currentx + pad, (currenty + pad) - 100,
 									width + vectorx, (height + vectory) + 100, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
 				}
-				else if(strncmp(tmpbuf, "#6", 2)==0)
+				else if(strncmp(tmpbuf, "#6", 3)==0)
 				{
 					/* Entryfields on OS/2 have a thick border that isn't on Windows and GTK */
 					WinSetWindowPos(handle, HWND_TOP, (currentx + pad) + 3, (currenty + pad) + 3,
 									(width + vectorx) - 6, (height + vectory) - 6, SWP_MOVE | SWP_SIZE | SWP_ZORDER);
 				}
 	return 0;
 }
 void _do_resize(Box *thisbox, int x, int y)
 {
-	if(x != 0 && y != 0) {
+	if(x != 0 && y != 0)
+	{
 		if(thisbox)
 		{
 			int usedx = 0, usedy = 0, usedpadx = 0, usedpady = 0, depth = 0;
 			_resize_box(thisbox, &depth, x, y, &usedx, &usedy, 1, &usedpadx, &usedpady);
 								dw_listbox_query_text(tmp->window, index, buf1, 500);
 								WinQueryClassName(tmp->window, 99, classbuf);
-								if(id && strncmp(classbuf, "#2", 2)==0)
+								if(id && strncmp(classbuf, "#2", 3)==0)
 								{
 									char *buf2;
 									buf2 = dw_window_get_text(tmp->window);
 				mybox->flags = 0;
 			if(mybox && (swp->fl & SWP_MAXIMIZE))
 			{
 				int z;
+				SWP swp2;
+				WinQueryWindowPos(swp->hwnd, &swp2);
+				if(swp2.cx == swp->cx && swp2.cy == swp->cy)
+					return FALSE;
 				mybox->flags = 0;
 				/* Hide the window when recalculating to reduce
 				 * CPU load.
 {
 	int rc = WinSetWindowPos(handle, NULLHANDLE, 0, 0, 0, 0, SWP_SHOW);
 	HSWITCH hswitch;
 	SWCNTRL swcntrl;
+	_fix_button_owner(handle, 0);
 	WinSetFocus(HWND_DESKTOP, handle);
 	_initial_focus(handle);
 	/* If this window has a  switch list entry make sure it is visible */
 	hswitch = WinQuerySwitchHandle(handle, 0);
 		HWND found;
 		WinQueryClassName(child, 99, tmpbuf);
 		/* If the child is a box (frame) then recurse into it */
-		if(strncmp(tmpbuf, "#1", 2)==0)
+		if(strncmp(tmpbuf, "#1", 3)==0)
 			if((found = dw_window_from_id(child, id)) != NULLHANDLE)
 				return found;
 		if(windowid && windowid == id)
 		{
 			tmpitem[z] = thisitem[z];
 		}
 		WinQueryClassName(item, 99, tmpbuf);
-		if(strncmp(tmpbuf, "#1", 2)==0)
+		if(strncmp(tmpbuf, "#1", 3)==0)
 			tmpitem[thisbox->count].type = TYPEBOX;
 		else
 			tmpitem[thisbox->count].type = TYPEITEM;
 		tmpitem[thisbox->count].hwnd = item;
 		thisbox->count++;
 /* Don't set the ownership if it's an entryfield  or combobox */
 		WinQueryClassName(item, 99, tmpbuf);
-		if(strncmp(tmpbuf, "#6", 2)!=0 /*&& strncmp(tmpbuf, "#2", 2)!=0*/)
+		if(strncmp(tmpbuf, "#6", 3)!=0 /*&& strncmp(tmpbuf, "#2", 2)!=0*/)
 		{
 			if((boxowner = WinQueryWindow(box, QW_OWNER)) != 0)
 				WinSetOwner(item, boxowner);
 			else
 				WinSetOwner(item, box);
 *          index: Item index.
 *          state: TRUE if selected FALSE if unselected.
 */
 void dw_listbox_select(HWND handle, int index, int state)
 {
+	char tmpbuf[100];
 	WinSendMsg(handle, LM_SELECTITEM, MPFROMSHORT(index), (MPARAM)state);
-	_run_event(handle, WM_CONTROL, MPFROM2SHORT(0, LN_SELECT), (MPARAM)handle);
+	WinQueryClassName(handle, 99, tmpbuf);
+	/* If we are setting a combobox call the event handler manually */
+	if(strncmp(tmpbuf, "#6", 3)==0)
+		_run_event(handle, WM_CONTROL, MPFROM2SHORT(0, LN_SELECT), (MPARAM)handle);
 }
 /*
 * Deletes the item with given index from the list.
 * Parameters:
 {
 	ULONG *flags = (ULONG *)WinQueryWindowPtr(handle, 0);
 	int z, size = 0, totalsize, count = 0;
 	PRECORDCORE temp;
 	ContainerInfo *ci;
-	void *blah;
+	void *blah = NULL;
-	if(!flags)
+	if(!flags || rowcount < 1)
 		return NULL;
 	while(flags[count])
 		count++;
 			size += sizeof(CTIME);
 	}
 	totalsize = size + sizeof(RECORDCORE);
-	blah = (void *)WinSendMsg(handle, CM_ALLOCRECORD, MPFROMLONG(size), MPFROMLONG(rowcount));
+	z = 0;
+	while((blah = (void *)WinSendMsg(handle, CM_ALLOCRECORD, MPFROMLONG(size), MPFROMLONG(rowcount))) == NULL)
+	{
+		z++;
+		if(z > 5000000)
+			break;
+		DosSleep(1);
+	}
 	if(!blah)
 		return NULL;
 	temp = (PRECORDCORE)blah;
 *          title: String title of the item.
 */
 void dw_container_set_row_title(void *pointer, int row, char *title)
 {
 	ContainerInfo *ci = (ContainerInfo *)pointer;
-	PRECORDCORE temp = (PRECORDCORE)ci->data;
+	PRECORDCORE temp;
 	int z, currentcount;
 	CNRINFO cnr;
 	if(!ci)
 		return;
+	temp = (PRECORDCORE)ci->data;
 	WinSendMsg(ci->handle, CM_QUERYCNRINFO, (MPARAM)&cnr, MPFROMSHORT(sizeof(CNRINFO)));
 	currentcount = cnr.cRecords;
 	for(z=0;z<(row-currentcount);z++)
 */
 void dw_container_insert(HWND handle, void *pointer, int rowcount)
 {
 	RECORDINSERT recin;
 	ContainerInfo *ci = (ContainerInfo *)pointer;
+	int z;
 	if(!ci)
 		return;
 	recin.cb = sizeof(RECORDINSERT);
 	recin.pRecordParent = NULL;
 	recin.zOrder = CMA_TOP;
 	recin.fInvalidateRecord = TRUE;
 	recin.cRecordsInsert = rowcount;
-	WinSendMsg(handle, CM_INSERTRECORD, MPFROMP(ci->data), MPFROMP(&recin));
+	z = 0;
+	while(WinSendMsg(handle, CM_INSERTRECORD, MPFROMP(ci->data), MPFROMP(&recin)) == 0)
+	{
+		z++;
+		if(z > 5000000)
+			break;
+		DosSleep(1);
+	}
 }
 /*
 * Removes all rows from a container.
 * Parameters:
 *       handle: Handle to the window (widget) to be cleared.
 */
 void dw_container_clear(HWND handle)
 {
-	WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)0L, MPFROM2SHORT(0, CMA_INVALIDATE | CMA_FREE));
+	int z = 0;
+	while((int)WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)0L, MPFROM2SHORT(0, CMA_INVALIDATE | CMA_FREE)) == -1)
+	{
+		z++;
+		if(z > 5000000)
+			break;
+		DosSleep(1);
+	}
 }
 /*
 * Removes the first x rows from a container.
 * Parameters:
 *       rowcount: The number of rows to be deleted.
 */
 void dw_container_delete(HWND handle, int rowcount)
 {
 	RECORDCORE *last, **prc = malloc(sizeof(RECORDCORE *) * rowcount);
-	int current = 1;
+	int current = 1, z;
 	prc[0] = last = (RECORDCORE *)WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 	while(last && current < rowcount)
 	{
 		prc[current] = last = (RECORDCORE *)WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)last, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
 		current++;
 	}
-	WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)prc, MPFROM2SHORT(current, CMA_INVALIDATE | CMA_FREE));
+	z = 0;
+	while((int)WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)prc, MPFROM2SHORT(current, CMA_INVALIDATE | CMA_FREE)) == -1)
+	{
+		z++;
+		if(z > 5000000)
+			break;
+		DosSleep(1);
+	}
 	free(prc);
 }
 /*
 * Scrolls container up or down.
 			tmpitem[z+1] = thisitem[z];
 		}
 		WinQueryClassName(item, 99, tmpbuf);
-		if(strncmp(tmpbuf, "#1", 2)==0)
+		if(strncmp(tmpbuf, "#1", 3)==0)
 			tmpitem[0].type = TYPEBOX;
 		else
 			tmpitem[0].type = TYPEITEM;
 		tmpitem[0].hwnd = item;
 		thisbox->count++;
 		WinQueryClassName(item, 99, tmpbuf);
 		/* Don't set the ownership if it's an entryfield or combobox */
-		if(strncmp(tmpbuf, "#6", 2)!=0 /*&& strncmp(tmpbuf, "#2", 2)!=0*/)
+		if(strncmp(tmpbuf, "#6", 3)!=0 /*&& strncmp(tmpbuf, "#2", 2)!=0*/)
 		{
 			if((boxowner = WinQueryWindow(box, QW_OWNER)) != 0)
 				WinSetOwner(item, boxowner);
 			else
 				WinSetOwner(item, box);
 		}
 	}
 	return (ulBuild);
 }
+/*
+* Sets the default focus item for a window/dialog.
+* Parameters:
+*         window: Toplevel window or dialog.
+*         defaultitem: Handle to the dialog item to be default.
+*/
+void dw_window_default(HWND window, HWND defaultitem)
+{
+	Box *thisbox = NULL;
+	HWND box;
+	box = WinWindowFromID(window, FID_CLIENT);
+	if(box)
+		thisbox = WinQueryWindowPtr(box, QWP_USER);
+	if(thisbox)
+		thisbox->defaultitem = defaultitem;
+}
 /*
 * Returns some information about the current operating environment.
 * Parameters:
 *       env: Pointer to a DWEnv struct.

Mercurial > dwindows

comparison os2/dw.c @ 34:b03b24bb95f8