git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/AxWin4 - (minor) Fix CColour to compile in non-native context
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
drv
/
pty.c
diff --git
a/KernelLand/Kernel/drv/pty.c
b/KernelLand/Kernel/drv/pty.c
index
862997a
..
d1f74c5
100644
(file)
--- a/
KernelLand/Kernel/drv/pty.c
+++ b/
KernelLand/Kernel/drv/pty.c
@@
-85,6
+85,7
@@
tVFS_NodeType gPTY_NodeType_Root = {
};
tVFS_NodeType gPTY_NodeType_Client = {
.TypeName = "PTY-Client",
};
tVFS_NodeType gPTY_NodeType_Client = {
.TypeName = "PTY-Client",
+ .Flags = VFS_NODETYPEFLAG_STREAM,
.Read = PTY_ReadClient,
.Write = PTY_WriteClient,
.IOCtl = PTY_IOCtl,
.Read = PTY_ReadClient,
.Write = PTY_WriteClient,
.IOCtl = PTY_IOCtl,
@@
-93,6
+94,7
@@
tVFS_NodeType gPTY_NodeType_Client = {
};
tVFS_NodeType gPTY_NodeType_Server = {
.TypeName = "PTY-Server",
};
tVFS_NodeType gPTY_NodeType_Server = {
.TypeName = "PTY-Server",
+ .Flags = VFS_NODETYPEFLAG_STREAM,
.Read = PTY_ReadServer,
.Write = PTY_WriteServer,
.IOCtl = PTY_IOCtl,
.Read = PTY_ReadServer,
.Write = PTY_WriteServer,
.IOCtl = PTY_IOCtl,
@@
-235,6
+237,7
@@
tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req
if( InitialMode )
ret->Mode = *InitialMode;
// - Client node
if( InitialMode )
ret->Mode = *InitialMode;
// - Client node
+ ret->ClientNode.Size = -1;
ret->ClientNode.ImplPtr = ret;
ret->ClientNode.Type = &gPTY_NodeType_Client;
ret->ClientNode.UID = Threads_GetUID();
ret->ClientNode.ImplPtr = ret;
ret->ClientNode.Type = &gPTY_NodeType_Client;
ret->ClientNode.UID = Threads_GetUID();
@@
-308,7
+311,8
@@
int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M
else
{
// SIGWINSZ to client
else
{
// SIGWINSZ to client
- Threads_SignalGroup(PTY->ControllingProcGroup, SIGWINCH);
+ if( PTY->ControllingProcGroup > 0 )
+ Threads_SignalGroup(PTY->ControllingProcGroup, SIGWINCH);
}
LOG("PTY %p dims set to %ix%i", PTY, Dims->W, Dims->H);
PTY->Dims = *Dims;
}
LOG("PTY %p dims set to %ix%i", PTY, Dims->W, Dims->H);
PTY->Dims = *Dims;
@@
-386,12
+390,13
@@
size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length)
if( PTY->Mode.InputMode & PTYIMODE_CANON )
{
if( PTY->Mode.InputMode & PTYIMODE_CANON )
{
- const char char_bs = '\b';
+
switch(Input[0])
{
case 3: // INTR - ^C
// Send SIGINT
switch(Input[0])
{
case 3: // INTR - ^C
// Send SIGINT
- Threads_SignalGroup(PTY->ControllingProcGroup, SIGINT);
+ if( PTY->ControllingProcGroup > 0 )
+ Threads_SignalGroup(PTY->ControllingProcGroup, SIGINT);
print = 0;
break;
case 4: // EOF - ^D
print = 0;
break;
case 4: // EOF - ^D
@@
-401,17
+406,21
@@
size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length)
print = 0;
break;
case 8: // Backspace
print = 0;
break;
case 8: // Backspace
- if(PTY->LineLength != 0)
+ if(PTY->LineLength != 0)
{
PTY->LineLength --;
PTY->LineLength --;
+ PTY_WriteClient(&PTY->ClientNode, 0, 3, "\b \b", 0);
+ }
+ print = 0;
break;
case 'w'-'a': // Word erase
while(PTY->LineLength != 0 && isalnum(PTY->LineData[--PTY->LineLength]))
break;
case 'w'-'a': // Word erase
while(PTY->LineLength != 0 && isalnum(PTY->LineData[--PTY->LineLength]))
- PTY_WriteClient(&PTY->ClientNode, 0, 1, &char_bs, 0);
+ PTY_WriteClient(&PTY->ClientNode, 0, 1, "\b", 0);
+ PTY_WriteClient(&PTY->ClientNode, 0, 3, "\x1b[K", 0);
print = 0;
break;
case 'u'-'a': // Kill
print = 0;
break;
case 'u'-'a': // Kill
- while(PTY->LineLength > 0)
-
PTY_WriteClient(&PTY->ClientNode, 0, 1, &char_bs, 0)
;
+ PTY_WriteClient(&PTY->ClientNode, 0, 8, "\x1b[2K\x1b[0G", 0);
+
PTY->LineLength = 0
;
print = 0;
break;
case 'v'-'a':
print = 0;
break;
case 'v'-'a':
@@
-618,12
+627,14
@@
size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void
// If the server has terminated, send SIGPIPE
if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 )
{
// If the server has terminated, send SIGPIPE
if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 )
{
+ LOG("SIGPIPE, server has terminated");
Threads_PostSignal(SIGPIPE);
errno = EIO;
return -1;
}
// Write to either FIFO or directly to output function
Threads_PostSignal(SIGPIPE);
errno = EIO;
return -1;
}
// Write to either FIFO or directly to output function
+ LOG("pty->OutputFcn = %p", pty->OutputFcn);
if( pty->OutputFcn ) {
pty->OutputFcn(pty->OutputHandle, Length, Buffer);
return Length;
if( pty->OutputFcn ) {
pty->OutputFcn(pty->OutputHandle, Length, Buffer);
return Length;
@@
-804,6
+815,8
@@
int PTY_IOCtl(tVFS_Node *Node, int ID, void *Data)
int is_server = !pty || Node == pty->ServerNode;
int is_server = !pty || Node == pty->ServerNode;
+ LOG("(%i,%p) %s", ID, Data, (is_server?"Server":"Client"));
+
switch(ID)
{
case DRV_IOCTL_TYPE: return DRV_TYPE_TERMINAL;
switch(ID)
{
case DRV_IOCTL_TYPE: return DRV_TYPE_TERMINAL;
UCC
git Repository :: git.ucc.asn.au