From cd50335b4daf91a7195ccf6eccdd2d109e64957b Mon Sep 17 00:00:00 2001 From: pancake Date: Thu, 23 May 2024 21:27:52 +0200 Subject: [PATCH] Unsigned CI builds for macOS-x64 and add badge in the README --- .github/workflows/ci.yml | 28 + .../ColorPicker-x86_64.framework/ColorPicker | 1 - .../ColorPicker-x86_64.framework/Headers | 1 - .../ColorPicker-x86_64.framework/Modules | 1 - .../ColorPicker-x86_64.framework/Resources | 1 - .../Versions/A/Headers/CPKColorWell.h | 26 - .../A/Headers/CPKMainViewController.h | 42 - .../Versions/A/Headers/CPKPopover.h | 44 - .../Versions/A/Headers/CPKSwatchView.h | 14 - .../Versions/A/Headers/ColorPicker.h | 12 - .../Versions/A/Modules/module.modulemap | 6 - .../A/Resources/ActiveEscapeHatch.tiff | Bin 7764 -> 0 bytes .../A/Resources/ActiveEyedropper.tiff | Bin 8662 -> 0 bytes .../Versions/A/Resources/Add.tiff | Bin 7260 -> 0 bytes .../Versions/A/Resources/EscapeHatch.tiff | Bin 7408 -> 0 bytes .../Versions/A/Resources/Eyedropper.tiff | Bin 8056 -> 0 bytes .../Versions/A/Resources/HSB.tiff | Bin 10378 -> 0 bytes .../Versions/A/Resources/Info.plist | 46 - .../Versions/A/Resources/NoColor.tiff | Bin 7582 -> 0 bytes .../Versions/A/Resources/RGB.tiff | Bin 9066 -> 0 bytes .../Versions/A/Resources/Remove.tiff | Bin 7146 -> 0 bytes .../A/Resources/SelectedColorIndicator.tiff | Bin 7746 -> 0 bytes .../A/Resources/SelectionIndicator.tiff | Bin 7334 -> 0 bytes .../A/Resources/SwatchCheckerboard.tiff | Bin 7236 -> 0 bytes .../Versions/A/Resources/colors.txt | 1822 ----------------- .../Versions/Current | 1 - .../ColorPicker.xcodeproj/project.pbxproj | 6 +- Makefile | 18 +- README.md | 2 + config.h | 2 +- plists/Therm.plist.development | 227 ++ ...lease-iTerm2.plist => Therm.plist.release} | 0 plists/iTermTests-Info.plist | 32 - sources/NSStringITerm.m | 2 +- sources/PTYTextView.m | 2 +- sources/PointerPrefsController.m | 14 +- sources/ProfileModel.m | 2 +- .../ProfilesColorsPreferencesViewController.m | 3 +- .../ProfilesWindowPreferencesViewController.m | 2 +- sources/TriggerController.m | 3 +- sources/iTermKeyBindingMgr.m | 2 +- sources/iTermPreferences.m | 6 +- sources/iTermPreferencesBaseViewController.m | 2 +- sources/iTermShortcut.m | 2 +- sources/iTermTipCardActionButton.m | 2 +- sources/iTermWarning.m | 2 +- version.txt | 2 +- 47 files changed, 297 insertions(+), 2081 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 120000 ColorPicker/ColorPicker-x86_64.framework/ColorPicker delete mode 120000 ColorPicker/ColorPicker-x86_64.framework/Headers delete mode 120000 ColorPicker/ColorPicker-x86_64.framework/Modules delete mode 120000 ColorPicker/ColorPicker-x86_64.framework/Resources delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKColorWell.h delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKMainViewController.h delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKPopover.h delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKSwatchView.h delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/ColorPicker.h delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Modules/module.modulemap delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEscapeHatch.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEyedropper.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Add.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/EscapeHatch.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Eyedropper.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/HSB.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Info.plist delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/NoColor.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/RGB.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Remove.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectedColorIndicator.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectionIndicator.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SwatchCheckerboard.tiff delete mode 100644 ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/colors.txt delete mode 120000 ColorPicker/ColorPicker-x86_64.framework/Versions/Current create mode 100644 plists/Therm.plist.development rename plists/{release-iTerm2.plist => Therm.plist.release} (100%) delete mode 100644 plists/iTermTests-Info.plist diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..384ecbafba --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,28 @@ +name: therm + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + macos-x64: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - name: Build + run: | + make -j4 CIFLAGS='CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO' | tee build.log + - name: Count Warnings + run: | + grep 'warning:' build.log | wc -l + - name: Packaging + run: make dist CIFLAGS='CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO' + - uses: actions/upload-artifact@v3 + with: + name: Therm.zip + path: Therm-*.zip + diff --git a/ColorPicker/ColorPicker-x86_64.framework/ColorPicker b/ColorPicker/ColorPicker-x86_64.framework/ColorPicker deleted file mode 120000 index cd380e50df..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/ColorPicker +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/ColorPicker \ No newline at end of file diff --git a/ColorPicker/ColorPicker-x86_64.framework/Headers b/ColorPicker/ColorPicker-x86_64.framework/Headers deleted file mode 120000 index a177d2a6b9..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/ColorPicker/ColorPicker-x86_64.framework/Modules b/ColorPicker/ColorPicker-x86_64.framework/Modules deleted file mode 120000 index 5736f3186e..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/ColorPicker/ColorPicker-x86_64.framework/Resources b/ColorPicker/ColorPicker-x86_64.framework/Resources deleted file mode 120000 index 953ee36f3b..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKColorWell.h b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKColorWell.h deleted file mode 100644 index 0a8719695a..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKColorWell.h +++ /dev/null @@ -1,26 +0,0 @@ -#import -#import "CPKSwatchView.h" - -/** - * Shows a color well. When clicked, it opens a popover with a color picker attached to it. - * TODO(georgen): Use an NSCell subclass. Currently this control doesn't do a lot of what you'd - * expect a control to do because it doesn't have a cell. - */ -@interface CPKColorWell : NSControl - -@property(nonatomic, retain) NSColor *color; -@property(nonatomic, assign) BOOL alphaAllowed; -@property(nonatomic, assign) BOOL noColorAllowed; - -// Called just before popover opens. -@property(nonatomic, copy) void (^willOpenPopover)(void); - -// Called just before popover closes. -@property(nonatomic, copy) void (^willClosePopover)(void); - -// Override these methods to customize how the popover is presented. Normally it is presented from -// the color well's frame. -- (NSRect)presentationRect; -- (NSView *)presentingView; - -@end diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKMainViewController.h b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKMainViewController.h deleted file mode 100644 index 83ed6fa85a..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKMainViewController.h +++ /dev/null @@ -1,42 +0,0 @@ -#import - -typedef NS_OPTIONS(NSInteger, CPKMainViewControllerOptions) { - CPKMainViewControllerOptionsAlpha = (1 << 0), // Show opacity control - CPKMainViewControllerOptionsNoColor = (1 << 1), // Allow selection of "no color" -}; - -/** - * The view controller for the color picker. This can go inside a popover, or something else if - * you like. - */ -@interface CPKMainViewController : NSViewController - -/** How large we want our view to be. */ -@property(nonatomic, readonly) NSSize desiredSize; - -/** The currently selected color. */ -@property(nonatomic, readonly) NSColor *selectedColor; - -/** - * Initializes a main view controller. - * - * @param block The block to call when the user changes the color. - * @param color The initial color. - * @param alphaAllowed Can alpha be adjusted? - * - * @return An initialized instance. - */ -- (instancetype)initWithBlock:(void (^)(NSColor *))block - color:(NSColor *)color - alphaAllowed:(BOOL)alphaAllowed DEPRECATED_ATTRIBUTE; - -- (instancetype)initWithBlock:(void (^)(NSColor *))block - useSystemColorPicker:(void (^)(void))useSystemColorPickerBlock - color:(NSColor *)color - options:(CPKMainViewControllerOptions)options; - - -// Changes the selected color. -- (void)selectColor:(NSColor *)color; - -@end diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKPopover.h b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKPopover.h deleted file mode 100644 index 2c3a59e47d..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKPopover.h +++ /dev/null @@ -1,44 +0,0 @@ -#import -#import "CPKMainViewController.h" - -/** - * A popover that houses a color picker. - * NOTE: Do not set the delegate of CPKPopover. It is its own delegate because - * NSPopover uses an unsafe delegate pointer. This causes problems if the - * delegate gets dealloced. Instead, use the willClose block. - */ -@interface CPKPopover : NSPopover - -/** Reflects the final selected color. Setter changes color in open popover. */ -@property(nonatomic, strong) NSColor *selectedColor; - -/** Called before popover closes. */ -@property(nonatomic, copy) void (^willClose)(void); - -/** - * Shows the color picker in a popover. Returns the semitransient popover. - * - * @param positioningRect The frame to position the popover on - * @param positioningView The view whose coordinate system the |positioningRect| is in - * @param color The starting color for the color picker - * @param alphaAllowed User may adjust alpha value - * @param block Invoked when the user changes the color - * - * @return A new popover that's being displayed. - */ -+ (instancetype)presentRelativeToRect:(NSRect)positioningRect - ofView:(NSView *)positioningView - preferredEdge:(NSRectEdge)preferredEdge - initialColor:(NSColor *)color - alphaAllowed:(BOOL)alphaAllowed - selectionDidChange:(void (^)(NSColor *))block DEPRECATED_ATTRIBUTE; - -+ (instancetype)presentRelativeToRect:(NSRect)positioningRect - ofView:(NSView *)positioningView - preferredEdge:(NSRectEdge)preferredEdge - initialColor:(NSColor *)color - options:(CPKMainViewControllerOptions)options - selectionDidChange:(void (^)(NSColor *))block - useSystemColorPicker:(void (^)(void))useSystemColorPicker; - -@end diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKSwatchView.h b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKSwatchView.h deleted file mode 100644 index 7881fa6209..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/CPKSwatchView.h +++ /dev/null @@ -1,14 +0,0 @@ -#import - -@interface CPKSwatchView : NSView - -/** The color to display. When the color is changed by the color picker this value gets updated. */ -@property(nonatomic, retain) NSColor *color; - -/** Defaults to 3 */ -@property(nonatomic) NSInteger cornerRadius; - -/** Defaults to gray */ -@property(nonatomic, retain) NSColor *borderColor; - -@end diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/ColorPicker.h b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/ColorPicker.h deleted file mode 100644 index 927621401c..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Headers/ColorPicker.h +++ /dev/null @@ -1,12 +0,0 @@ -#import -#import "CPKColorWell.h" -#import "CPKMainViewController.h" -#import "CPKPopover.h" - -//! Project version number for ColorPicker. -FOUNDATION_EXPORT double ColorPickerVersionNumber; - -//! Project version string for ColorPicker. -FOUNDATION_EXPORT const unsigned char ColorPickerVersionString[]; - - diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Modules/module.modulemap b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index 5057cc8750..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module ColorPicker { - umbrella header "ColorPicker.h" - - export * - module * { export * } -} diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEscapeHatch.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEscapeHatch.tiff deleted file mode 100644 index efad22327483250ab07dca121e01a6dcb0681f31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7764 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 KiT?kT=sy5@=#x4C diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEyedropper.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/ActiveEyedropper.tiff deleted file mode 100644 index 2f063f1361082f37afba0d2b002dc7f3abbb1ad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8662 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 Qk23$G%>O9!|C=)ZFXSTw761SM diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Add.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Add.tiff deleted file mode 100644 index fcf4d99934ea7c880f2d3cddc86571cfdf9077af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7260 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 WO)0)9#W$t+rWD_l;`{#;-#-C*n6iKX diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/EscapeHatch.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/EscapeHatch.tiff deleted file mode 100644 index 5276b6b225c8e3237bcb78d3d750373e68d308de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7408 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 X)Zv^uoKuH$>TpgS&Z)!ypE~>(nTq|h diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Eyedropper.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Eyedropper.tiff deleted file mode 100644 index 7cd8e1355f6e8e6a10f6e8f9610698e3e5586a7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8056 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 diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/HSB.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/HSB.tiff deleted file mode 100644 index 99add0afce3b5c3e9460c261b3f053014bcc342c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10378 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 Hbddi8=7f^$ diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Info.plist b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index 152c81b1a5..0000000000 --- a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,46 +0,0 @@ - - - - - BuildMachineOSBuild - 16B2657 - CFBundleDevelopmentRegion - en - CFBundleExecutable - ColorPicker - CFBundleIdentifier - com.pancake.therm.ColorPicker - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ColorPicker - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 8B62 - DTPlatformVersion - GM - DTSDKBuild - 16B2649 - DTSDKName - macosx10.12 - DTXcode - 0810 - DTXcodeBuild - 8B62 - NSHumanReadableCopyright - Copyright © 2015 Google. All rights reserved. - - diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/NoColor.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/NoColor.tiff deleted file mode 100644 index 6268492d1561ff2af60570002517970da6c94a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7582 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 oH3??ae&%|9AmY+*=0(z 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 diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Remove.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/Remove.tiff deleted file mode 100644 index cf2b390eee148775bb25e8f9d89959020284d44d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7146 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 diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectedColorIndicator.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectedColorIndicator.tiff deleted file mode 100644 index 55f6d0587081f6f967dc87ceaeba4d41389ced1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7746 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 diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectionIndicator.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SelectionIndicator.tiff deleted file mode 100644 index 12e5f0ae3e427bfa7c129a00efe7884e6078094c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7334 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 diff --git a/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SwatchCheckerboard.tiff b/ColorPicker/ColorPicker-x86_64.framework/Versions/A/Resources/SwatchCheckerboard.tiff deleted file mode 100644 index 5f009fda700f22b02db95c63a5b53a737f6ce8b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7236 zcmeI0cT`i^7KhKh=^-J6gwP@M4gvxJM0yA5Ac#Up0)!G`2*utI6;u=vX*NI*aljD; zWUPoCQ7m8|&_OJWgX16;)OQ0e;JvkGeDD3u$y(=rci(-^-lyE;{NnEq3;_T)SF@M_ z!)OK>m*c_?Y~|`ZQgS=uf>@!1bLcz|PGCv)N*ncp3stfNZ4Y~$B3Ev3DOWSVqy*@s zD{@cs4N9;7*2KS4nC?(;L!Wx$i?pRnmAn42lAW5R)C0Hsi(VC(R)uYKGol)v5|Be1 zo$H&GF}XZclgm)E{Fi1={<>B{1U{_oS22jLu-WMT;3M`_OkeL11BV9fF~j$a{ol#2 zy7BejPERoB|qtZ z8BzjB&yu##MM!y)yC9Wm{pf#ZNnG>sxY7W*Kn~OF!P7WooF!48Y)A(<07zblKhj3} zED~$mM7-};Jec@ENDjy+B#SNPB)TT@ILSOwTpC-%b+X7d6$%o7m>(aXA?BwrGc9aq zBVCZZ{P==2SO$Ppfmjsm>B5{J8O6kPA&C(H7MKIT=A;Y#Lp(weXW;Gb%1lR`Bs^8# z_l(aPxNYJU$Yf60|0|+$gd#CA#z4f|lFLiyAe@76N|snCu@56mk4u&?ELk7A2uToO z1qmliu<^Lh1UpHXn=0TUK9Zb;+*GcFI}qNOnZZLC<%e)?CZCsu@EwG;Q!-Nd2!BAB zp2}mV1Arz;>|!1#5#d<~lSHAxt_aUTwg)L;8plmzF)tg*69CsV;Sv!)AyLfK=NK@} zZEaahFJ4v(Pb@YGWOI^{^+r}S<(u~O6Hb{OtQ7Pt+lm@g())qljR>D zPI~<_NY-}3<6Y4Bnn8@tDce-rDO*}40IU&YZnjO?;z|K%Sr351gDIQ#J^&~=05sp2 zHXep#za)yqLOV0FtgI|kK96H6nb67dLx)MvzlUk@OeOIq=Z@*di)Uw~h?$Z}<)o#g zWr&#RLN{C_u`me#a9jDvacJP}WTgbGJ?8DEfqEVqEm7xU8uOupdnR`~yH zHZ2DUPV8$0Xw_c?0bZf=i~Li zRd4}v3#aoFm=d#Va43_LAgoDTs4N`>EAsxsFvVd67T*w{rgMy(*C>Bb91W*RF99jqELxoTov>&R2euhp! z=b$T4H*_EBhh9Q|LZ4t1OoHjKDy$2e!7SJr_Ju>?g>VAA7+wnJz+2%GxDq}LH^b-P zYw%sT4}J}gAU_~dCatY7 z)JKvm$&lnqiY8@{wvuW|XG!--@5p4bF4>73MHZ8{lIzIl$xp~1q-oNo(%#Zs=~dF@ z(#_Jhq~A~o6dj5)Wf5g5rI^x0xj`9{A;{>;xXQ3)R?3vioRI028KKgs=F|XcDs?mU z5cLZ6g)B~1SJqvYE1M%*C3{}>84X3#qPfyIv~{#<+6CGG9ZT1vd()HX`ShRYUG!l& zS-IJA;d0q><#MOw`WPsNF2kFV!YE)IW%MvU$*amc%k$(n$v4Q~k{?x2R&Y|_DdZ_M zD%@50q{visS4>viuGpgZSP89Us1&4>rL;%sg3^#OUD;llqnxLFRQZ7ltYWAVtg=j{ zN~Kd}L{&}IQ&p&1s(M~^NR6T9q?V*sq;^{Er8-T0t~y`6Nd1iZE2bRNnVG^YVRkTw zHB>abG%_^yYjkOR*3{Ds(_E|BsQFlnsKwHX*DBI#*BaJV*Y?+5u3fMFK!>2i(n-|W zrE^JVR98}Z^|(BGhJ)iV*18R+bqg#yV)hP zud}RXrOc|H_0U|_+{b*ad7Js47KRoai*k!QmSjs0%T<=GmTzYp&F0PCGy9$u&C1_u zgH^lL7i$}9k#&RhOB-#QSepu)UKX7d$lA=hY>TmVv0Y_*()OdBwVl}RsNEm-Cicnp zhwNX>(VN4YQ$6RIgQf%9VZTG)T;|-^x%=k!Ichkv9V;E5I%zp^oobv0oei9moDVy{ zahc^JayjlY>T2h@!u6~h%FWX)&#lW{);-L<%>9XnrbmKDy~nVpmFF_gvtAf4U$5<6 zz22(c9Pc{sVILcx6+RulB;OF1oK(~K!A6^j)2F3 zdVz}re+j|{1qPJ|Jr6byULJfYgccGLawz0|s7q);=)*Amu#B+wa7uV|cwP8tgj+;m zMBjX~`77pMi&To_N47@cqQawUqDB_DFW9+YAlfQAH@at`-oosKR~9KPN?CL&h7!Y$ zX^O?fM#LV99b*TuE7>D)-f8)Zqa+vDO(9c+((Vsatvpn-dR(MuZHZ@z2-MPeY$)+WPOFfnz zScYE4S=PQ>WBHop{VSYT>|Y73j9b~hN^4cls)5y>s}HUru1Q{VeeJBZg=_y>7qPA_ zM>S`4&a?HN>+5r+b49tm8|*ji-H6`E-`KUua#QK1uX)_OtNF9?i}S}eb2eYyV!owh z%eSrZTe}LZ3-)ZoZWCO-f9;Ifd8K%E@!nm;T^YOj zO8iP%OSMb4m5!AqmfbCPDQ~P$sn}F8x|_TE)*h!l4SQAh=I{NqkH7EUe$V~QmAaM1 zRoJS`s^`_=)t3&i4%F2s)#TTFsTI`r9SlC$QD;+EcSz+>K|NfbQUCIA^x>O7x&74I zVA8O^kq_9&K-8H8mX5IaYC;c08{cYF^Sj+>+SR*BaT{eZuEN zdz*dR@n1}TsXeK2viy|Xse;qQ(>bTVomqNjrLC6ZQXOa zPv3I9b?&y??TdH3?_9e(?{0TbSkJxQ=-$42+|K`{qPJeU`&mSImD|-9w&&}@?-_`y#`>*zqz>z2KQ{R6c&HJGE z;owKs$4j3gJ`H}(8pDm1d@=aa_SN_6qi?C-zD-k;vFAQ;4OJF^)w zJxTvldM{~8?@^kk^d9B(kM$nq&5!jSrE5y>QN|>PE2JRWZ~R;~as8p*8y9;sYHvpE pjc=YAwKx4Qiy5^yqxNRh-i+FtQF}9LZ$|CSsJ$7r_rIyVe*q%*p~C + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + command + tool + sh + zsh + csh + pl + + CFBundleTypeIconFile + Therm.icns + CFBundleTypeName + Terminal scripts + CFBundleTypeRole + Editor + + + CFBundleTypeName + Folders + CFBundleTypeOSTypes + + fold + + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + itermcolors + + CFBundleTypeIconFile + Therm.icns + CFBundleTypeName + Therm Color Presets + CFBundleTypeRole + Editor + + + CFBundleTypeRole + Shell + LSItemContentTypes + + public.unix-executable + + + + CFBundleExecutable + Therm + CFBundleGetInfoString + unknown + CFBundleHelpBookFolder + Therm Help + CFBundleHelpBookName + Therm Help + CFBundleIconFile + Therm.icns + ATSApplicationFontsPath + fonts + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Therm + CFBundlePackageType + APPL + CFBundleShortVersionString + unknown + CFBundleSignature + ITRM + CFBundleURLTypes + + + CFBundleURLName + http URL + CFBundleURLSchemes + + http + + + + CFBundleURLName + https URL + CFBundleURLSchemes + + https + + + + CFBundleURLName + ftp URL + CFBundleURLSchemes + + ftp + + + + CFBundleURLName + gopher URL + CFBundleURLSchemes + + gopher + + + + CFBundleURLName + mailto URL + CFBundleURLSchemes + + mailto + + + + CFBundleURLName + news URL + CFBundleURLSchemes + + news + + + + CFBundleURLName + nntp URL + CFBundleURLSchemes + + nntp + + + + CFBundleURLName + ssh URL + CFBundleURLSchemes + + ssh + + + + CFBundleURLName + telnet URL + CFBundleURLSchemes + + telnet + + + + CFBundleURLName + wais URL + CFBundleURLSchemes + + wais + + + + CFBundleURLName + whois URL + CFBundleURLSchemes + + whois + + + + CFBundleURLName + x-man-page URL + CFBundleURLSchemes + + x-man-page + + + + CFBundleVersion + unknown + LSApplicationCategoryType + public.app-category.utilities + NSAppleScriptEnabled + YES + NSExtensions + + NSHumanReadableCopyright + GPL v2 + NSMainNibFile + MainMenu + NSPrincipalClass + iTermApplication + NSServices + + + NSMenuItem + + default + New Therm Window Here + + NSMessage + openWindow + NSRequiredContext + + NSTextContent + FilePath + + NSSendTypes + + NSFilenamesPboardType + public.plain-text + + + + NSSupportsAutomaticGraphicsSwitching + + OSAScriptingDefinition + Therm.sdef + SUFeedURLForFinal + https://iterm2.com/appcasts/final.xml + SUFeedURLForTesting + https://iterm2.com/appcasts/testing.xml + SUPublicDSAKeyFile + dsa_pub.pem + + diff --git a/plists/release-iTerm2.plist b/plists/Therm.plist.release similarity index 100% rename from plists/release-iTerm2.plist rename to plists/Therm.plist.release diff --git a/plists/iTermTests-Info.plist b/plists/iTermTests-Info.plist deleted file mode 100644 index ba0e84af5c..0000000000 --- a/plists/iTermTests-Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/sources/NSStringITerm.m b/sources/NSStringITerm.m index 0d308d1793..4c85498791 100644 --- a/sources/NSStringITerm.m +++ b/sources/NSStringITerm.m @@ -1441,7 +1441,7 @@ + (NSString *)stringForModifiersWithMask:(NSUInteger)keyMods { if (keyMods & NSShiftKeyMask) { [theKeyString appendString:@"⇧"]; } - if (keyMods & NSCommandKeyMask) { + if (keyMods & NSEventModifierFlagCommand) { [theKeyString appendString:@"⌘"]; } return theKeyString; diff --git a/sources/PTYTextView.m b/sources/PTYTextView.m index 973feb42d0..1747bb7bbe 100644 --- a/sources/PTYTextView.m +++ b/sources/PTYTextView.m @@ -5063,7 +5063,7 @@ - (void)saveDocumentAs:(id)sender formattedDate = [formattedDate stringByReplacingOccurrencesOfString:@":" withString:@"-"]; NSString *nowStr = [NSString stringWithFormat:@"Log at %@.txt", formattedDate]; - if ([aSavePanel legacyRunModalForDirectory:path file:nowStr] == NSFileHandlingPanelOKButton) { + if ([aSavePanel legacyRunModalForDirectory:path file:nowStr] == NSModalResponseOK) { if (![aData writeToFile:[aSavePanel legacyFilename] atomically:YES]) { NSBeep(); } diff --git a/sources/PointerPrefsController.m b/sources/PointerPrefsController.m index fae125bc8c..3d1730cc62 100644 --- a/sources/PointerPrefsController.m +++ b/sources/PointerPrefsController.m @@ -162,7 +162,7 @@ + (NSDictionary *)dictForAction:(NSString *)action + (NSString *)modCharsForMask:(int)modifiers { NSMutableString *modStr = [NSMutableString string]; - if (modifiers & NSCommandKeyMask) { + if (modifiers & NSEventModifierFlagCommand) { [modStr appendString:kCommandKeyChar]; } if (modifiers & NSAlternateKeyMask) { @@ -181,7 +181,7 @@ + (int)maskForModChars:(NSString *)modChars { int mask = 0; if ([modChars rangeOfString:kCommandKeyChar].location != NSNotFound) { - mask |= NSCommandKeyMask; + mask |= NSEventModifierFlagCommand; } if ([modChars rangeOfString:kOptionKeyChar].location != NSNotFound) { mask |= NSAlternateKeyMask; @@ -546,7 +546,7 @@ + (NSDictionary *)defaultActions } } temp = tempCopy; - int modMasks[] = { NSCommandKeyMask, NSAlternateKeyMask, NSControlKeyMask, NSShiftKeyMask }; + int modMasks[] = { NSEventModifierFlagCommand, NSAlternateKeyMask, NSControlKeyMask, NSShiftKeyMask }; int numModCombos = 1 << (sizeof(modMasks) / sizeof(int)); for (int numClicks = 0; numClicks <= kMaxClicks; numClicks++) { // i is a bitmask over the modMasks array indices. @@ -715,7 +715,7 @@ + (NSString *)localizedButtonKey:(NSString *)key - (void)setModifierButtons:(int)modMask { - [editModifiersCommand_ setState:(modMask & NSCommandKeyMask) ? NSOnState : NSOffState]; + [editModifiersCommand_ setState:(modMask & NSEventModifierFlagCommand) ? NSOnState : NSOffState]; [editModifiersOption_ setState:(modMask & NSAlternateKeyMask) ? NSOnState : NSOffState]; [editModifiersShift_ setState:(modMask & NSShiftKeyMask) ? NSOnState : NSOffState]; [editModifiersControl_ setState:(modMask & NSControlKeyMask) ? NSOnState : NSOffState]; @@ -864,7 +864,7 @@ - (void)loadKeyIntoEditPane:(NSString *)key NSString *currentArg = [PointerPrefsController argumentForKey:key]; [self updateArgumentFieldsForAction:actionIdent argument:currentArg]; - [editModifiersCommand_ setState:(modMask & NSCommandKeyMask) ? NSOnState : NSOffState]; + [editModifiersCommand_ setState:(modMask & NSEventModifierFlagCommand) ? NSOnState : NSOffState]; [editModifiersOption_ setState:(modMask & NSAlternateKeyMask) ? NSOnState : NSOffState]; [editModifiersShift_ setState:(modMask & NSShiftKeyMask) ? NSOnState : NSOffState]; [editModifiersControl_ setState:(modMask & NSControlKeyMask) ? NSOnState : NSOffState]; @@ -923,7 +923,7 @@ - (void)tableViewSelectionDidChange:(NSNotification *)notification [editAction_ selectItemWithTitle:[PointerPrefsController localizedActionForDict:action]]; int modflags = [PointerPrefsController modifiersForKey:key]; - [editModifiersCommand_ setState:(modflags & NSCommandKeyMask) ? NSOnState : NSOffState]; + [editModifiersCommand_ setState:(modflags & NSEventModifierFlagCommand) ? NSOnState : NSOffState]; [editModifiersOption_ setState:(modflags & NSAlternateKeyMask) ? NSOnState : NSOffState]; [editModifiersShift_ setState:(modflags & NSShiftKeyMask) ? NSOnState : NSOffState]; [editModifiersControl_ setState:(modflags & NSControlKeyMask) ? NSOnState : NSOffState]; @@ -977,7 +977,7 @@ - (IBAction)ok:(id)sender { NSString *newKey; int modMask = 0; if ([editModifiersCommand_ state] == NSOnState) { - modMask |= NSCommandKeyMask; + modMask |= NSEventModifierFlagCommand; } if ([editModifiersOption_ state] == NSOnState) { modMask |= NSAlternateKeyMask; diff --git a/sources/ProfileModel.m b/sources/ProfileModel.m index b292f4ec42..0b3300c05e 100644 --- a/sources/ProfileModel.m +++ b/sources/ProfileModel.m @@ -976,7 +976,7 @@ - (void)addBookmark:(Profile*)b NSString* shortcut = [b objectForKey:KEY_SHORTCUT]; if ([shortcut length]) { [item setKeyEquivalent:[shortcut lowercaseString]]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSControlKeyMask | (isAlternate ? NSAlternateKeyMask : 0)]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSControlKeyMask | (isAlternate ? NSAlternateKeyMask : 0)]; } else if (isAlternate) { [item setKeyEquivalentModifierMask:NSAlternateKeyMask]; } diff --git a/sources/ProfilesColorsPreferencesViewController.m b/sources/ProfilesColorsPreferencesViewController.m index 746db83503..37b7e69691 100644 --- a/sources/ProfilesColorsPreferencesViewController.m +++ b/sources/ProfilesColorsPreferencesViewController.m @@ -15,7 +15,8 @@ #import "NSTextField+iTerm.h" #import "PreferencePanel.h" -#import +// #import +#import "../ColorPicker/ColorPicker/ColorPicker.h" static NSString * const kColorGalleryURL = @"https://www.iterm2.com/colorgallery"; diff --git a/sources/ProfilesWindowPreferencesViewController.m b/sources/ProfilesWindowPreferencesViewController.m index 5e94ba0c30..c12e64cf1f 100644 --- a/sources/ProfilesWindowPreferencesViewController.m +++ b/sources/ProfilesWindowPreferencesViewController.m @@ -208,7 +208,7 @@ - (void)openFilePicker { [panel setAllowedFileTypes:[NSImage imageTypes]]; void (^completion)(NSInteger) = ^(NSInteger result) { - if (result == NSFileHandlingPanelOKButton) { + if (result == NSModalResponseOK) { NSURL *url = [[panel URLs] objectAtIndex:0]; [self loadBackgroundImageWithFilename:[url path]]; [self setString:self.backgroundImageFilename forKey:KEY_BACKGROUND_IMAGE_LOCATION]; diff --git a/sources/TriggerController.m b/sources/TriggerController.m index bdd4d53b16..310d524945 100644 --- a/sources/TriggerController.m +++ b/sources/TriggerController.m @@ -30,7 +30,8 @@ #import "StopTrigger.h" #import "Trigger.h" -#import +// #import +#import "../ColorPicker/ColorPicker/ColorPicker.h" static NSString *const kiTermTriggerControllerPasteboardType = @"kiTermTriggerControllerPasteboardType"; diff --git a/sources/iTermKeyBindingMgr.m b/sources/iTermKeyBindingMgr.m index 7b3058d137..732aa4129f 100644 --- a/sources/iTermKeyBindingMgr.m +++ b/sources/iTermKeyBindingMgr.m @@ -599,7 +599,7 @@ + (BOOL)haveKeyMappingForKeyString:(NSString*)keyString inBookmark:(Profile*)boo } + (NSEventModifierFlags)modifiersForKeyCode:(int)keyCode modifiers:(NSEventModifierFlags)keyMods { - NSEventModifierFlags theModifiers = keyMods & (NSAlternateKeyMask | NSControlKeyMask | NSShiftKeyMask | NSCommandKeyMask | NSNumericPadKeyMask); + NSEventModifierFlags theModifiers = keyMods & (NSAlternateKeyMask | NSControlKeyMask | NSShiftKeyMask | NSEventModifierFlagCommand | NSNumericPadKeyMask); // on some keyboards, arrow keys have NSNumericPadKeyMask bit set; manually set it for keyboards that don't if (keyCode >= NSUpArrowFunctionKey && keyCode <= NSRightArrowFunctionKey) { diff --git a/sources/iTermPreferences.m b/sources/iTermPreferences.m index bc88e4510a..b674001c7a 100644 --- a/sources/iTermPreferences.m +++ b/sources/iTermPreferences.m @@ -482,10 +482,10 @@ + (void)addObserverForKey:(NSString *)key block:(void (^)(id before, id after))b + (NSUInteger)maskForModifierTag:(iTermPreferencesModifierTag)tag { switch (tag) { case kPreferencesModifierTagEitherCommand: - return NSCommandKeyMask; + return NSEventModifierFlagCommand; case kPreferencesModifierTagCommandAndOption: - return NSCommandKeyMask | NSAlternateKeyMask; + return NSEventModifierFlagCommand | NSAlternateKeyMask; case kPreferencesModifierTagEitherOption: return NSAlternateKeyMask; @@ -495,7 +495,7 @@ + (NSUInteger)maskForModifierTag:(iTermPreferencesModifierTag)tag { default: NSLog(@"Unexpected value for maskForModifierTag: %d", tag); - return NSCommandKeyMask | NSAlternateKeyMask; + return NSEventModifierFlagCommand | NSAlternateKeyMask; } } diff --git a/sources/iTermPreferencesBaseViewController.m b/sources/iTermPreferencesBaseViewController.m index b84bd3ca41..015b1773b5 100644 --- a/sources/iTermPreferencesBaseViewController.m +++ b/sources/iTermPreferencesBaseViewController.m @@ -14,7 +14,7 @@ #import "NSTextField+iTerm.h" #import "PreferencePanel.h" -#import +#import "../ColorPicker/ColorPicker/ColorPicker.h" static NSString *const kPreferenceDidChangeFromOtherPanel = @"kPreferenceDidChangeFromOtherPanel"; diff --git a/sources/iTermShortcut.m b/sources/iTermShortcut.m index 4f381080e4..1285dcf107 100644 --- a/sources/iTermShortcut.m +++ b/sources/iTermShortcut.m @@ -26,7 +26,7 @@ // The numeric keypad mask is here so we can disambiguate between keys that // exist in both the numeric keypad and outside of it. -const NSEventModifierFlags kHotKeyModifierMask = (NSCommandKeyMask | +const NSEventModifierFlags kHotKeyModifierMask = (NSEventModifierFlagCommand | NSAlternateKeyMask | NSShiftKeyMask | NSControlKeyMask | diff --git a/sources/iTermTipCardActionButton.m b/sources/iTermTipCardActionButton.m index 93d32be98e..80981e9ede 100644 --- a/sources/iTermTipCardActionButton.m +++ b/sources/iTermTipCardActionButton.m @@ -135,7 +135,7 @@ - (void)setTitle:(NSString *)title { - (void)updateTitle { CGFloat width = NSWidth(self.bounds) - NSMinX(_textField.frame); NSMutableParagraphStyle *paragraphStyle = [[[NSMutableParagraphStyle alloc] init] autorelease]; - paragraphStyle.alignment = NSLeftTextAlignment; + paragraphStyle.alignment = NSTextAlignmentLeft; // For inscrutable reasons, putting the tab stop all the way at the right edge of the field // doesn't work--the tab seems to be ignored. diff --git a/sources/iTermWarning.m b/sources/iTermWarning.m index f6d242c30c..315e087a7e 100644 --- a/sources/iTermWarning.m +++ b/sources/iTermWarning.m @@ -240,7 +240,7 @@ - (iTermWarningSelection)runModalImpl { } // Save info if suppression was enabled. - if (remember && alert.suppressionButton.state == NSOnState) { + if (remember && alert.suppressionButton.state == NSControlStateValueOn) { NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; if (_warningType == kiTermWarningTypeTemporarilySilenceable) { NSString *theKey = [self.class temporarySilenceKeyForIdentifier:_identifier]; diff --git a/version.txt b/version.txt index 844f6a91ac..d2b13eb644 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.6.3 +0.6.4