Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • karan_m/iterm2
  • zhaochangqing/iterm2
  • joykeeper/iterm2
  • nleroux/iterm2
  • kenji21/iterm2
  • gagasegsegsegeg/iterm2
  • stanhu/iterm2
  • ivyfan/iterm2
  • DAddYE/iterm2
  • trave801/iterm2
  • lordrings/iterm2
  • tweekmonster/iterm2
  • imardaras/iterm2
  • DabeDotCom/iterm2
  • sherifamin83/iterm2
  • aquarecif/iterm2
  • visualrobots/iterm2
  • xmarianox/iterm2
  • doomsayer13/iterm2
  • vikdutt/iterm2
  • me36/iterm2
  • DevGrohl/iterm2
  • manigandan-rajasekar/iterm2
  • DWoodiwiss/iterm2
  • vti/iterm2
  • DamonQin/iterm2
26 results
Show changes
Commits on Source (14)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 959 additions and 253 deletions
Interfaces/MainMenu.xib
View file @ 1272d4b2
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -1099,6 +1100,12 @@ DQ
<action selector="copyModeShortcuts:" target="-1" id="fOs-EL-nnE"/>
</connections>
</menuItem>
<menuItem title="Open Source Licenses" identifier="Open Source Licenses" id="dV2-dF-UB1">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="openSourceLicenses:" target="201" id="kij-nS-KMI"/>
</connections>
</menuItem>
</items>
</menu>
</menuItem>
Interfaces/PreferencePanel.xib
View file @ 1272d4b2
@@ -5230,21 +5230,21 @@ DQ
<popUpButton verticalHuggingPriority="750" misplaced="YES" id="4118">
<rect key="frame" x="184" y="176" width="161" height="26"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="⌥⌘" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="6" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="4137" id="4129">
<popUpButtonCell key="cell" type="push" title="⌥⌘ Number" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="6" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="4137" id="4129">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" autoenablesItems="NO" id="4130">
<items>
<menuItem tag="9" id="4132">
<menuItem title="No Shortcut" tag="9" id="4132">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌥" tag="5" id="kEx-j4-xkm">
<menuItem title="⌥ Number" tag="5" id="kEx-j4-xkm">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌘" tag="4" id="4133">
<menuItem title="⌘ Number" tag="4" id="4133">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌥⌘" state="on" tag="6" id="4137">
<menuItem title="⌥⌘ Number" state="on" tag="6" id="4137">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>
@@ -5258,21 +5258,21 @@ DQ
<popUpButton verticalHuggingPriority="750" misplaced="YES" id="4269">
<rect key="frame" x="184" y="146" width="161" height="26"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<popUpButtonCell key="cell" type="push" title="⌥⌘" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="6" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="4273" id="4270">
<popUpButtonCell key="cell" type="push" title="⌥⌘ Number" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="6" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="4273" id="4270">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" autoenablesItems="NO" id="4271">
<items>
<menuItem tag="9" id="4274">
<menuItem title="No Shortcut" tag="9" id="4274">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌥" tag="5" id="XvI-gy-pDy">
<menuItem title="⌥ Number" tag="5" id="XvI-gy-pDy">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌘" tag="4" id="4272">
<menuItem title="⌘ Number" tag="4" id="4272">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="⌥⌘" state="on" tag="6" id="4273">
<menuItem title="⌥⌘ Number" state="on" tag="6" id="4273">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>
ThirdParty/AMIndeterminateProgressIndicator/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright (c) 2007, Andreas Mayer (andreas@harmless.de)
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
ThirdParty/Licenses.txt 0 → 100644
View file @ 1272d4b2
This diff is collapsed.
ThirdParty/NMSSH.src/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright (c) 2013 Nine Muses AB
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
ThirdParty/PSMTabBarControl/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright © 2005, Positive Spin Media. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of Positive Spin Media nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ThirdParty/PSMTabBarControl/iTermDiffs/changeIdentifier.diff deleted 100644 → 0
View file @ afa9f9b5
Index: source/PSMTabBarControl.h
===================================================================
--- source/PSMTabBarControl.h (revision 255)
+++ source/PSMTabBarControl.h (working copy)
@@ -154,6 +154,7 @@
- (void)setAutomaticallyAnimates:(BOOL)value;
- (int)tabLocation;
- (void)setTabLocation:(int)value;
+- (void)changeIdentifier:(id)newIdentifier atIndex:(int)theIndex;
// accessors
- (NSTabView *)tabView;
@@ -177,6 +178,7 @@
// internal bindings methods also used by the tab drag assistant
- (void)bindPropertiesForCell:(PSMTabBarCell *)cell andTabViewItem:(NSTabViewItem *)item;
+- (void)disconnectItem:(NSObjectController*)item fromCell:(PSMTabBarCell*)cell;
- (void)removeTabForCell:(PSMTabBarCell *)cell;
@end
Index: source/PSMTabBarControl.m
===================================================================
--- source/PSMTabBarControl.m (revision 255)
+++ source/PSMTabBarControl.m (working copy)
@@ -519,6 +519,19 @@
//[self update];
}
+- (void)disconnectItem:(NSObjectController*)item fromCell:(PSMTabBarCell*)cell
+{
+ if ([item respondsToSelector:@selector(isProcessing)]) {
+ [item removeObserver:cell forKeyPath:@"isProcessing"];
+ }
+ if ([item respondsToSelector:@selector(icon)]) {
+ [item removeObserver:cell forKeyPath:@"icon"];
+ }
+ if ([item respondsToSelector:@selector(objectCount)]) {
+ [item removeObserver:cell forKeyPath:@"objectCount"];
+ }
+}
+
- (void)removeTabForCell:(PSMTabBarCell *)cell
{
NSObjectController *item = [[cell representedObject] identifier];
@@ -531,16 +544,7 @@
[cell unbind:@"count"];
if (item != nil) {
-
- if ([item respondsToSelector:@selector(isProcessing)]) {
- [item removeObserver:cell forKeyPath:@"isProcessing"];
- }
- if ([item respondsToSelector:@selector(icon)]) {
- [item removeObserver:cell forKeyPath:@"icon"];
- }
- if ([item respondsToSelector:@selector(objectCount)]) {
- [item removeObserver:cell forKeyPath:@"objectCount"];
- }
+ [self disconnectItem:item fromCell:cell];
}
// stop watching identifier
@@ -1985,6 +1989,24 @@
[self update];
}
+- (void)changeIdentifier:(id)newIdentifier atIndex:(int)theIndex
+{
+ PSMTabBarCell *cell;
+ NSTabViewItem* tabViewItem = [tabView tabViewItemAtIndex:theIndex];
+ assert(tabViewItem);
+ NSEnumerator *e = [_cells objectEnumerator];
+ while ( (cell = [e nextObject])) {
+ if ([cell representedObject] == tabViewItem) {
+ [self disconnectItem:[tabViewItem identifier] fromCell:cell];
+ [[cell representedObject] removeObserver:self forKeyPath:@"identifier"];
+ [tabViewItem setIdentifier:newIdentifier];
+ [self bindPropertiesForCell:cell andTabViewItem:tabViewItem];
+ return;
+ }
+ }
+ assert(false);
+}
+
#pragma mark -
#pragma mark Convenience
ThirdParty/ProtobufRuntime/LICENSE 0 → 100644
View file @ 1272d4b2
This license applies to all parts of Protocol Buffers except the following:
- Atomicops support for generic gcc, located in
src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
This file is copyrighted by Red Hat Inc.
- Atomicops support for AIX/POWER, located in
src/google/protobuf/stubs/atomicops_internals_power.h.
This file is copyrighted by Bloomberg Finance LP.
Copyright 2014, Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Code generated by the Protocol Buffer compiler is owned by the owner
of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This
support library is itself covered by the above license.
ThirdParty/RegexKitLite/LICENSE 0 → 100644
View file @ 1272d4b2
RegexKitLite License
Copyright © 2008-2010, John Engelhart
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
• Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
• Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
• Neither the name of the Zang Industries nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ThirdParty/SCEvents/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright (c) 2008-2014 Stuart Connolly.
All rights reserved.
https://github.com/stuconnolly/scevents
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
ThirdParty/SSKeychain/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright (c) 2010-2012 Sam Soffes.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
ThirdParty/Sparkle/LICENSE 0 → 100644
View file @ 1272d4b2
Copyright (c) 2006-2013 Andy Matuschak.
Copyright (c) 2009-2013 Elgato Systems GmbH.
Copyright (c) 2011-2014 Kornel Lesiński.
Copyright (c) 2015-2017 Mayur Pawashe.
Copyright (c) 2014 C.W. Betts.
Copyright (c) 2014 Petroules Corporation.
Copyright (c) 2014 Big Nerd Ranch.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=================
EXTERNAL LICENSES
=================
bspatch.c and bsdiff.c, from bsdiff 4.3 <http://www.daemonology.net/bsdiff/>:
Copyright (c) 2003-2005 Colin Percival.
sais.c and sais.c, from sais-lite (2010/08/07) <https://sites.google.com/site/yuta256/sais>:
Copyright (c) 2008-2010 Yuta Mori.
SUDSAVerifier.m:
Copyright (c) 2011 Mark Hamlin.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted providing that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
ThirdParty/UKCrashReporter/LICENSE 0 → 100644
View file @ 1272d4b2
// Created by Uli Kusterer on Sat Feb 04 2006.
// Copyright (c) 2006 Uli Kusterer.
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
iTerm2.xcodeproj/project.pbxproj
View file @ 1272d4b2
@@ -1920,6 +1920,7 @@
A6BDB0BC1B470CBE00F511E6 /* iTermRootTerminalView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BDB0BA1B470CBE00F511E6 /* iTermRootTerminalView.m */; };
A6C1207A1E39C3A4004021BB /* iTermBuriedSessions.h in Headers */ = {isa = PBXBuildFile; fileRef = A6C120781E39C3A4004021BB /* iTermBuriedSessions.h */; };
A6C1207B1E39C3A4004021BB /* iTermBuriedSessions.m in Sources */ = {isa = PBXBuildFile; fileRef = A6C120791E39C3A4004021BB /* iTermBuriedSessions.m */; };
A6C1FD4E1FC2A65E006B9A69 /* Licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = A6C1FD4D1FC2A65D006B9A69 /* Licenses.txt */; };
A6C4E8E21846E13800CFAA77 /* IntervalTree.h in Headers */ = {isa = PBXBuildFile; fileRef = A6C4E8DD1846E13800CFAA77 /* IntervalTree.h */; };
A6C537BE1938374600A08C18 /* iTermTabBarControlView.h in Headers */ = {isa = PBXBuildFile; fileRef = A6C537BC1938374600A08C18 /* iTermTabBarControlView.h */; };
A6C537C31939507100A08C18 /* iTermRestorableSession.h in Headers */ = {isa = PBXBuildFile; fileRef = A6C537C11939507100A08C18 /* iTermRestorableSession.h */; };
@@ -3756,6 +3757,7 @@
A6BDB0BA1B470CBE00F511E6 /* iTermRootTerminalView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermRootTerminalView.m; sourceTree = "<group>"; };
A6C120781E39C3A4004021BB /* iTermBuriedSessions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermBuriedSessions.h; sourceTree = "<group>"; };
A6C120791E39C3A4004021BB /* iTermBuriedSessions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermBuriedSessions.m; sourceTree = "<group>"; };
A6C1FD4D1FC2A65D006B9A69 /* Licenses.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Licenses.txt; sourceTree = "<group>"; };
A6C4E8DC1846E13800CFAA77 /* IntervalTree.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = IntervalTree.m; sourceTree = "<group>"; tabWidth = 4; };
A6C4E8DD1846E13800CFAA77 /* IntervalTree.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = IntervalTree.h; sourceTree = "<group>"; tabWidth = 4; };
A6C537BC1938374600A08C18 /* iTermTabBarControlView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = iTermTabBarControlView.h; sourceTree = "<group>"; tabWidth = 4; };
@@ -4602,6 +4604,7 @@
1D03D42519144B8E0049EB8F /* ThirdParty */ = {
isa = PBXGroup;
children = (
A6C1FD4D1FC2A65D006B9A69 /* Licenses.txt */,
A65871661D85E6660061CEEE /* LetsMove */,
1D1F8C171A32616A00167161 /* AMIndeterminateProgressIndicator */,
F6441F610E748404000EC682 /* CGSInternal */,
@@ -7982,6 +7985,7 @@
A67D0D6B1A2EE12A003A8B35 /* iTermPasteSpecialWindow.xib in Resources */,
A68BADFC1E0DD52F00E4BB7B /* Touch Bar Function Keys@2x.png in Resources */,
1D4BAFEE1BFE77E4004FF52B /* iTermPrintAccessoryViewController.xib in Resources */,
A6C1FD4E1FC2A65E006B9A69 /* Licenses.txt in Resources */,
A6339DDC1D232DF2000BAD78 /* StatusItemAlt@2x.png in Resources */,
A67F118018D82B9500B23C7B /* PrefsAdvanced.png in Resources */,
9D737D6017495B4100B3334D /* PrefsGeneral@2x.png in Resources */,
plists/ColorPresets.plist
View file @ 1272d4b2
@@ -427,209 +427,255 @@
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.25882352941176473</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.027450980392156862</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Blue Component</key>
<real>0.14145712554454803</real>
<real>0.1843137254901961</real>
<key>Green Component</key>
<real>0.10840645432472229</real>
<real>0.19607843137254902</real>
<key>Red Component</key>
<real>0.81926983594894409</real>
<real>0.8627450980392157</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Blue Component</key>
<real>0.38298487663269043</real>
<real>0.4588235294117647</real>
<key>Green Component</key>
<real>0.35665956139564514</real>
<real>0.43137254901960786</real>
<key>Red Component</key>
<real>0.27671992778778076</real>
<real>0.34509803921568627</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43850564956665039</real>
<real>0.5137254901960784</real>
<key>Green Component</key>
<real>0.40717673301696777</real>
<real>0.4823529411764706</real>
<key>Red Component</key>
<real>0.32436618208885193</real>
<real>0.396078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>0.5882352941176471</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>0.5803921568627451</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>0.5137254901960784</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Blue Component</key>
<real>0.72908437252044678</real>
<real>0.7686274509803922</real>
<key>Green Component</key>
<real>0.33896297216415405</real>
<real>0.44313725490196076</real>
<key>Red Component</key>
<real>0.34798634052276611</real>
<real>0.4235294117647059</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.6313725490196078</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.5764705882352941</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Blue Component</key>
<real>0.86405980587005615</real>
<real>0.8901960784313725</real>
<key>Green Component</key>
<real>0.95794391632080078</real>
<real>0.9647058823529412</real>
<key>Red Component</key>
<real>0.98943418264389038</real>
<real>0.9921568627450981</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Blue Component</key>
<real>0.020208755508065224</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.54115492105484009</real>
<real>0.6</real>
<key>Red Component</key>
<real>0.44977453351020813</real>
<real>0.5215686274509804</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Blue Component</key>
<real>0.023484811186790466</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.46751424670219421</real>
<real>0.5372549019607843</real>
<key>Red Component</key>
<real>0.64746475219726562</real>
<real>0.7098039215686275</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Blue Component</key>
<real>0.78231418132781982</real>
<real>0.8235294117647058</real>
<key>Green Component</key>
<real>0.46265947818756104</real>
<real>0.5450980392156862</real>
<key>Red Component</key>
<real>0.12754884362220764</real>
<real>0.14901960784313725</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43516635894775391</real>
<real>0.5098039215686274</real>
<key>Green Component</key>
<real>0.10802463442087173</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.77738940715789795</real>
<real>0.8274509803921568</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Blue Component</key>
<real>0.52502274513244629</real>
<real>0.596078431372549</real>
<key>Green Component</key>
<real>0.57082360982894897</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.14679534733295441</real>
<real>0.16470588235294117</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Blue Component</key>
<real>0.79781103134155273</real>
<real>0.8352941176470589</real>
<key>Green Component</key>
<real>0.89001238346099854</real>
<real>0.9098039215686274</real>
<key>Red Component</key>
<real>0.91611063480377197</real>
<real>0.9333333333333333</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Blue Component</key>
<real>0.15170273184776306</real>
<real>0.21176470588235294</real>
<key>Green Component</key>
<real>0.11783610284328461</real>
<real>0.16862745098039217</real>
<key>Red Component</key>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Blue Component</key>
<real>0.073530435562133789</real>
<real>0.08627450980392157</real>
<key>Green Component</key>
<real>0.21325300633907318</real>
<real>0.29411764705882354</real>
<key>Red Component</key>
<real>0.74176257848739624</real>
<real>0.796078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Background Color</key>
<dict>
<key>Blue Component</key>
<real>0.86405980587005615</real>
<real>0.8901960784313725</real>
<key>Green Component</key>
<real>0.95794391632080078</real>
<real>0.9647058823529412</real>
<key>Red Component</key>
<real>0.98943418264389038</real>
<real>0.9921568627450981</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Bold Color</key>
<dict>
<key>Blue Component</key>
<real>0.38298487663269043</real>
<real>0.4588235294117647</real>
<key>Green Component</key>
<real>0.35665956139564514</real>
<real>0.43137254901960786</real>
<key>Red Component</key>
<real>0.27671992778778076</real>
<real>0.34509803921568627</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Cursor Color</key>
<dict>
<key>Blue Component</key>
<real>0.43850564956665039</real>
<real>0.5137254901960784</real>
<key>Green Component</key>
<real>0.40717673301696777</real>
<real>0.4823529411764706</real>
<key>Red Component</key>
<real>0.32436618208885193</real>
<real>0.396078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.79781103134155273</real>
<real>0.8352941176470589</real>
<key>Green Component</key>
<real>0.89001238346099854</real>
<real>0.9098039215686274</real>
<key>Red Component</key>
<real>0.91611063480377197</real>
<real>0.9333333333333333</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Foreground Color</key>
<dict>
<key>Blue Component</key>
<real>0.43850564956665039</real>
<real>0.5137254901960784</real>
<key>Green Component</key>
<real>0.40717673301696777</real>
<real>0.4823529411764706</real>
<key>Red Component</key>
<real>0.32436618208885193</real>
<real>0.396078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Selected Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.38298487663269043</real>
<real>0.4588235294117647</real>
<key>Green Component</key>
<real>0.35665956139564514</real>
<real>0.43137254901960786</real>
<key>Red Component</key>
<real>0.27671992778778076</real>
<real>0.34509803921568627</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Selection Color</key>
<dict>
<key>Blue Component</key>
<real>0.79781103134155273</real>
<real>0.8352941176470589</real>
<key>Green Component</key>
<real>0.89001238346099854</real>
<real>0.9098039215686274</real>
<key>Red Component</key>
<real>0.91611063480377197</real>
<real>0.9333333333333333</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
</dict>
<key>Solarized Dark</key>
@@ -637,209 +683,255 @@
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.25882352941176473</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.027450980392156862</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 1 Color</key>
<dict>
<key>Blue Component</key>
<real>0.14145714044570923</real>
<real>0.1843137254901961</real>
<key>Green Component</key>
<real>0.10840655118227005</real>
<real>0.19607843137254902</real>
<key>Red Component</key>
<real>0.81926977634429932</real>
<real>0.8627450980392157</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 10 Color</key>
<dict>
<key>Blue Component</key>
<real>0.38298487663269043</real>
<real>0.4588235294117647</real>
<key>Green Component</key>
<real>0.35665956139564514</real>
<real>0.43137254901960786</real>
<key>Red Component</key>
<real>0.27671992778778076</real>
<real>0.34509803921568627</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 11 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43850564956665039</real>
<real>0.5137254901960784</real>
<key>Green Component</key>
<real>0.40717673301696777</real>
<real>0.4823529411764706</real>
<key>Red Component</key>
<real>0.32436618208885193</real>
<real>0.396078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 12 Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>0.5882352941176471</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>0.5803921568627451</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>0.5137254901960784</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 13 Color</key>
<dict>
<key>Blue Component</key>
<real>0.72908437252044678</real>
<real>0.7686274509803922</real>
<key>Green Component</key>
<real>0.33896297216415405</real>
<real>0.44313725490196076</real>
<key>Red Component</key>
<real>0.34798634052276611</real>
<real>0.4235294117647059</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 14 Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.6313725490196078</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.5764705882352941</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 15 Color</key>
<dict>
<key>Blue Component</key>
<real>0.86405980587005615</real>
<real>0.8901960784313725</real>
<key>Green Component</key>
<real>0.95794391632080078</real>
<real>0.9647058823529412</real>
<key>Red Component</key>
<real>0.98943418264389038</real>
<real>0.9921568627450981</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 2 Color</key>
<dict>
<key>Blue Component</key>
<real>0.020208755508065224</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.54115492105484009</real>
<real>0.6</real>
<key>Red Component</key>
<real>0.44977453351020813</real>
<real>0.5215686274509804</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 3 Color</key>
<dict>
<key>Blue Component</key>
<real>0.023484811186790466</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.46751424670219421</real>
<real>0.5372549019607843</real>
<key>Red Component</key>
<real>0.64746475219726562</real>
<real>0.7098039215686275</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 4 Color</key>
<dict>
<key>Blue Component</key>
<real>0.78231418132781982</real>
<real>0.8235294117647058</real>
<key>Green Component</key>
<real>0.46265947818756104</real>
<real>0.5450980392156862</real>
<key>Red Component</key>
<real>0.12754884362220764</real>
<real>0.14901960784313725</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 5 Color</key>
<dict>
<key>Blue Component</key>
<real>0.43516635894775391</real>
<real>0.5098039215686274</real>
<key>Green Component</key>
<real>0.10802463442087173</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.77738940715789795</real>
<real>0.8274509803921568</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 6 Color</key>
<dict>
<key>Blue Component</key>
<real>0.52502274513244629</real>
<real>0.596078431372549</real>
<key>Green Component</key>
<real>0.57082360982894897</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.14679534733295441</real>
<real>0.16470588235294117</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 7 Color</key>
<dict>
<key>Blue Component</key>
<real>0.79781103134155273</real>
<real>0.8352941176470589</real>
<key>Green Component</key>
<real>0.89001238346099854</real>
<real>0.9098039215686274</real>
<key>Red Component</key>
<real>0.91611063480377197</real>
<real>0.9333333333333333</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 8 Color</key>
<dict>
<key>Blue Component</key>
<real>0.15170273184776306</real>
<real>0.21176470588235294</real>
<key>Green Component</key>
<real>0.11783610284328461</real>
<real>0.16862745098039217</real>
<key>Red Component</key>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Ansi 9 Color</key>
<dict>
<key>Blue Component</key>
<real>0.073530435562133789</real>
<real>0.08627450980392157</real>
<key>Green Component</key>
<real>0.21325300633907318</real>
<real>0.29411764705882354</real>
<key>Red Component</key>
<real>0.74176257848739624</real>
<real>0.796078431372549</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Background Color</key>
<dict>
<key>Blue Component</key>
<real>0.15170273184776306</real>
<real>0.21176470588235294</real>
<key>Green Component</key>
<real>0.11783610284328461</real>
<real>0.16862745098039217</real>
<key>Red Component</key>
<real>0.0</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Bold Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.6313725490196078</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.5764705882352941</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Cursor Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>0.5882352941176471</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>0.5803921568627451</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>0.5137254901960784</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Cursor Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.25882352941176473</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.027450980392156862</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Foreground Color</key>
<dict>
<key>Blue Component</key>
<real>0.51685798168182373</real>
<real>0.5882352941176471</real>
<key>Green Component</key>
<real>0.50962930917739868</real>
<real>0.5803921568627451</real>
<key>Red Component</key>
<real>0.44058024883270264</real>
<real>0.5137254901960784</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Selected Text Color</key>
<dict>
<key>Blue Component</key>
<real>0.56363654136657715</real>
<real>0.6313725490196078</real>
<key>Green Component</key>
<real>0.56485837697982788</real>
<real>0.6313725490196078</real>
<key>Red Component</key>
<real>0.50599193572998047</real>
<real>0.5764705882352941</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
<key>Selection Color</key>
<dict>
<key>Blue Component</key>
<real>0.19370138645172119</real>
<real>0.25882352941176473</real>
<key>Green Component</key>
<real>0.15575926005840302</real>
<real>0.21176470588235294</real>
<key>Red Component</key>
<real>0.0</real>
<real>0.027450980392156862</real>
<key>Color Space</key>
<string>sRGB</string>
</dict>
</dict>
<key>Pastel (Dark Background)</key>
sources/FindViewController.m
View file @ 1272d4b2
@@ -363,6 +363,12 @@ const CGFloat kEdgeWidth = 3;
}
 
- (void)open {
if ([findBarTextField_.window.appearance.name isEqual:NSAppearanceNameVibrantDark]) {
findBarTextField_.appearance = [NSAppearance appearanceNamed:NSAppearanceNameVibrantLight];
} else {
findBarTextField_.appearance = nil;
}
if (savedState_) {
[self restoreState];
findBarTextField_.stringValue = state_.string;
sources/PTYSession.m
View file @ 1272d4b2
@@ -196,6 +196,10 @@ static NSString *const kVariableKeySessionCreationTimeString = @"session.creatio
static NSString *const kVariableKeySessionPID = @"iterm2.pid";
static NSString *const kVariableKeySessionAutoLogID = @"session.autoLogId";
 
// Value for SESSION_ARRANGEMENT_TMUX_TAB_COLOR that means "don't use the
// default color from the tmux profile; this tab should have no color."
static NSString *const iTermTmuxTabColorNone = @"none";
// Maps Session GUID to saved contents. Only live between window restoration
// and the end of startup activities.
static NSMutableDictionary *gRegisteredSessionContents;
@@ -963,7 +967,8 @@ ITERM_WEAKLY_REFERENCEABLE
}
if ([arrangement objectForKey:SESSION_ARRANGEMENT_TMUX_PANE]) {
// This is a tmux arrangement.
NSDictionary *tabColorDict = [ITAddressBookMgr encodeColor:[NSColor colorFromHexString:arrangement[SESSION_ARRANGEMENT_TMUX_TAB_COLOR]]];
NSString *colorString = arrangement[SESSION_ARRANGEMENT_TMUX_TAB_COLOR];
NSDictionary *tabColorDict = [ITAddressBookMgr encodeColor:[NSColor colorFromHexString:colorString]];
if (tabColorDict) {
// We're restoring a tmux arrangement that specifies a tab color.
if (![iTermProfilePreferences boolForKey:KEY_USE_TAB_COLOR inProfile:theBookmark] ||
@@ -973,7 +978,8 @@ ITERM_WEAKLY_REFERENCEABLE
theBookmark = [theBookmark dictionaryBySettingObject:@YES forKey:KEY_USE_TAB_COLOR];
needDivorce = YES;
}
} else if ([iTermProfilePreferences boolForKey:KEY_USE_TAB_COLOR inProfile:theBookmark]) {
} else if ([colorString isEqualToString:iTermTmuxTabColorNone] &&
[iTermProfilePreferences boolForKey:KEY_USE_TAB_COLOR inProfile:theBookmark]) {
// There was no tab color but the tmux profile specifies one. Disable it and divorce.
theBookmark = [theBookmark dictionaryBySettingObject:@NO forKey:KEY_USE_TAB_COLOR];
needDivorce = YES;
@@ -3444,7 +3450,8 @@ ITERM_WEAKLY_REFERENCEABLE
tabColorDict = nil;
}
NSColor *tabColor = [ITAddressBookMgr decodeColor:tabColorDict];
[self.tmuxController setTabColorString:[tabColor hexString] forWindowPane:_tmuxPane];
[self.tmuxController setTabColorString:tabColor ? [tabColor hexString] : iTermTmuxTabColorNone
forWindowPane:_tmuxPane];
}
}
 
sources/PTYTextView.m
View file @ 1272d4b2
@@ -306,7 +306,11 @@ static const int kDragThreshold = 3;
selector:@selector(imageDidLoad:)
name:iTermImageDidLoad
object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(applicationDidResignActive:)
name:NSApplicationDidResignActiveNotification
object:nil];
_semanticHistoryController = [[iTermSemanticHistoryController alloc] init];
_semanticHistoryController.delegate = self;
_semanticHistoryDragged = NO;
@@ -504,10 +508,12 @@ static const int kDragThreshold = 3;
}
 
- (void)refuseFirstResponderAtCurrentMouseLocation {
DLog(@"set refuse location");
_mouseLocationToRefuseFirstResponderAt = [NSEvent mouseLocation];
}
 
- (void)resetMouseLocationToRefuseFirstResponderAt {
DLog(@"reset refuse location from\n%@", [NSThread callStackSymbols]);
_mouseLocationToRefuseFirstResponderAt = NSMakePoint(DBL_MAX, DBL_MAX);
}
 
@@ -1853,7 +1859,11 @@ static const int kDragThreshold = 3;
_keyFocusStolenCount = 0;
[self setNeedsDisplay:YES];
}
[self resetMouseLocationToRefuseFirstResponderAt];
if ([NSApp isActive]) {
[self resetMouseLocationToRefuseFirstResponderAt];
} else {
DLog(@"Ignore mouse exited because app is not active");
}
[self updateUnderlinedURLs:event];
[_delegate textViewShowHoverURL:nil];
}
@@ -6150,6 +6160,10 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
}
}
 
- (void)applicationDidResignActive:(NSNotification *)notification {
[self refuseFirstResponderAtCurrentMouseLocation];
}
- (BOOL)imageIsVisible:(iTermImageInfo *)image {
if (![_drawingHelper.missingImages containsObject:image.uniqueIdentifier]) {
return NO;
sources/PseudoTerminal+TouchBar.h
View file @ 1272d4b2
@@ -14,8 +14,9 @@
NSScrubberDelegate,
NSScrubberDataSource>
 
- (void)updateTouchBarIfNeeded;
- (void)updateTouchBarIfNeeded:(BOOL)force;
- (void)updateTouchBarFunctionKeyLabels;
- (void)updateTouchBarWithWordAtCursor:(NSString *)word;
- (void)updateColorPresets;
 
@end
sources/PseudoTerminal+TouchBar.m
View file @ 1272d4b2
@@ -56,6 +56,11 @@ ITERM_IGNORE_PARTIAL_BEGIN
[self updateStatus];
}
 
- (void)updateColorPresets {
if (IsTouchBarAvailable() && [self respondsToSelector:@selector(touchBar)]) {
[self updateTouchBarIfNeeded:YES];
}
}
- (void)updateTouchBarWithWordAtCursor:(NSString *)word {
if (IsTouchBarAvailable() && [self respondsToSelector:@selector(touchBar)]) {
NSTouchBarItem *item = [self.touchBar itemForIdentifier:iTermTouchBarIdentifierManPage];
@@ -117,14 +122,14 @@ ITERM_IGNORE_PARTIAL_BEGIN
return touchBar;
}
 
- (void)updateTouchBarIfNeeded {
- (void)updateTouchBarIfNeeded:(BOOL)force {
if (!self.wellFormed) {
DLog(@"Not updating touch bar in %@ because not well formed", self);
return;
}
if (IsTouchBarAvailable()) {
NSTouchBar *replacement = [self amendTouchBar:[self makeGenericTouchBar]];
if (![replacement.customizationIdentifier isEqualToString:self.touchBar.customizationIdentifier]) {
if (force || ![replacement.customizationIdentifier isEqualToString:self.touchBar.customizationIdentifier]) {
self.touchBar = replacement;
} else {
NSScrubber *scrubber = (NSScrubber *)self.tabsTouchBarItem.view;
@@ -262,16 +267,7 @@ ITERM_IGNORE_PARTIAL_BEGIN
constant:0]];
}
 
- (NSTouchBarItem *)colorPresetsScrollViewTouchBarItem {
if (!IsTouchBarAvailable()) {
return nil;
}
NSScrollView *scrollView = [[[NSScrollView alloc] init] autorelease];
NSCustomTouchBarItem *item = [[[NSCustomTouchBarItem alloc] initWithIdentifier:iTermTouchBarIdentifierColorPresetScrollview] autorelease];
item.view = scrollView;
NSView *documentView = [[NSView alloc] init];
documentView.translatesAutoresizingMaskIntoConstraints = NO;
scrollView.documentView = documentView;
- (void)addButtonsToColorPresetsDocumentView:(NSView *)documentView {
NSButton *previous = nil;
for (NSDictionary *dict in @[ [iTermColorPresets builtInColorPresets] ?: @{},
[iTermColorPresets customColorPresets] ?: @{} ]) {
@@ -289,7 +285,7 @@ ITERM_IGNORE_PARTIAL_BEGIN
attributes:attributes] autorelease];
button = [iTermTouchBarButton buttonWithTitle:@""
target:self
action:@selector(colorPresetTouchBarItemSelected:)];
action:@selector(colorPresetTouchBarItemSelected:)];
[button sizeToFit];
button.attributedTitle = title;
button.bezelColor = backgroundColor;
@@ -303,6 +299,19 @@ ITERM_IGNORE_PARTIAL_BEGIN
if (previous) {
[self constrainButton:previous toRightOfSuperview:documentView];
}
}
- (NSTouchBarItem *)colorPresetsScrollViewTouchBarItem {
if (!IsTouchBarAvailable()) {
return nil;
}
NSScrollView *scrollView = [[[NSScrollView alloc] init] autorelease];
NSCustomTouchBarItem *item = [[[NSCustomTouchBarItem alloc] initWithIdentifier:iTermTouchBarIdentifierColorPresetScrollview] autorelease];
item.view = scrollView;
NSView *documentView = [[NSView alloc] init];
documentView.translatesAutoresizingMaskIntoConstraints = NO;
scrollView.documentView = documentView;
[self addButtonsToColorPresetsDocumentView:documentView];
return item;
}