Skip to content
Snippets Groups Projects
Commit 93f73dc8 authored by George Nachman's avatar George Nachman
Browse files

Adhoc build 1.0.0.20131122_174504

parent a223af45
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
PTYSession.m
+ 28
− 88
View file @ 93f73dc8
@@ -872,21 +872,11 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
 
- (void)writeTaskImpl:(NSData *)data
{
static BOOL checkedDebug;
static BOOL debugKeyDown;
if (!checkedDebug) {
debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
checkedDebug = YES;
}
if (debugKeyDown || gDebugLogging) {
if (gDebugLogging) {
const char *bytes = [data bytes];
for (int i = 0; i < [data length]; i++) {
if (debugKeyDown) {
NSLog(@"writeTask keydown %d: %d (%c)", i, (int) bytes[i], bytes[i]);
}
if (gDebugLogging) {
DebugLog([NSString stringWithFormat:@"writeTask keydown %d: %d (%c)", i, (int) bytes[i], bytes[i]]);
}
DLog(@"writeTask keydown %d: %d (%c) from %@",
i, (int) bytes[i], bytes[i], [NSThread callStackSymbols]);
}
}
 
@@ -1327,7 +1317,6 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
// pass the keystroke as input.
- (void)keyDown:(NSEvent *)event
{
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
unsigned char *send_str = NULL;
unsigned char *dataPtr = NULL;
int dataLength = 0;
@@ -1354,15 +1343,13 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
}
unicode = [keystr length] > 0 ? [keystr characterAtIndex:0] : 0;
unmodunicode = [unmodkeystr length] > 0 ? [unmodkeystr characterAtIndex:0] : 0;
if (debugKeyDown) {
NSLog(@"PTYSession keyDown modflag=%d keystr=%@ unmodkeystr=%@ unicode=%d unmodunicode=%d", (int)modflag, keystr, unmodkeystr, (int)unicode, (int)unmodunicode);
}
DLog(@"PTYSession keyDown modflag=%d keystr=%@ unmodkeystr=%@ unicode=%d unmodunicode=%d",
(int)modflag, keystr, unmodkeystr, (int)unicode, (int)unmodunicode);
gettimeofday(&lastInput, NULL);
 
if ([[[self tab] realParentWindow] inInstantReplay]) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown in IR");
}
DLog(@"PTYSession keyDown in IR");
// Special key handling in IR mode, and keys never get sent to the live
// session, even though it might be displayed.
if (unicode == 27) {
@@ -1394,9 +1381,7 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
}
 
unsigned short keycode = [event keyCode];
if (debugKeyDown) {
NSLog(@"event:%@ (%x+%x)[%@][%@]:%x(%c) <%d>", event,modflag,keycode,keystr,unmodkeystr,unicode,unicode,(modflag & NSNumericPadKeyMask));
}
DebugLog([NSString stringWithFormat:@"event:%@ (%x+%x)[%@][%@]:%x(%c) <%d>", event,modflag,keycode,keystr,unmodkeystr,unicode,unicode,(modflag & NSNumericPadKeyMask)]);
 
// Check if we have a custom key mapping for this event
@@ -1406,10 +1391,7 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
keyMappings:[[self addressBookEntry] objectForKey:KEY_KEYBOARD_MAP]];
 
if (keyBindingAction >= 0) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown action=%d", keyBindingAction);
}
DebugLog([NSString stringWithFormat:@"keyBindingAction=%d", keyBindingAction]);
DLog(@"PTYSession keyDown action=%d", keyBindingAction);
// A special action was bound to this key combination.
NSString* temp;
int profileAction = [iTermKeyBindingMgr localActionForKeyCode:unmodunicode
@@ -1599,20 +1581,14 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
[self handleKeypressInTmuxGateway:unicode];
return;
}
if (debugKeyDown) {
NSLog(@"PTYSession keyDown no keybinding action");
}
DebugLog(@"No keybinding action");
DLog(@"PTYSession keyDown no keybinding action");
if (EXIT) {
DebugLog(@"Terminal already dead");
return;
}
// No special binding for this key combination.
if (modflag & NSFunctionKeyMask) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown is a function key");
}
DebugLog(@"Is a function key");
DLog(@"PTYSession keyDown is a function key");
// Handle all "special" keys (arrows, etc.)
NSData *data = nil;
 
@@ -1673,10 +1649,7 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
([self optionKey] != OPT_NORMAL)) || /// synergy
((modflag & NSRightAlternateKeyMask) == NSRightAlternateKeyMask &&
([self rightOptionKey] != OPT_NORMAL))) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown opt + key -> modkey");
}
DebugLog(@"Option + key -> modified key");
DLog(@"PTYSession keyDown opt + key -> modkey");
// A key was pressed while holding down option and the option key
// is not behaving normally. Apply the modified behavior.
int mode; // The modified behavior based on which modifier is pressed.
@@ -1703,43 +1676,28 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
}
}
} else {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown regular path");
}
DebugLog(@"Regular path for keypress");
DLog(@"PTYSession keyDown regular path");
// Regular path for inserting a character from a keypress.
int max = [keystr length];
NSData *data=nil;
 
if (max != 1||[keystr characterAtIndex:0] > 0x7f) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown non-ascii");
}
DebugLog(@"Non-ascii input");
DLog(@"PTYSession keyDown non-ascii");
data = [keystr dataUsingEncoding:[TERMINAL encoding]];
} else {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown ascii");
}
DebugLog(@"ASCII input");
DLog(@"PTYSession keyDown ascii");
data = [keystr dataUsingEncoding:NSUTF8StringEncoding];
}
 
// Enter key is on numeric keypad, but not marked as such
if (unicode == NSEnterCharacter && unmodunicode == NSEnterCharacter) {
modflag |= NSNumericPadKeyMask;
if (debugKeyDown) {
NSLog(@"PTYSession keyDown enter key");
}
DebugLog(@"Enter key");
DLog(@"PTYSession keyDown enter key");
keystr = @"\015"; // Enter key -> 0x0d
}
// Check if we are in keypad mode
if (modflag & NSNumericPadKeyMask) {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown numeric keyoad");
}
DebugLog(@"Numeric keypad mask");
DLog(@"PTYSession keyDown numeric keyoad");
data = [TERMINAL keypadData:unicode keystr:keystr];
}
 
@@ -1752,29 +1710,21 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
// fat-fingered switching of tabs/windows.
// Do not send anything for cmd+[shift]+enter if it wasn't
// caught by the menu.
DebugLog(@"Cmd + 0-9 or cmd + enter");
if (debugKeyDown) {
NSLog(@"PTYSession keyDown cmd+0-9 or cmd+enter");
}
DLog(@"PTYSession keyDown cmd+0-9 or cmd+enter");
data = nil;
}
if (data != nil) {
send_str = (unsigned char *)[data bytes];
send_strlen = [data length];
DebugLog([NSString stringWithFormat:@"modflag = 0x%x; send_strlen = %zd; send_str[0] = '%c (0x%x)'",
DLog([NSString stringWithFormat:@"modflag = 0x%x; send_strlen = %zd; send_str[0] = '%c (0x%x)'",
modflag, send_strlen, send_str[0], send_str[0]]);
if (debugKeyDown) {
DebugLog([NSString stringWithFormat:@"modflag = 0x%x; send_strlen = %zd; send_str[0] = '%c (0x%x)'",
modflag, send_strlen, send_str[0], send_str[0]]);
}
}
 
if ((modflag & NSControlKeyMask) &&
send_strlen == 1 &&
send_str[0] == '|') {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown c-|");
}
DLog(@"PTYSession keyDown c-|");
// Control-| is sent as Control-backslash
send_str = (unsigned char*)"\034";
send_strlen = 1;
@@ -1782,27 +1732,24 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
(modflag & NSShiftKeyMask) &&
send_strlen == 1 &&
send_str[0] == '/') {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown c-?");
}
DLog(@"PTYSession keyDown c-?");
// Control-shift-/ is sent as Control-?
send_str = (unsigned char*)"\177";
send_strlen = 1;
} else if ((modflag & NSControlKeyMask) &&
send_strlen == 1 &&
send_str[0] == '/') {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown c-/");
}
DLog(@"PTYSession keyDown c-/");
// Control-/ is sent as Control-/, but needs some help to do so.
send_str = (unsigned char*)"\037"; // control-/
send_strlen = 1;
} else if ((modflag & NSShiftKeyMask) &&
send_strlen == 1 &&
send_str[0] == '\031') {
if (debugKeyDown) {
NSLog(@"PTYSession keyDown shift-tab -> esc[Z");
}
DLog(@"PTYSession keyDown shift-tab -> esc[Z");
// Shift-tab is sent as Esc-[Z (or "backtab")
send_str = (unsigned char*)"\033[Z";
send_strlen = 3;
@@ -1862,18 +1809,11 @@ static NSString *kTmuxFontChanged = @"kTmuxFontChanged";
}
}
 
#if DEBUG_METHOD_TRACE
NSLog(@"%s(%d):-[PTYSession insertText:%@]",
__FILE__, __LINE__, mstring);
#endif
data = [mstring dataUsingEncoding:[TERMINAL encoding]
allowLossyConversion:YES];
 
if (data != nil) {
if (gDebugLogging) {
DebugLog([NSString stringWithFormat:@"writeTask:%@", data]);
}
DLog(@"PTYSession writeTask:%@", data);
[self writeTask:data];
}
}
PTYTextView.m
+ 58
− 80
View file @ 93f73dc8
@@ -1515,10 +1515,15 @@ NSMutableArray* screens=0;
return result;
}
 
- (BOOL)isInKeyWindow
{
return ([[self window] isKeyWindow]);
}
- (BOOL)_isCursorBlinking
{
if ([self blinkingCursor] &&
[[self window] isKeyWindow] &&
[self isInKeyWindow] &&
[[[dataSource session] tab] activeSession] == [dataSource session]) {
return YES;
} else {
@@ -2374,21 +2379,15 @@ NSMutableArray* screens=0;
isFirstInteraction = NO;
}
 
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown BEGIN %@", event);
}
DebugLog(@"PTYTextView keyDown");
DLog(@"PTYTextView keyDown BEGIN %@ on PTYTextView %@", event, self);
id delegate = [self delegate];
if ([delegate isPasting]) {
[delegate queueKeyDown:event];
return;
}
if ([[[[[self dataSource] session] tab] realParentWindow] inInstantReplay]) {
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown: in instant replay, send to delegate");
}
DLog(@"PTYTextView keyDown: in instant replay, send to delegate");
// Delegate has special handling for this case.
[delegate keyDown:event];
return;
@@ -2398,19 +2397,17 @@ NSMutableArray* screens=0;
BOOL prev = [self hasMarkedText];
 
keyIsARepeat = [event isARepeat];
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown modflag=%d keycode=%d", modflag, (int)keyCode);
NSLog(@"prev=%d", (int)prev);
NSLog(@"hasActionableKeyMappingForEvent=%d", (int)[delegate hasActionableKeyMappingForEvent:event]);
NSLog(@"modFlag & (NSNumericPadKeyMask | NSFUnctionKeyMask)=%d", (modflag & (NSNumericPadKeyMask | NSFunctionKeyMask)));
NSLog(@"charactersIgnoringModififiers length=%d", (int)[[event charactersIgnoringModifiers] length]);
NSLog(@"delegate optionkey=%d, delegate rightOptionKey=%d", (int)[delegate optionKey], (int)[delegate rightOptionKey]);
NSLog(@"modflag & leftAlt == leftAlt && optionKey != NORMAL = %d", (int)((modflag & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask && [delegate optionKey] != OPT_NORMAL));
NSLog(@"modflag == alt && optionKey != NORMAL = %d", (int)(modflag == NSAlternateKeyMask && [delegate optionKey] != OPT_NORMAL));
NSLog(@"modflag & rightAlt == rightAlt && rightOptionKey != NORMAL = %d", (int)((modflag & NSRightAlternateKeyMask) == NSRightAlternateKeyMask && [delegate rightOptionKey] != OPT_NORMAL));
NSLog(@"isControl=%d", (int)(modflag & NSControlKeyMask));
NSLog(@"keycode is slash=%d, is backslash=%d", (keyCode == 0x2c), (keyCode == 0x2a));
}
DLog(@"PTYTextView keyDown modflag=%d keycode=%d", modflag, (int)keyCode);
DLog(@"prev=%d", (int)prev);
DLog(@"hasActionableKeyMappingForEvent=%d", (int)[delegate hasActionableKeyMappingForEvent:event]);
DLog(@"modFlag & (NSNumericPadKeyMask | NSFUnctionKeyMask)=%d", (modflag & (NSNumericPadKeyMask | NSFunctionKeyMask)));
DLog(@"charactersIgnoringModififiers length=%d", (int)[[event charactersIgnoringModifiers] length]);
DLog(@"delegate optionkey=%d, delegate rightOptionKey=%d", (int)[delegate optionKey], (int)[delegate rightOptionKey]);
DLog(@"modflag & leftAlt == leftAlt && optionKey != NORMAL = %d", (int)((modflag & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask && [delegate optionKey] != OPT_NORMAL));
DLog(@"modflag == alt && optionKey != NORMAL = %d", (int)(modflag == NSAlternateKeyMask && [delegate optionKey] != OPT_NORMAL));
DLog(@"modflag & rightAlt == rightAlt && rightOptionKey != NORMAL = %d", (int)((modflag & NSRightAlternateKeyMask) == NSRightAlternateKeyMask && [delegate rightOptionKey] != OPT_NORMAL));
DLog(@"isControl=%d", (int)(modflag & NSControlKeyMask));
DLog(@"keycode is slash=%d, is backslash=%d", (keyCode == 0x2c), (keyCode == 0x2a));
 
// Hide the cursor
[NSCursor setHiddenUntilMouseMoves:YES];
@@ -2425,22 +2422,19 @@ NSMutableArray* screens=0;
((modflag & NSRightAlternateKeyMask) == NSRightAlternateKeyMask && [delegate rightOptionKey] != OPT_NORMAL))) ||
((modflag & NSControlKeyMask) && // a few special cases
(keyCode == 0x2c /* slash */ || keyCode == 0x2a /* backslash */)))) {
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown: process in delegate");
}
DLog(@"PTYTextView keyDown: process in delegate");
[delegate keyDown:event];
return;
}
 
if (debugKeyDown) {
NSLog(@"Test for command key");
}
DLog(@"Test for command key");
if (modflag & NSCommandKeyMask) {
// You pressed cmd+something but it's not handled by the delegate. Going further would
// send the unmodified key to the terminal which doesn't make sense.
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown You pressed cmd+something");
}
DLog(@"PTYTextView keyDown You pressed cmd+something");
return;
}
 
@@ -2449,9 +2443,8 @@ NSMutableArray* screens=0;
BOOL workAroundControlBug = NO;
if (!prev &&
(modflag & (NSControlKeyMask | NSCommandKeyMask | NSAlternateKeyMask)) == NSControlKeyMask) {
if (debugKeyDown) {
NSLog(@"Special ctrl+key handler running");
}
DLog(@"Special ctrl+key handler running");
NSString *unmodkeystr = [event charactersIgnoringModifiers];
if ([unmodkeystr length] != 0) {
unichar unmodunicode = [unmodkeystr length] > 0 ? [unmodkeystr characterAtIndex:0] : 0;
@@ -2473,9 +2466,8 @@ NSMutableArray* screens=0;
}
if (cc != 0xffff) {
[self insertText:[NSString stringWithCharacters:&cc length:1]];
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown work around control bug. cc=%d", (int)cc);
}
DLog(@"PTYTextView keyDown work around control bug. cc=%d", (int)cc);
workAroundControlBug = YES;
}
}
@@ -2484,24 +2476,24 @@ NSMutableArray* screens=0;
if (!workAroundControlBug) {
// Let the IME process key events
IM_INPUT_INSERT = NO;
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown send to IME");
}
DLog(@"PTYTextView keyDown send to IME");
[self interpretKeyEvents:[NSArray arrayWithObject:event]];
 
DLog(@"prev=%d, IM_INPUT_INSERT=%d, hasMarkedText=%d",
(int)prev,
(int)IM_INPUT_INSERT,
(int)[self hasMarkedText]);
// If the IME didn't want it, pass it on to the delegate
if (!prev &&
!IM_INPUT_INSERT &&
![self hasMarkedText]) {
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown IME no, send to delegate");
}
DLog(@"PTYTextView keyDown IME no, send to delegate");
[delegate keyDown:event];
}
}
if (debugKeyDown) {
NSLog(@"PTYTextView keyDown END");
}
DLog(@"PTYTextView keyDown END");
}
 
- (BOOL)keyIsARepeat
@@ -2921,7 +2913,7 @@ NSMutableArray* screens=0;
if (![obj disableFocusFollowsMouse]) {
[[self window] makeKeyWindow];
}
if ([[self window] isKeyWindow]) {
if ([self isInKeyWindow]) {
[[[dataSource session] tab] setActiveSession:[dataSource session]];
}
}
@@ -3948,12 +3940,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 
- (void)placeCursorOnCurrentLineWithEvent:(NSEvent *)event
{
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
if (debugKeyDown) {
NSLog(@"PTYTextView placeCursorOnCurrentLineWithEvent BEGIN %@", event);
}
DebugLog(@"PTYTextView placeCursorOnCurrentLineWithEvent");
DLog(@"PTYTextView placeCursorOnCurrentLineWithEvent BEGIN %@", event);
 
NSPoint clickPoint = [self clickPoint:event];
int x = clickPoint.x;
@@ -3993,14 +3980,9 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
i--;
}
}
if (debugKeyDown) {
NSLog(@"cursor at %d,%d (x,y) moved to %d,%d (x,y) [window width: %d]",
cursorX, cursorY, x, y, width);
}
if (debugKeyDown) {
NSLog(@"PTYTextView placeCursorOnCurrentLineWithEvent END");
}
DLog(@"cursor at %d,%d (x,y) moved to %d,%d (x,y) [window width: %d]",
cursorX, cursorY, x, y, width);
DLog(@"PTYTextView placeCursorOnCurrentLineWithEvent END");
}
 
- (NSString*)contentInBoxFromX:(int)startx
@@ -4861,11 +4843,10 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 
- (void)insertText:(id)aString
{
DLog(@"PTYTextView insertText:%@", aString);
if ([self hasMarkedText]) {
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
if (debugKeyDown) {
NSLog(@"insertText: clear marked text");
}
DLog(@"insertText: clear marked text");
IM_INPUT_MARKEDRANGE = NSMakeRange(0, 0);
[markedText release];
markedText=nil;
@@ -4881,6 +4862,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
else
[super insertText:aString];
 
DLog(@"PTYTextView insertText set IM_INPUT_INSERT=YES");
IM_INPUT_INSERT = YES;
}
 
@@ -4898,10 +4880,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 
- (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange
{
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
if (debugKeyDown) {
NSLog(@"set marked text to %@; range %@", aString, [NSValue valueWithRange:selRange]);
}
DLog(@"set marked text to %@; range %@", aString, [NSValue valueWithRange:selRange]);
[markedText release];
if ([aString isKindOfClass:[NSAttributedString class]]) {
markedText = [[NSAttributedString alloc] initWithString:[aString string]
@@ -4939,10 +4919,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 
- (void)unmarkText
{
BOOL debugKeyDown = [[[NSUserDefaults standardUserDefaults] objectForKey:@"DebugKeyDown"] boolValue];
if (debugKeyDown) {
NSLog(@"clear marked text");
}
DLog(@"clear marked text");
// As far as I can tell this is never called.
IM_INPUT_MARKEDRANGE = NSMakeRange(0, 0);
imeOffset = 0;
@@ -7268,7 +7246,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
lastTimeCursorMoved_ = now;
}
if ([self blinkingCursor] &&
[[self window] isKeyWindow] &&
[self isInKeyWindow] &&
[[[dataSource session] tab] activeSession] == [dataSource session] &&
now - lastTimeCursorMoved_ > 0.5) {
// Allow the cursor to blink if it is configured, the window is key, this session is active
@@ -7366,7 +7344,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
switch (cursorType_) {
case CURSOR_BOX:
// draw the box
if ([[self window] isKeyWindow] &&
if ([self isInKeyWindow] &&
[[[dataSource session] tab] activeSession] == [dataSource session]) {
frameOnly = NO;
NSRectFill(NSMakeRect(curX,
@@ -7387,7 +7365,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
int fgColor;
BOOL fgAlt;
BOOL fgBold;
if ([[self window] isKeyWindow]) {
if ([self isInKeyWindow]) {
// Draw a character in background color when
// window is key.
fgColor = screenChar.backgroundColor;
@@ -7405,7 +7383,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
int theColor;
BOOL alt;
BOOL isBold;
if ([[self window] isKeyWindow]) {
if ([self isInKeyWindow]) {
theColor = screenChar.backgroundColor;
alt = screenChar.alternateBackgroundSemantics;
isBold = screenChar.bold;
@@ -7449,7 +7427,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
int theColor;
BOOL alt;
BOOL isBold;
if ([[self window] isKeyWindow]) {
if ([self isInKeyWindow]) {
theColor = ALTSEM_CURSOR;
alt = YES;
isBold = screenChar.bold;
@@ -8722,7 +8700,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
redrawBlink = YES;
 
if ([self blinkingCursor] &&
[[self window] isKeyWindow]) {
[self isInKeyWindow]) {
// Blink flag flipped and there is a blinking cursor. Mark it dirty.
[self markCursorAsDirty];
}
iTerm.plist
+ 2
− 2
View file @ 93f73dc8
@@ -192,8 +192,8 @@
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
<key>SUFeedURLForTesting</key>
<string>http://iterm2.com/appcasts/legacy_testing.xml</string>
<string>http://iterm2.com/appcasts/testing.xml</string>
<key>SUFeedURLForFinal</key>
<string>http://iterm2.com/appcasts/legacy_final.xml</string>
<string>http://iterm2.com/appcasts/final.xml</string>
</dict>
</plist>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment