dwindows: os2/dw.c comparison

comparison os2/dw.c @ 55:b6948eac375a

Sync with the latest dynamic windows, tree fixes, and other miscellaneous stuff.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 21 Nov 2001 22:31:55 +0000
parents	c4e1139d9872
children	5c66a108aa47

comparison

equal deleted inserted replaced

-:c4e1139d9872
+:b6948eac375a
 LONG _foreground = 0xAAAAAA, _background = 0;
 HWND hwndBubble = NULLHANDLE, hwndBubbleLast = NULLHANDLE;
 PRECORDCORE pCore = NULL;
 ULONG aulBuffer[4];
+HWND lasthcnr = 0, lastitem = 0;
 #define IS_WARP4() (aulBuffer[0] == 20 && aulBuffer[1] >= 40)
 #ifndef min
 #define min(a, b) (((a < b) ? a : b))
 	char name[30];
 } SignalList;
 /* List of signals and their equivilent OS/2 message */
-#define SIGNALMAX 13
+#define SIGNALMAX 14
 SignalList SignalTranslate[SIGNALMAX] = {
 	{ WM_SIZE, "configure_event" },
 	{ WM_CHAR, "key_press_event" },
 	{ WM_BUTTON1DOWN, "button_press_event" },
 	{ WM_COMMAND, "clicked" },
 	{ CN_ENTER, "container-select" },
 	{ CN_CONTEXTMENU, "container-context" },
 	{ LN_SELECT, "item-select" },
 	{ CN_EMPHASIS, "tree-select" },
-	{ WM_SETFOCUS, "set-focus" }
+	{ WM_SETFOCUS, "set-focus" },
+	{ WM_USER+1, "lose-focus" }
 };
 /* This function adds a signal handler callback into the linked list.
 */
 void _new_signal(ULONG message, HWND window, void *signalfunction, void *data)
 {
 	SignalHandler *new = malloc(sizeof(SignalHandler));
+#ifndef NO_SIGNALS
+	if(message == WM_COMMAND)
+		dw_signal_disconnect_by_window(window);
+#endif
 	new->message = message;
 	new->window = window;
 	new->signalfunction = signalfunction;
 	new->data = data;
 	}
 	WinEndEnumWindows(henum);
 	return;
 }
+void _disconnect_windows(HWND handle)
+{
+	HENUM henum;
+	HWND child;
+#ifndef NO_SIGNALS
+	dw_signal_disconnect_by_window(handle);
+#endif
+	henum = WinBeginEnumWindows(handle);
+	while((child = WinGetNextWindow(henum)) != NULLHANDLE)
+		_disconnect_windows(child);
+	WinEndEnumWindows(henum);
+}
 /* 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", 3)==0 ||  /* Entryfield */
+	if(strncmp(tmpbuf, "#2", 3)==0 ||  /* Combobox */
 	   strncmp(tmpbuf, "#3", 3)==0 ||  /* Button */
-	   strncmp(tmpbuf, "#6", 3)==0 ||  /* Combobox */
+	   strncmp(tmpbuf, "#6", 3)==0 ||  /* Entryfield */
 	   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;
 }
 /* This function finds the first widget in the
 * layout and moves the current focus to it.
 */
-void _initial_focus(HWND handle)
+int _initial_focus(HWND handle)
 {
 	Box *thisbox = NULL;
 	HWND box;
 	box = WinWindowFromID(handle, FID_CLIENT);
 	if(box)
 		thisbox = WinQueryWindowPtr(box, QWP_USER);
+	else
+		return 1;
 	if(thisbox)
-	{
 		_focus_check_box(thisbox, handle, 3, thisbox->defaultitem);
-	}
+	return 0;
 }
 /* This function finds the current widget in the
 * layout and moves the current focus to the next item.
 */
 	}
 	else
 		WinSetFocus(HWND_DESKTOP, handle);
 }
+MRESULT EXPENTRY _comboentryproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(hWnd, QWP_USER);
+	switch(msg)
+	{
+	case WM_SETFOCUS:
+		_run_event(hWnd, msg, mp1, mp2);
+		break;
+	}
+	if(blah && blah->oldproc)
+		return blah->oldproc(hWnd, msg, mp1, mp2);
+	return WinDefWindowProc(hWnd, msg, mp1, mp2);
+}
 /* Originally just intended for entryfields, it now serves as a generic
 * procedure for handling TAB presses to change input focus on controls.
 */
 MRESULT EXPENTRY _entryproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
 	WindowData *blah = (WindowData *)WinQueryWindowPtr(hWnd, QWP_USER);
+	PFNWP oldproc = 0;
+	if(blah)
+		oldproc = blah->oldproc;
 	switch(msg)
 	{
 	case WM_BUTTON1DOWN:
 	case WM_BUTTON2DOWN:
 		else if(SHORT1FROMMP(mp2) == '\r' && blah && blah->clickdefault)
 			_click_default(blah->clickdefault);
 		break;
 	}
-	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);
 }
 /* Handle correct painting of a combobox with the WS_CLIPCHILDREN
 * flag enabled, and also handle TABs to switch input focus.
 */
 MRESULT EXPENTRY _comboproc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
 	WindowData *blah = WinQueryWindowPtr(hWnd, QWP_USER);
+	PFNWP oldproc = 0;
+	if(blah)
+		oldproc = blah->oldproc;
 	switch(msg)
 	{
 	case WM_CHAR:
 		if(SHORT1FROMMP(mp2) == '\t')
 			WinReleasePS(hpsPaint);
 		}
 		break;
 	}
-	if(blah && blah->oldproc)
+	if(oldproc)
-		return blah->oldproc(hWnd, msg, mp1, mp2);
+		return oldproc(hWnd, msg, mp1, mp2);
 	return WinDefWindowProc(hWnd, msg, mp1, mp2);
 }
 void _GetPPFont(HWND hwnd, char *buff)
 		msg = WM_BUTTON1UP;
 	/* Find any callbacks for this function */
 	while(tmp)
 	{
-		if(tmp->message == msg || msg == WM_CONTROL)
+		if(tmp->message == msg || msg == WM_CONTROL || tmp->message == WM_USER+1)
 		{
 			switch(msg)
 			{
 			case WM_SETFOCUS:
 				{
-					if(mp2)
+					if((mp2 && tmp->message == WM_SETFOCUS) || (!mp2 && tmp->message == WM_USER+1))
 					{
 						int (*setfocusfunc)(HWND, void *) = (int (*)(HWND, void *))tmp->signalfunction;
 						if(hWnd == tmp->window || WinWindowFromID(tmp->window, FID_CLIENT) == hWnd)
 						{
 									dw_tree_item_select(tmp->window, (HWND)mp2);
 									pre.pRecord = mp2;
 									pre.fEmphasisMask = CRA_CURSORED;
 									pre.hwndCnr = tmp->window;
 									_run_event(hWnd, WM_CONTROL, MPFROM2SHORT(0, CN_EMPHASIS), (MPARAM)&pre);
+									pre.pRecord->flRecordAttr |= CRA_CURSORED;
 								}
 								result = containercontextfunc(tmp->window, text, x, y, tmp->data, user);
 								tmp = NULL;
 							}
 						}
 								{
 									if(tmp->window == pre->hwndCnr)
 									{
 										PCNRITEM pci = (PCNRITEM)pre->pRecord;
-										if(pci && pre->fEmphasisMask & CRA_CURSORED)
+										if(pci && pre->fEmphasisMask & CRA_CURSORED && (pci->rc.flRecordAttr & CRA_CURSORED))
 										{
 											int (*treeselectfunc)(HWND, HWND, char *, void *, void *) = (int (*)(HWND, HWND, char *, void *, void *))tmp->signalfunction;
-											result = treeselectfunc(tmp->window, (HWND)pci, pci->rc.pszIcon, pci->user, tmp->data);
+											if(lasthcnr == tmp->window && lastitem == (HWND)pci)
+											{
+												lasthcnr = 0;
+												lastitem = 0;
+											}
+											else
+											{
+												lasthcnr = tmp->window;
+												lastitem = (HWND)pci;
+												result = treeselectfunc(tmp->window, (HWND)pci, pci->rc.pszIcon, pci->user, tmp->data);
+											}
 											tmp = NULL;
 										}
 									}
 								}
 								emph_recurse = 0;
 		thisbox->items = tmpitem;
 		free(thisitem);
 		thisbox->count--;
 	}
-	_free_window_memory(handle);
+	_disconnect_windows(handle);
 	return WinDestroyWindow(handle);
 }
 /* Causes entire window to be invalidated and redrawn.
 * Parameters:
 							   NULLHANDLE,
 							   HWND_TOP,
 							   id,
 							   NULL,
 							   NULL);
+	HENUM henum = WinBeginEnumWindows(tmp);
+	HWND child;
+	while((child = WinGetNextWindow(henum)) != NULLHANDLE)
+	{
+		WindowData *moreblah = calloc(1, sizeof(WindowData));
+		moreblah->oldproc = WinSubclassWindow(child, _comboentryproc);
+		WinSetWindowPtr(child, QWP_USER, moreblah);
+	}
+	WinEndEnumWindows(henum);
 	dw_window_set_font(tmp, DefaultFont);
 	dw_window_set_color(tmp, DW_CLR_BLACK, DW_CLR_WHITE);
 	blah->oldproc = WinSubclassWindow(tmp, _comboproc);
 	WinSetWindowPtr(tmp, QWP_USER, blah);
 	return tmp;
 	pci = WinSendMsg(handle, CM_ALLOCRECORD, MPFROMLONG(cbExtra), MPFROMSHORT(1));
 	/* Fill in the parent record data */
 	pci->rc.cb          = sizeof(MINIRECORDCORE);
-	pci->rc.pszIcon     = title;
+	pci->rc.pszIcon     = strdup(title);
 	pci->rc.hptrIcon    = icon;
 	pci->hptrIcon       = icon;
 	pci->user           = itemdata;
 	PCNRITEM pci = (PCNRITEM)item;
 	if(!pci)
 		return;
-	pci->rc.pszIcon     = title;
+	if(pci->rc.pszIcon)
+		free(pci->rc.pszIcon);
+	pci->rc.pszIcon     = strdup(title);
 	pci->rc.hptrIcon    = icon;
 	pci->hptrIcon       = icon;
 	WinSendMsg(handle, CM_INVALIDATERECORD, (MPARAM)&pci, MPFROM2SHORT(1, CMA_TEXTCHANGED));
 		if(pCore->flRecordAttr & CRA_SELECTED)
 			WinSendMsg(handle, CM_SETRECORDEMPHASIS, (MPARAM)pCore, MPFROM2SHORT(FALSE, CRA_SELECTED | CRA_CURSORED));
 		pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)pCore, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
 	}
 	WinSendMsg(handle, CM_SETRECORDEMPHASIS, (MPARAM)item, MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED));
+	lastitem = 0;
+	lasthcnr = 0;
 }
 /*
 * Removes all nodes from a tree.
 * Parameters:
 *       item: Handle to node to be deleted.
 */
 void dw_tree_delete(HWND handle, HWND item)
 {
 	PCNRITEM     pci = (PCNRITEM)item;
+	if(!item)
+		return;
+	if(pci->rc.pszIcon)
+		free(pci->rc.pszIcon);
 	WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)&pci, MPFROM2SHORT(1, CMA_INVALIDATE | CMA_FREE));
 }
 /* Some OS/2 specific container structs */
 typedef struct _containerinfo {
 * Returns:
 *       -1 on error.
 */
 int dw_exec(char *program, int type, char **params)
 {
-	return spawnvp(P_NOWAIT, program, params);
+	return spawnvp(P_NOWAIT, program, (const char **)params);
 }
 /*
 * Loads a web browser pointed at the given URL.
 * Parameters:
 */
 void dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data)
 {
 	ULONG message = 0L;
+	if(strcmp(signame, "lose-focus") == 0)
+	{
+		char tmpbuf[100];
+		WinQueryClassName(window, 99, tmpbuf);
+		if(strncmp(tmpbuf, "#2", 3) == 0)
+		{
+			HENUM henum = WinBeginEnumWindows(window);
+			HWND child = WinGetNextWindow(henum);
+			WinEndEnumWindows(henum);
+			if(child)
+				window = child;
+		}
+	}
 	if(window && signame && sigfunc)
 	{
 		if((message = _findsigmessage(signame)) != 0)
 			_new_signal(message, window, sigfunc, data);
 	}

Mercurial > dwindows

comparison os2/dw.c @ 55:b6948eac375a