CogVM source as per

VMMaker.oscog-eem.2923

DropPlugin:
Add primitiveDropRequestURI to support launch apple events as drop events
on MacOS.  Nuke the unused setFileAccessCallback:. Delete unused functions from
DropPlugin.h and implementors.
Currently the only full implememntation (unu=tested) is on X11/Unix.  The Mac
implementation is skeletal; it should be filled in real soon now.

Author: eliotmiranda

platforms/Cross/plugins/DropPlugin/DropPlugin.h

@@ -4,10 +4,7 @@
 sqInt dropInit(void);
 sqInt dropShutdown(void);
 
-char* dropRequestFileName(sqInt dropIndex); /* return name of file or NULL if error */
+char *dropRequestFileName(sqInt dropIndex); /* return name of file or NULL if error */
+char *dropRequestURI(sqInt dropIndex); /* return uri (if supported) or NULL if error */
 /* note: dropRequestFileHandle needs to bypass plugin security checks when implemented */
 sqInt dropRequestFileHandle(sqInt dropIndex); /* return READ-ONLY file handle OOP or nilObject if error */
-sqInt sqSecFileAccessCallback(void *);
-void sqSetNumberOfDropFiles(sqInt numberOfFiles);
-void sqSetFileInformation(sqInt dropIndex, void *dropFile);
-void sqDragTriggerData(char *aByteArray, sqInt dataLength, char *aFormat, sqInt formatLength);

platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m

@@ -50,13 +50,15 @@ sqInt dropShutdown(void) {
 	return 1;
 };
 
-char* dropRequestFileName(sqInt dropIndex) {
-	/* return name of file or NULL if error */
+char *dropRequestFileName(sqInt dropIndex) {
+	/* return file name or NULL if error */
 	NSView <sqSqueakOSXView> *view = [((sqSqueakOSXScreenAndWindow*)((__bridge NSWindow *)windowHandleFromIndex(1)).delegate) getMainViewOnWindow];
 	NSString *fileNameString = [view dragFileNameStringAtIndex: dropIndex];
 	return (char *) [fileNameString UTF8String];
 }
 
+char *dropRequestURI(sqInt dropIndex) { return NULL; }
+
 /* note: dropRequestFileHandle needs to bypass plugin security checks when implemented */
 sqInt dropRequestFileHandle(sqInt dropIndex) {
 
@@ -75,7 +77,3 @@ sqInt dropRequestFileHandle(sqInt dropIndex) {
 	sqInt result = ((sqInt (*) (char * nameIndex, sqInt nameSize, sqInt writeFlag, sqInt secureFlag)) fn)(fileName,(sqInt) strlen(fileName), 0,0);
 	return result;
 }
-
-sqInt sqSecFileAccessCallback(void *ptr) { 
-	return 0; 
-}

platforms/iOS/vm/OSX/sqSqueakOSXMetalView.m

@@ -861,12 +861,10 @@ - (BOOL) performDragOperation: (id<NSDraggingInfo>)info {
 }
 
 - (NSString*) dragFileNameStringAtIndex: (sqInt) index {
-	if (!self.dragItems)
+	if (!self.dragItems
+	 || index < 1 || index > [self.dragItems count])
 		return NULL;
-	if (index < 1 || index > [self.dragItems count])
-		return NULL;
-	NSString *filePath = (self.dragItems)[(NSUInteger) index - 1];
-	return filePath;
+	return (self.dragItems)[(NSUInteger) index - 1];
 }
 
 

platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c

@@ -52,8 +52,7 @@ extern char		     **uxDropFileNames;
 extern SQFile * fileValueOf(sqInt objectPointer);
 #else
 /*	Return a pointer to the first byte of of the SQFile data structure file
-	record within
-	anSQFileRecord, which is expected to be a ByteArray of size
+	record within anSQFileRecord, which is expected to be a ByteArray of size
 	self>>fileRecordSize. 
  */
 
@@ -68,17 +67,53 @@ fileValueOf(sqInt anSQFileRecord)
 sqInt dropInit(void)     { return 1; }
 sqInt dropShutdown(void) { return 1; }
 
-char *dropRequestFileName(sqInt dropIndex)	// in st coordinates
+/* We now set USE_FILE_URIs to 1 in platforms/unix//vm-display-X11/sqUnixXdnd.c
+ * hence dropRequestFileName skips the URI prefix and dropRequestURI includes it
+ */
+char *
+dropRequestFileName(sqInt dropIndex)	// in st coordinates
 {
-	if ((dropIndex > 0) && (dropIndex <= uxDropFileCount)) {
-		assert(uxDropFileNames);
-		dndReceived(uxDropFileNames[dropIndex - 1]);
-		return uxDropFileNames[dropIndex - 1];
-	}
-	return 0;
+	char *fileURIPrefix = "file:///";
+	int prefixLength = 0;
+	char *dropFileName;
+
+	if (dropIndex <= 0 || dropIndex > uxDropFileCount)
+		return 0;
+
+	assert(uxDropFileNames);
+	dndReceived(uxDropFileNames[dropIndex - 1]);
+
+	// The three valid schemes are
+	// file://host/path (prefix length 7)
+	// file:///path     (prefix length 8)
+	// file:/path 		(prefix length 6)
+	// see https://en.wikipedia.org/wiki/File_URI_scheme
+
+	// Compute the length of the prefix...
+	if (!(dropFileName = uxDropFileNames[dropIndex - 1]))
+		return 0;
+	while (*fileURIPrefix && *fileURIPrefix++ == *dropFileName++)
+		++prefixLength;
+
+	// file:///path & file:/path => path; anything else answered verbatim
+	return prefixLength == 8 || prefixLength == 6
+		? uxDropFileNames[dropIndex - 1] + fileURILength
+		: uxDropFileNames[dropIndex - 1];
 }
 
-sqInt dropRequestFileHandle(sqInt dropIndex)
+char *
+dropRequestURI(sqInt dropIndex)	// in st coordinates
+{
+	if (dropIndex <= 0 || dropIndex > uxDropFileCount)
+		return 0;
+
+	assert(uxDropFileNames);
+	dndReceived(uxDropFileNames[dropIndex - 1]);
+	return uxDropFileNames[dropIndex - 1];
+}
+
+sqInt
+dropRequestFileHandle(sqInt dropIndex)
 {
 	char *path= dropRequestFileName(dropIndex);
 	if (path) {
@@ -89,7 +124,3 @@ sqInt dropRequestFileHandle(sqInt dropIndex)
 	}  
 	return interpreterProxy->nilObject();
 }
-
-sqInt	sqSecFileAccessCallback(void *callback)               { return 0; }
-void	sqSetNumberOfDropFiles(sqInt numberOfFiles)           { }
-void	sqSetFileInformation(sqInt dropIndex, void *dropFile) { }