Add terminator-style titles to split panes (currently not optional)

MovePaneController.m

@@ -58,6 +58,8 @@
     [term insertSession:movingSession atIndex:0];
     [oldView autorelease];
+    [theTab numberOfSessionsDidChange];
+    [[term currentTab] numberOfSessionsDidChange];
  }
 - (SessionView *)removeAndClearSession

PTYSession.m

@@ -2148,6 +2148,7 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
 - (void)setName:(NSString*)theName
 {
+    [view setTitle:theName];
     if (!bookmarkName) {
         bookmarkName = [theName copy];
     }

PTYTab.h

@@ -198,6 +198,7 @@ static const int MIN_SESSION_COLUMNS = 2;
 - (void)_splitViewDidResizeSubviews:(NSSplitView*)splitView;
 - (CGFloat)splitView:(NSSplitView *)splitView constrainSplitPosition:(CGFloat)proposedPosition ofSubviewAt:(NSInteger)dividerIndex;
 - (void)_recursiveRemoveView:(NSView*)theView;
+- (void)numberOfSessionsDidChange;
 @end

PTYTab.m

@@ -133,6 +133,16 @@ static const BOOL USE_THIN_SPLITTERS = YES;
     deadStateColor = [NSColor grayColor];
 }
+- (void)numberOfSessionsDidChange
+{
+    NSArray *sessions = [self sessions];
+    for (PTYSession *aSession in sessions) {
+        if ([[aSession view] setShowTitle:[sessions count] > 1]) {
+            [self fitSessionToCurrentViewSize:aSession];
+        }
+    }
+}
+
 - (void)appendSessionViewToViewOrder:(SessionView*)sessionView
 {
     NSNumber* n = [NSNumber numberWithInt:[sessionView viewId]];
@@ -143,6 +153,7 @@ static const BOOL USE_THIN_SPLITTERS = YES;
         }
         [viewOrder_ insertObject:n atIndex:i];
     }
+    [self numberOfSessionsDidChange];
 }
 - (void)appendSessionToViewOrder:(PTYSession*)session
@@ -1071,9 +1082,10 @@ static NSString* FormatRect(NSRect r) {
     if (aSession == activeSession_) {
         [self setActiveSessionPreservingViewOrder:[(SessionView*)nearestNeighbor session]];
     }
-    
+
     [self recheckBlur];
     [realParentWindow_ sessionWasRemoved];
+    [self numberOfSessionsDidChange];
 }
 - (BOOL)canSplitVertically:(BOOL)isVertical withSize:(NSSize)newSessionSize
@@ -1882,6 +1894,8 @@ static NSString* FormatRect(NSRect r) {
         [[root objectForKey:TAB_ARRANGEMENT_IS_MAXIMIZED] boolValue]) {
         [theTab maximize];
     }
+
+    [theTab numberOfSessionsDidChange];
 }
 - (NSDictionary*)arrangementWithMap:(NSMutableDictionary*)idMap

PTYTextView.m

@@ -3425,29 +3425,32 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (BOOL)_haveShortSelection
 {
-    return startX > -1 && abs(startY - endY) <= 1;
+    return startX > -1 && startY >= 0 && abs(startY - endY) <= 1;
 }
 - (NSMenu *)menuForEvent:(NSEvent *)theEvent
 {
-    PTYTextView* frontTextView = [[iTermController sharedInstance] frontTextView];
-    NSRect visibleRect = [[self enclosingScrollView] documentVisibleRect];
-    NSPoint locationInWindow = [theEvent locationInWindow];
-    NSPoint locationInTextView = [self convertPoint:locationInWindow fromView:nil];
-    VT100Terminal *terminal = [dataSource terminal];
-    MouseMode mm = [terminal mouseMode];
-    if (frontTextView == self &&
-        ([self xtermMouseReporting]) &&
-        (mm == MOUSE_REPORTING_NORMAL ||
-         mm == MOUSE_REPORTING_BUTTON_MOTION ||
-         mm == MOUSE_REPORTING_ALL_MOTION) &&
-        (locationInTextView.y > visibleRect.origin.y) &&
-        [[frontTextView->dataSource session] tab] == [[dataSource session] tab] &&
-        [theEvent type] == NSLeftMouseDown &&
-        ([theEvent modifierFlags] & NSControlKeyMask) &&
-        [[PreferencePanel sharedInstance] passOnControlLeftClick]) {
-        // All the many conditions are met for having the click passed on via xterm mouse reporting.
-        return nil;
+    if (theEvent) {
+        // Not for "synthetic" events, as the session title view sends.
+        PTYTextView* frontTextView = [[iTermController sharedInstance] frontTextView];
+        NSRect visibleRect = [[self enclosingScrollView] documentVisibleRect];
+        NSPoint locationInWindow = [theEvent locationInWindow];
+        NSPoint locationInTextView = [self convertPoint:locationInWindow fromView:nil];
+        VT100Terminal *terminal = [dataSource terminal];
+        MouseMode mm = [terminal mouseMode];
+        if (frontTextView == self &&
+            ([self xtermMouseReporting]) &&
+            (mm == MOUSE_REPORTING_NORMAL ||
+             mm == MOUSE_REPORTING_BUTTON_MOTION ||
+             mm == MOUSE_REPORTING_ALL_MOTION) &&
+            (locationInTextView.y > visibleRect.origin.y) &&
+            [[frontTextView->dataSource session] tab] == [[dataSource session] tab] &&
+            [theEvent type] == NSLeftMouseDown &&
+            ([theEvent modifierFlags] & NSControlKeyMask) &&
+            [[PreferencePanel sharedInstance] passOnControlLeftClick]) {
+            // All the many conditions are met for having the click passed on via xterm mouse reporting.
+            return nil;
+        }
     }
     NSMenu *theMenu;
@@ -3489,18 +3492,24 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     // Menu items for acting on text selections
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Open Selection as URL",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(browse:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Search Google for Selection",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(searchInBrowser:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Send Email to Selected Address",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(mail:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
     // Split pane options
     [theMenu addItemWithTitle:@"Split Pane Vertically" action:@selector(splitTextViewVertically:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:@"Split Pane Horizontally" action:@selector(splitTextViewHorizontally:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:@"Move Session to Split Pane" action:@selector(movePane:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
@@ -3508,10 +3517,13 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     // Copy,  paste, and save
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Copy",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(copy:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Paste",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(paste:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Save",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(saveDocumentAs:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
@@ -3519,11 +3531,13 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     // Select all
     [theMenu addItemWithTitle:NSLocalizedStringFromTableInBundle(@"Select All",@"iTerm", [NSBundle bundleForClass: [self class]], @"Context menu")
                      action:@selector(selectAll:) keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Clear buffer
     [theMenu addItemWithTitle:@"Clear Buffer"
                        action:@selector(clearTextViewBuffer:)
                 keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
@@ -3532,6 +3546,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     [theMenu addItemWithTitle:@"Edit Session..."
                        action:@selector(editTextViewSession:)
                 keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
@@ -3540,6 +3555,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     [theMenu addItemWithTitle:@"Toggle Broadcasting Input"
                        action:@selector(toggleBroadcastingInput:)
                 keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Separator
     [theMenu addItem:[NSMenuItem separatorItem]];
@@ -3548,10 +3564,12 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     [theMenu addItemWithTitle:@"Close"
                        action:@selector(closeTextViewSession:)
                 keyEquivalent:@""];
+    [[theMenu itemAtIndex:[theMenu numberOfItems] - 1] setTarget:self];
     // Ask the delegae if there is anything to be added
-    if ([[self delegate] respondsToSelector:@selector(menuForEvent: menu:)])
-        [[self delegate] menuForEvent:theEvent menu: theMenu];
+    if ([[self delegate] respondsToSelector:@selector(menuForEvent: menu:)]) {
+        [[self delegate] menuForEvent:theEvent menu:theMenu];
+    }
     return [theMenu autorelease];
 }

PseudoTerminal.m

@@ -2658,6 +2658,7 @@ NSString *sessionsKey = @"sessions";
     [theTab setTabViewItem:tabViewItem];
     [tabViewItem setLabel:[session name] ? [session name] : @""];
+    [theTab numberOfSessionsDidChange];
     return tabViewItem;
 }
@@ -3223,7 +3224,8 @@ NSString *sessionsKey = @"sessions";
         [[self currentTab] setActiveSessionPreservingViewOrder:newSession];
     }
     [[self currentTab] recheckBlur];
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"iTermNumberOfSessionsDidChange" object: self userInfo: nil];
+    [[self currentTab] numberOfSessionsDidChange];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"iTermNumberOfSessionsDidChange" object: self userInfo: nil];
 }
 - (void)splitVertically:(BOOL)isVertical withBookmark:(Bookmark*)theBookmark targetSession:(PTYSession*)targetSession
@@ -4434,7 +4436,7 @@ NSString *sessionsKey = @"sessions";
     // Tell the session at this index that it is no longer associated with this tab.
     PTYTab* oldTab = [aTabViewItem identifier];
-    [oldTab setTabViewItem:nil];
+    [oldTab setTabViewItem:nil];  // TODO: This looks like a bug if there are multiple sessions in one tab
     // Replace the session for the tab view item.
     PTYTab* newTab = [[PTYTab alloc] initWithSession:aSession];
@@ -4450,6 +4452,7 @@ NSString *sessionsKey = @"sessions";
         [[self window] makeKeyAndOrderFront:self];
     }
     [[iTermController sharedInstance] setCurrentTerminal:self];
+    [newTab numberOfSessionsDidChange];
 }
 - (CGFloat)fullscreenToolbeltWidth
@@ -5136,6 +5139,7 @@ NSString *sessionsKey = @"sessions";
     if ([object SCREEN]) {  // screen initialized ok
         [self insertSession:object atIndex:[TABVIEW numberOfTabViewItems]];
     }
+    [[self currentTab] numberOfSessionsDidChange];
 }
 -(void)replaceInSessions:(PTYSession *)object atIndex:(unsigned)anIndex
@@ -5168,6 +5172,7 @@ NSString *sessionsKey = @"sessions";
     if ([object SCREEN]) {  // screen initialized ok
         [self insertSession:object atIndex:anIndex];
     }
+    [[self currentTab] numberOfSessionsDidChange];
 }
 -(void)removeFromSessionsAtIndex:(unsigned)anIndex

SessionTitleView.h

+//
+//  SessionTitleView.h
+//  iTerm
+//
+//  Created by George Nachman on 10/21/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@protocol SessionTitleViewDelegate
+
+- (NSMenu *)menu;
+- (void)close;
+
+@end
+
+
+@interface SessionTitleView : NSView {
+    NSString *title_;
+    NSTextField *label_;
+    NSButton *closeButton_;
+    NSPopUpButton *menuButton_;
+    NSObject<SessionTitleViewDelegate> *delegate_;
+}
+
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, assign) NSObject<SessionTitleViewDelegate> *delegate;
+@end

SessionTitleView.m

+//
+//  SessionTitleView.m
+//  iTerm
+//
+//  Created by George Nachman on 10/21/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "SessionTitleView.h"
+
+const double kBottomMargin = 0;
+static const CGFloat kButtonSize = 17;
+
+@implementation SessionTitleView
+
+@synthesize title = title_;
+@synthesize delegate = delegate_;
+
+- (id)initWithFrame:(NSRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        const double kMargin = 5;
+        double x = kMargin;
+        
+        NSImage *closeImage = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"closebutton"
+                                                                                                      ofType:@"tif"]];
+        closeButton_ = [[NSButton alloc] initWithFrame:NSMakeRect(x, (frame.size.height - kButtonSize) / 2, kButtonSize, kButtonSize)];
+        [closeButton_ setButtonType:NSMomentaryPushInButton];
+        [closeButton_ setImage:closeImage];
+        [closeButton_ setTarget:self];
+        [closeButton_ setAction:@selector(close:)];
+        [closeButton_ setBordered:NO];
+        [closeButton_ setTitle:@""];
+        [[closeButton_ cell] setHighlightsBy:NSContentsCellMask];
+        [self addSubview:closeButton_];
+        [closeButton_ release];
+
+        x += closeButton_.frame.size.width + kMargin;
+        menuButton_ = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 42, 16.0) pullsDown:YES];
+        [(NSPopUpButtonCell *)[menuButton_ cell] setBezelStyle:NSSmallIconButtonBezelStyle];
+        [[menuButton_ cell] setArrowPosition:NSPopUpArrowAtBottom];
+        [menuButton_ setBordered:NO];
+        [menuButton_ addItemWithTitle:@""];
+        NSMenuItem *item = [menuButton_ itemAtIndex:0];
+        [item setImage:[NSImage imageNamed:@"NSActionTemplate"]];
+        [item setOnStateImage:nil];
+        [item setMixedStateImage:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(popupWillOpen:)
+                                                     name:NSPopUpButtonWillPopUpNotification
+                                                   object:menuButton_];
+        [menuButton_ addItemWithTitle:@"Foo"];
+        [menuButton_ addItemWithTitle:@"Bar"];
+
+        NSLog(@"menu button %@", [NSValue valueWithRect:menuButton_.frame]);
+        
+        menuButton_.frame = NSMakeRect(frame.size.width - menuButton_.frame.size.width - kMargin,
+                                       (frame.size.height - menuButton_.frame.size.height) / 2,
+                                       menuButton_.frame.size.width,
+                                       menuButton_.frame.size.height);
+        [menuButton_ setAutoresizingMask:NSViewMinXMargin];
+        [self addSubview:menuButton_];
+        
+        label_ = [[[NSTextField alloc] initWithFrame:NSMakeRect(x, 0, menuButton_.frame.origin.x - x - kMargin, frame.size.height)] autorelease];
+        [label_ setStringValue:@""];
+        [label_ setBezeled:NO];
+        [label_ setDrawsBackground:NO];
+        [label_ setEditable:NO];
+        [label_ setSelectable:NO];
+        [label_ setFont:[NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]]];
+        [label_ sizeToFit];
+        NSRect lframe = label_.frame;
+        lframe.origin.y += (frame.size.height - lframe.size.height) / 2 + kBottomMargin;
+        lframe.size.width = menuButton_.frame.origin.x - x - kMargin;
+        label_.frame = lframe;
+        [self addSubview:label_];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [title_ release];
+    [super dealloc];
+}
+
+- (void)popupWillOpen:(NSNotification *)notification
+{
+    NSLog(@"popupWillOpen");
+    if ([notification object] == menuButton_) {
+        NSLog(@"Set menu");
+        NSMenu *menu = [delegate_ menu];
+        NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""] autorelease];
+        [menu insertItem:item atIndex:0];
+        [item setImage:[NSImage imageNamed:@"NSActionTemplate"]];
+        [item setOnStateImage:nil];
+        [item setMixedStateImage:nil];
+        [menuButton_ setMenu:menu];
+    }
+}
+
+- (void)close:(id)sender
+{
+    [delegate_ close];
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    [[NSColor windowFrameColor] set];
+    NSRectFill(dirtyRect);
+/*
+    NSGradient *aGradient = [[[NSGradient alloc] initWithStartingColor:[NSColor grayColor] endingColor:[NSColor darkGrayColor]] autorelease];
+    [aGradient drawInRect:NSMakeRect(dirtyRect.origin.x, 0, dirtyRect.size.width, self.frame.size.height) angle:90];
+*/
+    
+    [[NSColor blackColor] set];
+    
+    [[NSColor lightGrayColor] set];
+    NSRectFill(NSMakeRect(dirtyRect.origin.x, 1, dirtyRect.size.width, 1));
+    
+    [[NSColor blackColor] set];
+    NSRectFill(NSMakeRect(dirtyRect.origin.x, 0, dirtyRect.size.width, 1));
+    NSRectFill(NSMakeRect(self.frame.size.width - 1, 0, 1, self.frame.size.height));
+    
+    [super drawRect:dirtyRect];
+}
+
+- (void)setTitle:(NSString *)title
+{
+    [label_ setStringValue:title];
+    [self setNeedsDisplay:YES];
+}
+
+@end

SessionView.h

@@ -28,11 +28,13 @@
 #import <Cocoa/Cocoa.h>
 #import "FindViewController.h"
 #import "PTYSession.h"
+#import "SessionTitleView.h"
 @class PTYSession;
 @class SplitSelectionView;
-@interface SessionView : NSView {
+@class SessionTitleView;
+@interface SessionView : NSView <SessionTitleViewDelegate> {
     PTYSession* session_;
     BOOL dim_;
     BOOL backgroundDimmed_;
@@ -56,6 +58,9 @@
     // When moving a pane, a view is put over all sessions to help the user
     // choose how to split the destination.
     SplitSelectionView *splitSelectionView_;
+
+    BOOL showTitle_;
+    SessionTitleView *title_;
 }
 + (NSDate*)lastResizeDate;
@@ -75,5 +80,7 @@
 - (void)saveFrameSize;
 - (void)restoreFrameSize;
 - (void)setSplitSelectionMode:(SplitSelectionMode)mode;
+- (BOOL)setShowTitle:(BOOL)value;
+- (void)setTitle:(NSString *)title;
 @end

SessionView.m

@@ -33,9 +33,11 @@
 #import "SplitSelectionView.h"
 #import "MovePaneController.h"
 #import "PSMTabDragAssistant.h"
+#import "SessionTitleView.h"
 static const float kTargetFrameRate = 1.0/60.0;
 static int nextViewId;
+static const double kTitleHeight = 22;
 // Last time any window was resized TODO(georgen):it would be better to track per window.
 static NSDate* lastResizeDate_;
@@ -93,7 +95,7 @@ static NSDate* lastResizeDate_;
     self = [self initWithFrame:frame];
     if (self) {
         [self _initCommon];
-        session_ = [session retain];
+        [self setSession:session];
     }
     return self;
 }
@@ -114,6 +116,7 @@ static NSDate* lastResizeDate_;
 - (void)dealloc
 {
     [previousUpdate_ release];
+    [title_ removeFromSuperview];
     [self unregisterDraggedTypes];
     [session_ release];
     [super dealloc];
@@ -256,9 +259,18 @@ static NSDate* lastResizeDate_;
 - (void)mouseDown:(NSEvent*)event
 {
+    // A click on the very top of the screen while in full screen mode may not be
+    // in any subview!
+    NSPoint basePoint = [[self window] convertScreenToBase:[NSEvent mouseLocation]];
+    NSPoint relativePoint = [self convertPointFromBase:basePoint];
+    if (title_ && NSPointInRect(relativePoint, [title_ frame])) {
+        [super mouseDown:event];
+        return;
+    }
     if (splitSelectionView_) {
         [splitSelectionView_ mouseDown:event];
-    } else if ([[[self session] TEXTVIEW] mouseDownImpl:event]) {
+    } else if (NSPointInRect(relativePoint, [[[self session] SCROLLVIEW] frame]) &&
+               [[[self session] TEXTVIEW] mouseDownImpl:event]) {
         [super mouseDown:event];
     }
 }
@@ -452,4 +464,52 @@ static NSDate* lastResizeDate_;
     return YES;
 }
+- (BOOL)setShowTitle:(BOOL)value
+{
+    if (value == showTitle_) {
+        return NO;
+    }
+    showTitle_ = value;
+    PTYScrollView *scrollView = [session_ SCROLLVIEW];
+    NSRect frame = [scrollView frame];
+    if (showTitle_) {
+        frame.size.height -= kTitleHeight;
+        title_ = [[[SessionTitleView alloc] initWithFrame:NSMakeRect(0,
+                                                                     self.frame.size.height - kTitleHeight,
+                                                                     self.frame.size.width,
+                                                                     kTitleHeight)] autorelease];
+        [title_ setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+        title_.delegate = self;
+        [self addSubview:title_];
+    } else {
+        frame.size.height += kTitleHeight;
+        [title_ removeFromSuperview];
+        title_ = nil;
+    }
+    [scrollView setFrame:frame];
+    [self setTitle:[session_ name]];
+    return YES;
+}
+
+- (void)setTitle:(NSString *)title
+{
+    if (!title) {
+        title = @"";
+    }
+    title_.title = title;
+    [title_ setNeedsDisplay:YES];
+}
+
+#pragma mark SessionTitleViewDelegate
+
+- (NSMenu *)menu
+{
+    return [[session_ TEXTVIEW] menuForEvent:nil];
+}
+
+- (void)close
+{
+    [[[session_ tab] realParentWindow] closeSessionWithConfirmation:session_];
+}
+
 @end

iTerm.xcodeproj/project.pbxproj

@@ -278,6 +278,8 @@
 		1DE8DDAE1415648600F83147 /* ToolPasteHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE8DDAC1415648600F83147 /* ToolPasteHistory.m */; };
 		1DE8DF361415799700F83147 /* ToolWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DE8DF341415799700F83147 /* ToolWrapper.h */; };
 		1DE8DF371415799700F83147 /* ToolWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE8DF351415799700F83147 /* ToolWrapper.m */; };
+		1DEDC8FD1451F67D004F1615 /* SessionTitleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DEDC8FB1451F67D004F1615 /* SessionTitleView.h */; };
+		1DEDC8FE1451F67D004F1615 /* SessionTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DEDC8FC1451F67D004F1615 /* SessionTitleView.m */; };
 		1DEE9FDD11FCA60F009E18C9 /* credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DEE9FDB11FCA60F009E18C9 /* credits.rtf */; };
 		1DF0895B13DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DF0895713DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.h */; };
 		1DF0895C13DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DF0895813DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.m */; };
@@ -490,6 +492,8 @@
 		1DEB29301288885700B2CB9F /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
 		1DEB29371288887100B2CB9F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		1DEB293D1288899A00B2CB9F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
+		1DEDC8FB1451F67D004F1615 /* SessionTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionTitleView.h; sourceTree = "<group>"; };
+		1DEDC8FC1451F67D004F1615 /* SessionTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionTitleView.m; sourceTree = "<group>"; };
 		1DEE9FDC11FCA60F009E18C9 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/credits.rtf; sourceTree = "<group>"; };
 		1DF0895713DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBitmapImageRep+CoreImage.h"; sourceTree = "<group>"; };
 		1DF0895813DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBitmapImageRep+CoreImage.m"; sourceTree = "<group>"; };
@@ -731,6 +735,7 @@
 				F5E533B403B2959201A8A066 /* PTYTabView.m */,
 				F56B230B03A1B36701A8A066 /* PTYWindow.m */,
 				1D36155412CBF33E00803EA9 /* ScreenChar.m */,
+				1DEDC8FC1451F67D004F1615 /* SessionTitleView.m */,
 				1D2E813012A18F7500F3D71E /* SessionView.m */,
 				1D29732A14082A52004C5DBE /* SplitSelectionView.m */,
 				1DF8AF5713FD781700C8A435 /* SplitPanel.m */,
@@ -745,6 +750,7 @@
 		0464AB15006CD2EC7F000001 /* Headers */ = {
 			isa = PBXGroup;
 			children = (
+				1DEDC8FB1451F67D004F1615 /* SessionTitleView.h */,
 				1D4AE8FC14343A760092EB49 /* TrouterPrefsController.h */,
 				1D24C2C3142FEACF006B246F /* SmartSelectionController.h */,
 				1D24C282142EF334006B246F /* SendTextTrigger.h */,
@@ -1267,6 +1273,7 @@
 				1D24C284142EF334006B246F /* SendTextTrigger.h in Headers */,
 				1D24C2C5142FEACF006B246F /* SmartSelectionController.h in Headers */,
 				1D4AE8FE14343A760092EB49 /* TrouterPrefsController.h in Headers */,
+				1DEDC8FD1451F67D004F1615 /* SessionTitleView.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1536,6 +1543,7 @@
 				1D24C285142EF334006B246F /* SendTextTrigger.m in Sources */,
 				1D24C2C6142FEACF006B246F /* SmartSelectionController.m in Sources */,
 				1D4AE8FF14343A760092EB49 /* TrouterPrefsController.m in Sources */,
+				1DEDC8FE1451F67D004F1615 /* SessionTitleView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};