From 2d0a3776264afdd921f207a6a725c768a71bfa7e Mon Sep 17 00:00:00 2001 From: cyd01 Date: Tue, 1 Dec 2020 18:43:53 +0100 Subject: [PATCH] Tagging the 0.74.3.3 release of the kitty project. --- 0.74_My_PuTTY/version.h | 2 +- 0.74_My_PuTTY/windows/version_minor.txt | 2 +- 0.74_My_PuTTY/windows/window.c | 12 +++--- blocnote/notepad.a | Bin 32244 -> 32436 bytes blocnote/notepad.c | 47 ++++++++++++++---------- blocnote/notepad.rc | 2 +- blocnote/notepad_64.a | Bin 32754 -> 34076 bytes docs/pages/cygtermd.md | 28 +++++++++----- docs/version.txt | 2 +- kitty.c | 4 +- kitty_win.c | 16 ++++---- kitty_win.h | 2 +- 12 files changed, 68 insertions(+), 49 deletions(-) diff --git a/0.74_My_PuTTY/version.h b/0.74_My_PuTTY/version.h index 55d3a36..7274ca3 100644 --- a/0.74_My_PuTTY/version.h +++ b/0.74_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.74 #define TEXTVER "Release 0.74" #define SSHVER "-Release-0.74" -#define BINARY_VERSION 0,74,3,2 +#define BINARY_VERSION 0,74,3,3 #define SOURCE_COMMIT "unavailable" diff --git a/0.74_My_PuTTY/windows/version_minor.txt b/0.74_My_PuTTY/windows/version_minor.txt index 0cfbf08..00750ed 100644 --- a/0.74_My_PuTTY/windows/version_minor.txt +++ b/0.74_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -2 +3 diff --git a/0.74_My_PuTTY/windows/window.c b/0.74_My_PuTTY/windows/window.c index bab97f1..61a7fe1 100644 --- a/0.74_My_PuTTY/windows/window.c +++ b/0.74_My_PuTTY/windows/window.c @@ -965,7 +965,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) if( existfile(argv[i]) ) { LoadFile = (char*) malloc( strlen(argv[i])+1 ) ; strcpy( LoadFile, argv[i] ) ; - RunPuttyEd( hwnd, LoadFile, true ) ; + RunPuttyEd( hwnd, LoadFile ) ; free( LoadFile ) ; } else { MessageBox(hwnd,"Unable to find requested file","Error",MB_OK|MB_ICONERROR) ; @@ -1112,22 +1112,22 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) CreateFileAssoc() ; return 0 ; } else if( !strcmp(p, "-ed") ) { char buffer[1024]; - sprintf(buffer, "%s|%s|0", (char*)get_param_str("INI"), (char*)get_param_str("SAV") ) ; + sprintf(buffer, "%s|%s|0|0", (char*)get_param_str("INI"), (char*)get_param_str("SAV") ) ; return Notepad_WinMain(inst, prev, buffer, show) ; } else if( !strcmp(p, "-edb") ) { i++; if( existfile(argv[i]) ) { char buffer[1024]; - sprintf(buffer, "%s|%s|%s", (char*)get_param_str("INI"), (char*)get_param_str("SAV"), argv[i] ) ; + sprintf(buffer, "%s|%s|%s|0", (char*)get_param_str("INI"), (char*)get_param_str("SAV"), argv[i] ) ; return Notepad_WinMain(inst, prev, buffer, show) ; } else { MessageBox(hwnd,"Unable to find requested file","Error",MB_OK|MB_ICONERROR) ; } exit(0); - } else if( !strcmp(p, "-help") ) { + } else if( !strcmp(p, "-help") || !strcmp(p, "-h") ) { SetTextToClipboard(GetHelpMessage()) ; char buffer[1024]; - sprintf(buffer, "%s|%s|2", (char*)get_param_str("INI"), (char*)get_param_str("SAV") ) ; + sprintf(buffer, "%s|%s|1|1", (char*)get_param_str("INI"), (char*)get_param_str("SAV") ) ; return Notepad_WinMain(inst, prev, buffer, show) ; #ifdef MOD_LAUNCHER } else if( !strcmp(p, "-launcher") ) { @@ -3334,7 +3334,7 @@ else if((UINT_PTR)wParam == TIMER_INIT) { // Initialisation // On charge automatiquement au démarrage (-edit) un fichier dans l'editeur connecté if( !PuttyFlag ) if( LoadFile!=NULL ) { - RunPuttyEd( hwnd, LoadFile, true ) ; + RunPuttyEd( hwnd, LoadFile ) ; free( LoadFile ) ; LoadFile = NULL ; } diff --git a/blocnote/notepad.a b/blocnote/notepad.a index fcf485de1cc926bb87555a4a17e7e573e80924cd..2607fbe0feff75faa958f3132d444e20b0ac6f10 100644 GIT binary patch delta 8213 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 Fi~ub1{_+3- delta 7928 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 diff --git a/blocnote/notepad.c b/blocnote/notepad.c index e0571c5..346efb1 100644 --- a/blocnote/notepad.c +++ b/blocnote/notepad.c @@ -1,4 +1,5 @@ #include +#include #include "notepad.h" LRESULT CALLBACK Notepad_WndProc(HWND, UINT, WPARAM, LPARAM); @@ -20,6 +21,7 @@ static const char Notepad_szFilenameFilter[] = "Text files, (*.txt, *.log, *.ini static char * IniFile = NULL ; static char * SavFile = NULL ; static char * LoadFile = NULL ; +static bool readonly = false ; #endif BOOL FileExists(LPCTSTR szPath) { @@ -64,7 +66,7 @@ int WINAPI Notepad_WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR l #ifdef NOMAIN if( lpCmdLine!=NULL ) { - if( strlen(lpCmdLine) > 0 ) { + if( strlen(lpCmdLine) > 0 ) { char *st = strstr( lpCmdLine, "|" ) ; if( st!=NULL ) { SavFile=(char*)malloc(strlen(st)+1); @@ -77,6 +79,11 @@ int WINAPI Notepad_WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR l LoadFile = (char*)malloc(strlen(st)+1); strcpy( LoadFile, st+1 ) ; st[0] = '\0' ; + st = strstr( LoadFile, "|" ); + if( st!=NULL ) { + if( !strcmp(st+1,"1") ) { readonly = true ; } + st[0] = '\0' ; + } } } } @@ -115,25 +122,28 @@ int WINAPI Notepad_WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR l AppendMenu(hSMEdition, MF_STRING, NOTEPAD_IDM_SETFONT, Notepad_LoadString(NOTEPAD_STR_SETFONT)); hSMFichier = CreateMenu(); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_NEW, Notepad_LoadString(NOTEPAD_STR_NEW)); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_OPEN, Notepad_LoadString(NOTEPAD_STR_OPEN)); - AppendMenu(hSMFichier, MF_STRING|MF_GRAYED|MF_DISABLED, NOTEPAD_IDM_SAVE, Notepad_LoadString(NOTEPAD_STR_SAVE)); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_SAVEAS, Notepad_LoadString(NOTEPAD_STR_SAVEAS)); + + if( !readonly ) { + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_NEW, Notepad_LoadString(NOTEPAD_STR_NEW)); + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_OPEN, Notepad_LoadString(NOTEPAD_STR_OPEN)); + AppendMenu(hSMFichier, MF_STRING|MF_GRAYED|MF_DISABLED, NOTEPAD_IDM_SAVE, Notepad_LoadString(NOTEPAD_STR_SAVE)); + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_SAVEAS, Notepad_LoadString(NOTEPAD_STR_SAVEAS)); #ifdef NOMAIN - AppendMenu(hSMFichier, MF_SEPARATOR, 0, NULL ); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_LOAD_INI, TEXT("ini file")); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_LOAD_SAV, TEXT("sav file")); - if( ParentWindow!=NULL ) { AppendMenu(hSMFichier, MF_SEPARATOR, 0, NULL ); - AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_RESIZE, TEXT("&Resize")); - } + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_LOAD_INI, TEXT("ini file")); + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_LOAD_SAV, TEXT("sav file")); + if( ParentWindow!=NULL ) { + AppendMenu(hSMFichier, MF_SEPARATOR, 0, NULL ); + AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_RESIZE, TEXT("&Resize")); + } #endif - AppendMenu(hSMFichier, MF_SEPARATOR, 0, NULL ); + AppendMenu(hSMFichier, MF_SEPARATOR, 0, NULL ); + } AppendMenu(hSMFichier, MF_STRING, NOTEPAD_IDM_QUIT, Notepad_LoadString(NOTEPAD_STR_QUIT)); hMenu = CreateMenu(); AppendMenu(hMenu,MF_POPUP,(UINT)hSMFichier,Notepad_LoadString(NOTEPAD_STR_FILE)); - AppendMenu(hMenu,MF_POPUP,(UINT)hSMEdition,Notepad_LoadString(NOTEPAD_STR_EDIT)); + if( !readonly ) { AppendMenu(hMenu,MF_POPUP,(UINT)hSMEdition,Notepad_LoadString(NOTEPAD_STR_EDIT)); } #ifdef NOMAIN HMENU hSMDelim = CreateMenu() ; @@ -141,17 +151,17 @@ int WINAPI Notepad_WinMain(HINSTANCE hinstance, HINSTANCE hPrevInstance, LPSTR l AppendMenu(hSMDelim, MF_STRING|MF_CHECKED, NOTEPAD_IDM_SCOLON, Notepad_LoadString(NOTEPAD_STR_SCOLON)); AppendMenu(hSMDelim, MF_STRING|MF_UNCHECKED, NOTEPAD_IDM_SLASH, Notepad_LoadString(NOTEPAD_STR_SLASH)); AppendMenu(hSMDelim, MF_STRING|MF_UNCHECKED, NOTEPAD_IDM_TILDE, Notepad_LoadString(NOTEPAD_STR_TILDE)); - AppendMenu(hMenu,MF_POPUP,(UINT)hSMDelim,Notepad_LoadString(NOTEPAD_STR_DELIM)); + if( !readonly ) { AppendMenu(hMenu,MF_POPUP,(UINT)hSMDelim,Notepad_LoadString(NOTEPAD_STR_DELIM)); } HMENU hWindows = CreateMenu() ; AppendMenu(hWindows, MF_STRING, NOTEPAD_IDM_RESIZE_ALL, "&Arrange"); AppendMenu(hWindows, MF_STRING, NOTEPAD_IDM_CASCADE_ALL, "&Cascade"); - AppendMenu(hMenu,MF_POPUP,(UINT)hWindows,"&Windows"); + if( !readonly ) { AppendMenu(hMenu,MF_POPUP,(UINT)hWindows,"&Windows"); } - AppendMenu(hMenu,MF_STRING, NOTEPAD_IDM_SEND, Notepad_LoadString(NOTEPAD_STR_SEND)); + if( !readonly ) { AppendMenu(hMenu,MF_STRING, NOTEPAD_IDM_SEND, Notepad_LoadString(NOTEPAD_STR_SEND)) ; } //AppendMenu(hMenu,MF_STRING, NOTEPAD_IDM_SEND_ALL, Notepad_LoadString(NOTEPAD_STR_SEND_ALL)); #endif - AppendMenu(hMenu,MF_POPUP,(UINT)hSMApropos,Notepad_LoadString(NOTEPAD_STR_HELP)); + if( !readonly ) { AppendMenu(hMenu,MF_POPUP,(UINT)hSMApropos,Notepad_LoadString(NOTEPAD_STR_HELP)); } //hwnd = CreateWindow(Notepad_szprogname, Notepad_szprogname, WS_OVERLAPPEDWINDOW,CW_USEDEFAULT, CW_USEDEFAULT, cxScreen, cyScreen, NULL, hMenu, hinstance, NULL); hwnd = CreateWindowEx(WS_EX_ACCEPTFILES,Notepad_szprogname, Notepad_szprogname, WS_OVERLAPPEDWINDOW,CW_USEDEFAULT, CW_USEDEFAULT, (int)cxScreen/2, (int)cyScreen/2, NULL, hMenu, hinstance, NULL); @@ -194,11 +204,10 @@ LRESULT CALLBACK Notepad_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa switch (uMsg) { case WM_CREATE: { - if( (LoadFile!=NULL)&&(strlen(LoadFile)>0)&&(!strcmp(LoadFile,"2")) ) { + if( readonly ) { hEdit = CreateWindow("edit", "", WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL, 0, 0, 0, 0, hwnd, NULL, notepad_hinst, NULL); - strcpy(LoadFile,"1"); } else { hEdit = CreateWindow("edit", "", WS_CHILD | WS_VISIBLE | ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL, diff --git a/blocnote/notepad.rc b/blocnote/notepad.rc index a7120f1..df590cc 100644 --- a/blocnote/notepad.rc +++ b/blocnote/notepad.rc @@ -49,5 +49,5 @@ BEGIN NOTEPAD_FILE_FILTER "Text files, (*.txt, *.ini)|*.txt;*.ini|C/C++ files, (*.c, *.cpp, *.h, *.rc)|*.c;*.cpp;*.h;*.rc|Script files, (*.ksh, *.sh)|*.ksh;*.sh\0SQL files, (*.sql)|*.sql|All files, (*.*)|*.*\0" - NOTEPAD_STR_LICENCE " mNotepad 1.0\nwritten by Cyd, 2016, for the Telnet/SSH client TTY" + NOTEPAD_STR_LICENCE " mNotepad 1.0\nwritten by Cyd, 2020, for the Telnet/SSH client TTY" END diff --git a/blocnote/notepad_64.a b/blocnote/notepad_64.a index 889211ab94da9dd2013682f2e0ed6abe2002a5ae..4a2665e696d90cdbf66dbc7f775830446f43093b 100644 GIT binary patch delta 10052 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 delta 8814 zcmbQ!#q{Yv5RWEN-3U}Rv>ah*JmSxGR4k%3`~8v{d1 z1X!9OeDXzRX^{`^5FU(lU;tN<97(VgG9sI0Z=j;=lO3dFCo4#^ zG2WQ0E^Wm)cXE=nmf+49kjXhe|Nr;sJmk^c+A%ptT4C}586M7po#`Mcy`PgGNNX}N z|D4P%qse$3z7#NT4h z%)sz+86N|Ktso-<1Aj{bGXsOIF%yXC&j(U1z~7<^8ObiS!dAJ!E zY-+4E55s2f<2ifK(p>GrxhtV&NYynkKZuoq!4|}<_pm(&7U|$%U;s1grESlEMf%tn z80u}$g4yNl3=A*hLHe(N`JN#CSHVmzRtAQbE+DCwV17Hu(;#NOwC#1U$aj#F?t_^h zLEaVzDSi#++i@~5*n*ioe?Sg+0~U?u1cd-61A_-oH>-mH0|O}Lq&`lLSD7el!3&BI zxTyOFP(tf%5MW?YvHAi`ER13}D{r~@R z7aIe^&RL)g^mekm`bs9J$D2>7J1|-`zWo3HB`9J%x*_hDdj0?Z%XKU$P8NLn|NqNb zsA6+ByJ+UHFeN>lyh+!ZQEKu#T{T9%$)b9?j0~Gy^jJ446 z1C+LRDopM+Sj4EaSjhfYACJ3=E)J1w`|3GBAXI%;IEV z=;vf$NMV4`iChc}1q=)fAX=ZBfuV+hp`HQ6SjNr3(80jK0HW`5GcZhHU|;~zw|E&C z7BDa{fM@|e1_n?;1)^K{85lr81EP2FGcX)sU|;~zKlm9KK-CC{juK#CxWmA}0HUXY zQW*mS1BgB*z`*c@fq?-;e-o%@U|?WmVE87$z>p-xz`(-@p{HvyFi0>mFo5XU+6)Y! zDhfnb=`b)DFfuTJ=yF{K1_wq41`r*l$H3sj$iM)izvwYAfT~G%XJ;z~4R^m#O$Bp3 zW8L!1JYypTBLhPV17kxY1_lOU1_lOuko_zSG7Jn1CJYP=EDXwUmN_V{z+x^83=C#q zmJb61LoJvU4Hrv>i{-)fcEedyLA4iH$0E4cMg|53C$QKbhI$4DM=(>85hfVL$iUzX z7Fz^o?P6qLr~`}LWMp6fIf#Yf9U}vSD_BgQ38teQ&gy4^=~%@CQ+JvP=FNLBRy_kZ zGfWUvlR!ejm6?IT4Q%vkW(EdOH~dfV2L=W#vG52&~tR1?DU@ zRv62H6=vISR*-r1pg`wlgSj<ZnlvBT8Kb1*P?fz_FFz;qOG zKoT(v!xjz(25+$Jc@72!P^7Ui{N{i;!I6`J0o24|VesN)sE5X^KPM9%j>z~B#7SAQ2S z{Rz%e;)Y45aKqf1%MCN8h#ThAMsAo>ySZUTPl2oSQyNB7#JGCZgqppM)NQ*G=aso@W33nmj~v+Lp(4CUgUu}@IGAc zLSC5XHu5qs)I-uTGat-_W_)0GF|aUr!CA$8FlSAGvkvjWEI!Q#v-koZ%;NieFpJ;9 zb$Ii`ERN=f<)O9p{4k5p@-r|5fc^BJ9~SQt0-!VsN)>8wmaYKII#W=q46MUT0G1px z1Yk}rg|nIj7#IS<>bl`#I|U$Vrk;i26_m-spd|?NyB(ZWCCI?g0@gfF5SIE^2{JIW zg2grp!mK+CXPp*gU}yu&K7s4_0N3#yuI?X*1u6e{gEKw1dI%hbm5YCzkW7RVphA|n=h`=mi6oqNlhqGeg ztZq1KJ)E^)6qYKkz{Q@x#eTxYn8aY=t0@Mu16=-DiorDdfdxSct_aRr0B5ZfgE{aX zT#R2FWDH1$gg8vr9WGV`XU&DPPQY2;#2MHq}BnflEEJ+52cCgqsNd{;Q z_)HR#byyhKq!<{Yz_L&WlF&^^g}6F@Eb~l?Esa3 z77!)_3xkU^%w4|HFop4OR*E#N7RZL{D1ysYN;5FTfvszVi*>_U)8MSR(hLmoV0Fu+ z85rsz74BNN^fox_oHWdz*WqHH;9|ewV%#z?r^>=vDl%Z-F|aV`$iPZM2N?#21hB7F zkO9_Gt-!#L31)S|Wfv*HELjO>ZC8LlF z3S6uRE;d0K=9u})3=CP|2-~X+%e>d%>fS3e)H7s*rT@SM*;E)9a=>EzDljLAslf8A zJX}l-&eDgo+*M%CFM^A;!C5m^VBxkLE>^!4E_hr87U=g>7#MQFPIw0wV^xKTiK@cX z>A=M-RbfVZ!)24;vRQE1M!4(@h%Bi5TL70{4`&^OE4%?w$iTwz051DV6&5lKYB0x$ ztHB&7uLhGfgUkBDWkc0qPK^hR%s|S&Qn(cgbnM+-0f(bG5Ao%vtVmb)j%pI$TE`Tt^RF#~e6ohXyQR9)^pZ z2eBaK-)p#ZgeFX3ntV0DC}Hq7KeZ3c#7uxz4sJp)4tm|3n3%d>TGR+l!cD0!<5%e{&^Fm=8< z3=E}Uy}NZ_4m_g+bKpfCm;>+YFff#X)&16CU?>N(WOSju%X$VkT?U2=3=9kw3=9m+;L#t5v;YHSoQIhKG!zSw1&s$mWI+QK5S9X5FKC1aBBlY? zs{@w>$$&63c%TEqvH*3LAV!0RksyMgt}%oK>Y71hK?6$=F;Hh3!UFY`AhMvLCWsiQ zO$T9tnqUxFP?G~91{#Kfut2pbM7ADO)ItP7BU2C-C`CY|K@kHHtAYCoG*SkU1@(&{ zvY^2$2&)I~W6*R2L<}^X1!2vA%g%wASI@u<9^ryWFM&&g2InDSpfN89YXe+%3q&&m zGk6pXBD)7JdjKvA8W)4eo`B1qfy;tM%IYD~SK!h&;L@PMGl=X1xa00smh?CnVF?a22nUfCfXj-&WkJJo5Lp?xtO8sX zG*AbT)qu-_X1pL`prJbm%LFPL&dgu|*K7l4fyVV9aqI#Y^MJEJBYhCr0JvBPoD~5w zdUAepvk)k^fvR^9&B&m@z{EKDqOq6_sLTT;BCrrhjscWtK!dIb5l}(_4ZR{nKxyL- z)8wj@h-lClEJETvbOaV50t#u+I4nX06r`Y0S%iobBVqjuH&rd14GN?)v3C=AnqDQ$dD~U z$96^r2GGDQLgWM^14Gng@igT~(7-K1oRbMMe2Wl~VuFm}B1E*9AS1a55i2GJ2GDc? zGq|M7Nz=11HZz?(IZZVaG|G!m7th4N02=E>h~zLqMtl(>l}wOvUxY{p6J+!kBBEE4 zS^+9WKt2T(y3CBAQQ?J?71PsMSAfdn$-U|Fj2V;HrYp08#)`uyUrmp!KL-gYkS1uD zJ;D$HO~il|Ffc&XFo8S-6@n-i#SqcQ5OKp0iK@pC%Eb_A!Vu}l5LtpDvIRrrFowug zW>CIB@y8nsMSn3w#6Y2mqDuoq!~sJj07E2+1ymQJ7*vj-r~^X;G{Xbc1dWaj7-|k< zh}_2z`NjgO3!x@KVv!d-qX`j$h{$7z=wXO>V2H$Eh!kUpw17ll;SaHFI!Fj&JJe@u zFhurah+M@Gd5$6S6+?uJ4P+72eu(vQU?Gq&ES(!*h&W@2gky;0V2IRVh)jTpKwjUz00Yl^fhR7uhk(U@EERaPRNG5~UF@U(Bi5O^5t6?ZI#}M(u5J{fgony*a zGWlT6dexH5T+rwT$Xo^nP~F3jo{KC7DwUfy7v{caWHB}~w3z&h(M>GFH6^nITr3(h dWVq$$LD-WI ## About cygtermd, the PuTTYCyg workaround @@ -12,35 +13,44 @@ Download it and put it into your **/bin** Cygwin directory. This feature is also available directly from the command-line. Once the **cygtermd.exe** is put into the **Cygwin** directory just call this command: ``` -kitty.exe -localproxy 'C:\cygwin64\bin\cygtermd.exe /home/cyd /bin/bash -login' localhost +kitty.exe -localproxy "C:\cygwin64\bin\cygtermd.exe /home/%USERNAME% /bin/bash -login" localhost ``` -Adapt **C:\cygwin64\bin\cygtermd.exe** and **/home/cyd** with your own settings. You must provide a target hostname (ex: localhost) even if it is not used in this situation. - +Adapt **C:\cygwin64\bin\cygtermd.exe** if it has been installed to a different directory. You must provide a target hostname (ex: localhost) even if it is not used in this situation. + +If you are running this command from PowerShell rather than a Windows shortcut, Start➡Run, or a regular command prompt, you should use single quotes instead of double quotes. +``` +kitty.exe -localproxy 'C:\cygwin64\bin\cygtermd.exe /home/%USERNAME% /bin/bash -login' localhost +``` ### Start a **CMD.EXE** into a **KiTTY** terminal It is possible to start directly the Windows command line utility **cmd.exe**: ``` -kitty.exe -localproxy 'C:\cygwin64\bin\cygtermd.exe /cygdrive/c/Windows /cygdrive/c/Windows/System32/cmd.exe' localhost +kitty.exe -localproxy "C:\cygwin64\bin\cygtermd.exe /cygdrive/c/Windows /cygdrive/c/Windows/System32/cmd.exe" localhost ``` -Don't forget to choose the rigth codepage in translation tab or use the **-codepage** command line option. +Don't forget to choose the right codepage in translation tab or use the **-codepage** command line option. -It si not necessary to have the full **Cygwin** environment to do this. Just add the **cygtermd.exe** file and the corresponding **cygwin1.dll** library next the **kitty.exe** binary. +It is not necessary to have the full **Cygwin** environment to do this. Just add the **cygtermd.exe** file and the corresponding **cygwin1.dll** library next the **kitty.exe** binary. ### Use **winpty** to start **cmd.exe** or ** PowerShell** Windows utilities -It is also possible to start the Windows command line utility **cmd.exe** from de [winpty tool](https://github.com/rprichard/winpty): +It is also possible to start the Windows command line utility **cmd.exe** from the [winpty tool](https://github.com/rprichard/winpty): Get it and unzip it into your **/usr** Cygwin directory. Then run ``` -kitty.exe -localproxy 'C:\cygwin64\bin\cygtermd.exe /cygdrive/c/Windows /usr/bin/winpty.exe /cygdrive/c/Windows/System32/cmd.exe' localhost +kitty.exe -localproxy "C:\cygwin64\bin\cygtermd.exe /usr/bin/winpty.exe C:\Windows\System32\cmd.exe" localhost ``` And now use it to run **PowerShell**: ``` -kitty.exe -localproxy 'C:\cygwin64\bin\cygtermd.exe /cygdrive/c /usr/bin/winpty.exe /cygdrive/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe' localhost +kitty.exe -localproxy "C:\cygwin64\bin\cygtermd.exe /usr/bin/winpty.exe C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" localhost +``` + +or **PowerShell 7**: +``` +kitty.exe -localproxy "C:\cygwin64\bin\cygtermd.exe /usr/bin/winpty.exe C:\Program Files\PowerShell\7\pwsh.exe" localhost ``` --- diff --git a/docs/version.txt b/docs/version.txt index 9243766..f6fa7bc 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.74.3.2 \ No newline at end of file +0.74.3.3 \ No newline at end of file diff --git a/kitty.c b/kitty.c index dea83ac..5ed62ab 100644 --- a/kitty.c +++ b/kitty.c @@ -5010,12 +5010,12 @@ int ManageShortcuts( HWND hwnd, const int* clips_system, int key_num, int shift_ if( key == shortcuts_tab.editor ) { // Lancement d'un putty-ed if( debug_flag ) { debug_logevent( "Start empty internal editor" ) ; } - RunPuttyEd( hwnd, NULL, false ) ; + RunPuttyEd( hwnd, NULL ) ; return 1 ; } if( key == (shortcuts_tab.editorclipboard ) ) { // Lancement d'un putty-ed qui charge le contenu du presse-papier if( debug_flag ) { debug_logevent( "Start internal editor fullfiled with clipboard" ) ; } - term_copyall(term,clips_system,lenof(clips_system)) ; RunPuttyEd( hwnd, "1", false ) ; + term_copyall(term,clips_system,lenof(clips_system)) ; RunPuttyEd( hwnd, "1" ) ; return 1 ; } else if( key == shortcuts_tab.winscp ) { // Lancement de WinSCP SendMessage( hwnd, WM_COMMAND, IDM_WINSCP, 0 ) ; return 1 ; diff --git a/kitty_win.c b/kitty_win.c index 002cd89..be44f0c 100644 --- a/kitty_win.c +++ b/kitty_win.c @@ -396,17 +396,17 @@ void RunCommand( HWND hwnd, const char * cmd ) { } } -void RunPuttyEd( HWND hwnd, char * filename, bool readonly ) { +void RunPuttyEd( HWND hwnd, char * filename ) { char buffer[1024]="", shortname[1024]="" ; if( GetModuleFileName( NULL, (LPTSTR)buffer, 1023 ) ) if( GetShortPathName( buffer, shortname, 1023 ) ) { - strcat( shortname, " -ed" ); - if( filename!=NULL ) if( strlen(filename)>0 ) { - strcat( shortname, "b " ) ; - strcat( shortname, filename ) ; - } - debug_logevent( shortname ) ; - RunCommand( hwnd, shortname ) ; + strcat( shortname, " -ed" ); + if( filename!=NULL ) if( strlen(filename)>0 ) { + strcat( shortname, "b " ) ; + strcat( shortname, filename ) ; } + debug_logevent( shortname ) ; + RunCommand( hwnd, shortname ) ; + } } // Verifie si une mise a jour est disponible sur le site web diff --git a/kitty_win.h b/kitty_win.h index 9d8b29e..6fd4788 100644 --- a/kitty_win.h +++ b/kitty_win.h @@ -29,7 +29,7 @@ int SetTextToClipboard( const char * buf ) ; void RunCommand( HWND hwnd, const char * cmd ) ; // Démarre l'éditeur embarqué -void RunPuttyEd( HWND hwnd, char * filename, bool readonly ) ; +void RunPuttyEd( HWND hwnd, char * filename ) ; // Verifie si une mise a jour est disponible sur le site web void CheckVersionFromWebSite( HWND hwnd ) ;