dwindows: os2/dw.c comparison

comparison os2/dw.c @ 465:4ff2c7210973

Menu item handlers are now window local, ID is still used but it is local to the menubar or popup menu it is associated with.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 02 Oct 2003 07:51:26 +0000
parents	9d874ce0124a
children	c3dfa117b080

comparison

equal deleted inserted replaced

-:3251fbca6fb3
+:4ff2c7210973
 HAB dwhab = 0;
 HMQ dwhmq = 0;
 DWTID _dwtid = 0;
 LONG _foreground = 0xAAAAAA, _background = DW_CLR_DEFAULT;
-HWND hwndBubble = NULLHANDLE, hwndBubbleLast = NULLHANDLE, hwndEmph = NULLHANDLE;
+HWND hwndApp = NULLHANDLE, hwndBubble = NULLHANDLE, hwndBubbleLast = NULLHANDLE, hwndEmph = NULLHANDLE;
 PRECORDCORE pCore = NULL, pCoreEmph = NULL;
 ULONG aulBuffer[4];
 HWND lasthcnr = 0, lastitem = 0, popup = 0, desktop;
 unsigned long _colors[] = {
 */
 void _new_signal(ULONG message, HWND window, int id, void *signalfunction, void *data)
 {
 	SignalHandler *new = malloc(sizeof(SignalHandler));
-	if(message == WM_COMMAND)
-		dw_signal_disconnect_by_window(window);
 	new->message = message;
 	new->window = window;
 	new->id = id;
 	new->signalfunction = signalfunction;
 	new->data = data;
 		SignalHandler *prev = NULL, *tmp = Root;
 		while(tmp)
 		{
 			if(tmp->message == message &&
 			   tmp->window == window &&
+			   tmp->id == id &&
 			   tmp->signalfunction == signalfunction)
 			{
 				tmp->data = data;
 				free(new);
 				return;
 		WinSendMsg(hwndEmph, CM_SETRECORDEMPHASIS, pCoreEmph, MPFROM2SHORT(FALSE, CRA_SOURCE));
 	hwndEmph = NULLHANDLE;
 	pCoreEmph = NULL;
 }
+/* Find the desktop window handle */
+HWND _menu_owner(HWND handle)
+{
+	HWND menuowner = NULLHANDLE, lastowner = (HWND)dw_window_get_data(handle, "_dw_owner");
+	int menubar = (int)dw_window_get_data(handle, "_dw_menubar");
+	/* Find the toplevel window */
+	while(!menubar && (menuowner = (HWND)dw_window_get_data(lastowner, "_dw_owner")) != NULLHANDLE)
+	{
+		menubar = (int)dw_window_get_data(lastowner, "_dw_menubar");
+		lastowner = menuowner;
+	}
+	if(menuowner && menubar)
+	{
+		HWND client = WinWindowFromID(menuowner, FID_CLIENT);
+		return client ? client : menuowner;
+	}
+	return NULLHANDLE;
+}
 MRESULT EXPENTRY _run_event(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
 	int result = -1;
 	SignalHandler *tmp = Root;
 	ULONG origmsg = msg;
 			case WM_COMMAND:
 				{
 					int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))tmp->signalfunction;
 					ULONG command = COMMANDMSG(&msg)->cmd;
-					if(tmp->window < 65536 && command == tmp->window)
+					if(tmp->id)
+					{
+						HWND menuowner = _menu_owner(tmp->window);
+						if((menuowner == hWnd || menuowner == NULLHANDLE) && command == tmp->id)
+						{
+							result = clickfunc(tmp->window, tmp->data);
+							tmp = NULL;
+						}
+					}
+					else if(tmp->window < 65536 && command == tmp->window)
 					{
 						result = clickfunc(popup ?  popup : tmp->window, tmp->data);
 						tmp = NULL;
 					}
 				}
 	DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_MS_COUNT,(void *)aulBuffer, 4*sizeof(ULONG));
 	desktop = WinQueryDesktopWindow(dwhab, NULLHANDLE);
 	if(!IS_WARP4())
-DefaultFont = "8.Helv";
+		DefaultFont = "8.Helv";
+	/* This is a window that hangs around as long as the
+	 * application does and handles menu messages.
+	 */
+	hwndApp = dw_window_new(HWND_OBJECT, "", 0);
 	return rc;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 								 location,
 								 HWND_TOP,
 								 FID_MENU,
 								 NULL,
 								 NULL);
+	dw_window_set_data(tmp, "_dw_owner", (void *)location);
+	dw_window_set_data(tmp, "_dw_menubar", (void *)location);
 	return tmp;
 }
 /*
 * Destroys a menu created with dw_menubar_new or dw_menu_new.
 *       submenu: Handle to an existing menu to be a submenu or NULL.
 */
 HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG id, ULONG flags, int end, int check, HMENUI submenu)
 {
 	MENUITEM miSubMenu;
+	char buffer[15];
-	if(!menux)
+	if(!menux || id > 65536)
 		return NULLHANDLE;
 	if(end)
 		miSubMenu.iPosition=MIT_END;
 	else
 	WinSendMsg(menux,
 			   MM_INSERTITEM,
 			   MPFROMP(&miSubMenu),
 			   MPFROMP(title));
+	sprintf(buffer, "_dw_id%d", id);
+	dw_window_set_data(hwndApp, buffer, (void *)menux);
+	if(submenu)
+		dw_window_set_data(submenu, "_dw_owner", (void *)menux);
 	return (HWND)id;
 }
 /*
 * Sets the state of a menu item check.
 * Parameters:
 *       exitcode: Exit code reported to the operating system.
 */
 void API dw_exit(int exitcode)
 {
+	/* Destroy the menu message window */
+	dw_window_destroy(hwndApp);
 	/* In case we are in a signal handler, don't
 	 * try to free memory that could possibly be
 	 * free()'d by the runtime already.
 	 */
 	Root = NULL;
 *       sigfunc: The pointer to the function to be used as the callback.
 *       data: User data to be passed to the handler function.
 */
 void API dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data)
 {
-	ULONG message = 0L;
+	ULONG message = 0, id = 0;
 	if(window && signame && sigfunc)
 	{
 		if((message = _findsigmessage(signame)) != 0)
-			_new_signal(message, window, 0, sigfunc, data);
+		{
+			/* Handle special case of the menu item */
+			if(message == WM_COMMAND && window < 65536)
+			{
+				char buffer[15];
+				HWND owner;
+				sprintf(buffer, "_dw_id%d", (int)window);
+				owner = (HWND)dw_window_get_data(hwndApp, buffer);
+				if(owner)
+				{
+					id = window;
+					window = owner;
+					dw_window_set_data(hwndApp, buffer, 0);
+				}
+				else
+				{
+					/* If it is a popup menu clear all entries */
+					dw_signal_disconnect_by_window(window);
+				}
+			}
+			_new_signal(message, window, id, sigfunc, data);
+		}
 	}
 }
 /*
 * Removes callbacks for a given window with given name.

Mercurial > dwindows

comparison os2/dw.c @ 465:4ff2c7210973