From 207dbcdfb542c693c9e391eff1e63101840261e4 Mon Sep 17 00:00:00 2001 From: Brian G Date: Sun, 26 Feb 2017 09:31:12 +0000 Subject: [PATCH] [update] - added pipe and stream support to terminal class git-svn-id: svn://localhost/gambas/trunk@8105 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.form.terminal/.icon.png | Bin 7608 -> 7678 bytes comp/src/gb.form.terminal/.project | 3 +- .../.src/TerminalView/FTestTerminalView.form | 2 +- .../.src/TerminalView/PipeTest.class | 209 ++++++++++++++++++ .../.src/TerminalView/PipeTest.form | 75 +++++++ .../.src/TerminalView/PipedTask.class | 74 +++++++ .../.src/TerminalView/TerminalFilter.class | 2 +- .../TerminalView/TerminalFilter_VT100.class | 2 +- .../.src/TerminalView/TerminalView.class | 90 ++++++-- comp/src/gb.form.terminal/.startup | 3 +- 10 files changed, 441 insertions(+), 19 deletions(-) create mode 100644 comp/src/gb.form.terminal/.src/TerminalView/PipeTest.class create mode 100644 comp/src/gb.form.terminal/.src/TerminalView/PipeTest.form create mode 100644 comp/src/gb.form.terminal/.src/TerminalView/PipedTask.class diff --git a/comp/src/gb.form.terminal/.icon.png b/comp/src/gb.form.terminal/.icon.png index e8fc91df2dd1420a8ae995970edfe8d8b541019a..544d3693e8e233b594fd508da3b53d6a8ae410a2 100644 GIT binary patch literal 7678 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 z zZ%I1@r5>=FR~@TXDR%oN9slhqmzI_s0!ZQwS%2XtPU}ZodQ^9OhVA$Li8i-jbR%5K zwv_oR?pLSkH$mrYb<){=XTr!*K6j)xK_Ka{jvdU7)fS>=T>RcBv-Jd4=KVJ9=a4}<%~xCb_T%iUY5Zs0 ziNZ!i$ZDNwgwai7&U@0EM1OnTPASZe#_{(hCe1<=&sqA`ME9vH)vdw%Uh`%HgyuJu zuTi_53Rp3P4Goqv3HQ{Q(pmcR&}rSZRt!fI7lWhHuki}r2^dGRZ$}53^I}WaRnzq4 z3i_VbzgRpnUG~cRDfGDJaxr&h$x$OotC)n8XLVAC`+ zL`MYWN;}bD>j7OpG+HU!{#<2`Y;s_vOzW5~i+|4jMXQDCQi|4duzYdJ{WiN~M(%sN z>5K++rtF#7=+l`>W`Ee-Ip>@rlJ;9IW7@N`$ue>Oe1C1Y*kk&xAHuZ%m`YZ=51QKM z8uH>bL~{d3A?Qc(ME6ZOQL@8*+KD=DPHcLSWmtL}uYoa{#U!%d1F(vZ02Wq-ssM%+fcz!#fJ!v<;zg9aad%Lm+X9#wQ zA+Uj+Sl;$SO#^FyIsPPslbi96-1&FG>VQIjk(Jj&;|Si%`XgWfYU=!Xu^%7OshLy@ z+DPJboi!4F&|Oj@eWHfpUBOA@-+l%sNx}M@i>@1d6;d-BcC|0Y`mw5pD*PSh`F7^H zpM4|HePm6GTdrB_Q@qpe_Z<{a{o_{O^X=35Q|@e<^Du}NkbVsv(aHrp>p!nR7{W|h}sc0a(=so*yeVX1g;+_$r+4MnZVZTXS-*6DXq$h31@Vpp=Qf9#) zfJ5t93%Re?>R8(lwY$6NYX6pRn-kWY8GfAFaPiIY$T6`^*uxd{MaXiU@3k%=2Us#o z(lk6;%?aNO%7bs~ufJhek^XNNaSAXK+Y+59mmQ!+T*1`mOb_ zho^(IyQ^*lYFdG&{(gCc zK#;_>gfj<&AQ2kWzwJxSWv-^oaM<3~`VtB5rKl||tBB8s>k2~X!jI5QjpIJ4)}s&X z&#t8n$|g#R2zYecvGEgbB=8N;l9WF~y42cs)x(YnMbZlSI}yh8Xlg!bwP`1`2)QJVkA+#_siH{8{qn>hX)N=@;_T~ z9}w&h!dD;|`u62{E8LNeQlxSVZN_&ex@a|>fG~N}v7d(&ruS55o)Sotm2jrd zoFni@dtyU)09}A_>fBd4{;s=j0IV+eFqLNAns4q>85e-PZ=KhGrZ0O1JTw=J0#$_ zFCzf|q%dbWpR-nR5aQ#^iC{%2r~LumvO*Xc$d874b`~X7^FW7WX?yM(`Ad*}eO~Tjsp3xKg+;haeM_w!vet z7Cl%Kv8twvtaydHvqNsT=A&(8-U9$mZ?^WyD?vn{U`GB|@)^T&gxaiLvrX*UZKCvF zoW3Z5+!6Lzfk^%ix4?LHY@hT;e}sdA3D0o~e);fjXmz1>qCZ8;62PUHH%7Ekl-zgF z!UmDz3GB3GEIAn%)|ADL9n6GLB6V@hjduU)V5Y)zgL|FjA>7v9K!zW`a0GNd(8rdq zohW30cv@7ncA=ntr0Kdv<;_3A=mN~Fz29mygM>|22Gjvy0TzTque))tla3Ien;*q{ z$mGlI#|Iu5($J-qz2={f@>l#+_7@Um|M;FPfDEtsTU$mq0LB7jyb%=kfy{s0QQI#^ zEPX&OFE8&e<$G`9t?cKgRa?Z8Jb7g8q(uY$RnE1BQMkiiGL4WR^IA-)yqXC+S2QoS z%L?$LxKb8B`lIzFmCK*cjYhq1C=Y9cP~GlbUnchGYcSa<|#LE@&Z?TV`H zng4u+3Ghc_7nL{FOvC_KC)^P!m>?*OndJ|nt(rxw%lo4AUOZ?{YHLFmJj+6|{;fiH z<@M^q?a1k!Jl+l=$5-uZ?<*`T-QIlW*GUF(*k#UkkI>;ec)XKycU=RroaKPPNayA59E@+}_Y|N|& z3Ka9;vJmaWG7CfdJ7;L)N?|~nFk>|Q51=nF3RE$UfK-b&t(`Qh#E-f+zWG%-vFbPK zsk9^KP>KJn3s_&+<%h}TU4zGhe?qLbFqN`|tJX`&!J0%t0IC$Q7NSF9J3FuXwb;J7 zUCr~-vhoAzOn#cBBXc6adB~Q!XDqd7pma|WC%yBy^mY8zH~hA6W8Zl+5%1KylC?b=>{-q zOEhrrdR*XM31|sCKDwNen(EJCpS;%VTSbgtR4&_JN^?NQ=FMx+0|sWJ07o?U_KlYo zk|pLZi*Hw#+SQg>NP;e`^_=UKm&{HmL~_tVhKGlJ!opG-8We48Y~~ggXeeQPTwGj8 zX8ODuKtQL1-ytFw)T9v8&|?sym6cLSxHj7?c^Jop( zW5tn&yf=3y?HAYAr4>1qQ=HI@ar9UYI+hM@Gm8JiUtVE+z{Q(L>%l+yBg-nR4#pJ1 zZJ?gDiTgFb#Z{|Jza`RT(aiXig-ZHauXj6gMQ5QtD24)K5T^{vDk?O=9IfRGv;oUitb)k6oo2fgM!sQdZSZ)y?l%5I9JTcLYHlgSD z!JrwIM*eW+3ViP1fE$d=K7|<02Dmle2BGa^%av_Nrv+=fY6>FeR7@oQNqq?A>kw3$ zQ%)%qMA1T6u9#ULyE=0@T&KN)4a22g@}2>J1ByBb*!R;iDg`OKF!x68S9nRxZ13^0 zdP+*l++jPfxtc;9LXlQj*l%yyKvtkft{Q%GrsMfQ(DiPeq%gW07M;$xu#Wn3^ zHNxYjl>ZIBP9&~1MQqb!X7w_J!Ogn>JcGLdU!oO&vN0H+I!3c$s%w6}#O~bw5&2=X zBW!kW%u~s%cGABy$Gmjft8*`OnrLMdA(m<2k_p%1rD4(hP$3`6$zXaaaDrLA@hKP9 zjxxCs0OsePC4rhX_oz{?ckcm%6WRuy@RH%Rec;P4u2@0HkF%QFJ=%qmI+>i8P8*phjt2WX}Ae8R{Ss#EivD$`U$y|k` zHEKak;m^O&w$K25o3dG#6UkSV&PhPjFH=Hu%ccQW?fMJa!9qcvs(Z&AEZ-dG`bt4h3gyNn8LHlFi+XJ113uIMX&xkL3j< z5GTX)F~Fz?*~Hj*?oj=soOa8!ZnMo7Z&=ObTJYJ|%RwL?iiwG-gzj%bUc7jr!a@(7 z4s~D#Qy&CGi5k$zhgAR^k$2^g#Z#W8;AhP3Uz+(~_)j1FMMXjykHUfBtTyE4Z-KabQGY4EG2$&N>{m1QD zT(7gjSUeFbyoRNBxL$Gbuwm+2?av#hq9;yiqDRJwPzxf&;!Z?-5u3<*V?Gp*!VS`>FbYyRK`vc;Wg~*l$%h598%g@nR|Sb1_q4KQ)08rm-g5! zNKD&AE^)-YCJS?0_8Oh9=arc@^?%Ot$o(T`%w%%>FU^D7)H&}%2(WiwG;K_so0+i_ zeQBVp1L~cf7DjN=UGo61#O-rr?xIs@tX|jpfQjg78#_BK!T`hYRgk2h3HPw^2pXU!KmQLkV^>xjYjKKTVBl&26+Xf4B&AcOFhphpeE?jX;l=( z57s7n;M|2)BU}6_t-*r7EhG_*3TD-JOyk$j*swGS3=XMhT`^T;v~n~Se_+dHZU|Cn zn^*CQOb3A=(th|`6+@-$1+zq+W&Xh#u$+(KWv1~0@ca0>gt^(q#Z(2r9X|&`10EklbecEeIKKbt@p>Un_UD}C{f{i(v z=@lD;H=m3wUs5|$PZmJbe7!7D@XdsdocKKvn~JeO0oF<>v755SD2=DMkfeIJ1)eW8t!*I9{<{5{dSN%2*c0Bx4&H){sDmuu)^ezEZ zmyb^CJVKqNij79)ff>7vuzm*2m*cK_Q76f0WhWRolYL*Mz^gv@XCbJZ!J*&>JUrwN z!RaB+93Ru=ZT{N7bZ7YbRW?m&$w+-P7Ays^0)_-8kZ8YcD1jBeaUL`+SRS2)(29$J z$Y36r_A%lO=HsWg^MVmkNI}MVK`nz}vvem50`lJF*yZSanT5=b12b%b z{$V5n*?S{8J`v0~cENO3L|uj91>k#3B5h&Zd_Sx(E{9j*H{_}?OO9z! diff --git a/comp/src/gb.form.terminal/.project b/comp/src/gb.form.terminal/.project index f60c90886..909e58863 100644 --- a/comp/src/gb.form.terminal/.project +++ b/comp/src/gb.form.terminal/.project @@ -1,13 +1,14 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.9.90 Title=Gambas Terminal control -Startup=FTestTerminalView +Startup=PipeTest Icon=terminalview.png Version=3.9.90 VersionFile=1 Component=gb.image Component=gb.gui Component=gb.form +Component=gb.net Authors="Benoît Minisini\nFabien Bodard" TabSize=2 Language=fr diff --git a/comp/src/gb.form.terminal/.src/TerminalView/FTestTerminalView.form b/comp/src/gb.form.terminal/.src/TerminalView/FTestTerminalView.form index 882b90eb1..80075fd0e 100644 --- a/comp/src/gb.form.terminal/.src/TerminalView/FTestTerminalView.form +++ b/comp/src/gb.form.terminal/.src/TerminalView/FTestTerminalView.form @@ -43,7 +43,7 @@ } } { Timer1 #Timer - #MoveScaled(117,17) + #MoveScaled(4,63) Delay = 50 } } diff --git a/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.class b/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.class new file mode 100644 index 000000000..ceef0ecf0 --- /dev/null +++ b/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.class @@ -0,0 +1,209 @@ +' Gambas class file + +Private $hPipeIn As File +Private $hPipeOut As File +Private InPipe As File +Private OutPipe As File +Private $hMySock As Socket + +Public TheTask As PipedTask + + + +Public Sub Form_Open() + + OutPipe = Pipe "/tmp/MyPipeIn" For Write ' providers output pipe + $hPipeIn = Pipe "/tmp/MyPipeIn" For Read Watch + + $hPipeOut = Pipe "/tmp/MyPipeOut" For Write ' open this first so other side never blocks + InPipe = Pipe "/tmp/MyPipeOut" For Read ' providers in pipe + + + If Not Term.Piped(OutPipe, InPipe) Then + + Close $hPipeOut + Close InPipe + Close OutPipe + Close $hPipeIn + $hPipeIn = Null + $hPipeOut = Null + InPipe = Null + OutPipe = Null + + Endif + +End + +Public Sub file_read() + + If Not Lof($hPipeIn) Then Return + + DataFromTerminal.Text &= Read #$hPipeIn, Lof($hPipeIn) + +End + +Public Sub sndTxt_Click() + + If TheTask Then + TaskStop_Click() + Endif + + If Not $hPipeIn Then + Form_Open() + Endif + + Write #$hPipeOut, dataToSend.Text + +End + +Public Sub KillSession_Click() + + Term.Kill() + + If $hPipeIn Then Close #$hPipeIn + If $hPipeOut Then Close #$hPipeOut + If InPipe Then Close InPipe + If OutPipe Then Close OutPipe + + $hPipeIn = Null + $hPipeOut = Null + InPipe = Null + OutPipe = Null + + +End + + + +Public Sub TaskTest_Click() + + If TheTask Then Return + + PipedTask.$sInputFileName = "/tmp/MyPipeIn" + PipedTask.$sOutputFileName = "/tmp/MyPipeOut" + + TheTask = New PipedTask As "TheBestTask" ' Start the task which should wait on the input stream until opened by the terminal + + Wait 1 + + If TheTask Then + + InPipe = Pipe PipedTask.$sInputFileName For Write + OutPipe = Pipe PipedTask.$sOutputFileName For Read + + Term.Piped(InPipe, OutPipe) ' tell the terminal about the remote task + + Endif + +End + + + +Public Sub TaskStop_Click() + + If Not Thetask Then Return + + Term.Kill() + + TheTask.Stop() + + Close InPipe + Close OutPipe + + Thetask = Null + InPipe = Null + OutPipe = Null + +End + +Public Sub TheBestTask_Read(buffer As String) + + DataFromTerminal.text &= "Task stdout -> " & buffer ' display from task stdout + +End + +Public Sub TheBestTask_kill() + DataFromTerminal.text &= "Task Killed" +End + + + +Public Sub StartRs232_Click() + + $hPipeIn = SerialPort1.Open() + $hPipeOut = $hPipeIn() + + If Not Term.Piped($hPipeIn, $hPipeOut) Then + + Close $hPipeOut + Close $hPipeIn + $hPipeIn = Null + $hPipeOut = Null + + + Endif + +End + +Public Sub Stoprs232_Click() + + KillSession_Click ' should be same as this + +End + +Public Sub Button2_Click() +Dim Port As Integer +Dim host As String + + + $hMySock = New Socket As "Socket1" + Port = Val(PortNumber.text) + host = HostName.text + + $hMySock.Connect(Host, port) + + DataFromTerminal.text &= "Opening Socket host = " & Host & ", Port = " & Str$(Port) & "\n" + +End + +Public Sub Socket1_Found() + + DataFromTerminal.text &= "Found Socket\n" +End + + + +Public Sub Socket1_Ready() + + + DataFromTerminal.text &= "Ready to send receive on socket\n" + + Term.Piped($hMySock, $hMySock) + +End + + + +Public Sub TCPSTOP_Click() + + If Not $hMySock Then Return + Term.Kill + Close #$hMySock + $hMySock = Null + DataFromTerminal.text &= "Closed for send receive on socket\n" + +End + +Public Sub Socket1_Error() + + DataFromTerminal.text &= "Error on socket(" & Str$($hMySock.Status) & ")\n" + $hMySock = Null + +End + +Public Sub Socket1_Closed() + + DataFromTerminal.text &= "Event Closed for send receive on socket\n" + + +End diff --git a/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.form b/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.form new file mode 100644 index 000000000..fef93472f --- /dev/null +++ b/comp/src/gb.form.terminal/.src/TerminalView/PipeTest.form @@ -0,0 +1,75 @@ +# Gambas Form File 3.0 + +{ Form Form + MoveScaled(0,0,147,69) + { Term TerminalView + MoveScaled(2,4,58,56) + } + { sndTxt Button + MoveScaled(132,4,13,4) + Text = ("Send data") + } + { dataToSend TextBox + MoveScaled(66,3,61,6) + Text = ("Test Data to the terminal") + } + { DataFromTerminal TextArea + MoveScaled(66,15,65,41) + } + { Label1 Label + MoveScaled(67,11,44,4) + Text = ("Data From Terminal") + } + { KillSession Button + MoveScaled(132,20,14,6) + Text = ("kill Session") + } + { TaskTest Button + MoveScaled(132,27,14,6) + Text = ("Task Testing") + } + { TaskStop Button + MoveScaled(132,33,14,5) + Text = ("Task Stop") + } + { Timer1 #Timer + #MoveScaled(29,61) + } + { SerialPort1 #SerialPort + #MoveScaled(43,61) + FlowControl = SerialPort.None + PortName = "/dev/ttyS0" + } + { StartSession Button + MoveScaled(132,14,14,6) + Text = ("Start Session") + } + { StartRs232 Button + MoveScaled(132,40,14,6) + Text = ("Start Rs232") + } + { Stoprs232 Button + MoveScaled(132,46,14,5) + Text = ("Stop Rs232") + } + { Button2 Button + MoveScaled(132,57,14,5) + Text = ("TCP test") + } + { Socket1 #Socket + #MoveScaled(54,61) + Host = "localhost" + } + { TCPSTOP Button + MoveScaled(132,62,14,5) + Text = ("TCP Stop") + } + { HostName TextBox + MoveScaled(67,57,63,5) + Text = ("127.0.0.1") + } + { PortNumber TextBox + MoveScaled(67,62,63,5) + Text = ("23") + } +} diff --git a/comp/src/gb.form.terminal/.src/TerminalView/PipedTask.class b/comp/src/gb.form.terminal/.src/TerminalView/PipedTask.class new file mode 100644 index 000000000..8097db4fb --- /dev/null +++ b/comp/src/gb.form.terminal/.src/TerminalView/PipedTask.class @@ -0,0 +1,74 @@ +' Gambas class file + +Export +Inherits Task + +Private $hPipeIn As File +Private $hPipeOut As File + +Static Public $sInputFileName As String +Static Public $sOutputFileName As String + + +Public Sub Main() + Dim i As Integer = 1 + + Print "Task is up and running" + + $hPipeOut = Pipe $sOutputFileName For Write + + Print "Task has opened output file : " & $sOutputFileName + Wait 2 + Print "Waited 2 Seconds" + + $hPipeIn = Pipe $sInputFileName For Read Watch ' we should hang on this till the other side starts + + Print "Task IO in " & $sInputFilename + + Do + + Wait 5 + + Print " Task Is alive " & i + Inc i + If $hPipeIn.EndOfFile Then + Print " Task Pipe Closed on other end" + Wait 1 + Break + Endif + + Loop + + +End + +Public Sub file_read() + + Dim $sBuffer As String + Dim $sChar As String + + + Print "Got read message" + + If Lof($hPipeIn) Then + + $sBuffer = "Term Key Rx .. Echoed back ---->" + + $sChar = Read #$hPipeIn, Lof($hPipeIn) + + Write #$hPipeOut, $sChar + + Print $sBuffer & $sChar + + Endif + +End + +Public Sub _kill() + + Print "Exit task" + + Close #$hPipeIn + Close #$hPipeOut + +End diff --git a/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter.class b/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter.class index f8bcbd58b..902d62f43 100644 --- a/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter.class +++ b/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter.class @@ -16,7 +16,7 @@ Public Sub OutputTo((hView) As TerminalView, (hScreen) As TerminalScreen, (hProc End -Public Sub InputTo((hView) As TerminalView, (hScreen) As TerminalScreen, (hProcess) As Process, (iKeyCode) As Integer, (sText) As String, Optional (bNormal) As Boolean = True, (bShift) As Boolean, (bControl) As Boolean) As Boolean +Public Sub InputTo((hView) As TerminalView, (hScreen) As TerminalScreen, (hProcess) As Stream, (iKeyCode) As Integer, (sText) As String, Optional (bNormal) As Boolean = True, (bShift) As Boolean, (bControl) As Boolean) As Boolean End diff --git a/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter_VT100.class b/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter_VT100.class index 585c6a89f..c9b41b16a 100644 --- a/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter_VT100.class +++ b/comp/src/gb.form.terminal/.src/TerminalView/TerminalFilter_VT100.class @@ -632,7 +632,7 @@ NOT_IMPLEMENTED: End -Public Sub InputTo(hView As TerminalView, hScreen As TerminalScreen, hProcess As Process, iCode As Integer, sText As String, Optional bNormal As Boolean = True, bShift As Boolean, bControl As Boolean) As Boolean +Public Sub InputTo(hView As TerminalView, hScreen As TerminalScreen, hProcess As Stream, iCode As Integer, sText As String, Optional bNormal As Boolean = True, bShift As Boolean, bControl As Boolean) As Boolean If bNormal Then diff --git a/comp/src/gb.form.terminal/.src/TerminalView/TerminalView.class b/comp/src/gb.form.terminal/.src/TerminalView/TerminalView.class index e312ea46f..102b34c08 100644 --- a/comp/src/gb.form.terminal/.src/TerminalView/TerminalView.class +++ b/comp/src/gb.form.terminal/.src/TerminalView/TerminalView.class @@ -47,6 +47,9 @@ Private $hMouseTimer As Timer Private $bTermUseMouse As Boolean Private $hProcess As Process +Private $hPipeIn As Stream ' Added this BG to support pipe io to and from the ScreenTop +Private $hPipeOut As Stream ' added this BG to support pipe io to and from the screen + Private $fStart As Float Private $hFilter As TerminalFilter @@ -562,13 +565,25 @@ End Public Sub View_KeyPress() 'If Key.Text Then $hScreen.Print(Replace(Key.Text, "\r", "\n")) - If Not $hProcess Then Return + + If Not $hProcess And Not $hPipeout Then Return ' added BG to allow redirection of io If $hOutputTimer.Enabled Then $hOutputTimer.Trigger + + If $hPipeOut Then ' added BG to allow redirection of io + + If $hFilter.InputTo(Me, $hScreen, $hPipeOut, Key.Code, Key.Text, Key.Normal, Key.Shift, Key.Control) Then + EnsureVisible + Stop Event + Endif + + Else - If $hFilter.InputTo(Me, $hScreen, $hProcess, Key.Code, Key.Text, Key.Normal, Key.Shift, Key.Control) Then - EnsureVisible - Stop Event + If $hFilter.InputTo(Me, $hScreen, $hProcess, Key.Code, Key.Text, Key.Normal, Key.Shift, Key.Control) Then + EnsureVisible + Stop Event + Endif + Endif End @@ -676,7 +691,7 @@ Public Sub Exec(Command As String[], Optional Environment As String[]) As Proces Dim aEnv As String[] - If $hProcess Then Return + If Not (IsNull($hProcess) Or IsNull($hPipeOut)) Then Return aEnv = ["TERM=xterm"] If Environment Then aEnv.Insert(Environment) @@ -695,7 +710,7 @@ Public Sub Shell(Command As String, Optional Environment As String[]) As Process Dim aEnv As String[] - If $hProcess Then Return + If Not (IsNull($hProcess) Or IsNull($hPipeOut)) Then Return aEnv = ["TERM=xterm"] If Environment Then aEnv.Insert(Environment) @@ -710,6 +725,27 @@ Public Sub Shell(Command As String, Optional Environment As String[]) As Process End + +' allow a connection to a filter or other task + +Public Sub Piped(PipeOut As Variant, PipeIn As Variant) As Boolean ' added BG this function to use as a piped terminal + + + If $hProcess Then Return + + $hPipeOut = PipeOut + $hPipeIn = PipeIn + + $hPipeIn.Watch(gb.Read, True) + Object.Attach($hPipeIn, Me, "Process") + + $fStart = Timer + + Return True + +End + + Public Sub Process_Kill() If $sBuffer Then OutputTimer_Timer @@ -718,12 +754,18 @@ Public Sub Process_Kill() End + Public Sub Process_Read() Dim sData As String - - sData = Read #$hProcess, Lof($hProcess) - + + If $hPipeIn Then + Read #$hPipeIn, sData, Lof($hPipeIn) + Stop Event + Else + sData = Read #$hProcess, Lof($hProcess) + Endif + $sBuffer &= sData If Len($sBuffer) > 65536 Or If (Timer - $fStart) > 0.25 Then @@ -744,7 +786,12 @@ End Public Sub OutputTimer_Timer() $fStart = Timer - $hFilter.OutputTo(Me, $hScreen, $hProcess, $sBuffer) + + If $hPipeOut Then + $hFilter.OutputTo(Me, $hScreen, $hPipeOut, $sBuffer) ' added this BG to support piped io + Else + If $hProcess Then $hFilter.OutputTo(Me, $hScreen, $hProcess, $sBuffer) + Endif $sBuffer = "" $hOutputTimer.Stop EnsureVisible @@ -792,8 +839,19 @@ End Public Sub Kill() - Try $hProcess.Kill - + + If $hProcess Then + Try $hProcess.Kill + Else ' added BG to end the piped session + If $hPipeIn Then + Process_Read() ' Get the last data in stream and display it + $hPipeIn.Watch(gb.Read, False) + + $hPipeIn = Null ' dont close the pipes its the owners problem + $hPipeOut = Null + Endif + Endif + End Private Function Blink_Read() As Boolean @@ -830,13 +888,17 @@ Public Sub Paste() Dim sText As String - If Not $hProcess Then Return + If Not $hProcess Or Not $hPipeOut Then Return ' Added BG to support Pipes sText = Clipboard.Paste("text/plain") If Not sText Then Return If $hFilter.BracketedPasteActive Then sText = "\e[200~" & sText & "\e[200~" - $hFilter.InputTo(Me, $hScreen, $hProcess, 0, sText) + If $hPipeOut Then + $hFilter.InputTo(Me, $hScreen, $hPipeOut, 0, sText) + Else + $hFilter.InputTo(Me, $hScreen, $hProcess, 0, sText) + Endif EnsureVisible End diff --git a/comp/src/gb.form.terminal/.startup b/comp/src/gb.form.terminal/.startup index cc52f8f4b..1da80cfb8 100644 --- a/comp/src/gb.form.terminal/.startup +++ b/comp/src/gb.form.terminal/.startup @@ -1,4 +1,4 @@ -FTestTerminalView +PipeTest Gambas Terminal control 0 0 @@ -7,4 +7,5 @@ Gambas Terminal control gb.image gb.gui gb.form +gb.net