--- a/dep/animia/src/win/quartz.cc	Wed Dec 06 19:42:33 2023 -0500
+++ b/dep/animia/src/win/quartz.cc	Wed Dec 06 21:26:13 2023 -0500
@@ -1,12 +1,5 @@
-/* We actually DON'T need Objective-C for most of this file.
- * GetWindowTitle() is the only function that really needs it.
- * (and even then, we can use the C bindings for it...)
- *
- * However, being able to use the Foundation classes makes things
- * so, so, so much easier, and so I've decided to make this file
- * in Objective-C++.
-*/
 #include "animia/win/quartz.h"
+#include "animia/util/osx.h"
 #include "animia.h"
 
 #include <objc/runtime.h>
@@ -14,46 +7,61 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CoreGraphics.h>
-#include <Carbon/Carbon.h>
+
+#include <iostream>
 
 namespace animia::internal::quartz {
 
+typedef id (*object_message_send)(id, SEL, ...);
+typedef id (*class_message_send)(Class, SEL, ...);
+
+static const object_message_send obj_send = reinterpret_cast<object_message_send>(objc_msgSend);
+static const class_message_send cls_send = reinterpret_cast<class_message_send>(objc_msgSend);
+
 static bool GetWindowTitle(unsigned int wid, std::string& result) {
-	// id app = [NSApplication sharedApplication];
-	id app = cls_msg(cls("NSApplication"), sel("sharedApplication"));
+	// NSApplication* app = [NSApplication sharedApplication];
+	id app = cls_send(objc_getClass("NSApplication"), sel_getUid("sharedApplication"));
 
-	// id window = [app windowWithWindowNumber: wid];
-	id window = msg(app, sel("windowWithWindowNumber:"), wid);
+	// NSWindow* window = [app windowWithWindowNumber: wid];
+	id window = obj_send(app, sel_getUid("windowWithWindowNumber:"), wid);
+	if (!window)
+		return false;
 
-	// return [[window title] UTF8String];
-	return StringFromCFString(reinterpret_cast<CFStringRef>(msg(window, "title")), result);
+	// NSString* title = [window title];
+	// does this have to be freed?
+	CFStringRef title = reinterpret_cast<CFStringRef>(obj_send(window, sel_getUid("title")));
+	if (!title)
+		return false;
+
+	// return [title UTF8String];
+	return osx::util::StringFromCFString(title, result);
 }
 
 bool QuartzWinTools::EnumerateWindows(window_proc_t window_proc) {
 	if (!window_proc)
 		return false;
 
-	CFArrayRef windows = CGWindowListCopyWindowInfo(kCGWindowListOptionAll, kCGNullWindowID);
+	const CFArrayRef windows = CGWindowListCopyWindowInfo(kCGWindowListOptionAll, kCGNullWindowID);
 	if (!windows)
 		return false;
 
-	CFIndex i = 0; count = CFArrayGetCount(windows);
-	for (; i < count; i++) {
-		CFDictionaryRef window = CFArrayGetValueAtIndex(windows, i);
+	const CFIndex count = CFArrayGetCount(windows);
+	for (CFIndex i = 0; i < count; i++) {
+		CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(windows, i));
 		if (!window)
 			continue;
 
 		Process proc;
 		{
 			{
-				CFNumber num;
-				CFDictionaryGetValueIfPresent(window, "kCGWindowOwnerPID", &num);
-				osx::util::GetCFNumber(num, proc.pid);
+				CFNumberRef num = nullptr;
+				if (CFDictionaryGetValueIfPresent(window, CFSTR("kCGWindowOwnerPID"), reinterpret_cast<const void**>(&num)) && num)
+					osx::util::GetCFNumber(num, proc.pid);
 			}
 			{
-				CFStringRef str;
-				CFDictionaryGetValueIfPresent(window, "kCGWindowOwnerName", &str);
-				osx::util::StringFromCFString(str, proc.name);
+				CFStringRef str = nullptr;
+				if (CFDictionaryGetValueIfPresent(window, CFSTR("kCGWindowOwnerName"), reinterpret_cast<const void**>(&str)) && str)
+					osx::util::StringFromCFString(str, proc.name);
 			}
 			if (proc.name.empty())
 				osx::util::GetProcessName(proc.pid, proc.name);
@@ -62,22 +70,26 @@
 		Window win;
 		{
 			{
-				CFNumber num;
-				CFDictionaryGetValueIfPresent(window, "kCGWindowNumber", &num);
-				osx::util::GetCFNumber(num, win.id);
+				CFNumberRef num = nullptr;
+				if (CFDictionaryGetValueIfPresent(window, CFSTR("kCGWindowNumber"), reinterpret_cast<const void**>(&num)) && num)
+					osx::util::GetCFNumber(num, win.id);
 			}
 			{
-				CFStringRef str;
-				CFDictionaryGetValueIfPresent(window, "kCGWindowName", &str);
-				osx::util::GetCFNumber(str, win.class_name);
+				CFStringRef str = nullptr;
+				if (CFDictionaryGetValueIfPresent(window, CFSTR("kCGWindowName"), reinterpret_cast<const void**>(&str)) && str)
+					osx::util::StringFromCFString(str, win.class_name);
 			}
 			GetWindowTitle(win.id, win.text);
 		}
 
-		if (!window_proc(proc, win))
+		if (!window_proc(proc, win)) {
+			CFRelease(windows);
 			return false;
+		}
 	}
 
+	CFRelease(windows);
+
 	return true;
 }