#38 Closed - completed work on Paste

Controllers/CMEmulatorController.m

@@ -162,12 +162,17 @@ - (void)addRecentMediaItemWithURL:(NSURL *)url
 - (void)clearRecentMediaItemsInMenu:(NSMenuItem *)menuItem;
 - (void) rebuildRecentItemsMenus;
 - (void) syncRecentDocuments;
+- (void) pasteFromPasteBoard;
 
 - (BOOL)diskSizeValid:(int)size;
 - (NSString *) generateTimestampedFilenameAtPath:(NSString *)parentPath
                                         template:(NSString *)template
                                        extension:(NSString *)ext;
 
+- (void) pasteAlertDidEnd:(NSAlert *) alert
+			   returnCode:(NSInteger) returnCode
+			  contextInfo:(void *) contextInfo;
+
 @end
 
 @implementation CMEmulatorController
@@ -1052,6 +1057,18 @@ - (CMMsxDisplayView *)screen
 
 #pragma mark - Private methods
 
+- (void) pasteFromPasteBoard
+{
+	NSPasteboard *pasteBoard  = [NSPasteboard generalPasteboard];
+	NSString *text = [pasteBoard stringForType:NSPasteboardTypeString];
+
+	NSString *runningMachineId = [self runningMachineConfiguration];
+	NSString *layoutName = [CMMSXKeyboard layoutNameOfMachineWithIdentifier:runningMachineId];
+
+	[[self input] pasteText:text
+				 layoutName:layoutName];
+}
+
 - (void)zoomWindowBy:(CGFloat)factor
 {
     [self setScreenSize:NSMakeSize(WIDTH_DEFAULT * factor, HEIGHT_DEFAULT * factor)
@@ -1755,15 +1772,24 @@ - (BOOL)toggleEjectCassetteMenuItemStatus:(NSMenuItem*)menuItem
     return NO;
 }
 
-- (void)pasteText:(id)sender
+- (void) pasteText:(id) sender
 {
-    NSPasteboard *pasteBoard  = [NSPasteboard generalPasteboard];
-    NSString *text = [pasteBoard stringForType:NSPasteboardTypeString];
-
-    NSString *runningMachineId = [self runningMachineConfiguration];
-    NSString *layoutName = [CMMSXKeyboard layoutNameOfMachineWithIdentifier:runningMachineId];
-
-    [[self input] pasteText:text layoutName:layoutName];
+	if (CMGetIntPref(@"emulationSpeedPercentage") != 100) {
+		NSAlert *alert = [NSAlert alertWithMessageText:CMLoc(@"Due to timing restrictions, Paste is only available when emulating at default speed.", @"")
+										 defaultButton:CMLoc(@"Set to Default", @"Alert dialog button")
+									   alternateButton:CMLoc(@"Cancel", "Alert dialog button")
+										   otherButton:nil
+							 informativeTextWithFormat:@""];
+
+		[alert beginSheetModalForWindow:[self window]
+						  modalDelegate:self
+						 didEndSelector:@selector(pasteAlertDidEnd:returnCode:contextInfo:)
+							contextInfo:nil];
+
+		return;
+	}
+
+	[self pasteFromPasteBoard];
 }
 
 - (void)windowKeyDidChange:(BOOL)isKey
@@ -3047,6 +3073,18 @@ - (void)cassetteRepositionedTo:(NSInteger)position
     emulatorResume();
 }
 
+#pragma mark - NSAlert
+
+- (void) pasteAlertDidEnd:(NSAlert *) alert
+			   returnCode:(NSInteger) returnCode
+			  contextInfo:(void *) contextInfo
+{
+	if (returnCode == NSAlertDefaultReturn) {
+		CMSetIntPref(@"emulationSpeedPercentage", 100);
+		[self pasteFromPasteBoard];
+	}
+}
+
 #pragma mark - NSUserInterfaceValidation
 
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item

Src/Cocoa/CMCocoaInput.m

@@ -218,7 +218,8 @@ - (BOOL) pasteText:(NSString *) text
         return NO; // Invalid key layout
 	}
 
-	// FIXME: stop paste if in process
+	[self stopPasting];
+
 #ifdef DEBUG
     NSTimeInterval startTime = [NSDate timeIntervalSinceReferenceDate];
 #endif