Skip to content
Snippets Groups Projects
Commit b56b0373 authored by pjaspers's avatar pjaspers
Browse files

Merge branch 'applescript' into dev

parents 433e09ab 2dfe52e6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/iTerm.scriptTerminology
+ 112
− 0
View file @ b56b0373
@@ -15,6 +15,118 @@
<key>Name</key>
<string>background color</string>
</dict>
<key>ansiBlackColor</key>
<dict>
<key>Description</key>
<string>Ansi black color</string>
<key>Name</key>
<string>ansi black color</string>
</dict>
<key>ansiRedColor</key>
<dict>
<key>Description</key>
<string>Ansi red color</string>
<key>Name</key>
<string>ansi red color</string>
</dict>
<key>ansiGreenColor</key>
<dict>
<key>Description</key>
<string>Ansi green color</string>
<key>Name</key>
<string>ansi green color</string>
</dict>
<key>ansiYellowColor</key>
<dict>
<key>Description</key>
<string>Ansi yellow color</string>
<key>Name</key>
<string>ansi yellow color</string>
</dict>
<key>ansiBlueColor</key>
<dict>
<key>Description</key>
<string>Ansi blue color</string>
<key>Name</key>
<string>ansi blue color</string>
</dict>
<key>ansiMagentaColor</key>
<dict>
<key>Description</key>
<string>Ansi magenta color</string>
<key>Name</key>
<string>ansi magenta color</string>
</dict>
<key>ansiCyanColor</key>
<dict>
<key>Description</key>
<string>Ansi cyan color</string>
<key>Name</key>
<string>ansi cyan color</string>
</dict>
<key>ansiWhiteColor</key>
<dict>
<key>Description</key>
<string>Ansi white color</string>
<key>Name</key>
<string>ansi white color</string>
</dict>
<key>ansiBrightBlackColor</key>
<dict>
<key>Description</key>
<string>Ansi bright black color</string>
<key>Name</key>
<string>ansi bright black color</string>
</dict>
<key>ansiBrightRedColor</key>
<dict>
<key>Description</key>
<string>Ansi bright red color</string>
<key>Name</key>
<string>ansi bright red color</string>
</dict>
<key>ansiBrightGreenColor</key>
<dict>
<key>Description</key>
<string>Ansi bright green color</string>
<key>Name</key>
<string>ansi bright green color</string>
</dict>
<key>ansiBrightYellowColor</key>
<dict>
<key>Description</key>
<string>Ansi bright yellow color</string>
<key>Name</key>
<string>ansi bright yellow color</string>
</dict>
<key>ansiBrightBlueColor</key>
<dict>
<key>Description</key>
<string>Ansi bright blue color</string>
<key>Name</key>
<string>ansi bright blue color</string>
</dict>
<key>ansiBrightMagentaColor</key>
<dict>
<key>Description</key>
<string>Ansi bright magenta color</string>
<key>Name</key>
<string>ansi bright magenta color</string>
</dict>
<key>ansiBrightCyanColor</key>
<dict>
<key>Description</key>
<string>Ansi bright cyan color</string>
<key>Name</key>
<string>ansi bright cyan color</string>
</dict>
<key>ansiBrightWhiteColor</key>
<dict>
<key>Description</key>
<string>Ansi bright white color</string>
<key>Name</key>
<string>ansi bright white color</string>
</dict>
<key>backgroundImagePath</key>
<dict>
<key>Description</key>
Resources/AppleScript/iTerm.scriptSuite
+ 112
− 0
View file @ b56b0373
@@ -19,6 +19,118 @@
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBlackColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiRedColor</key>
<dict>
<key>AppleEventCode</key>
<string>ARcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiGreenColor</key>
<dict>
<key>AppleEventCode</key>
<string>AGcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiYellowColor</key>
<dict>
<key>AppleEventCode</key>
<string>AYcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBlueColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiMagentaColor</key>
<dict>
<key>AppleEventCode</key>
<string>AMcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiCyanColor</key>
<dict>
<key>AppleEventCode</key>
<string>ACcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiWhiteColor</key>
<dict>
<key>AppleEventCode</key>
<string>AWcl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightBlackColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABbl</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightRedColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABrc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightGreenColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABgc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightYellowColor</key>
<dict>
<key>AppleEventCode</key>
<string>AByc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightBlueColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABbc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightMagentaColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABmc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightCyanColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABcc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>ansiBrightWhiteColor</key>
<dict>
<key>AppleEventCode</key>
<string>ABwc</string>
<key>Type</key>
<string>NSColor</string>
</dict>
<key>backgroundImagePath</key>
<dict>
<key>AppleEventCode</key>
Session/PTYSession.h
+ 36
− 0
View file @ b56b0373
@@ -369,6 +369,42 @@ static const float kBackgroundSessionIntervalSec = 1;
- (void)logStop;
- (NSString *)backgroundImagePath;
- (void)setBackgroundImagePath: (NSString *)imageFilePath;
// Ansi Colors
- (NSColor *)ansiBlackColor;
- (void)setAnsiBlackColor:(NSColor*)color;
- (NSColor *)ansiRedColor;
- (void)setAnsiRedColor:(NSColor*)color;
- (void)setAnsiGreenColor:(NSColor*)color;
- (NSColor *)ansiGreenColor;
- (void)setAnsiYellowColor:(NSColor*)color;
- (NSColor *)ansiYellowColor;
- (void)setAnsiBlueColor:(NSColor*)color;
- (NSColor *)ansiBlueColor;
- (void)setAnsiMagentaColor:(NSColor*)color;
- (NSColor *)ansiMagentaColor;
- (void)setAnsiCyanColor:(NSColor*)color;
- (NSColor *)ansiCyanColor;
- (NSColor *)ansiWhiteColor;
- (void)setAnsiWhiteColor:(NSColor*)color;
- (NSColor *)ansiBrightBlackColor;
- (void)setAnsiBrightBlackColor:(NSColor*)color;
- (NSColor *)ansiBrightRedColor;
- (void)setAnsiBrightRedColor:(NSColor*)color;
- (void)setAnsiBrightGreenColor:(NSColor*)color;
- (NSColor *)ansiBrightGreenColor;
- (void)setAnsiBrightYellowColor:(NSColor*)color;
- (NSColor *)ansiBrightYellowColor;
- (void)setAnsiBrightBlueColor:(NSColor*)color;
- (NSColor *)ansiBrightBlueColor;
- (void)setAnsiBrightMagentaColor:(NSColor*)color;
- (NSColor *)ansiBrightMagentaColor;
- (void)setAnsiBrightCyanColor:(NSColor*)color;
- (NSColor *)ansiBrightCyanColor;
- (NSColor *)ansiBrightWhiteColor;
- (void)setAnsiBrightWhiteColor:(NSColor*)color;
- (NSColor *)foregroundColor;
- (void)setForegroundColor:(NSColor*)color;
- (NSColor *)backgroundColor;
Session/PTYSession.m
+ 205
− 0
View file @ b56b0373
@@ -2088,6 +2088,211 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
[[self SCROLLVIEW] setBackgroundColor: color];
}
 
#pragma mark -
#pragma mark Ansi Colors
/*
* All these are mainly added to support setting them using
* Applescript.
*/
- (NSColor *)ansiBlackColor
{
return [TEXTVIEW defaultBGColor];
}
- (void)setAnsiBlackColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:0 color:color];
}
- (void)setAnsiRedColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:1 color:color];
}
- (NSColor *)ansiRedColor
{
return [TEXTVIEW colorInColorTableWithIndex:1];
}
- (void)setAnsiGreenColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:2 color:color];
}
- (NSColor *)ansiGreenColor
{
return [TEXTVIEW colorInColorTableWithIndex:2];
}
- (void)setAnsiYellowColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:3 color:color];
}
- (NSColor *)ansiYellowColor
{
return [TEXTVIEW colorInColorTableWithIndex:3];
}
- (void)setAnsiBlueColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:4 color:color];
}
- (NSColor *)ansiBlueColor
{
return [TEXTVIEW colorInColorTableWithIndex:4];
}
- (void)setAnsiMagentaColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:5 color:color];
}
- (NSColor *)ansiMagentaColor
{
return [TEXTVIEW colorInColorTableWithIndex:5];
}
- (void)setAnsiCyanColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:6 color:color];
}
- (NSColor *)ansiCyanColor
{
return [TEXTVIEW colorInColorTableWithIndex:6];
}
- (void)setAnsiWhiteColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:7 color:color];
}
- (NSColor *)ansiWhiteColor
{
return [TEXTVIEW colorInColorTableWithIndex:7];
}
#pragma mark -
#pragma mark Ansi Bright Colors
- (NSColor *)ansiBrightBlackColor
{
return [TEXTVIEW colorInColorTableWithIndex:8];
}
- (void)setAnsiBrightBlackColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:8 color:color];
}
- (void)setAnsiBrightRedColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:9 color:color];
}
- (NSColor *)ansiBrightRedColor
{
return [TEXTVIEW colorInColorTableWithIndex:9];
}
- (void)setAnsiBrightGreenColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:10 color:color];
}
- (NSColor *)ansiBrightGreenColor
{
return [TEXTVIEW colorInColorTableWithIndex:10];
}
- (void)setAnsiBrightYellowColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:11 color:color];
}
- (NSColor *)ansiBrightYellowColor
{
return [TEXTVIEW colorInColorTableWithIndex:11];
}
- (void)setAnsiBrightBlueColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:12 color:color];
}
- (NSColor *)ansiBrightBlueColor
{
return [TEXTVIEW colorInColorTableWithIndex:12];
}
- (void)setAnsiBrightMagentaColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:13 color:color];
}
- (NSColor *)ansiBrightMagentaColor
{
return [TEXTVIEW colorInColorTableWithIndex:13];
}
- (void)setAnsiBrightCyanColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:14 color:color];
}
- (NSColor *)ansiBrightCyanColor
{
return [TEXTVIEW colorInColorTableWithIndex:14];
}
- (void)setAnsiBrightWhiteColor:(NSColor*) color
{
if (color == nil) return;
[self setColorTable:15 color:color];
}
- (NSColor *)ansiBrightWhiteColor
{
return [TEXTVIEW colorInColorTableWithIndex:15];
}
#pragma mark -
#pragma mark Regular Colors
- (NSColor *) boldColor
{
return [TEXTVIEW defaultBoldColor];
Session/PTYTextView.h
+ 1
− 0
View file @ b56b0373
@@ -319,6 +319,7 @@ typedef struct PTYFontInfo PTYFontInfo;
- (void)setBGColor:(NSColor*)color;
- (void)setBoldColor:(NSColor*)color;
- (void)setColorTable:(int) theIndex color:(NSColor *) c;
- (NSColor *)colorInColorTableWithIndex:(int) theIndex;
- (void)setSelectionColor:(NSColor *)aColor;
- (void)setCursorColor:(NSColor*)color;
- (void)setSelectedTextColor:(NSColor *)aColor;
Session/PTYTextView.m
+ 8
− 0
View file @ b56b0373
@@ -497,6 +497,14 @@ static NSImage* wrapToBottomImage = nil;
[self setNeedsDisplay:YES];
}
 
- (NSColor *)colorInColorTableWithIndex:(int)theIndex
{
if (theIndex > 255) {
return nil;
}
return colorTable[theIndex];
}
- (NSColor*)_colorForCode:(int)theIndex alternateSemantics:(BOOL)alt bold:(BOOL)isBold
{
NSColor* color;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment