X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fvterm.c;h=716a55316170065a9444c31325ab9d4d6d1fceae;hb=0dbc91f0676576b954aa95dafdb434ce19bc805c;hp=76b7f1e8a4c31d631cecd92874f064b79a169962;hpb=6ea2f6040da80c963882f6ccfe4bf21ff048eaff;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 76b7f1e8..716a5531 100644
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -19,8 +19,8 @@
 #define MAX_INPUT_CHARS32	64
 #define MAX_INPUT_CHARS8	(MAX_INPUT_CHARS32*4)
 #define VT_SCROLLBACK	1	// 2 Screens of text
-#define DEFAULT_OUTPUT	"VGA"
-//#define DEFAULT_OUTPUT	"BochsGA"
+//#define DEFAULT_OUTPUT	"VGA"
+#define DEFAULT_OUTPUT	"BochsGA"
 #define DEFAULT_INPUT	"PS2Keyboard"
 #define	DEFAULT_WIDTH	80
 #define	DEFAULT_HEIGHT	25
@@ -348,6 +348,28 @@ Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	case TERM_MODE_TEXT:
 		VT_int_PutString(term, Buffer, Length);
 		break;
+	case TERM_MODE_FB:
+		if( term->RealWidth > term->Width || term->RealHeight > term->Height )
+		{
+			#if 0
+			 int	x, y, h;
+			x = Offset/4;	y = x / term->Width;	x %= term->Width;
+			w = Length/4+x;	h = w / term->Width;	w %= term->Width;
+			while(h--)
+			{
+				VFS_WriteAt( giVT_OutputDevHandle,
+					(x+y*term->RealWidth)*4,
+					term->Width * 4,
+					Buffer
+					);
+				Buffer = (void*)( (Uint)Buffer + term->Width*term->Height*4 );
+			}
+			#endif
+			return 0;
+		}
+		else {
+			return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
+		}
 	}
 	
 	//LEAVE('i', 0);
@@ -364,6 +386,10 @@ int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data)
 	tVTerm	*term = Node->ImplPtr;
 	ENTER("pNode iId pData", Node, Id, Data);
 	
+	if(Id >= DRV_IOCTL_LOOKUP) {
+		if( Threads_GetUID() != 0 )	return -1;
+	}
+	
 	switch(Id)
 	{
 	case DRV_IOCTL_TYPE:
@@ -407,6 +433,11 @@ int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data)
 		Log("VT_Terminal_IOCtl - RETURN term->Height = %i", term->Height);
 		LEAVE('i', term->Height);
 		return term->Height;
+	
+	case TERM_IOCTL_FORCESHOW:
+		VT_SetTerminal( Node->Inode );
+		LEAVE('i', 1);
+		return 1;
 	}
 	LEAVE('i', -1);
 	return -1;