Fix smart selection pointer command to also copy to pasteboard

niw · Jan 17, 2012 · f38cd7f · f38cd7f
1 parent d8c30e7
commit f38cd7f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/PTYTextView.m b/PTYTextView.m
@@ -3371,6 +3371,23 @@ - (void)smartSelectIgnoringNewlinesWithEvent:(NSEvent *)event
     [self smartSelectAtX:x y:y ignoringNewlines:YES];
 }
 
+- (void)smartSelectAndMaybeCopyWithEvent:(NSEvent *)event
+                        ignoringNewlines:(BOOL)ignoringNewlines
+{
+    NSPoint clickPoint = [self clickPoint:event];
+    int x = clickPoint.x;
+    int y = clickPoint.y;
+
+    [self smartSelectAtX:x y:y ignoringNewlines:ignoringNewlines];
+    [self setSelectionTime];
+    if (startX > -1 && _delegate) {
+        // if we want to copy our selection, do so
+        if ([[PreferencePanel sharedInstance] copySelection]) {
+            [self copy:self];
+        }
+    }
+}
+
 - (void)openContextMenuWithEvent:(NSEvent *)event
 {
     NSPoint clickPoint = [self clickPoint:event];

diff --git a/PointerController.h b/PointerController.h
@@ -14,8 +14,8 @@
 - (void)pasteFromSelectionWithEvent:(NSEvent *)event;
 - (void)openTargetWithEvent:(NSEvent *)event;
 - (void)openTargetInBackgroundWithEvent:(NSEvent *)event;
-- (void)smartSelectWithEvent:(NSEvent *)event;
-- (void)smartSelectIgnoringNewlinesWithEvent:(NSEvent *)event;
+- (void)smartSelectAndMaybeCopyWithEvent:(NSEvent *)event
+                        ignoringNewlines:(BOOL)ignoringNewlines;
 - (void)openContextMenuWithEvent:(NSEvent *)event;
 - (void)nextTabWithEvent:(NSEvent *)event;
 - (void)previousTabWithEvent:(NSEvent *)event;

diff --git a/PointerController.m b/PointerController.m
@@ -25,9 +25,11 @@ - (void)performAction:(NSString *)action
     } else if ([action isEqualToString:kOpenTargetPointerAction]) {
         [delegate_ openTargetWithEvent:event];
     } else if ([action isEqualToString:kSmartSelectionPointerAction]) {
-        [delegate_ smartSelectWithEvent:event];
+        [delegate_ smartSelectAndMaybeCopyWithEvent:event
+                                   ignoringNewlines:NO];
     } else if ([action isEqualToString:kSmartSelectionIgnoringNewlinesPointerAction]) {
-        [delegate_ smartSelectIgnoringNewlinesWithEvent:event];
+        [delegate_ smartSelectAndMaybeCopyWithEvent:event
+                                   ignoringNewlines:YES];
     } else if ([action isEqualToString:kContextMenuPointerAction]) {
         [delegate_ openContextMenuWithEvent:event];
     } else if ([action isEqualToString:kNextTabPointerAction]) {