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

Adhoc build 3.0.20160817_160443

parent ef3ef929
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -65,12 +65,15 @@ static NSString *const kSuppressCaptureOutputToolNotVisibleWarning =
onString:(iTermStringLine *)stringLine
atAbsoluteLineNumber:(long long)lineNumber
stop:(BOOL *)stop {
DLog(@"Capture trigger fired");
if (!aSession.screen.shellIntegrationInstalled) {
if (![[NSUserDefaults standardUserDefaults] boolForKey:kSuppressCaptureOutputRequiresShellIntegrationWarning]) {
DLog(@"Showing shell integration required announcement");
[self showShellIntegrationRequiredAnnouncementInSession:aSession];
}
} else if (![self capturedOutputToolVisibleInSession:aSession]) {
if (![[NSUserDefaults standardUserDefaults] boolForKey:kSuppressCaptureOutputToolNotVisibleWarning]) {
DLog(@"Showing tool not visible announcement");
[self showCapturedOutputToolNotVisibleAnnouncementInSession:aSession];
}
}
Loading
Loading
Loading
Loading
@@ -88,15 +88,11 @@ int DebugLogImpl(const char *file, int line, const char *function, NSString* val
} else {
lastSlash++;
}
[gDebugLogStr appendFormat:@"%lld.%06lld %s:%d (%s): ",
NSMutableString *temp = [NSMutableString string];
[temp appendFormat:@"%lld.%06lld %s:%d (%s): ",
(long long)tv.tv_sec, (long long)tv.tv_usec, lastSlash, line, function];
[gDebugLogStr appendString:value];
[gDebugLogStr appendString:@"\n"];
static const NSInteger kMaxLogSize = 100000000;
if ([gDebugLogStr length] > kMaxLogSize) {
[gDebugLogStr replaceCharactersInRange:NSMakeRange(0, kMaxLogSize / 2)
withString:@"*GIANT LOG TRUNCATED*\n"];
}
[temp appendString:value];
NSLog(@"%@", temp);
[gDebugLogLock unlock];
}
return 1;
Loading
Loading
Loading
Loading
@@ -3935,8 +3935,10 @@ ITERM_WEAKLY_REFERENCEABLE
#pragma mark - Captured Output
 
- (void)addCapturedOutput:(CapturedOutput *)capturedOutput {
DLog(@"Add captured output %@ to session %@", capturedOutput, self);
VT100ScreenMark *lastCommandMark = [_screen lastCommandMark];
if (!lastCommandMark) {
DLog(@"Failed to find a mark!");
// TODO: Show an announcement
return;
}
Loading
Loading
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