mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 11:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix mime <-> UTI roundtripping

Browse Source
This commit is contained in:
Kovid Goyal
2026-02-21 16:37:04 +05:30
parent e93e50293a
commit aab60b7967
1 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
glfw/cocoa_window.m
View File

@@ -42,20 +42,46 @@
// Macro and forward declaration needed before draggingEntered: (uti_to_mime is defined in Clipboard section) // Macro and forward declaration needed before draggingEntered: (uti_to_mime is defined in Clipboard section)
#define UTI_ROUNDTRIP_PREFIX @"uti-is-typical-apple-nih." #define UTI_ROUNDTRIP_PREFIX @"uti-is-typical-apple-nih."
static NSString* static NSString*
mime_to_uti(const char *mime) { mime_to_uti(const char *mime) {
if (strcmp(mime, "text/plain") == 0) return NSPasteboardTypeString; if (strcmp(mime, "text/plain") == 0) return NSPasteboardTypeString;
if (@available(macOS 11.0, *)) { UTType *t = [UTType typeWithMIMEType:@(mime)]; // auto-released
UTType *t = [UTType typeWithMIMEType:@(mime)]; // auto-released if (t != nil && !t.dynamic) return t.identifier;
if (t != nil && !t.dynamic) return t.identifier; size_t sz = strlen(mime);
} NSMutableString *hex = [NSMutableString stringWithCapacity:sz * 2];
return [NSString stringWithFormat:@"%@%s", UTI_ROUNDTRIP_PREFIX, mime]; // auto-released for (NSUInteger i = 0; i < sz; i++) [hex appendFormat:@"%02x", (unsigned char)mime[i]];
return [NSString stringWithFormat:@"%@%@", UTI_ROUNDTRIP_PREFIX, hex]; // auto-released
}
static char
hexval(char c, bool *ok) {
if (c >= '0' && c <= '9') return c - '0';
if (c >= 'a' && c <= 'f') return c - 'a' + 10;
if (c >= 'A' && c <= 'F') return c - 'A' + 10;
*ok = false;
return 0;
} }
static const char* static const char*
uti_to_mime(NSString *uti) { uti_to_mime(NSString *uti) {
if ([uti isEqualToString:NSPasteboardTypeString]) return "text/plain"; if ([uti isEqualToString:NSPasteboardTypeString]) return "text/plain";
if ([uti hasPrefix:UTI_ROUNDTRIP_PREFIX]) return [[uti substringFromIndex:[UTI_ROUNDTRIP_PREFIX length]] UTF8String]; if ([uti hasPrefix:UTI_ROUNDTRIP_PREFIX]) {
NSString *hexPart = [uti substringFromIndex:UTI_ROUNDTRIP_PREFIX.length];
NSUInteger hexLen = hexPart.length;
if (hexLen == 0 || hexLen % 2 != 0) { return ""; }
const char *hex = [hexPart UTF8String];
static char buf[4096];
size_t i, j;
for (i = 0, j = 0; i < hexLen && j < sizeof(buf)-1; i += 2, j++) {
char hi = hex[i], lo = hex[i + 1];
bool ok = true;
buf[j] = (hexval(hi, &ok) << 4) | hexval(lo, &ok);
if (!ok) return "";
}
buf[j] = 0;
return buf;
}
if (@available(macOS 11.0, *)) { if (@available(macOS 11.0, *)) {
UTType *t = [UTType typeWithIdentifier:uti]; // auto-released UTType *t = [UTType typeWithIdentifier:uti]; // auto-released
if (t.preferredMIMEType != nil) return [t.preferredMIMEType UTF8String]; if (t.preferredMIMEType != nil) return [t.preferredMIMEType UTF8String];
@@ -1448,18 +1474,18 @@ update_drop_state(_GLFWwindow *window, size_t mime_count) {
if ([pasteboard canReadObjectForClasses:@[[NSString class]] options:nil]) { if ([pasteboard canReadObjectForClasses:@[[NSString class]] options:nil]) {
mime_array[mime_count++] = _glfw_strdup("text/plain"); mime_array[mime_count++] = _glfw_strdup("text/plain");
} }
#define add_mime(uti) { \ #define add_mime(uti) { \
const char* mime = uti_to_mime(uti); \ const char* mime = uti_to_mime(uti); \
if (mime && mime[0]) { \ if (mime && mime[0]) { \
bool duplicate = false; \ bool duplicate = false; \
for (size_t i = 0; i < mime_count; i++) { \ for (size_t i = 0; i < mime_count; i++) { \
if (strcmp(mime_array[i], mime) == 0) { \ if (strcmp(mime_array[i], mime) == 0) { \
duplicate = true; \ duplicate = true; \
break; \ break; \
} \
} \
if (!duplicate) mime_array[mime_count++] = _glfw_strdup(mime); \
} \ } \
} \
if (!duplicate) mime_array[mime_count++] = _glfw_strdup(mime); \
} \
} }
// Get file promise based types // Get file promise based types
for (NSFilePromiseReceiver *receiver in receivers) { for (NSFilePromiseReceiver *receiver in receivers) {