Skip to content

Commit 506a321

Browse files
jkoutavasjkoutavas
committed
First pass at doing an embedded iTerm2, based off lemonmojo's PR gnachman#366 (gnachman#366). A key difference between lemonmojo's approach and this approach is instead of adding a iTerm2Lib target to the iTerm2 project, I've created an iTerm2Lib project and referenced iTerm2 as a sub-project, thus not requiring any modification to the iTerm2 project.
1 parent b124f4c commit 506a321

18 files changed

+2499
-14
lines changed

‎embed/iTerm2Lib.xcodeproj/project.pbxproj

Lines changed: 636 additions & 0 deletions
Large diffs are not rendered by default.

‎embed/iTerm2Lib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎embed/iTerm2Lib.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎embed/iTerm2Lib.xcodeproj/project.xcworkspace/xcuserdata/jay.xcuserdatad/UserInterfaceState.xcuserstate

8.98 KB
Binary file not shown.

‎embed/iTerm2Lib.xcodeproj/xcuserdata/jay.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>iTerm2Lib.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>3</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

‎embed/iTerm2Lib/Info.plist

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
</dict>
22+
</plist>

‎embed/iTerm2Lib/NSWindow+iTermLib.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#import <Cocoa/Cocoa.h>
2+
3+
@interface NSWindow (iTermLib)
4+
5+
- (double)approximateFractionOccluded;
6+
7+
@end

‎embed/iTerm2Lib/NSWindow+iTermLib.m

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#import "NSWindow+iTermLib.h"
2+
3+
@implementation NSWindow (iTermLib)
4+
5+
- (double)approximateFractionOccluded
6+
{
7+
return 0;
8+
}
9+
10+
@end

‎embed/iTerm2Lib/SessionView+iTermLib.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#import <Cocoa/Cocoa.h>
2+
3+
#import "SessionView.h"
4+
5+
extern NSString* const iTermLibSessionViewDidMoveToWindowNotification;
6+
7+
@interface SessionView (iTermLib)
8+
9+
@end

‎embed/iTerm2Lib/SessionView+iTermLib.m

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#import "SessionView+iTermLib.h"
2+
3+
NSString* const iTermLibSessionViewDidMoveToWindowNotification = @"iTermLibSessionViewDidMoveToWindowNotification";
4+
5+
@implementation SessionView (iTermLib)
6+
7+
- (void)viewDidMoveToWindow
8+
{
9+
[NSNotificationCenter.defaultCenter postNotificationName:iTermLibSessionViewDidMoveToWindowNotification object:self];
10+
}
11+
12+
@end

‎embed/iTerm2Lib/iTerm2Lib.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#import <Cocoa/Cocoa.h>
2+
3+
#import "iTermLibApplication.h"
4+
#import "iTermLibController.h"
5+
#import "iTermLibSessionController.h"
6+
#import "SessionView+iTermLib.h"
7+
#import "NSWindow+iTermLib.h"
8+

‎embed/iTerm2Lib/iTermLibApplication.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#import <Cocoa/Cocoa.h>
2+
3+
@class iTermLibController;
4+
5+
@interface iTermLibApplication : NSObject
6+
7+
+ (instancetype)sharedApplication;
8+
9+
@property (readonly) iTermLibController *delegate;
10+
11+
@end

‎embed/iTerm2Lib/iTermLibApplication.m

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#import "iTermLibApplication.h"
2+
3+
#import "iTermLibController.h"
4+
5+
static iTermLibApplication* _gSharedApplication;
6+
7+
@implementation iTermLibApplication
8+
9+
+ (instancetype)sharedApplication
10+
{
11+
static dispatch_once_t onceToken;
12+
dispatch_once(&onceToken, ^{
13+
_gSharedApplication = [[iTermLibApplication alloc] init];
14+
});
15+
16+
return _gSharedApplication;
17+
}
18+
19+
- (iTermLibController*)delegate
20+
{
21+
return iTermLibController.sharedController;
22+
}
23+
24+
@end

‎embed/iTerm2Lib/iTermLibController.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#import <Cocoa/Cocoa.h>
2+
3+
#import "iTermLibSessionController.h"
4+
5+
@class PTYSession;
6+
@class iTermLibController;
7+
8+
@protocol iTermLibControllerDelegate<NSObject>
9+
10+
- (void)controller:(iTermLibController*)controller shouldRemoveSessionView:(iTermLibSessionController*)session;
11+
12+
@optional
13+
- (void)controller:(iTermLibController*)controller sessionDidClose:(iTermLibSessionController*)session;
14+
- (void)controller:(iTermLibController*)controller nameOfSession:(iTermLibSessionController*)session didChangeTo:(NSString*)newName;
15+
16+
@end
17+
18+
@interface iTermLibController : NSObject<iTermLibSessionDelegate>
19+
20+
+ (instancetype)sharedController;
21+
22+
@property (readonly, copy) NSArray<iTermLibSessionController*>* sessions;
23+
@property (readonly) iTermLibSessionController* activeSession;
24+
@property (assign) id<iTermLibControllerDelegate> delegate;
25+
@property (assign) BOOL broadcasting;
26+
27+
- (iTermLibSessionController*)createSessionWithProfile:(Profile*)profile command:(NSString*)command initialSize:(NSSize)initialSize;
28+
29+
@end

0 commit comments

Comments
 (0)