sources/PseudoTerminal.m

@@ -1176,7 +1176,7 @@ ITERM_WEAKLY_REFERENCEABLE
 }
 - (void)tabTitleDidChange:(PTYTab *)tab {
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 // Allow frame to go off-screen while hotkey window is sliding in or out.
@@ -1506,11 +1506,11 @@ ITERM_WEAKLY_REFERENCEABLE
 }
 - (void)keyBindingsDidChange:(NSNotification *)notification {
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 - (void)colorPresetsDidChange:(NSNotification *)notification {
-    [self updateTouchBarIfNeeded];
+    [self updateColorPresets];
 }
 - (IBAction)closeCurrentTab:(id)sender {
@@ -3659,7 +3659,7 @@ ITERM_WEAKLY_REFERENCEABLE
     [self updateTabColors];
     [self saveTmuxWindowOrigins];
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 - (BOOL)fullScreen
@@ -3796,7 +3796,7 @@ ITERM_WEAKLY_REFERENCEABLE
         [_didEnterLionFullscreen release];
         _didEnterLionFullscreen = nil;
     }
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 - (void)windowWillExitFullScreen:(NSNotification *)notification
@@ -3832,7 +3832,7 @@ ITERM_WEAKLY_REFERENCEABLE
     [self notifyTmuxOfWindowResize];
     [self saveTmuxWindowOrigins];
     [self.window makeFirstResponder:self.currentSession.textview];
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 - (NSRect)windowWillUseStandardFrame:(NSWindow *)sender defaultFrame:(NSRect)defaultFrame {
@@ -3930,6 +3930,15 @@ ITERM_WEAKLY_REFERENCEABLE
 }
 // Contextual menu
+- (void)editSession:(NSMenuItem *)item {
+    NSTabViewItem *tabViewItem = item.representedObject;
+    PTYTab *tab = tabViewItem.identifier;
+    PTYSession *session = tab.activeSession;
+    if (session) {
+        [self editSession:session makeKey:NO];
+    }
+}
+
 - (void)editCurrentSession:(id)sender
 {
     PTYSession* session = [self currentSession];
@@ -4119,7 +4128,7 @@ ITERM_WEAKLY_REFERENCEABLE
     if ([[PreferencePanel sessionsInstance] isWindowLoaded]) {
         [self editSession:self.currentSession makeKey:NO];
     }
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
     NSInteger darkCount = 0;
     NSInteger lightCount = 0;
@@ -4456,7 +4465,7 @@ ITERM_WEAKLY_REFERENCEABLE
     [self updateTabColors];
     [self _updateTabObjectCounts];
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
     if (_contentView.tabView.numberOfTabViewItems == 1 &&
         _previousNumberOfTabs == 0 &&
@@ -4501,6 +4510,12 @@ ITERM_WEAKLY_REFERENCEABLE
    }
     // add tasks
+    item = [[[NSMenuItem alloc] initWithTitle:@"Edit Session…"
+                                       action:@selector(editSession:)
+                                keyEquivalent:@""] autorelease];
+    [item setRepresentedObject:tabViewItem];
+    [rootMenu addItem:item];
+
     item = [[[NSMenuItem alloc] initWithTitle:@"Close Tab"
                                        action:@selector(closeTabContextualMenuAction:)
                                 keyEquivalent:@""] autorelease];
@@ -5702,7 +5717,7 @@ ITERM_WEAKLY_REFERENCEABLE
     if ([[PreferencePanel sessionsInstance] isWindowLoaded]) {
         [self editSession:self.currentSession makeKey:NO];
     }
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
     [self updateCurrentLocation];
 }
@@ -7424,7 +7439,7 @@ ITERM_WEAKLY_REFERENCEABLE
                  @(_anchoredScreenNumber), @(_isAnchoredToScreen), self);
         }
     }
-    [self updateTouchBarIfNeeded];
+    [self updateTouchBarIfNeeded:NO];
 }
 // Called when the parameter panel should close.

sources/VT100Terminal.m

@@ -355,6 +355,7 @@ static const int kMaxScreenRows = 4096;
     if (userInitiated) {
         [_parser reset];
     }
+    [delegate_ terminalShowPrimaryBuffer];
     [delegate_ terminalResetPreservingPrompt:userInitiated];
 }

sources/iTermApplicationDelegate.m

@@ -201,6 +201,9 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
     NSMutableDictionary<id, ITMNotificationRequest *> *_terminateSessionSubscriptions;
     NSMutableDictionary<id, ITMNotificationRequest *> *_layoutChangeSubscriptions;
     BOOL _layoutChanged;
+
+    // Location of mouse when the app became inactive.
+    NSPoint _savedMouseLocation;
 }
 - (instancetype)init {
@@ -866,6 +869,7 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
         DLog(@"Application resigning active. Disabling secure input.");
         [self setSecureInput:NO];
     }
+    _savedMouseLocation = [NSEvent mouseLocation];
 }
 - (void)applicationWillHide:(NSNotification *)aNotification {
@@ -883,7 +887,9 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
     // If focus follows mouse is on, find the window under the cursor and make it key. If a PTYTextView
     // is under the cursor make it first responder.
-    if ([iTermPreferences boolForKey:kPreferenceKeyFocusFollowsMouse]) {
+    NSPoint mouseLocation = [NSEvent mouseLocation];
+    if (!NSEqualPoints(mouseLocation, _savedMouseLocation) && 
+        [iTermPreferences boolForKey:kPreferenceKeyFocusFollowsMouse]) {
         NSRect mouseRect = {
             .origin = [NSEvent mouseLocation],
             .size = { 0, 0 }
@@ -2045,6 +2051,11 @@ static const NSTimeInterval kOneMonth = 30 * 24 * 60 * 60;
     [[TmuxDashboardController sharedInstance] showWindow:nil];
 }
+- (IBAction)openSourceLicenses:(id)sender {
+    NSURL *url = [[NSBundle mainBundle] URLForResource:@"Licenses" withExtension:@"txt"];
+    [[NSWorkspace sharedWorkspace] openURL:url];
+}
+
 #pragma mark - Private
 - (void)updateProcessType {