* drv/vterm.c
* - Virtual Terminal - Initialisation and VFS Interface
*/
-#define DEBUG 1
+#define DEBUG 0
#include "vterm.h"
#include <fs_devfs.h>
#include <modules.h>
#define NUM_VTS 8
//#define DEFAULT_OUTPUT "BochsGA"
#define DEFAULT_OUTPUT "Vesa"
-#define FALLBACK_OUTPUT "x86_VGAText"
#define DEFAULT_INPUT "Keyboard"
#define DEFAULT_WIDTH 640
#define DEFAULT_HEIGHT 480
// === PROTOTYPES ===
int VT_Install(char **Arguments);
int VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data);
-void VT_int_PutFBData(tVTerm *Term, size_t Offset, size_t Length, const void *Data);
void VT_PTYOutput(void *Handle, size_t Length, const void *Data);
int VT_PTYResize(void *Handle, const struct ptydims *Dims);
int VT_PTYModeset(void *Handle, const struct ptymode *Mode);
data[ val - arg ] = '\0';
val ++;
}
- Log_Debug("VTerm", "Argument '%s'", arg);
+ Log_Debug("VTerm", "Argument '%s'='%s'", opt, val);
if( strcmp(opt, "Video") == 0 ) {
if( !gsVT_OutputDevice )
// Apply Defaults
if(!gsVT_OutputDevice) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
else if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
- if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)FALLBACK_OUTPUT;
+ //if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)FALLBACK_OUTPUT;
if( Module_EnsureLoaded( gsVT_OutputDevice ) ) {
- Log_Error("VTerm", "Fallback video '%s' is not avaliable, giving up", FALLBACK_OUTPUT);
+ Log_Error("VTerm", "Video device '%s' is not avaliable, giving up", gsVT_OutputDevice);
return MODULE_ERR_MISC;
}
Log_Debug("VTerm", "Initialising nodes (and creating buffers)");
for( i = 0; i < NUM_VTS; i++ )
{
- gVT_Terminals[i].Mode = TERM_MODE_TEXT;
- gVT_Terminals[i].Flags = 0;
// gVT_Terminals[i].Flags = VT_FLAG_HIDECSR; //HACK - Stop all those memcpy calls
gVT_Terminals[i].CurColour = DEFAULT_COLOUR;
- gVT_Terminals[i].WritePos = 0;
- gVT_Terminals[i].AltWritePos = 0;
- gVT_Terminals[i].ViewPos = 0;
- gVT_Terminals[i].ScrollHeight = 0;
+ gVT_Terminals[i].Mode = PTYBUFFMT_TEXT;
// Initialise
VT_int_Resize( &gVT_Terminals[i], giVT_RealWidth, giVT_RealHeight );
- gVT_Terminals[i].Mode = PTYBUFFMT_TEXT;
char name[] = {'v','t','0'+i,'\0'};
- gVT_Terminals[i].PTY = PTY_Create(name, &gVT_Terminals[i],
- VT_PTYOutput, VT_PTYResize, VT_PTYModeset);
- struct ptymode mode = {
- .OutputMode = PTYBUFFMT_TEXT,
- .InputMode = PTYIMODE_CANON|PTYIMODE_ECHO
- };
struct ptydims dims = {
.W = giVT_RealWidth / giVT_CharWidth,
.H = giVT_RealHeight / giVT_CharHeight,
.PW = giVT_RealWidth,
.PH = giVT_RealHeight
};
- PTY_SetAttrib(gVT_Terminals[i].PTY, &dims, &mode, 0);
+ struct ptymode mode = {
+ .OutputMode = PTYBUFFMT_TEXT,
+ .InputMode = PTYIMODE_CANON|PTYIMODE_ECHO
+ };
+ gVT_Terminals[i].PTY = PTY_Create(name, &gVT_Terminals[i],
+ VT_PTYOutput, VT_PTYResize, VT_PTYModeset,
+ &dims, &mode);
}
// Add to DevFS
// Set kernel output to VT0
Log_Debug("VTerm", "Setting kernel output to VT#0");
- Debug_SetKTerminal("/Devices/pts/vt0c");
+ Debug_SetKTerminal("/Devices/pts/vt0");
return MODULE_ERR_OK;
}
VT_int_PutString(term, Data, Length);
break;
case PTYBUFFMT_FB:
- // TODO: How do offset?
+ // TODO: How can the offset be done cleanly? (Ask the PTY for its offset?)
+ Warning("TODO: Offsets for VT_PTYOutput FBData");
VT_int_PutFBData(term, 0, Length, Data);
break;
case PTYBUFFMT_2DCMD:
- // TODO: Impliment 2D commands
+ VT_int_Handle2DCmd(term, Length, Data);
break;
case PTYBUFFMT_3DCMD:
- // TODO: Impliment 3D commands
+ // TODO: Implement 3D commands
+ Warning("TODO: VTerm 3D commands");
break;
}
}
tVTerm *term = Handle;
term->Mode = (Mode->OutputMode & PTYOMODE_BUFFMT);
+ memset(&term->Cmd2D, 0, sizeof(term->Cmd2D));
+
if( term == gpVT_CurTerm ) {
switch(term->Mode)
{