cmacos: working?

CMakeLists.txt

@@ -309,6 +309,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Retro")
     set_target_properties(Mw PROPERTIES LINK_FLAGS "-Wl,-gc-sections")
   endif()
 
+  list(APPEND LIBRARIES InterfaceLib WindowsLib ThreadsLib)
+
   target_compile_definitions(
    Mw
    PRIVATE
@@ -354,7 +356,7 @@ target_link_libraries(
 )
 
 if(MW_BUILD_OPENGL)
-    target_compile_definitions(
+  target_compile_definitions(
           Mw
           PRIVATE
           MW_OPENGL

include/Mw/LowLevel/ClassicMacOS.h

@@ -13,9 +13,12 @@
 struct _MwLLClassicMacOS {
 	struct _MwLLCommon common;
 
-	WindowRef   window;
+	MwLL parent;
-	EventRecord event;
+
-	Rect	    winRect;
+	WindowRef     window;
+	ControlHandle control;
+	EventRecord   event;
+	Rect	      winRect;
 };
 
 struct _MwLLClassicMacOSColor {

include/Mw/Widget/Vulkan.h

@@ -11,7 +11,7 @@
 #ifndef __MW_WIDGET_VULKAN_H__
 #define __MW_WIDGET_VULKAN_H__
 
-#if !defined(_WIN32) && !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if defined(MW_VULKAN) && !defined(_WIN32) && !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 #error Vulkan is unsupported on the requested platform.
 #endif
 

src/abstract/dynamic.c

@@ -14,33 +14,39 @@ void MwDynamicClose(void* handle) {
 }
 #elif defined(CLASSIC_MAC_OS)
 void* MwDynamicOpen(const char* path) {
-	CFragConnectionID connID;
+	// CFragConnectionID connID;
-	Ptr*		  addr;
+	// Ptr*		  addr;
-	unsigned char	  err[255];
+	// unsigned char	  err[255];
 
-	if(GetSharedLibrary((ConstStr63Param)path, kPowerPCCFragArch, kPrivateCFragCopy,
+	// if(GetSharedLibrary((ConstStr63Param)path, kPowerPCCFragArch, kPrivateCFragCopy,
-			    &connID, addr, err)) {
+	// 		    &connID, addr, err)) {
-		printf("Error getting %s: %s\n", path, err);
+	// 	printf("Error getting %s: %s\n", path, err);
-		return NULL;
+	// 	return NULL;
-	};
+	// };
-	return connID;
+	// return connID;
+	printf("MwDynamicOpen not implemented yet.\n");
+	getchar();
+	return NULL;
 }
 
 void* MwDynamicSymbol(void* handle, const char* symbol) {
-	CFragConnectionID connID = (CFragConnectionID)handle;
+	// CFragConnectionID connID = (CFragConnectionID)handle;
-	Ptr*		  symAddr;
+	// Ptr*		  symAddr;
-	CFragSymbolClass* symClass;
+	// CFragSymbolClass* symClass;
-	OSErr		  err;
+	// OSErr		  err;
-	if((err = FindSymbol(connID, (ConstStr63Param)symbol, symAddr, symClass))) {
+	// if((err = FindSymbol(connID, (ConstStr63Param)symbol, symAddr, symClass))) {
-		printf("Error getting %s: %d\n", symbol, err);
+	// 	printf("Error getting %s: %d\n", symbol, err);
-		return NULL;
+	// 	return NULL;
-	};
+	// };
-	return symAddr;
+	// return symAddr;
+	printf("MwDynamicSymbol not implemented yet.\n");
+	getchar();
+	return NULL;
 }
 
 void MwDynamicClose(void* handle) {
-	CFragConnectionID connID = (CFragConnectionID)handle;
+	// CFragConnectionID connID = (CFragConnectionID)handle;
-	CloseConnection(&connID);
+	// CloseConnection(&connID);
 }
 #elif defined(__unix__) || defined(__APPLE__)
 void* MwDynamicOpen(const char* path) {

src/backend/classicmacos.c

@@ -1,12 +1,24 @@
 #include <Mw/Milsko.h>
+#include <Threads.h>
+#include <QuickDraw.h>
 
 #include "../../external/stb_ds.h"
 
 static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 	MwLL r;
-
+	r = malloc(sizeof(*r));
+	memset(r, 0, sizeof(*r));
 	MwLLCreateCommon(r);
 
+	r->cmacos.parent = parent;
+
+	if(x == MwDEFAULT) {
+		x = (qd.screenBits.bounds.right / 2) - (width / 2);
+	}
+	if(y == MwDEFAULT) {
+		y = (qd.screenBits.bounds.bottom / 2) - (height / 2);
+	}
+
 	/* todo: how do we set parent windows? If we can't, what is our equivalant to MacOS's NSViews, Wayland's subsurfaces, etc.? */
 	SetRect(&r->cmacos.winRect, x, y, width, height);
 	r->cmacos.window = newcwindow(nil, &r->cmacos.winRect, "", true,
@@ -23,24 +35,26 @@ static void MwLLDestroyImpl(MwLL handle) {
 }
 
 static void MwLLBeginDrawImpl(MwLL handle) {
-	(void)handle;
 }
 
 static void MwLLEndDrawImpl(MwLL handle) {
-	(void)handle;
 }
 
 static void MwLLPolygonImpl(MwLL handle, MwPoint* points, int points_count, MwLLColor color) {
 	int	   i;
-	PolyHandle p = OpenPoly();
+	PolyHandle p;
 	RGBColor   col;
 
-	col.red	  = color->common.red;
+	SetPort(handle->cmacos.window);
-	col.green = color->common.green;
+	BeginUpdate(handle->cmacos.window);
-	col.blue  = color->common.blue;
+
+	p	  = OpenPoly();
+	col.red	  = color->common.red * 0x101;
+	col.green = color->common.green * 0x101;
+	col.blue  = color->common.blue * 0x101;
 
-	RGBBackColor(&col);
 	RGBForeColor(&col);
+	PenMode(patCopy);
 
 	for(i = 0; i < points_count; i++) {
 		if(i == 0) {
@@ -51,20 +65,24 @@ static void MwLLPolygonImpl(MwLL handle, MwPoint* points, int points_count, MwLL
 	}
 
 	ClosePoly();
-	PaintPoly(p);
+	FillCPoly(p, &qd.ltGray);
 	KillPoly(p);
+
+	EndUpdate(handle->cmacos.window);
 }
 
 static void MwLLLineImpl(MwLL handle, MwPoint* points, MwLLColor color) {
 	RGBColor col;
+	SetPort(handle->cmacos.window);
 
 	col.red	  = color->common.red;
 	col.green = color->common.green;
 	col.blue  = color->common.blue;
 
-	RGBBackColor(&col);
 	RGBForeColor(&col);
 
+	PenMode(patCopy);
+
 	MoveTo(points[0].x, points[0].y);
 	LineTo(points[1].x, points[1].y);
 }
@@ -103,10 +121,133 @@ static void MwLLFreeColorImpl(MwLLColor color) {
 }
 
 static int MwLLPendingImpl(MwLL handle) {
-	return GetNextEvent(everyEvent, &handle->cmacos.event);
+	YieldToAnyThread();
+	return EventAvail(everyEvent, &handle->cmacos.event);
 }
 
 static void MwLLNextEventImpl(MwLL handle) {
+	EventRecord event;
+	GetNextEvent(everyEvent, &event);
+
+	switch(event.what) {
+	case updateEvt: {
+	}
+	// MwLLDispatch(handle, draw, NULL);
+	break;
+	case osEvt:
+		break;
+	case mouseUp: {
+		// MwLLMouse m;
+		// m.button = MwLLMouseLeft;
+		// if(___curWindow->mouseButtonCallback != NULL) {
+		// 	int mods = MacModifiersToGLFWModifiers(event.modifiers);
+
+		// 	if(___curWindow->keyStateMap[MK_LCTRL] == 1) {
+		// 		___curWindow->mouseButtonCallback(
+		// 		    ___curWindow, GLFW_MOUSE_BUTTON_RIGHT, GLFW_RELEASE, mods);
+		// 	} else {
+		// 		___curWindow->mouseButtonCallback(
+		// 		    ___curWindow, GLFW_MOUSE_BUTTON_LEFT, GLFW_RELEASE, mods);
+		// 	}
+		// }
+	}
+	case mouseDown: {
+		// // start with callback stuff
+		// if(___curWindow->mouseButtonCallback != NULL) {
+		// 	int mods = MacModifiersToGLFWModifiers(event.modifiers);
+
+		// 	if(___curWindow->keyStateMap[MK_LCTRL] == 1) {
+		// 		___curWindow->mouseButtonCallback(
+		// 		    ___curWindow, GLFW_MOUSE_BUTTON_RIGHT, GLFW_PRESS, mods);
+		// 	} else {
+		// 		___curWindow->mouseButtonCallback(
+		// 		    ___curWindow, GLFW_MOUSE_BUTTON_LEFT, GLFW_PRESS, mods);
+		// 	}
+		// }
+
+		// then do system stuff
+		switch(FindWindow(event.where, &handle->cmacos.window)) {
+		case inDrag:
+			DragWindow(handle->cmacos.window, event.where, &qd.screenBits.bounds);
+			// if(___curWindow->windowPosCallback != NULL) {
+			// 	___curWindow->windowPosCallback(___curWindow, event.where.h,
+			// 					event.where.v);
+			// }
+			break;
+		case inGrow: {
+			long growResult =
+			    GrowWindow(handle->cmacos.window, event.where, &qd.screenBits.bounds);
+
+			int width  = growResult & 0xFFFF;
+			int height = growResult >> 16;
+
+			SizeWindow(handle->cmacos.window, growResult & 0xFFFF, growResult >> 16, true);
+
+			Rect rect;
+			GetWindowBounds(handle->cmacos.window, kWindowStructureRgn, &rect);
+			rect.right  = width;
+			rect.bottom = height;
+			SetWindowBounds(handle->cmacos.window, kWindowStructureRgn, &rect);
+
+			// ___curWindow->width  = width;
+			// ___curWindow->height = height;
+
+			// if(___curWindow->windowSizeCallback != NULL) {
+			// 	___curWindow->windowSizeCallback(___curWindow, width, height);
+			// }
+			// if(___curWindow->windowSetFramebufferSizeCallback != NULL) {
+			// 	___curWindow->windowSetFramebufferSizeCallback(___curWindow,
+			// 						       width, height);
+			// }
+		} break;
+
+		case inGoAway: {
+			if(TrackGoAway(handle->cmacos.window, event.where)) {
+				MwLLDispatch(handle, close, NULL);
+				// if(___curWindow->windowCloseCallback != NULL) {
+				// ___curWindow->windowCloseCallback(___curWindow);
+				// }
+				// ___curWindow->shouldClose = true;
+			}
+		} break;
+		}
+	}
+	case autoKey:
+	case keyDown:
+	case keyUp: {
+		// // key char stuff
+		// unsigned char ch = (event.message & charCodeMask);
+		// if(*___curWindow->charCallback != NULL) {
+		// 	___curWindow->charCallback(___curWindow, ch);
+		// }
+
+		// // key state map
+		// unsigned char key	       = (event.message & keyCodeMask) >> 8;
+		// ___curWindow->keyStateMap[key] = 0;
+		// if(event.what == keyDown || event.what == autoKey) {
+		// 	___curWindow->keyStateMap[key] &= 1;
+		// }
+
+		// if(*___curWindow->keyCallback != NULL) {
+		// 	int key	     = MacKeyToGLFWKey(event.message);
+		// 	int scancode = (event.message & adbAddrMask) >> 16;
+
+		// 	int mods = MacModifiersToGLFWModifiers(event.modifiers);
+
+		// 	int action;
+		// 	if(event.what == keyUp) {
+		// 		action = GLFW_RELEASE;
+		// 	} else {
+		// 		action = GLFW_PRESS;
+		// 	}
+		// 	___curWindow->keyCallback(___curWindow, key, scancode, action,
+		// 				  mods);
+		// }
+	}
+	}
+
+	FlushEvents(everyEvent, -1);
+	YieldToAnyThread();
 }
 
 static void MwLLSetTitleImpl(MwLL handle, const char* title) {
@@ -167,14 +308,14 @@ static void MwLLFocusImpl(MwLL handle) {
 static void MwLLGrabPointerImpl(MwLL handle, int toggle) {
 }
 
-static void MwLLSetClipboardImpl(MwLL handle, const char* text) {
+static void MwLLSetClipboardImpl(MwLL handle, const char* text, int clipboard_type) {
 	/* TODO */
 
 	(void)handle;
 	(void)text;
 }
 
-static void MwLLGetClipboardImpl(MwLL handle) {
+static void MwLLGetClipboardImpl(MwLL handle, int clipboard_type) {
 }
 
 static void MwLLMakeToolWindowImpl(MwLL handle) {

src/core.c

@@ -878,6 +878,9 @@ int MwLibraryInit(void) {
 #endif
 #ifdef USE_GDI
 	    MwLLGDICallInit,
+#endif
+#ifdef CLASSIC_MAC_OS
+	    MwLLClassicMacOSCallInit,
 #endif
 	    NULL};
 	int i;
@@ -900,6 +903,9 @@ int MwLibraryInit(void) {
 #endif
 #ifdef USE_GDI
 	       " GDI"
+#endif
+#ifdef CLASSIC_MAC_OS
+	       " ClassicMacOS"
 #endif
 	       "\n");