Skip to content
Snippets Groups Projects
Commit cf3c8a06 authored by George Nachman's avatar George Nachman
Browse files

Use a custom key graphic instead of the key emoji, which is too garish.

parent 108c54d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
iTerm2.xcodeproj/project.pbxproj
+ 52
− 36
View file @ cf3c8a06
@@ -1269,6 +1269,12 @@
A61F8E301E62591800D315D0 /* iTermFakeUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A61F8E2F1E62591800D315D0 /* iTermFakeUserDefaults.m */; };
A623D9471F8972750011F8C3 /* iTermCallWithTimeout.h in Headers */ = {isa = PBXBuildFile; fileRef = A623D9451F8972750011F8C3 /* iTermCallWithTimeout.h */; };
A623D9481F8972750011F8C3 /* iTermCallWithTimeout.m in Sources */ = {isa = PBXBuildFile; fileRef = A623D9461F8972750011F8C3 /* iTermCallWithTimeout.m */; };
A623D94B1F8984690011F8C3 /* key.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D9491F8983D70011F8C3 /* key.png */; };
A623D94C1F8984690011F8C3 /* key.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D9491F8983D70011F8C3 /* key.png */; };
A623D94D1F89846A0011F8C3 /* key.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D9491F8983D70011F8C3 /* key.png */; };
A623D94E1F8984700011F8C3 /* key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D94A1F8983D80011F8C3 /* key@2x.png */; };
A623D94F1F8984710011F8C3 /* key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D94A1F8983D80011F8C3 /* key@2x.png */; };
A623D9501F8984710011F8C3 /* key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A623D94A1F8983D80011F8C3 /* key@2x.png */; };
A624231019CF6B0C00182C08 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A624230F19CF6B0C00182C08 /* Sparkle.framework */; };
A624231119CF6B0C00182C08 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A624230F19CF6B0C00182C08 /* Sparkle.framework */; };
A624231219CF6B0C00182C08 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A624230F19CF6B0C00182C08 /* Sparkle.framework */; };
@@ -3247,6 +3253,8 @@
A61F8E2F1E62591800D315D0 /* iTermFakeUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermFakeUserDefaults.m; sourceTree = "<group>"; };
A623D9451F8972750011F8C3 /* iTermCallWithTimeout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = iTermCallWithTimeout.h; sourceTree = "<group>"; };
A623D9461F8972750011F8C3 /* iTermCallWithTimeout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iTermCallWithTimeout.m; sourceTree = "<group>"; };
A623D9491F8983D70011F8C3 /* key.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = key.png; path = images/key.png; sourceTree = "<group>"; };
A623D94A1F8983D80011F8C3 /* key@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "key@2x.png"; path = "images/key@2x.png"; sourceTree = "<group>"; };
A624230F19CF6B0C00182C08 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ThirdParty/Sparkle.framework; sourceTree = "<group>"; };
A624231319CF6B1600182C08 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = ThirdParty/Growl.framework; sourceTree = "<group>"; };
A624231819CF6DE000182C08 /* NMSSH.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NMSSH.framework; path = ThirdParty/NMSSH.framework; sourceTree = "<group>"; };
@@ -4661,52 +4669,20 @@
1D093C131217412B0029F9AD /* Images */ = {
isa = PBXGroup;
children = (
A60BB3821EB54B6700D76C09 /* CopyMode.png */,
A60BB3831EB54B6700D76C09 /* CopyMode@2x.png */,
A68BADF91E0DD52F00E4BB7B /* Touch Bar Function Keys.png */,
A68BADFA1E0DD52F00E4BB7B /* Touch Bar Function Keys@2x.png */,
A68E333D1DE79284003F1D8E /* Color Preset Touch Bar Icon.png */,
A68E333E1DE79284003F1D8E /* Color Preset Touch Bar Icon@2x.png */,
A68E33391DE78D08003F1D8E /* Man Page Touch Bar Icon.png */,
A68E333A1DE78D08003F1D8E /* Man Page Touch Bar Icon@2x.png */,
A68E332D1DE746F5003F1D8E /* Add Mark Touch Bar Icon.png */,
A68E332E1DE746F5003F1D8E /* Add Mark Touch Bar Icon@2x.png */,
A68E332F1DE746F5003F1D8E /* Next Mark Touch Bar Icon.png */,
A68E33301DE746F5003F1D8E /* Next Mark Touch Bar Icon@2x.png */,
A68E33311DE746F5003F1D8E /* Previous Mark Touch Bar Icon.png */,
A68E33321DE746F5003F1D8E /* Previous Mark Touch Bar Icon@2x.png */,
A69A15711D7FD78200A9E7EF /* TipCalendar.png */,
A69A15721D7FD78200A9E7EF /* TipCalendar@2x.png */,
A6339DD91D232DF2000BAD78 /* StatusItemAlt.png */,
A6339DDA1D232DF2000BAD78 /* StatusItemAlt@2x.png */,
A6339DD51D232CEE000BAD78 /* StatusItem.png */,
A6339DD61D232CEE000BAD78 /* StatusItem@2x.png */,
A6EFF2351D20F64800806EEF /* EraseDarkBackground.png */,
A6EFF2361D20F64800806EEF /* EraseDarkBackground@2x.png */,
A6EFF22F1D20499700806EEF /* Erase.png */,
A6EFF2301D20499700806EEF /* Erase@2x.png */,
1D44CCD91CC6A1DE00BE5630 /* Loupe.png */,
1D44CCDA1CC6A1DE00BE5630 /* Loupe@2x.png */,
A66DB8301C8E4C2E00233E88 /* ChangeProfile.png */,
A66DB8311C8E4C2E00233E88 /* ChangeProfile@2x.png */,
A66DB80C1C8E182B00233E88 /* Info.png */,
A66DB80D1C8E182B00233E88 /* Info@2x.png */,
A686A11B1C86AA930024C2DE /* DeadForDarkTheme.png */,
A686A11C1C86AA930024C2DE /* DeadForDarkTheme@2x.png */,
A686A1131C86A6CB0024C2DE /* NewOutputForDarkTheme.png */,
A686A1141C86A6CB0024C2DE /* NewOutputForDarkTheme@2x.png */,
1D99C8E21BD59C37001EE1FC /* SearchCursor.png */,
1D99C8E31BD59C37001EE1FC /* SearchCursor@2x.png */,
A6FD85321B768B7800EB9DCE /* BigArrow.png */,
A6FD85331B768B7800EB9DCE /* BigArrow@2x.png */,
1DEF5E6B185F889600300319 /* Alert.png */,
1DEF5E6C185F889600300319 /* Alert@2x.png */,
1DE922E51AC3709200965876 /* BackgroundStripes.png */,
1DE922E91AC370DC00965876 /* BackgroundStripes@2x.png */,
1DA02CFA1327612600D7E7DB /* bell.png */,
A6FD85321B768B7800EB9DCE /* BigArrow.png */,
A6FD85331B768B7800EB9DCE /* BigArrow@2x.png */,
1D8F396A13EB7A2C0025B80B /* BroadcastInput.png */,
A6057C161883D12E004A60AF /* broken_image.png */,
A69B457A1967B03B00F5444D /* BrokenPipeDivider.png */,
A66DB8301C8E4C2E00233E88 /* ChangeProfile.png */,
A66DB8311C8E4C2E00233E88 /* ChangeProfile@2x.png */,
A65B72581B1A630100F947A7 /* CheckMark.png */,
A65B72591B1A630100F947A7 /* CheckMark@2x.png */,
1D8BBA801B31DC0D0005A852 /* ChevronDown.png */,
@@ -4714,14 +4690,24 @@
FB094A16033D58B601F955DB /* close.png */,
A697101118DFA7D5007E901D /* closebutton.png */,
A697101018DFA7D5007E901D /* closebutton@2x.png */,
A68E333D1DE79284003F1D8E /* Color Preset Touch Bar Icon.png */,
A68E333E1DE79284003F1D8E /* Color Preset Touch Bar Icon@2x.png */,
FB754C5F036EFC5301F955DB /* config.png */,
1D9DDE9D142E855D00275650 /* Coprocess.png */,
A60BB3821EB54B6700D76C09 /* CopyMode.png */,
A60BB3831EB54B6700D76C09 /* CopyMode@2x.png */,
A6B70FB919830C37007A4284 /* dead.png */,
A6B70FBA19830C37007A4284 /* dead@2x.png */,
A686A11B1C86AA930024C2DE /* DeadForDarkTheme.png */,
A686A11C1C86AA930024C2DE /* DeadForDarkTheme@2x.png */,
A65B72A71B3285A300F947A7 /* DisableTips.png */,
A65B72A81B3285A300F947A7 /* DisableTips@2x.png */,
1D8BBA6F1B30F7FB0005A852 /* Dismiss.png */,
1D8BBA6E1B30F7FB0005A852 /* Dismiss@2x.png */,
A6EFF22F1D20499700806EEF /* Erase.png */,
A6EFF2301D20499700806EEF /* Erase@2x.png */,
A6EFF2351D20F64800806EEF /* EraseDarkBackground.png */,
A6EFF2361D20F64800806EEF /* EraseDarkBackground@2x.png */,
A6B3A7341AC74E02008E8D4E /* FindCursorCell1.png */,
A6B3A7331AC74E02008E8D4E /* FindCursorCell2.png */,
A6B3A7321AC74E02008E8D4E /* FindCursorCell3.png */,
@@ -4734,9 +4720,17 @@
1DA34E03165F268F00AA91C4 /* IBarCursorXMR@2x.png */,
FBB2EBCD040AC7C201F955DB /* important.png */,
1D48B291165F405A000046EE /* important@2x.png */,
A66DB80C1C8E182B00233E88 /* Info.png */,
A66DB80D1C8E182B00233E88 /* Info@2x.png */,
A623D9491F8983D70011F8C3 /* key.png */,
A623D94A1F8983D80011F8C3 /* key@2x.png */,
1D8BBA761B30FD230005A852 /* Later.png */,
1D8BBA771B30FD230005A852 /* Later@2x.png */,
1DA3E2AB1970AC4000001E6E /* LogoParts */,
1D44CCD91CC6A1DE00BE5630 /* Loupe.png */,
1D44CCDA1CC6A1DE00BE5630 /* Loupe@2x.png */,
A68E33391DE78D08003F1D8E /* Man Page Touch Bar Icon.png */,
A68E333A1DE78D08003F1D8E /* Man Page Touch Bar Icon@2x.png */,
1DC2A1CA1949165D005769D5 /* Maximized.png */,
1DC2A1CB1949165D005769D5 /* Maximized@2x.png */,
A690F7001B424C55009F76D8 /* Media.xcassets */,
@@ -4746,7 +4740,11 @@
1DEDF56819C917FD005B023A /* new-tab@2x.png */,
A6B70FBF19830F0D007A4284 /* NewOutput.png */,
A6B70FC019830F0D007A4284 /* NewOutput@2x.png */,
A686A1131C86A6CB0024C2DE /* NewOutputForDarkTheme.png */,
A686A1141C86A6CB0024C2DE /* NewOutputForDarkTheme@2x.png */,
FB896717038D935801F955DB /* newwin.png */,
A68E332F1DE746F5003F1D8E /* Next Mark Touch Bar Icon.png */,
A68E33301DE746F5003F1D8E /* Next Mark Touch Bar Icon@2x.png */,
A65B72AF1B33C07D00F947A7 /* NextTip.png */,
A65B72B01B33C07D00F947A7 /* NextTip@2x.png */,
1DB40A3E1B1FDC75005B83C7 /* NoColor.png */,
@@ -4765,14 +4763,26 @@
9DB3D6EB176CC47E0071CCF8 /* PrefsMouse@2x.png */,
9DB3D6E2176CB4D80071CCF8 /* PrefsProfile.png */,
9DB3D6E3176CB4D80071CCF8 /* PrefsProfile@2x.png */,
A68E33311DE746F5003F1D8E /* Previous Mark Touch Bar Icon.png */,
A68E33321DE746F5003F1D8E /* Previous Mark Touch Bar Icon@2x.png */,
1DC2AF4F19521CFF005769D5 /* QuestionMarkSign.png */,
1DC2AF5019521CFF005769D5 /* QuestionMarkSign@2x.png */,
1DBBA5DC1B3CB0590026E3B6 /* restore-arrangement.png */,
1DBBA5DD1B3CB0590026E3B6 /* restore-arrangement@2x.png */,
8786A96E052CEC220073D10E /* script.png */,
1D99C8E21BD59C37001EE1FC /* SearchCursor.png */,
1D99C8E31BD59C37001EE1FC /* SearchCursor@2x.png */,
A6339DD51D232CEE000BAD78 /* StatusItem.png */,
A6339DD61D232CEE000BAD78 /* StatusItem@2x.png */,
A6339DD91D232DF2000BAD78 /* StatusItemAlt.png */,
A6339DDA1D232DF2000BAD78 /* StatusItemAlt@2x.png */,
A663010619CFCE74004AF81C /* SuppressAllOutput.png */,
A663010719CFCE74004AF81C /* SuppressAllOutput@2x.png */,
A6B3A7481AC8A9A3008E8D4E /* TestBackground.png */,
A69A15711D7FD78200A9E7EF /* TipCalendar.png */,
A69A15721D7FD78200A9E7EF /* TipCalendar@2x.png */,
A68BADF91E0DD52F00E4BB7B /* Touch Bar Function Keys.png */,
A68BADFA1E0DD52F00E4BB7B /* Touch Bar Function Keys@2x.png */,
A65B72501B1A5D7500F947A7 /* WarningSign.png */,
A65B72511B1A5D7500F947A7 /* WarningSign@2x.png */,
1DA030F71328BD7C00D7E7DB /* wrap_to_bottom.png */,
@@ -7325,6 +7335,7 @@
1D6ED9AA19AEA20D005A7799 /* IBarCursor.png in Resources */,
1D6ED9AC19AEA20D005A7799 /* NewOutput@2x.png in Resources */,
1D6ED9AD19AEA20D005A7799 /* UKCrashReporter Readme.txt in Resources */,
A623D9501F8984710011F8C3 /* key@2x.png in Resources */,
1D6ED9AE19AEA20D005A7799 /* UKCrashReporter.nib in Resources */,
1D6ED9AF19AEA20D005A7799 /* UKCrashReporter.strings in Resources */,
A67D0D671A2EE12A003A8B35 /* iTermPasswordManager.xib in Resources */,
@@ -7364,6 +7375,7 @@
A67D0D581A2EE12A003A8B35 /* InstantReplay.xib in Resources */,
A67D0D341A2EE12A003A8B35 /* AboutWindow.xib in Resources */,
1D6ED9C519AEA20D005A7799 /* LogoShadow.png in Resources */,
A623D94D1F89846A0011F8C3 /* key.png in Resources */,
1D8BBA871B31DC160005A852 /* ChevronDown@2x.png in Resources */,
A60BB3881EB54BD300D76C09 /* CopyMode.png in Resources */,
1D6ED9C919AEA20D005A7799 /* IBarCursor@2x.png in Resources */,
@@ -7524,6 +7536,7 @@
1DC2A1CD1949165D005769D5 /* Maximized.png in Resources */,
1D44D07D1CC7F5A600BE5630 /* PTYTextViewTest-golden-travis-testIMEWithAmbiguousIsDoubleWidth.png in Resources */,
A6EFF23A1D20F6BF00806EEF /* EraseDarkBackground@2x.png in Resources */,
A623D94F1F8984710011F8C3 /* key@2x.png in Resources */,
1D44D0891CC7F5A600BE5630 /* PTYTextViewTest-golden-travis-testRegionStartingWithDWCRight.png in Resources */,
1D44D05B1CC7F5A600BE5630 /* PTYTextViewTest-golden-travis-testBlinkingTextVisible.png in Resources */,
A65B72AD1B3285A300F947A7 /* DisableTips@2x.png in Resources */,
@@ -7610,6 +7623,7 @@
1D44CFD21CC7F5A600BE5630 /* PTYTextViewTest-golden-nonretina-testSmartCursorColor_frameAllCursorColor.png in Resources */,
A686C1991ADF62F200906FAE /* Zoomed@2x.png in Resources */,
1D44D0531CC7F5A600BE5630 /* PTYTextViewTest-golden-travis-testBackgroundStripes.png in Resources */,
A623D94C1F8984690011F8C3 /* key.png in Resources */,
1D44CFDF1CC7F5A600BE5630 /* PTYTextViewTest-golden-nonretina-testSurrogatePair.png in Resources */,
1D44D0191CC7F5A600BE5630 /* PTYTextViewTest-golden-testHiddenCursor.png in Resources */,
1D44CF9A1CC7F5A600BE5630 /* PTYTextViewTest-golden-nonretina-testBlockCursor.png in Resources */,
@@ -7868,6 +7882,7 @@
1DB40A411B1FDC75005B83C7 /* NoColor@2x.png in Resources */,
A67D0D591A2EE12A003A8B35 /* iTerm.strings in Resources */,
A6B70FBB19830C37007A4284 /* dead.png in Resources */,
A623D94E1F8984700011F8C3 /* key@2x.png in Resources */,
93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */,
1DCF3CB71222FF1400AD56F1 /* PresetKeyMappings.plist in Resources */,
A67D0D411A2EE12A003A8B35 /* ProfilesWindow.xib in Resources */,
@@ -7886,6 +7901,7 @@
A68E33361DE746F5003F1D8E /* Next Mark Touch Bar Icon@2x.png in Resources */,
1D8BBA781B30FD230005A852 /* Later.png in Resources */,
1D8C6BF5126592DF00E2744E /* EncodingsWithLowerCase.plist in Resources */,
A623D94B1F8984690011F8C3 /* key.png in Resources */,
A68E33351DE746F5003F1D8E /* Next Mark Touch Bar Icon.png in Resources */,
A686A1151C86A6CB0024C2DE /* NewOutputForDarkTheme.png in Resources */,
1DC742A0127C96F90069594C /* IBarCursor.png in Resources */,
images/key.png 0 → 100644
+ 0
− 0
View file @ cf3c8a06
images/key.png

2.14 KiB

images/key.psd 0 → 100644
+ 0
− 0
View file @ cf3c8a06
File added
images/key@2x.png 0 → 100644
+ 0
− 0
View file @ cf3c8a06
images/key@2x.png

3.24 KiB

sources/iTermTextDrawingHelper.m
+ 7
− 11
View file @ cf3c8a06
@@ -2446,18 +2446,14 @@ static BOOL iTermTextDrawingHelperIsCharacterDrawable(screen_char_t *c,
}
 
if (_passwordInput) {
NSString *key = @"🔑";
BOOL bold = NO;
BOOL italic = NO;
PTYFontInfo *fontInfo = [_delegate drawingHelperFontForChar:' '
isComplex:NO
renderBold:&bold
renderItalic:&italic];
[[NSGraphicsContext currentContext] setCompositingOperation:NSCompositeSourceOver];
NSImage *keyImage = [NSImage imageNamed:@"key"];
CGPoint point = rect.origin;
point.y += _baselineOffset;
[key drawAtPoint:point withAttributes:@{ NSBackgroundColorAttributeName: [NSColor clearColor],
NSFontAttributeName: fontInfo.font }];
[keyImage drawInRect:NSMakeRect(point.x, point.y, _cellSize.width, _cellSize.height)
fromRect:NSZeroRect
operation:NSCompositeSourceOver
fraction:1
respectFlipped:YES
hints:nil];
return rect;
}
 
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment