ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store uri-list items as promises correctly

Browse source
This commit is contained in:
Kovid Goyal 2026-05-14 16:25:29 +05:30
parent 61ea2b4a38
commit 1ff9165335
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
glfw/cocoa_window.m
View file

@ -1555,7 +1555,9 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
// Check for common types first (use _glfw_strdup since we need to own the strings)
NSDictionary* options = @{NSPasteboardURLReadingFileURLsOnlyKey:@YES};
bool has_uri_list = false;
if ([pasteboard canReadObjectForClasses:@[[NSURL class]] options:options]) {
has_uri_list = true;
mime_array[mime_count++] = _glfw_strdup("text/uri-list");
}
if ([pasteboard canReadObjectForClasses:@[[NSString class]] options:nil]) {
@ -1577,7 +1579,15 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
// Get file promise based types
for (NSFilePromiseReceiver *receiver in receivers) {
for (NSString *uti in receiver.fileTypes) {
add_mime(uti);
UTType *promisedType = [UTType typeWithIdentifier:uti];
if (promisedType && [promisedType conformsToType:UTTypeFileURL]) {
if (!has_uri_list) {
mime_array[mime_count++] = _glfw_strdup("text/uri-list");
has_uri_list = true;
}
} else {
add_mime(uti);
}
}
}
@ -4369,16 +4379,13 @@ - (void)draggingSession:(NSDraggingSession *)session
if (line.length == 0 || [line hasPrefix:@"#"]) continue;
NSURL *url = [NSURL URLWithString:line];
if (use_promises && [[url scheme] caseInsensitiveCompare:@"file"] == NSOrderedSame) {
NSString *extension = [url pathExtension];
UTType *type = [UTType typeWithFilenameExtension:extension];
if (!type) type = UTTypeItem;
snprintf(buf, sizeof(buf), "kitty-internal/uri-list-item-%d", count);
NSString *filename = [url lastPathComponent];
GLFWFilePromiseProviderDelegate* delegate = [[[GLFWFilePromiseProviderDelegate alloc]
initWithWindow:window mimeType:buf fileName:[filename UTF8String]
instanceId:_glfw.drag.instance_id] autorelease];
NSFilePromiseProvider *provider = [[[NSFilePromiseProvider alloc]
initWithFileType:type.identifier delegate:delegate] autorelease];
initWithFileType:UTTypeFileURL.identifier delegate:delegate] autorelease];
// Store the delegate in the provider's user info so it's retained
provider.userInfo = delegate;
dragItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:provider] autorelease];