dwindows: mac/dw.c comparison

comparison mac/dw.c @ 565:355a6d46adb1

Changes to get the menus working. Switched to using RunApplicationEventLoop(), this may not work well with dw_main_iteration(). Will have to see as things progress. Next step is getting the layout engine working. Changes to get the menus working. Switched to using RunApplicationEventLoop(), this may not work well with dw_main_iteration(). Will have to see as things progress. Next step is getting the layout engine working.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 08 May 2004 06:53:12 +0000
parents	33b792d5c8ab
children	f6de197ecbe9

comparison

equal deleted inserted replaced

-:33b792d5c8ab
+:355a6d46adb1
 			}
 		}
 	}
 }
-/* Main MacOS Message loop, all events are handled here. */
-static void _doEvents(EventRecord *event)
-{
-	SignalHandler *tmp = Root;
-/* Find signal handlers */
-	while(tmp)
-	{
-		if(tmp->message == event->what)
-		{
-			switch(event->what)
-			{
-			case mouseDown:
-				break;
-			case mouseUp:
-				break;
-			case keyDown:
-				break;
-			case activateEvt:
-				break;
-			case updateEvt:
-				/*DrawWindow((WindowPtr) event->message);*/
-				break;
-			}
-		}
-		if(tmp)
-			tmp = tmp->next;
-	}
-	/* Handle system events */
-	switch(event->what)
-	{
-	case keyDown:
-		HiliteMenu(0);
-	case kHighLevelEvent:
-		break;
-	case diskEvt:
-		break;
-	}
-	AEProcessAppleEvent(event);
-}
 static pascal OSErr QuitAppleEventHandler(const AppleEvent *appleEvt, AppleEvent* reply, UInt32 refcon)
 {
 	ExitToShell();
 }
 					 &CreationRect, &CreationWindow);
 	CreateRootControl(CreationWindow, &RootControl);
 	HideWindow(CreationWindow);
 	if(AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, NewAEEventHandlerUPP(QuitAppleEventHandler), 0, false) != noErr)
 		ExitToShell();
-	DrawMenuBar();
 	/* Save the height, width and color depth */
 	_dw_screen_height = (*gd)->gdRect.bottom - (*gd)->gdRect.top;
 	_dw_screen_width = (*gd)->gdRect.right - (*gd)->gdRect.left;
 	_dw_color_depth = (*(*gd)->gdPMap)->cmpSize * (*(*gd)->gdPMap)->cmpCount;
 /*
 * Runs a message loop for Dynamic Windows.
 */
 void API dw_main(void)
 {
-	EventRecord eventStructure;
+	RunApplicationEventLoop();
-	int gDone = false;
-	while(!gDone)
-	{
-		if(WaitNextEvent(everyEvent, &eventStructure, 0xffffffff, 0))
-			_doEvents(&eventStructure);
-	}
 }
 /*
 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
 * Parameters:
 {
 	double start = (double)clock();
 	while(((((clock() - start) / CLOCKS_PER_SEC)/1000)) <= milliseconds)
 	{
-		EventRecord eventStructure;
+		RunCurrentEventLoop(1);
-		if(WaitNextEvent(everyEvent, &eventStructure, 1, 0))
-			_doEvents(&eventStructure);
 	}
 }
 /*
 * Processes a single message iteration and returns.
 void API dw_main_iteration(void)
 {
 	EventRecord eventStructure;
 	if(WaitNextEvent(everyEvent, &eventStructure, 0, 0))
-		_doEvents(&eventStructure);
+		RunCurrentEventLoop(0);
 }
 /*
 * Free's memory allocated by dynamic windows.
 * Parameters:
 *           dialog: Pointer to a dialog struct aquired by dw_dialog_new).
 */
 void * API dw_dialog_wait(DWDialog *dialog)
 {
 	void *tmp;
-	EventRecord eventStructure;
 	while(!dialog->done)
 	{
-		if(WaitNextEvent(everyEvent, &eventStructure, 180, 0))
+		RunCurrentEventLoop(180);
-			_doEvents(&eventStructure);
 	}
 	dw_event_close(&dialog->eve);
 	tmp = dialog->result;
 	free(dialog);
 	return tmp;
 	HWND hwnd = 0;
 	CreateTabsControl(CreationWindow, &CreationRect, kControlTabSizeSmall, kControlTabDirectionNorth, 1, NULL, &hwnd);
 	return hwnd;
 }
+char _removetilde(char *dest, char *src)
+{
+	int z, cur=0;
+	char accel = '\0';
+	for(z=0;z<strlen(src);z++)
+	{
+		if(src[z] != '~')
+		{
+			dest[cur] = src[z];
+			cur++;
+		}
+		else
+			accel = src[z+1];
+	}
+	dest[cur] = 0;
+	return accel;
+}
 /*
 * Create a menu object to be popped up.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HMENUI API dw_menu_new(ULONG id)
 {
-	return 0;
+	return NewMenu(id % 256, "");
 }
 /*
 * Create a menubar on a window.
 * Parameters:
 *       check: If TRUE menu is "check"able.
 *       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)
 {
-	char *buf = CToPascal(title);
+	char accel, *buf, *tempbuf = alloca(strlen(title)+1);
+accel = _removetilde(tempbuf, title);
+	buf = CToPascal(tempbuf);
 	if(menux == (HMENUI)-1)
-		NewMenu(id, buf);
+	{
+		SetMenuTitle(submenu, buf);
+		InsertMenu(submenu, 0);
+	}
 	else
 	{
 		/* Add a separator if requested */
 		if(!title || !*title)
-			AppendMenu(menux, "\002(-");
+			AppendMenu(menux, "\001-");
 		else
-			AppendMenuItemText(menux, buf);
+		{
+			MenuItemIndex item;
+			CFStringRef cftext = CFStringCreateWithCString(NULL, tempbuf, kCFStringEncodingDOSLatinUS);
+			AppendMenuItemTextWithCFString(menux, cftext, 0, 0, &item);
+			CFRelease(cftext);
+			id = item;
+			if(accel)
+			{
+				SetItemCmd(menux, item, accel);
+				SetMenuItemModifiers(menux, item, kMenuOptionModifier);
+			}
+		}
 	}
 	DrawMenuBar();
 	return (HWND)id;
 }

Mercurial > dwindows

comparison mac/dw.c @ 565:355a6d46adb1