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
Tests - Cleanup (disabling TCP Window Size module test)
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
drv
/
vterm.c
diff --git
a/KernelLand/Kernel/drv/vterm.c
b/KernelLand/Kernel/drv/vterm.c
index
1556aa8
..
2c6a0d2
100644
(file)
--- a/
KernelLand/Kernel/drv/vterm.c
+++ b/
KernelLand/Kernel/drv/vterm.c
@@
-20,7
+20,6
@@
#define NUM_VTS 8
//#define DEFAULT_OUTPUT "BochsGA"
#define DEFAULT_OUTPUT "Vesa"
#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
#define DEFAULT_INPUT "Keyboard"
#define DEFAULT_WIDTH 640
#define DEFAULT_HEIGHT 480
@@
-126,9
+125,9
@@
int VT_Install(char **Arguments)
// Apply Defaults
if(!gsVT_OutputDevice) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
else if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
// 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 ) ) {
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;
}
return MODULE_ERR_MISC;
}
@@
-163,18
+162,12
@@
int VT_Install(char **Arguments)
Log_Debug("VTerm", "Initialising nodes (and creating buffers)");
for( i = 0; i < NUM_VTS; i++ )
{
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].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 );
// Initialise
VT_int_Resize( &gVT_Terminals[i], giVT_RealWidth, giVT_RealHeight );
- gVT_Terminals[i].Mode = PTYBUFFMT_TEXT;
char name[] = {'v','t','0'+i,'\0'};
struct ptydims dims = {
.W = giVT_RealWidth / giVT_CharWidth,
char name[] = {'v','t','0'+i,'\0'};
struct ptydims dims = {
.W = giVT_RealWidth / giVT_CharWidth,
UCC
git Repository :: git.ucc.asn.au