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

Avoid profile divorce for restoreCursor (discovered in the debug log for issue...

Avoid profile divorce for restoreCursor (discovered in the debug log for issue 5344). Add logging for first responder changes for issue 5344.
parent ff4fe501
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -2672,8 +2672,7 @@ ITERM_WEAKLY_REFERENCEABLE
[self sanityCheck];
}
 
- (BOOL)reloadProfile
{
- (BOOL)reloadProfile {
[self sanityCheck];
DLog(@"Reload profile for %@", self);
BOOL didChange = NO;
Loading
Loading
@@ -7369,7 +7368,9 @@ ITERM_WEAKLY_REFERENCEABLE
// Set to default value
unicodeVersion = [[iTermProfilePreferences defaultObjectForKey:KEY_UNICODE_VERSION] integerValue];
}
if (unicodeVersion >= kMinimumUnicodeVersion && unicodeVersion <= kMaximumUnicodeVersion) {
if (unicodeVersion >= kMinimumUnicodeVersion &&
unicodeVersion <= kMaximumUnicodeVersion &&
unicodeVersion != [iTermProfilePreferences integerForKey:KEY_UNICODE_VERSION inProfile:self.profile]) {
[self setSessionSpecificProfileValues:@{ KEY_UNICODE_VERSION: @(unicodeVersion) }];
}
}
Loading
Loading
Loading
Loading
@@ -527,12 +527,16 @@ static const int kDragThreshold = 3;
- (BOOL)resignFirstResponder {
[_altScreenMouseScrollInferer firstResponderDidChange];
[self removeUnderline];
DLog(@"resignFirstResponder %@", self);
DLog(@"%@", [NSThread callStackSymbols]);
return YES;
}
 
- (BOOL)becomeFirstResponder {
[_altScreenMouseScrollInferer firstResponderDidChange];
[_delegate textViewDidBecomeFirstResponder];
DLog(@"becomeFirstResponder %@", self);
DLog(@"%@", [NSThread callStackSymbols]);
return YES;
}
 
Loading
Loading
Loading
Loading
@@ -117,7 +117,7 @@
return;
}
} else if ([event type] == NSKeyDown) {
DLog(@"Received KeyDown event: %@", event);
DLog(@"Received KeyDown event: %@. Key window is %@. First responder is %@", event, [self keyWindow], [[self keyWindow] firstResponder]);
iTermController* cont = [iTermController sharedInstance];
 
event = [self eventByRemappingForSecureInput:event];
Loading
Loading
@@ -241,7 +241,6 @@
}
DLog(@"NSKeyDown event taking the regular path");
}
[super sendEvent:event];
}
 
Loading
Loading
Loading
Loading
@@ -375,6 +375,12 @@ ITERM_WEAKLY_REFERENCEABLE
}
}
 
- (BOOL)makeFirstResponder:(nullable NSResponder *)responder {
DLog(@"%p makeFirstResponder:%@", self, responder);
DLog(@"%@", [NSThread callStackSymbols]);
return [super makeFirstResponder:responder];
}
NS_ASSUME_NONNULL_END
 
@end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment