Changeset 142 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

Timestamp:

06/14/03 09:54:54 (21 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE 1.4a1

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEETerminal.m

@@ -52 +52 @@
 - (unsigned int)characterIndexForPoint:(NSPoint)thePoint { return 0; }
 - (NSArray*)validAttributesForMarkedText { return nil; }
-
 // NSDraggingDestination
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender { return NSDragOperationNone; }
-- (void)draggingExited:(id <NSDraggingInfo>)sender {}
-
-    // misc. other stuff
+// misc. other stuff
 - (void)_optionClickEvent:(NSEvent *)event:(unsigned int)row:(unsigned short)column {}
 - (void)setNeedsDisplay; {}
-
 @end
 
@@ -441 +437 @@
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 {
-    if ([sender draggingSource] != self || ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)) {
+    if (!ICCF_prefs.terminalRequireOptionForSelfDrag || [sender draggingSource] != self || ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)) {
         [super draggingEntered: sender];
         // When doing non-self drags, this works around one bug in Terminal wherein the option key acts as a toggle, and it shouldn't (see Aqua HIG).  Unfortunately, this messes up drag feedback for self drags, but I don't know of any way to fix it.  Not that most Cocoa apps get it remotely right, anyway.