Permalink
Browse files

Merge branch '3.0.13'

  • Loading branch information...
2 parents 2b49054 + b04601f commit d86474ee310e8591c7e5e9381c39df8be3c36524 @gnachman committed Dec 5, 2016
Showing with 2,513 additions and 238 deletions.
  1. +16 −16 Interfaces/AboutWindow.xib
  2. +13 −0 OtherResources/image_decoder.sb
  3. +17 −0 ThirdParty/LetsMove/PFMoveApplication.h
  4. +512 −0 ThirdParty/LetsMove/PFMoveApplication.m
  5. +191 −0 ThirdParty/LetsMove/README.md
  6. +1 −1 ci/after_failure.sh
  7. +295 −0 iTerm2.xcodeproj/project.pbxproj
  8. +7 −6 iTerm2.xcodeproj/xcshareddata/xcschemes/iTerm2.xcscheme
  9. +21 −0 image_decoder/iTermSerializableImage.h
  10. +102 −0 image_decoder/iTermSerializableImage.m
  11. +124 −0 image_decoder/image_decoder.m
  12. +6 −0 sources/AsyncHostLookupController.m
  13. +2 −0 sources/DebugLogging.h
  14. +51 −0 sources/DebugLogging.m
  15. +2 −0 sources/NSWorkspace+iTerm.m
  16. +9 −3 sources/PTYSession.h
  17. +152 −27 sources/PTYSession.m
  18. +57 −1 sources/PTYTab.m
  19. +9 −0 sources/PTYTask.m
  20. +4 −0 sources/PTYTextView.h
  21. +32 −2 sources/PTYTextView.m
  22. +19 −3 sources/ProfileListView.m
  23. +4 −0 sources/PseudoTerminal.h
  24. +4 −4 sources/PseudoTerminal.m
  25. +4 −0 sources/PseudoTerminalRestorer.m
  26. +2 −1 sources/ScreenChar.h
  27. +10 −1 sources/ScreenChar.m
  28. +2 −2 sources/VT100Screen.h
  29. +11 −4 sources/VT100Screen.m
  30. +59 −49 sources/iTermAboutWindowController.m
  31. +4 −1 sources/iTermAdvancedSettingsModel.h
  32. +3 −0 sources/iTermAdvancedSettingsModel.m
  33. +3 −1 sources/iTermAnimatedImageInfo.h
  34. +12 −73 sources/iTermAnimatedImageInfo.m
  35. +39 −2 sources/iTermApplicationDelegate.m
  36. +4 −4 sources/iTermController.m
  37. +1 −1 sources/iTermFileDescriptorClient.c
  38. +5 −3 sources/iTermFileDescriptorServer.c
  39. +24 −0 sources/iTermImage.h
  40. +145 −0 sources/iTermImage.m
  41. +17 −0 sources/iTermImageDecoderDriver.h
  42. +246 −0 sources/iTermImageDecoderDriver.m
  43. +9 −2 sources/iTermImageInfo.h
  44. +93 −23 sources/iTermImageInfo.m
  45. +10 −0 sources/iTermPasteHelper.m
  46. +3 −0 sources/iTermPreferences.h
  47. +7 −1 sources/iTermPreferences.m
  48. +3 −0 sources/iTermTextDrawingHelper.h
  49. +38 −2 sources/iTermTextExtractor.m
  50. +4 −0 sources/iTermWarning.h
  51. +9 −0 sources/iTermWarning.m
  52. BIN tests/Goldens/PTYTextViewTest-golden-testDimmingTextAndBgAndCursorBoost.png
  53. BIN tests/Goldens/PTYTextViewTest-golden-testDimmingTextAndBgAndCursorBoostAndMinimumContrast.png
  54. +95 −0 tests/getdims.sh
  55. +1 −5 tools/release_beta.sh
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A320" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="iTermAboutWindowController">
@@ -24,29 +24,29 @@
<rect key="frame" x="0.0" y="0.0" width="354" height="255"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="86" translatesAutoresizingMaskIntoConstraints="NO" id="GaD-UM-uz4">
+ <textField verticalHuggingPriority="750" id="GaD-UM-uz4">
<rect key="frame" x="211" y="208" width="90" height="27"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="iTerm2" id="U4n-GV-8aZ">
<font key="font" metaFont="system" size="22"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="591-57-qeA">
+ <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="591-57-qeA">
<rect key="frame" x="169" y="111" width="165" height="92"/>
- <clipView key="contentView" ambiguous="YES" id="aKk-Vf-QAt">
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <clipView key="contentView" id="aKk-Vf-QAt">
<rect key="frame" x="0.0" y="0.0" width="165" height="92"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textView ambiguous="YES" editable="NO" importsGraphics="NO" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="syc-QG-1mF">
+ <textView editable="NO" importsGraphics="NO" usesFontPanel="YES" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="syc-QG-1mF">
<rect key="frame" x="0.0" y="0.0" width="165" height="92"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="165" height="92"/>
<size key="maxSize" width="364" height="10000000"/>
<color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
- <size key="minSize" width="165" height="92"/>
- <size key="maxSize" width="364" height="10000000"/>
</textView>
</subviews>
</clipView>
@@ -59,25 +59,25 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
- <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gde-AT-nev">
+ <imageView id="gde-AT-nev">
<rect key="frame" x="20" y="123" width="128" height="128"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="NSApplicationIcon" id="b3m-Nh-0FF"/>
</imageView>
- <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cIi-Dh-gHn">
+ <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="cIi-Dh-gHn">
<rect key="frame" x="20" y="20" width="314" height="83"/>
- <clipView key="contentView" ambiguous="YES" id="eAf-wk-9pT">
+ <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+ <clipView key="contentView" id="eAf-wk-9pT">
<rect key="frame" x="0.0" y="0.0" width="314" height="83"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textView ambiguous="YES" editable="NO" importsGraphics="NO" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="cP7-fE-CE6">
+ <textView editable="NO" importsGraphics="NO" usesFontPanel="YES" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="cP7-fE-CE6">
<rect key="frame" x="0.0" y="0.0" width="314" height="83"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="minSize" width="314" height="83"/>
+ <size key="minSize" width="314" height="0.0"/>
<size key="maxSize" width="364" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <size key="minSize" width="314" height="83"/>
- <size key="maxSize" width="364" height="10000000"/>
</textView>
</subviews>
</clipView>
@@ -0,0 +1,13 @@
+(version 1)
+(deny default)
+(allow file-read-data file-read-metadata
+(regex "^/System/Library/ColorSync/Profiles")
+ (regex "^/System/Library/Frameworks")
+ (regex "^/System/Library/PrivateFrameworks")
+ (literal "/dev/null")
+ (literal "@PATH_TO_EXECUTABLE@")
+ (literal "@PATH_TO_EXECUTABLE@/@EXECUTABLE@")
+ (regex "^/usr/lib"))
+
+(allow process-exec (literal "@PATH_TO_EXECUTABLE@/@EXECUTABLE@"))
+(allow mach* sysctl-read)
@@ -0,0 +1,17 @@
+//
+// PFMoveApplication.h, version 1.21
+// LetsMove
+//
+// Created by Andy Kim at Potion Factory LLC on 9/17/09
+//
+// The contents of this file are dedicated to the public domain.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void PFMoveToApplicationsFolderIfNecessary(void);
+
+#ifdef __cplusplus
+}
+#endif
Oops, something went wrong.

0 comments on commit d86474e

Please sign in to comment.