From 8fade482a9f7d4f9ba93d41fbc1edde7217e3926 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sat, 25 Oct 2008 16:34:16 +0200 Subject: [PATCH] Revert "Modifier key sends Esc" related commits This reverts the following three commits: 3ae360ddb38dd49e9392aad7a70f0f31a30849ee 007bb96eb3ec035169510caa4e206ab901e4b6d0 b6c06f31be1e8124ed12cc2ff5361752df1e4634 --- runtime/doc/gui_mac.txt | 26 ----- runtime/doc/tags | 1 - .../English.lproj/Preferences.nib/classes.nib | 2 - src/MacVim/English.lproj/Preferences.nib/info.nib | 2 +- .../English.lproj/Preferences.nib/keyedobjects.nib | Bin 35563 -> 33356 bytes src/MacVim/MMAppController.m | 4 - src/MacVim/MMApplication.h | 9 -- src/MacVim/MMApplication.m | 107 +-------------------- src/MacVim/Miscellaneous.h | 11 --- src/MacVim/Miscellaneous.m | 3 - 10 files changed, 2 insertions(+), 163 deletions(-) rewrite src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib (69%) diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt index f79de550..573ce83a 100644 --- a/runtime/doc/gui_mac.txt +++ b/runtime/doc/gui_mac.txt @@ -242,8 +242,6 @@ Here is a list of relevant dictionary entries: KEY VALUE ~ MMCellWidthMultiplier width of a normal glyph in em units [float] MMDialogsTrackPwd open/save dialogs track the Vim pwd [bool] -MMFakeEscTimeout timeout for modifier to count as Esc [float] -MMFakeEscOnKeyDown send Esc when modifier is pressed [bool] MMLoginShellArgument login shell parameter [string] MMLoginShellCommand which shell to use to launch Vim [string] MMNoFontSubstitution disable automatic font substitution [bool] @@ -285,30 +283,6 @@ user default MMLoginShellArgument (e.g. to "-l"). Finally, if the "bash" shell is used, then "-l" is automatically added as an argument. To override this behaviour set MMLoginShellArgument to "--". - *macvim-esc* -MacVim can treat a modifier key as Esc in order to avoid having to reach for -the Esc key all the time. The actual modifier key to treat as Esc can be -selected in the preferences (only the left modifier key is affected on -keyboards which have a left and a right modifier key). This is most useful if -Caps Lock has also been remapped to the chosen modifier since it is then -possible to use Caps Lock (which is very easy to reach) to go to normal mode -instead of using Esc (which is somewhat harder to reach). Caps Lock can be -remapped in the "Keyboard & Mouse" System Preference by clicking on the -"Modifier Keys..." button. - -This feature works by swapping the modifier key release event for an Esc key -press event, so the Esc is only sent when the modifier is released. Also, if -the modifier is not released quickly enough no Esc event is sent. This way it -is possible to keep using the modifier key as a modifier (by holding the key -down and pressing another key) as well as using it as Esc (by quickly pressing -the key). It is possible to make MacVim send Esc when the modifier is pressed -(which makes the key feel more responsive) by setting the MMFakeEscOnKeyDown -user default, but then that modifier key can only be used as Esc. The timeout -can also be change by setting the MMFakeEscTimeout user default to the desired -timeout in seconds (e.g. if you want to be able to press the modifier more -slowly but still having it count as Esc, then you could increase the timeout -to 1.0). - ============================================================================== 4. Special colors *macvim-colors* diff --git a/runtime/doc/tags b/runtime/doc/tags index 75717359..8c8215da 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -6366,7 +6366,6 @@ macvim-dialogs gui_mac.txt /*macvim-dialogs* macvim-differences gui_mac.txt /*macvim-differences* macvim-drag-n-drop gui_mac.txt /*macvim-drag-n-drop* macvim-encoding gui_mac.txt /*macvim-encoding* -macvim-esc gui_mac.txt /*macvim-esc* macvim-find gui_mac.txt /*macvim-find* macvim-hints gui_mac.txt /*macvim-hints* macvim-important gui_mac.txt /*macvim-important* diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib index d163273b..fbdbe519 100644 --- a/src/MacVim/English.lproj/Preferences.nib/classes.nib +++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib @@ -76,8 +76,6 @@ atsuiButtonClicked id - fakeEscModifierKeyChanged - id loginShellButtonClicked id quickstartButtonClicked diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib index e5cd30f1..9c4b5d95 100644 --- a/src/MacVim/English.lproj/Preferences.nib/info.nib +++ b/src/MacVim/English.lproj/Preferences.nib/info.nib @@ -13,7 +13,7 @@ 115 IBSystem Version - 9F33 + 9E17 targetFramework IBCocoaFramework diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib dissimilarity index 69% index a21ea9ae9ea2e1b8b949c5da673d6a769b932f13..d6c412543a190d5019c8f2dc4b568065b6bc396b 100644 GIT binary patch delta 14704 zcwUuy2V4{9|NrycNp5SAjiw*rAcNZ3P0$T$&YBzNGVHczahYOS?r?a;5a zxUJi|ZME83weDTF*4kP}ZLL-7;P>1G1gqcgzyI(`a>qUQ+3(MIa<@Jp4o)QAD|USY zl%Nsl3c7!&jhf3H89D$8tGuRyb4BNo=upfP% zLIX^7!8Di$^Pv~CLK_^0KZ{`rEQL-u29AXj;9GDaoC@EAAHt7dHCzZ6!R2rh{0i=b z``~_f7#@Mg;VF0)UV&HPFYqS(8$KZ*p&-17#)O(^L--IKh>qZAB8UhjB8VuDa6~tv z4>5#@CK3skfk+`Ti7a9$VI^!t2~kQ^5~GOm#GAxqVhZseVjZ!G*i39Eb`ZOWuZi8n zH^jHZLE;oXK22P~pI3=r@#ih#4)HtjC-IbcMp7hAHYS^pZOD$KhWMHcBE!iZ_`4@L z2!9R+O4x@SLdKFhQcoIPWICBmjv&j(Dslq(7CDWaPQFhHPz*b22(?*I4YUSqOz$%%4MPK)JUp?s-#9yT_x(wT@a(ZKk$RUs7LD`>2D|QR*0VoH{|BrY=)gsH@a9 z>L&Fob&I-7J)r)g9#W5}8XC}$meUH_i&oR#bQ{`-ZcBHhJJA7jARXqS!|Beng|^cy z{So~={hY3000S9;F-oQp)0k<(G-Xtbn(=0uG0mA4OiQK})0%0+ z_%Lmmc1(N5m+@o#nGQ@xrV|su1Tq>Xh|w~^Ob8RogfZbvXQnIDjd3vtnD3c`%pt~g zm^s26WsWh&nG?)O<`i?9Im4V~eqhcq=a~!4MdlK7nYqGTWv($lGS``(m>bN`%rDGM z=2zwxbDO!t++}`a?lHeJe=zr%KbZ&2U(7@15%ZY&n|Z=KWu7t5nHm|8K^Y+p<7WJ*~hS!0!~iL9wiB~#11Wi4c_WoYjpS}P1kr9- z;fAB!Fxm}wA%GY+9PEZ)tI6-(aI|oX-a`efQMD4*Go4*Xf%+mnGNDYg1Kmdt&_g$D z>V|4JZ03e7+_04!wsAv$H`Kaem>YI+!$>#m=7v4pu00pgxE|Ua0qFRdX;L-&+hu2xeK^@G)R47ze7r z8(=(m6Sx2ZZZHA71tx+?U^18j-Ud_gf2+WB@D7+ERLOjV51Wqk&NQa!%F8N-8q=cL zl9IIIajY;;)~;oaG0j+68eLw(=VJbq4wf5L%#IdXsXDuQp++cF1yuxUgQ8Ff>WS1y ztA>pfs4-HaVDFe^{s1*OE6Fw!@ZddA2_nI0%>8{JU^!;vqdDNip(0(YNL6H^<1D4D z$Q={ein7oq{JjNjHmh1yRYgYh4)gEYt?T$O|EkDt!e~_!BbbWtRa0YHB0DzLSy?>FQo?$Sgl&b7_#DY9j&iO-=%8pmfaQwI z?Zvhjw!|_vuL0#q?8_mQ6&2-W(y2EEp99nywNkZF0n{9|LMm)LFX5@GjY|xJtzaA2 z4t9Vq!B=1>_Kau{{AI+p!C^2=qJf%q8WaMg7xGq9&GQVEwqm;_j#;iR$8$!8S2o#gj~r2|SKDUh9~KZaD!?V#k~YXC%k`fZfuQ z1s6oW02da{Sk9GNN+j+X#fJTU8=9osVcZHGEGvpl+w$3NC{y;3~KV zegxOSPvC~|P~AR12(|O}--XT89tCDsb?t?NsMmPWCIf&D{E7lT1GkW`=ll-1i#k<< z-@rZOhy2C={Q>TSKh3J@SCc-}gNR*%qT&>1x_Vt`8pjS2YlDJ8xa^+xnL`hm^R&@*Wj~svg z6$iXP1#IduK2&4lOP0r`4abHJL+T7EI8I3cS!-C>5?qI^zzr0HI-@Qqu-1&QEjA-; zha$xD_SlZlPqHKIfbH0|){Za$8!U1I3Oq);z*Veq5Y%FwLtrQjgWJ1uR>W(x+y4ISn zCv4GcG3*6<;4h=v96{!E|2Dva2go5{> z2~2^>U=A)SThSvo#JSF_YFXup(Vme~q7yE4@rv^#w&VXjwZTlB+z`ydM>${;jP@iq zF~y+4C>DPX!Z_(CbcxWqLIs;a~$_55ZL1i2ye~!hulw&!Z3N00UWpQnqD=D^(WbJ)kD%fxed|Rr>$tdHW>P*AxyaQ)Q>P$l^ zD9(jaQJMm!oUUCchQw$%3%(BpI2(QdXQ7?w7xXjwS`7i(X;!tsT1R3aM@qG?caJcC ztpE564eH%X3d4_UtDOrg`yZ_96tEF4fS-8>)RrAN);1k$n=Bj&Yw5}@F5@xSN=$ZZ zy-sj3ZV~+8GPE5Ra{_Iv1N!GEUI0-B7b zp+#uf*_Z54iEDoq+yb}4ZSVuB3#r1S3z0bo4V8KZk9T`wkM{6*x0iU_bNu+TlA>j` zDlUh+z~}I5Fahqts;z{3;deN9q_blxq2<8>s%E09l6rQmo(1LMz!2^^TPQE9n!V@%EwVPQ z7abtH4ewx;?qUk}#QqQ7uN4RPfAArE1RrCudZA%xEEt>5f5H7ZT4;N(EiFT`nCFAi{FaYmr#a{N&$$|D3t`?~&HCnJ(+=P9LxuSBG-m^!dV<>LJr zW$Y-Hd#Rif0pL0jD3wzu;$D5 zEnku96`5Wt?+#CSe{IYX{fPlD#cUONqdsP(IOx{%r7*xT+vRmZOX!F=xR%fp2~y0C zM{lBW-av$;OVH=88qlE8C5+%JB3bNcH7`2aM(tk0ERhC7iF66GZiFyqhxPGu)nb;& zk?MYw=hY3oPO&&5pD1XcSR8r_O{`T+3UCpDy?RKRb?^1>s*3BSvO*MNx37Dps!YPJ zpI}z0qldG$k^aNVIsZzB9nTj0>&@>VoG+Pw3VQn=$+1_@x|GrVf8`8fEEZ?|i&Q!Loy6%=ROw@E9giZP;GPS&al`#B{x~g4p{HXlw&DK6ic8r4Mfiu82wx&D zON8gWAp9Sps!@l5|AWBwmk8X%nN%e3=?el2%qkz@An()Blf`cn?^fd|@r*OXUE;ST z#Bans&v+>eXdLMBT=;{yzl6A7-&^7-A-UX<;qY{2uZPn^;?YZRT8x&|Ms$nX3j8lx zjkaI{2{4+zc!8#+H~<%kXlf&bm9%+1nn*dRcnM9*(Tawdw1?Q}NX&cptOJwxzXH=s zP{QA?Nn~@lu^vifYhs?_1yDXm%M=Q<^1lFtR1nL^cJ=-uTaz8IzgA#>t*Z6cO0>EG zB*;Js25WFnoXD~c|0Ih|_`bl~MdF&ZkZewdl3|$TTD0NZ>ljMxB3@$GU1GNG1+(?J z@x^vlq?=h>`rnE4d5OqCkH}xVpt3PHrLwr9mdenoZoP1|itHURUJ4~Lnv7XQ#(2Ug zuWqOj!HC=cBDRd>EG5YtI}G>!Wj2=g+!IH}FC^pPAhFkIF3p6d%8C-U!ZR7V@Mzee zc_tHqADM)k=Pz;d{KqSUADIHCkg2tU-&g2&w52u)keT8jjr;$LU^tlrnvg?5F_|mg zO6HOIWC0jWnlbG)q=mGSHquVAeK4a9k`n(og_!{a0*#Tjv_~sW5}`OIJ6t>MF;RKa|E40XV7_c8U6U0sfK)$ zbk$EaXb<`Z4>iKj&OW98VlpA8fJvm&Gnq*BvK9IkhwJW~jI!E+95-l3yj4Re+@R%X zai_``mzM>M)jQ)2hDiPA zhkZXE`6~Upa z6yQho!D%`fr|Cb&OoJPs z4&R`|H}uDyHEdFgU`meymbhR!l}H(=Bp6MZPy%|4p1UD|`njRv)xEGSR2r53VlS)^ z{f(Zy*b5WmBtmLox^)v<@?QVlNx4KE=2<|Qv0a-)p{Llek1^bFpga={QD#?z-BQYi zG%*pKyMxzk%uz+u@CF-mHEswbXkeX6!l&O>rw+D6ILj5K^(zu}vdzYF{y#r9XF-;%ihH_8Xy$fMA zgrM*11bv?p8Vc&=hRT=x+Fk4pg~T3>UZ3BnPq5skT8Cn}8;No&&@;0tS=i!8R@OB= z5xvF>H9cCoUTj?BxLbt!h!Lm46N2-FG5^QzCh4SBNV}W6-OxL~vh4LchIpLwqt@bp zpC$%;bL_AZ%h>YD3Qw2*Dxi40d=p-NKwRE3i?tWyCW>#k!iiVxz$&-kUC5q5t>`W>XfJ3Yaw-eLyF7n#bre= zeh4@#%K1W=GqvKJqs|lisf*MlfO3p!CWrVt5$}c`xjMOFM>N+BJGfzh@YEVXnpN!t zqqSWC_6_wT7(iX8exiQPGNyGN$&ST$1${={aKpgQs9)SrBP81*;;7ryooeci)V0PG zOFy((xUpwm62&9P@6;b~1NA3Bb<9KEFa%9=!(g+@Ul?rl@is`#$>rG+tPg8Xw-gCO z?LHy@B=m&(7Otb7*Awb2T6cmQh6{~{4gBYFn!?MYX<7a9uHtf>*&>9WhDCLLov7!i zKLAUs>Tl^Jii+_NB@D2Jz3vve1?Eytx30gXhsY(t4Z92T?fqX7%9r+o8|e=9%lo)t zZ?wz}dkIt6s3!S!Hqe*Z*)hU4RvZ3L3R-N=)pTe*h5n+9tQ+<-s{*h&TM9FWX7B+?1jlVR`+Vh%Z)*atU~Jf4v_SVNh}O1J@!`+yurCBkSp4X{|J zMBv7q{1m9eefTImPqhZ~;7Z(;uf|cn2d=|YEuN|2EVv4;MZ?j2v25%{lhFn|kIt~* zUi~Aq3 z2pS(W0gtOJ9@BRs3mPY?6bYhe8=~BBkkDaxGZ$8{$fKYriVh22g~hDG$J26%h{Ps92vk+RNT zpVaz`N+J%_`3v|p@EAv#U=8*g_895H?jiuOA4bPtYgnQ}k*241JdV zfj&o{r!UYK=}Yuw`U-uOzDEB@U#EYfZ_q!}ztA`7U+G))ZTb#U$LEoqU zq#w|K(M1pGNAzR*Z~6)Slz!%hxZ1^H6S!fV8^*h#-VL$HiEe0c!z4E}x}nJplie`I z4O87P%?;DtFvATq-7w1yv)wSq4Trj6t{djLVZIv{xS`n%aXqvMpN!}stSt-Q(6}N2 z3cL7VfhzG4QbuZoMrEyqb|oQg^K``}Y!L5n8eJy-NarVR!TF0@b^clbDw_!{%eM(1 z^FhK*zLP2sSD{LWf8DQPsg)Hc4(A4*x|s{Q+hT)(3NPyvIpBoS;}mzJy%~= z!4`4S6~hgm91DtIBH%wL@q=h?)__DC1rRZxv;E#%?%HK#_% zs@z(asTiE87StU_H8}1eMo+w$!GK=G0!S2*05U+9n7u?afK-q}?8kjSpb|lnn7zcz z1q#SfAQz;Acnksw0xtltmP!Jd9&`bhftUlb$!h76(X7> zERkbC8ZcoTCBs!9MNE09uLK>F2ps8=Dt|HEN$`;#wF<+)`4PkCG1?&|Je=#?urE3x zJ#5tiDKK&l4fg=24mRVYj;~EEFf-8%H`HQe-bV+dXS2FVpzMeAA{e`fc(F4Tu zZrBVxz#x2xENg=2A^p!!>HM zO7*6i+^>edYPecWeyRFPO>|U~U#m{2$uX*FYUrg}t|t7|uv|4&O?FZ3Qj-T%V^ot> zJ5`^np;1l9RhQI6KUIb5do|fr)knpvMyuf})hX3jHQ7f^_EYUqy`d&|t7fX<7izdw z4U<(5RQuJWYoD4_sbQoVey%1*sY$%3iJJVRZX@EEnkZ3yt%m7p60_W?nxclOY9d_? zyQ#*hi7~25H953)s*yEE0d=t>YgHddG9T#}cT}==vi8-o_R_;I`XMIk2wZRlS(T5A z{DXW%MN3T398)C_7awUpX`%kDwk82m+3bSpZTj;537p>!T?rmZwf52r`arF1#X z(UtTVx{4l8yXXn@B>HW7Iz5|SKv&a?=r8HLIP;yu+3hanH9_`W-YUU*~DyRb})yS z^UQVTHglJ`$Na(kDT|Zk$Skr_S(R*(Y_@Ef>lxk?@=kCOM5 z_m>Zp50*#EW94yjy*yE#Bsa-ZVxQuW;)vpy;)LRq z;*8=4#d*a=#bw1+#SO(HFNK%NtCg3(S4XcAv~CR+sNcUx)7)-wD1`eK+}T@!jUT!}lxSUA}vL&--5V zz3h9{_ebB`zIT0p_r34?)c3g`=|}s?{8WD4e$4}}1w0HS1J!}e0$T*O3TzYDHn3x0 zm%x630|FBQvjTGh^8(pGN8s4Nw*sdH&I$Z7aBtwDz@GyD)IbfXp*1p1fJUQnX*D65 zFip6oizZ%^pfPBSniNf%rbM$?vsANO^SNe~W{qZ@W`ky<=A!0T&120I%`;6+kUU5o z)G{bIC^D#9P>-O2K?y-=L1jTzLF0p5LGGaWK?{PagBArX30fMoJZN{&lb~loHCm`8 zwX{~IRcMu3e{BzKoK~+*bZL{cCT)qfOzY5c+6rx@cC_|A?fcr<+Bw>fv~#up(Qee< z(B9JC(f+3WU3*{qK>JYpG?)%<9NZ>2BseU%b8tj(WN_c${=uoi>A{)7*}+4D^MVV4 z3xln}_TXW`Q-Y@kPY<3EJTv&c;P-=P2d@e~9DFYLLhz;FE5X--uLrws2Hy%%hWLkc z3<(I)glI$hhQx;?gd~MzhL}T~A>%?Oh0F?BAM!=WrjRWm+d{U7d>OJcctJwht`{Eemyoa-kKWqe91ojthMw^vzHd>JEJ?bW-S)(04-L4P6$xE_6fa zw$L4+Uxn@peH{8E^jT<47<7e^VRV=*EHJEdSg)`?VbNg;VR>O}*!-{sVbx)a!j^*oW(EcR0DmDt<5#=53DwXT`2g|4Npwa!P^ zO;@Tb*Ew~(u2MHzH&$1r8?T$CTd(^3AJiY#AJre% zpG<%WWCEQaOHd>z6B;KpO;9IkJzV8x5NcTMgR{Um6Y=4jK*{jv8(lelz@Tcx3q7@YL`;DJUs8DKsfOsY_DV zq^P9sNj;OIlS-1xk{n4~Qbp3Jq%le3lHN#qJ4r~Im*iTUv_9#(q@zh^lI|we7@?6g z(ngul-`LR@VAL43#t>tavAeOCv5&FbIMz7HC>R$QR~UB~4;T*`4;zmfj~h=IPZ`e| z&lxWmFByL}-Zb7e-ZefnJ~lNmsZ8Fc=BAdW)+QfQJCm=;-_+4G&@|W-ZHhI;nc__e zCacRNm_9IlX!_VR*YqFLr>5nmy{3Jp1Ezzf!=@vqW2T$QUdfG;nSRs1!OymeL``kuo-AT*@0MZ{l%hLdwLH$thD(-cFg8BBU%xsZLpxvLt0q z%DR;GDMwO{rJP7Pm2xKKY|6QmKT}(z`lPl?b@`_Hr*=#YNDWR6P3@kVnwp-PnVOwC zG&MIhKXr8KN2#Br&P$!2x*)YWb!qDI)E%imq@GW`n0h(&YU;Jr>#5Jv{L(t4bxI3N z3rY)4>zo#m_CwlVX^+zWPJ5d6Jgp`jrngD&lin|VK>DEcA?Y#cy7bxU>(V!*Z%p5u zzBPSY`VLq6>GX%`kJF!|KTEI4fEi4NJR>&4nqkivmN7hIM8?RB(u~O&OEZ>de4eo? zV@<}oj18G1GToWeGG}G3$Xu6sIP+-c@ywH%r!&uH{+d~n1+&O3I!l(-J}V?EEUQme zbe172H7h@BRMwQNsaeyrW@OFGs?OSwwJ~dR*4C`;S*{aV*RyV9{gU--)}5@svL0pA z*|Ka!wlcd(wko?>c0_h$cDL*v*}bxRXZOuc&#ufKojo?YDtmmkD|=%0o4M}XX}L3VSLUwHU7NchcT?`> z+^xCCbMNOq$bFdmcka{Nnmm}7o@dUh%$txmF>i9-)VxJ`8}l~jZOz-B_f_7(yo-64 z^RDLon0F)Z?|fx`ip*U?efF(yX1GxkIL_npO`;9pUZc>kv}(oe*S0qi}IJ| zFVA0@zcGJb{`dI@^H1ep$bVQs6$BN87w8L83vvpa1@9NkEBLgax?pj^vVs)_s|wZ@ zoGrLgP-AXnZf zr{6?zqhx(Z_pt%Ypi@WPRWWrdDHzVN-mC53wm_ZIFiJXm<7@L1tV3$V1e z_**(zG?rjXsHL;TXeqKxv`n!~v&^u(XL;Z9fn}fNwB>JWE31#Sz182^$r@7i>{l)sL^|tk{^`7+)>z`KFU)IOgC)Q`y8XL5cHrgh$ zDQrqxW1Gt6ZEJ38X=`osv9+`L+Wc)DZ2>loO=}CWh1_-EBQ>y={GMF*cn| zZ_Bb3+N`#3ZQt4U+rGCQvK_G`HrMdsDmG-pt;@-pby_-qzmU?q}~{?_>|O zceY2^1^Wl~kL;h==h^4m7uc)qi|kA6%j_%cEA6Z8Ywa8C8||CzTkYHJU)p!tzqaqO ze{28FzTbY(e%OB0e%yZ2e%gN4e$IZu?z&{ZV!vj;Zogr_X}@K^WB<+myZyfXf&C#1 zSb}BQ;p|8}Ogh;Lb~HPV9nT{6Ep{?Hm3@bu$-d8iz<$KeW#_Y>v5VNH>J{nK5z}|P&A@QC|Xr? zqUg@>R>K2^>xMro4k*?aXO0LT@$QH%BaV-_JyJdLdPz!2QOT^5Z%YoA+$nin>Q|~Q z?N(|i{jhXP>ABLoWlhTZm3>sUy6kY-m2yxnFISfbl@Bau9sZ7BN2nvr(cRJ0(aSN| z5$!nbIO{m)xZt?txZ=3xa9wxYaNKmIH8kt(oUIE;Z!;s zJ5^3^XA5U*r;oFp)7R zAgAR*xz1cyt{c~r>%;Zu2654xj?;4n&cvm18C*7(%N1}I&dwEaBe+t|!SUQEZY=i( z=i(-Cleo9J>D;^AEN(XUA@>RQA8rA+kXynn=T>rSxb@sdZVR`a`-=OT`-XFU#~t7f zaYwlm+-dFy?gDq2yT<**{leYi?sE6I``lmLBkl?JoQFKcGrWRt#5dv9d^5f!-AU3^))DhC|?RSO&{s4SW&4 z1gE&+t8f~81HKPGfOFwIxCpx7GWaQ61y{qh@GH0pZh>228@LVbfqU^4hu~3o5}tu) z;dk%~{2pF|Kf>Ga4!j2+!9U?&1Vi``zJwnUM6@M36J3a2L~kO3h{XR#6LKPsNFh>* zenfv_05O;tL5w8ac|<;;CG>=auoBfo4N*%t2t;ti>%@D+3~-5BPe_8KNrnt0gUGgIJJ^YAPj(_Z zlikVQWCWQ?YRGJIG&zPWAa$hCO`1pxSwU8kPSQoXNkqOxP9>+29`aps7WommkX%Hr zAXk!W$hG7qax=M`+(RBFkB}$HQ{-v#EP0MRPku*UA+M7+$Xn!H@+a~h`H1|5{DbnN zT2Za3&QupFlL`cT)RdEQQ&Xr{ zsp-^P)Q8jzYCg4qT28H?R#R)JP1I&;7qy!@OdX-lQdg*J;1YG6xGHoI+Gqbn9iX`(Rp+}t)&ZT zGi{-*w2iK!tLYlrMNgn7(l603)34Bz={M*%>FM@=3{0KGnbji%x4xb3zb~3w|-OL_lFSC!?&m3S5GKZMM%n{~m<|uQFInI2;oM28f=a>tt?~|o4>H!Dy zIXH`h_mK|=3lYu1nH>CxgL)3$LjZ|5sN>+z5~>vkXM3j6JE`zhYzNOskt_%3Kp_&N zXq148kQLP;7eZ(L3WPSWy1G+S5Ut5`)b!#N_N> zRcEc&mzv6J#|tV~R#eww{8^^*y3ATrnHJw!QC?eJQ91^z%j)_71#(ifz8-VTfkOO3$}wDU?(=vZm_tU3OQCrjzwML!45d<9shrnTQB=4C?YEU246?OCU$?W6?$G~y$4LDJd zorA-vqORIt;#EK$P&?Ef$5m#T-fR*gj=wv@VltGJ>8ne;;Lm`w^TAn=tYcYh<+_^M zin2x_{MyO};THsHorJ4+DOpyB$(U2CuQlmBuV=P*gYUo_^Kon>=MJm2n5ua{)f~t7 z_XPvMRTRDuTm#p^4KNo;QBTwhwL0ITiEardy8E1o9)KmIvvWr2&4@QrckEEFX?p0` z_I7KnMXHz9>OEZsvnl^U z)I$#m9hl!3(|pF@4;n+Q)%(GFOFP(pF>DVzz>csJ>RVMu{VN{M2`NO7v+I-a2_VKkIO1ysTq7>(AV^XMG< zQUU>5+rT~w%s9#fo_!Q?N}hc@-A0Jq{}uPZgnw{P1V-G%Jx~Kaf$6PqN6$ zk3|Ti0FYcPMzO*f{?#ng-~c|m+$gRgf?*~KpF7rMwANNs*ECrM4#jrKhQp8^+eL*6 zFR`t?I>QlgB+P-M;Al7ojs=b6_!V zMa&h}JN^3l!BUYgihRLPQdSzFxG5{pvna~fe|#NwWjKFOa=ngW$Wl=E3?JoH`#)^}OKQ-sb({ zb=Z2LH(@}sfE>Q*Mcy1YxCN&}JA50=;*moSj~gt+#~hfASIMrZF4LC^YYSoUvKMRy z2AVFwjPmO&Sq49ZGvG`(3w{J=!;j${Pp)4VeKzVBEZv6bx<48^Zi2UbHd%E63ZDlT zq5;BZxEOwdhRlac;8HXY4dS(44p+dHLeh=O957&{sj}KsgRQ0Ka~usunZqQKyQ{TP zo9NZ=N)r6V@H6=N0{A)n!gHcas2i?<0rPo=!2t``!7t%@umo<%=WSkEQJqt%H<&Ql zjI~&6O(?6MTq*}%gKdN}=fjzeoU<96oR5c+HI%z*%SeA2ezY| zH{>pyWr7*8wMJoU<)EO^g3C_wRkg`r`?0|ez&R)zjYeb8&_?qd;mz|k8rx`|<6iTe zz~&j(Xr9y94&#SO=mS|<0GD67J!p8XE{hV=9!1C+H(p{LJO|Ii_3#3`2rt3Qc@0M3 z1Bve$^tJlZ3bPPaSxC!@P(I2VljE$x^)uh#Z7786n_KcK${He<#d}|gp!umAC@Wpj zV9lGb&88K zw+#kM1O3p140DdBTUe*mCNB{&M6BSYI^=A@ON5F@Z04nUWaqs!c-VjEB@Nag#_Od9 z2RShQy78mS8w{_lD{sjK#2_LQgPMTcEqNe|$Od)pCKpUZldubPY?}!JHzlZq+8X1{ z^hp=N|6=rU81SHf82tqddV-FX^e^Xo9O;NUtD%I(sH4Rzxd5)*{AJja6T zYeU0TiWM;#o7ugduww}hOx^1pL?5sOjX1bqW)QDLrepoJZopBqA9qYnbvY&y%l5JPE3E+!xGbo zcfo8odJQ+RuQxQY)6g5udLZIMVZwNGTt90K?_pyDdlMhwZXN^qn3zM%#j8$7@1Xb2 zwX~|R=ECRJTq-R1R^x(h^mai;ZFQ+M2j^>zw117^-vxd8oS@Z$AWswWceS_$`ESIm zZ!X47Y!>9a-z4V)ZAO{#nH(M4u~=VX!be#ZMr*OvRE>w#42!V3_Y7?196l%MjUU-hWY3tG#h7w zCwW|_6uu;nZisddaT?YWXJ8R=jyR8nUmz~xx;M(?s1<4%nuoi=kI@`7E0|5k{mER< zl@Pn#NlH&dur^ah>lQWO3d~NBl_KTu9s$CKGL+4sPN$ac2>6 zr>Rl^Xw%;8>-fiTlk|T8I`k(NY4=205P?v9UP6<8We}0WItK8`kq6*7HxS zn>ZIO#>y=~pRD%HO@r=r#8WS75)#*O4QQNUpEX0c^e@34AxV+~Ge+T7vmaV2Xhw?Q zy7_P&NNxc)=}Y=G!@V4>Xd)(zTM-xE0NisZ&nKcq)MPM5eVF%-;E|OW^fK%Wm|xJ% zyLtz*<3h5*iusMOh5Zd(e%t2r7ugkbBc(XFR^#Bh`j4_ohJZRUw4to7K|i2X4e>{Y z^L-Ycw=Mu18Hp_r1xiR6e=8YH%1H&NB$Z@W=ptjuI5M70AXQ`{m`x^u8Dv)ihIuNo z^WCe__vj+})(5SVzz}o+Lr^qIPvfPBJ^P%2!j};-WPca}ACQB{OmZ+egd9p{;Uc;o zkB$bk741O>&=GVTo%%;n#TFkyj%+Hb^U((M6<<`34eKax*}UVy9I`)|Pih78Zo~|@ zJ{YKRG;i{>9lqa<8_{R|A*qKK$s%|ehr$-L8Rg-brJ?<6N}Fc!PnvO`CkHKIEFnvq zVcdqcV~oO(rH~6@A#9+1nwlST> z0?5gdAvacd4ar0oX13P84I|KE@6~cbZpSy-27ZPLL&~xt3o&ypzrvM zYE_F)i6krx5+yT$vXnL!DHoZ8aZze=DdfP z^R{BnyYAUIwzIo&TfGXO`5m9}Lj(t-8`xW%&3*CO!+X)pc zR%lTbDn6(a{xy!NcGyKvsE!RTx`SPGGnn$S)va);yXEDjRQIOk`PF|y_nu!JXZwG( zdN^MFY18UI+f?4|p2m$TYA`hfBLm(M04x!PfK>Dt{elf}U&nT;D3_M% z>&gulslMFkX%{JxQp2ecVD0$q99az>=F83KS0PBL9BR}8Y7{lvGbplK|Npc+9zv+W zP0QysTYffP{;{z9@BH$f6_H)t|FUZ(NYQ)utSAF7qiM6{FD&6t{{GSBCR`_;+isz( za5iNVwp*T{r%l@}R5>oxR0Rh?!+r}@E$p{YwXM)V4#I{V7s`$XbC6g)K5AFne*pUj ztmk%s{_^eswH(ARQZF?RVh;LnP}~s4jlNfS_kNpPAN_BEJdHR{5t!)&I_01*nu9YM z*MfunR<@Kw@G<3~-fgzLnS=fu3~0VQpTyn)O(;hH2S$e}5Ygt3^n`)9;2J|Jh{&_&HIoRfTKni&i{l)%A2HJ)JiJk#!%L8hK$#46R zuI?6wYHA;~zxhzj!S)>N@VBu#(K}WrCj5P@{@>Vue-5l)FY`CVb^20R;yW+a(`DSQGH}xaW zawn);)NNtOZXE2<;t(q=ckj979yKf`ZMInVyg^o@sln0zF6j3LL2j?4rwx*NHj@;R zH=@p3+aRgMK%ps`Zssf;D7`q?yTMs_(u>6o^6um);{K&jxf}XUIsnIsPh;Q7;RYy( zuh2Mf+w+@yWer2Pw8Z3;>V*lt<=Ca$&~2ZO-98+QXdXX_jnk(xPJxThf9OH!u9$Ru zpOH=^Pdedz1Lqu7A+5u(GW3--(xDYN$-S5&rREB0E&k79lJ*#4au!wStBulL(yR)6 zbq}d`16n$~+Ei?+HkBJpQoXI*D6KY?=_{MbY7o$*v%ykPgL7A3R8en|Qd z=&MaeVY?aQ;$Xa3sHn7>)-0ekbh_u9HWG$=X6ib6_7?>C=hc`>O@>;Nag^Tdxm?h# zmG|m_^q>XwAn&8fHXgUOP1>2~U=3~pmJP1c!|4%V1}@^mD)|R0H5_b0n2LIGFolDC zJ)afGLvTXUqd{MK3_X?}KNc5#99H;h%{+P>2h--!*x71NPn|rQE}(VuX`L{q_p=I* zV)fO|mMmkSjl>|j7|du~v_A*?p$Qz!(6Q2beQBL3N$Qaobnx^p=pk!KKpCw9#dPH} z0fTtE;%;@I=L22OewZ%=DK)aJEWUdiDm>b4Nl-mT5`|{&e?yv@HB|}C*ap;L^1U1 z&k&5n2!s}Wgy%hdjOUa-EaLC?yh9r)l78>mJ)^ObLWe)f<6D^4=kM3gqE!^2KYn)o zINrMVIXKo6R-|dsAq%k`b@V6CZpq{A$Z;^&Q&Sk@Zs@7#6==vRRz=K(ArwUfQ2nVB z@BtA+iJ+eNnDQlbc*=Z20UR6g)NP6c*NHh~SIqV?c*-7xC)}X~OCKcmgSk*c_Q$=t z51BWSV#t8sb3t@Iu|TOB~hQ3(gNXclUPV$phZm#5oPXc4qc!hGHiE#O|*>aKEiEtnD-BK1Ksf1#W2KsB_5Dj z7>x^dH~y0wEXIHQ?NvlQ%m&3|S7I9Om#Z*R1;$^(JGT=)rUp)i*Z z2KazF;SB~p6o`-cU?2wJNW{T_!$1g!zXt=>dOvZvF&Oy3Xek)n&qad}3h(j3fDC*% zc!R+k3e$yPn84eE4+cI8gm7pf7zi8=%bo=Tj*Nc|hH=kDgP^=#P+n9dGKh>Klc-o^ z7Fk4Akxf)0DixK9%0(5TN>P=lT2v#d71fFAMRt)x;B zo~@>M+^*Mh5Gzv8LA$4Ib#Xxc@QTX1N@>FnTvnRHI(FcHkR;`Q6(tROZu>smbEvet zXGCfHHf@I2)mR$tk%l!q{q%fU7TT`eb7z_!!g+3+BRs#A_HygkDg4iztOhB+S11kp z|5o$=yOQtwtmb>(Dvj%`V>>q2_PK{Ap5$_!hb@*#sl&6=aho@CVD;VRERJ0K*#}4#%K%U#S&<xA#)p#Pd7V0$7jh%Z@mB`FiA8K1UUp0f&wsxrwA|<=!AMP3=>2H zJGw6qv=z zLHC%3I)iYXX6Rn;g8wK|GJ% z;UF#rKS{`+*!}E83E_~Cff8~XyOVu^oh%`LmcWq`awfZ!{e`WSkO~PokzFn!cd#xA zIYC0+W2Z@Awgf6AaCqa7?fzm9N=OI$4O=H6MoD0WgbJ3Bxe^#FArG)M5~7C$x<8e` zt`fLPLT;9jNfL6OguE?*E7_A0GKHPWIwa6n0ynU)vD?{467sHute21vSUZ~}A$%l+ zl-(*JQY7Sd2^=LMN+sle2^lScYuJkt@)|o`LT;5njFFX)H`#5hlbs?V?=V?2*A7nw`*nMBOW6*itEKMiKmJ`6fYC67OxSn6R#J4CEg_7BHkw6A>Jk4 zBi<|CCq5`XB0efUDLyT}A^u7Hi}>KLa$5-L2^ws%Vd@Frl_MPrK z+xHXSHNKmDcl+-3-S2zQ_o(l2-_yQleb4*4FZf>az3uy}@9(~U`abb%?bqE;?x*yN z^^5oG>o?qQykCJ|mEQ}vX?xM{Wxo&nmiw*o+u*m$@37z3erNp7`F-nm(eJW6Z{#E`p{&oI#f2aQh|4II{{P+1E@IT~##Q&)O zasLzkr`-N${2%#037`X72Xqby4d@dP6QB+l6<`Rc444!!IlvPzFJM`~nt+V~djrk~ z{19*}kO-6n_6Q6K>=hUm*e7scU}oTuz^uSwfx`nw29^Yt1y%%B1=a-C2RZ`Z3H&bb zX5g*BJApq1{v7xq@KNC7z+VG@3;ZL93X%l13ThM7F32qn>Jij4C?Y5&sBe%uC_SiO z&<8;af<6!07<3@$V$e;NU<258Y$Th+rnCLn0qh`lFgujZW{0yQ*-`8mb}T!d&11D} z5o^ThJOwAzo9tWcJM3Qe9D9|$$=+t~viI2g>_eR0zp}rxf3i;`q@<0ctE7)4QX+Fp zQY8H)gC&I$tE5`;iDa#0i)5Q*hh&#zk7S?ZfaHqgaWEC^7u+hiO>n#5&cR)SrNQCB z%HY`Ggy6*B^x%HMnZZMXvx3J2mjzb@SA`ftN<(TwCWpKoGBadO$cm5+A=^WChU^PD z7IG@&QpgV>cS9b9_6Q9L?G+jp+9xzJ)U6C17@8S6Bs42@Sm?OW+)!<(F4Pig3#|yP z3ats982UmeipY*IL{vmfif~785ido&5-}y>&4^hMOCpvB%Od6Ya_K2}~Wcgs2XOY&Fbi{(q?%j7HMpUPLsKbNnTA5yeav{!UgbapGc zDx``YiV#JpqL(5}F^u;uF6Q|XysVtcx9eatJEp= zN`um*tWmzDoTpr%T%`O&>0YY*Lb*n{UAa@aTe(-cUwKe@Sb0-*&lN#=4{OQn9DIg#@vskVgq8^$A-je zVl!g<#}16mj2#?1G}ajVO6-)_*J7u|z7ab;_U*VsaTnt5$32YuCGKfF<&GD{2gSFJ zSH#D}$HgbaC&nkmr^Jtrua9@cyW%ItzYve&UyMH)e>wig`1|os6WS#7N(f8nlMtC8 zOBk4tnJ^?FD`8l|h=kmP`~+QsKH>d@xd|&0zDn4ea4g~bgr5^0Bs@xZobX%1?+Je< zJXJvzsiIYZDpu7>)kf7-B~`iOR0*m?RkA8om8R0DGF1Il167%-VwFW@QHlV4AM zGx@FL_mV$IQKx8AbSe52Ly9S-IK`5JQs$*BNLiHfNy^fcYcuUec8UjeOvc! z+qZq+j(v~yz0vpQzQ3kP(%PrRr6r^#rX{DPrlqBgNGndWq}kF+)5_CcPJ27elQu7H zS=#Ef4Qad5E~MQ}yO(x9?P1z4>Ogfjb$4}7b*MT_tx(6Pv(>}ZBh{nSW8CWT>U_0M ztyde>X0=USs;*GKrG7{KuKIoThw2&XS?by9b?VdVv+DEe3+hYi@6^}SH#9z)a7~0J zN)xS7Xq1{*O}u89rczU_snyhL92%EqqUK%A_nNDk>zW@mw>5V)_cRYQk2H@pzia-` z{H1xCPNXyG;`E;Bk?C$(dR%%!dSZHVdTn}rx+C3{J~91;bd>&L`rP!T>8sP%rf*5# zoqjs~az=-YP8nS?x@C0F=$R3k(K{m}qc)>H!;#_2n3(ZG2FjS6F)L$s#+;0K84EI2 zWPF0U&$$oWxsP&x&HW?y z&)g?@Ag^Oya$ag)T3&iyzr2BYnR&nDx6AL4-zmRqe)s$y`62ne^40my{0aG!^4!%ISvf5y68*Mvnw05|5q;`~c ztTtDhr`2k8T8DOqc9wRw);(7{U%N>AiFT*<2kkZO4ec%MUF}cWpS2GP{0qhwj4Q}3 z$S)`;C@e4(6c?BaECnS69~R6im|ZZpV1B{Eg2e?(3sw|tDA-uAxnNttse(%d-xb^_ zxK(hs;AdS&T^C(9T@PJ|u9q%M7on5sl5_@LvCg6^(Us{cbXB@qo!zZ_Nw-k9ShqyC zT=%JNmF{!hYTZHIZQWhnJ>3J{Bi*mM-wWFm#uuszlL}J{)rFeEjKcnf1%>WHuJEP8 z$%U^LPAhyvFV?r#hwGE{Df+&8wLU{XMsL0ni=x))^MGuR9Df+GG zPeX_y(vWD-82T9o8U`D(48sjp!vw?2hSv=58&(_E88#R;8MYd>8+IA48}1mz#$Lv7 zW27Gw~QX+`^Fi@S;mizTa2fT4~>tFzq^fpnShBf(WYoqs%f05 z&g3vnFuh>nOfQ?Jn7%SyH2qmrL(20rMo5CqOv4eR$5kBKDVs4 zthIb;`O31%vc!Pa>R1fa@=h>X*q2!P?2%#oEo< z-P*?*X`N%8XI*GrY+YhqW?f-jW&PZ`#=6eB!Mf49*}B!b-MZ7d+q%zs(0bT<)Oy_N zK4Cp=J!?I0yz~#qHee%clucw4+x%>S zHr5twYi(<5Yj5jl>ud|P^|sBl&9=?8EwC-NEw!z%t+IV#TWecy+i2Tj+iu%s+iN>u zJ8U~@`^I+4cGmW-?UL<^?W*mD?Uvhi*Y>mRq3yBlciUejpoAd$wWNDVNJ;OKJ|$5l@{*X6_>#nul#;ZP^pasEbtP|?d{MHmxd+PQQjk*h?>u0b+85Xt+n3sx+gI9G*}t%_wXe5- zW#44qV&7)pVc%unYu|4_Xg_TK+J4ObjoW_Ge%gN4e%^k;e%XG-{)7FR{YU#P`(67z z`+fUE`(yiW_CM@@Ie>$3P!7f+cKA609jv33qphR8qobpaXIrPcgR`@A z)EVZCaLSwtXRI^9ndD4$s+}3m0nSY4Q0Fk`NatwhIA@--z^Qi{oo1)aS>~*C);Q~( zPUl3Y+xepN73ZtYY0fvDZ#&<0e&C$xob8nT`Hl0G+j-Xct@D!eiu0=ThVz#5uJfMrzVnguSLYwjzno89&_%fzm#@p; z73gAJtz2zg?OmN*U0hOEPgkfb%oX91xe{E7t`t{am)e!#8sN%w4RsB3jdYE2jdkU^ zw5~#z!Byn*7LarBGFT1Q$TvJ_dxTd?_cD?KRz%|45k!y}? zzH5 Keyboard & Mouse -> Modifier Keys...".) - // - if (fakeEscKeyCode != 0) { - if (NSFlagsChanged == type && [event keyCode] == fakeEscKeyCode) { - BOOL sendEsc = NO; - CFAbsoluteTime timeNow = CFAbsoluteTimeGetCurrent(); - - if ((flags & fakeEscModifierMask) == 0) { - // The chosen modifier was released. If the modifier was - // recently pressed then convert this event to a "fake" Esc key - // press event. - if (!blockFakeEscEvent && !fakeEscOnKeyDown && - timeNow - fakeEscTimeDown < fakeEscTimeout) - sendEsc = YES; - - blockFakeEscEvent = YES; - blockKeyDown = NO; - } else { - // The chosen modifier was pressed. - blockFakeEscEvent = NO; - fakeEscTimeDown = timeNow; - - if (fakeEscOnKeyDown) { - sendEsc = YES; - - // Block key down while the fake Esc modifier key is held, - // otherwise "marked text" may pop up if a key is pressed - // while the fake Esc modifier is held (which looks ugly, - // but is harmless). - blockKeyDown = YES; - } - } - - if (sendEsc) { - NSEvent *e = [NSEvent keyEventWithType:NSKeyDown - location:[event locationInWindow] - modifierFlags:flags & 0x0000ffffU - timestamp:[event timestamp] - windowNumber:[event windowNumber] - context:[event context] - characters:@"\x1b" // Esc - charactersIgnoringModifiers:@"\x1b" - isARepeat:NO - keyCode:53]; - - [self postEvent:e atStart:YES]; - return; - } - } else if (type != NSKeyUp) { - // Another event occurred, so don't send any fake Esc events now - // (else the modifier would not function as a modifier key any - // more). - blockFakeEscEvent = YES; - } - - if (blockKeyDown && type == NSKeyDown) - return; - } - #ifdef MM_CTRL_TAB_HACK NSResponder *firstResponder = [[self keyWindow] firstResponder]; @@ -129,7 +51,7 @@ // key event. if ((NSKeyDown == type || NSKeyUp == type) && (flags & NSHelpKeyMask)) { flags &= ~NSHelpKeyMask; - NSEvent *e = [NSEvent keyEventWithType:[event type] + event = [NSEvent keyEventWithType:[event type] location:[event locationInWindow] modifierFlags:flags timestamp:[event timestamp] @@ -139,9 +61,6 @@ charactersIgnoringModifiers:[event charactersIgnoringModifiers] isARepeat:[event isARepeat] keyCode:[event keyCode]]; - - [self postEvent:e atStart:YES]; - return; } [super sendEvent:event]; @@ -164,28 +83,4 @@ nil]]; } -- (IBAction)fakeEscModifierKeyChanged:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - switch ([ud integerForKey:MMFakeEscModifierKey]) { - case MMCtrlFakeEsc: - fakeEscKeyCode = 59; - fakeEscModifierMask = NSControlKeyMask; - break; - case MMAltFakeEsc: - fakeEscKeyCode = 58; - fakeEscModifierMask = NSAlternateKeyMask; - break; - case MMCmdFakeEsc: - fakeEscKeyCode = 55; - fakeEscModifierMask = NSCommandKeyMask; - break; - default: - fakeEscKeyCode = fakeEscModifierMask = 0; - } - - fakeEscTimeout = [ud floatForKey:MMFakeEscTimeoutKey]; - fakeEscOnKeyDown = [ud boolForKey:MMFakeEscOnKeyDownKey]; -} - @end diff --git a/src/MacVim/Miscellaneous.h b/src/MacVim/Miscellaneous.h index ce4a02b5..23c3ebe2 100644 --- a/src/MacVim/Miscellaneous.h +++ b/src/MacVim/Miscellaneous.h @@ -53,9 +53,6 @@ extern NSString *MMOpenLayoutKey; extern NSString *MMVerticalSplitKey; extern NSString *MMPreloadCacheSizeKey; extern NSString *MMLastWindowClosedBehaviorKey; -extern NSString *MMFakeEscModifierKey; -extern NSString *MMFakeEscTimeoutKey; -extern NSString *MMFakeEscOnKeyDownKey; // Enum for MMUntitledWindowKey @@ -82,14 +79,6 @@ enum { MMTerminateWhenLastWindowClosed = 2, }; -// Enum for MMFakeEscModifierKey -enum { - MMDisableFakeEsc = 0, - MMCtrlFakeEsc = 1, - MMAltFakeEsc = 2, - MMCmdFakeEsc = 3 -}; - diff --git a/src/MacVim/Miscellaneous.m b/src/MacVim/Miscellaneous.m index f3605035..15259d48 100644 --- a/src/MacVim/Miscellaneous.m +++ b/src/MacVim/Miscellaneous.m @@ -44,9 +44,6 @@ NSString *MMOpenLayoutKey = @"MMOpenLayout"; NSString *MMVerticalSplitKey = @"MMVerticalSplit"; NSString *MMPreloadCacheSizeKey = @"MMPreloadCacheSize"; NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior"; -NSString *MMFakeEscModifierKey = @"MMFakeEscModifier"; -NSString *MMFakeEscTimeoutKey = @"MMFakeEscTimeout"; -NSString *MMFakeEscOnKeyDownKey = @"MMFakeEscOnKeyDown"; -- 2.11.4.GIT