github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-21 04:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not add transient pasteboard items to history

Browse Source 
See http://nspasteboard.org for details.
This commit is contained in:
Allan Odgaard
2014-02-17 09:42:44 +07:00
parent e2d2b1ef6a
commit 0da5fedf6c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Frameworks/OakAppKit/src/OakPasteboard.mm
View File

@@ -192,6 +192,10 @@ namespace
D(DBF_Pasteboard, bug("new data: %s (%zd = %zd)\n", BSTR((_changeCount != [[self pasteboard] changeCount])), (ssize_t)_changeCount, (ssize_t)[[self pasteboard] changeCount]););
if(_changeCount != [[self pasteboard] changeCount])
{
// Do not add to history, see http://nspasteboard.org
if([[self pasteboard] availableTypeFromArray:@[ @"org.nspasteboard.TransientType", @"org.nspasteboard.ConcealedType", @"org.nspasteboard.AutoGeneratedType" ]])
return;
NSString* onClipboard = [[self pasteboard] availableTypeFromArray:@[ NSStringPboardType ]] ? [[self pasteboard] stringForType:NSStringPboardType] : nil;
NSString* onStack = [([_entries count] == 0 ? nil : _entries[_index]) string];
_changeCount = [[self pasteboard] changeCount];
@@ -307,7 +311,7 @@ namespace
_index = [_entries count]-1;
_auxiliaryOptionsForCurrent = nil;
}
else if(!_avoidsDuplicates || ![[self current] isEqual:anEntry])
else if(!_avoidsDuplicates || ![_entries count] || ![_entries[_index] isEqual:anEntry])
{
[_entries addObject:anEntry];
[self setIndex:[_entries count]-1];
@@ -327,6 +331,11 @@ namespace
{
D(DBF_Pasteboard, bug("%zu / %zu\n", (size_t)_index, (size_t)[_entries count]););
[self checkForExternalPasteboardChanges];
if([[self pasteboard] availableTypeFromArray:@[ @"org.nspasteboard.TransientType", @"org.nspasteboard.ConcealedType", @"org.nspasteboard.AutoGeneratedType" ]])
{
if(NSString* onClipboard = [[self pasteboard] availableTypeFromArray:@[ NSStringPboardType ]] ? [[self pasteboard] stringForType:NSStringPboardType] : nil)
return [OakPasteboardEntry pasteboardEntryWithString:onClipboard andOptions:[[self pasteboard] availableTypeFromArray:@[ OakPasteboardOptionsPboardType ]] ? [[self pasteboard] propertyListForType:OakPasteboardOptionsPboardType] : nil];
}
return [_entries count] == 0 ? nil : _entries[_index];
}