i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear screen and clear line commands now work as expected.

Browse Source 
The default option of "m" is now honored.
Prints out <BEEP> to the debug output instead of printing it on-screen.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11934 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-03-21 13:42:54 +00:00
parent ccba980438
commit f5a0e223f4
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/common/console.cpp
+15 -5
View File
@@ -228,7 +228,7 @@ erase_screen(struct console_desc *con, erase_screen_mode mode)
{
switch (mode) {
case SCREEN_ERASE_WHOLE:
con->module->fill_glyph(0, 0, con->columns, con->lines, ' ', con->attr);
con->module->clear(con->attr);
break;
case SCREEN_ERASE_UP:
con->module->fill_glyph(0, 0, con->columns, con->y + 1, ' ', con->attr);
@@ -303,6 +303,12 @@ set_scroll_region(struct console_desc *con, int top, int bottom)
static void
set_vt100_attributes(struct console_desc *con, int32 *args, int32 argCount)
{
if (argCount == 0) {
// that's the default (attributes off)
argCount++;
args[0] = 0;
}
for (int32 i = 0; i < argCount; i++) {
//dprintf("set_vt100_attributes: %ld\n", args[i]);
switch (args[i]) {
@@ -454,10 +460,10 @@ process_vt100_command(struct console_desc *con, const char c,
break;
}
case 'K':
if (argCount < 0) {
if (argCount == 0 || args[0] == 0) {
// erase to end of line
erase_line(con, LINE_ERASE_RIGHT);
} else {
} else if (argCount > 0) {
if (args[0] == 1)
erase_line(con, LINE_ERASE_LEFT);
else if (args[0] == 2)
@@ -465,7 +471,7 @@ process_vt100_command(struct console_desc *con, const char c,
}
break;
case 'J':
if (argCount < 0) {
if (argCount == 0 || args[0] == 0) {
// erase to end of screen
erase_screen(con, SCREEN_ERASE_DOWN);
} else {
@@ -533,6 +539,10 @@ _console_write(struct console_desc *con, const void *buf, size_t len)
case '\t':
tab(con);
break;
case '\a':
// beep
dprintf("<BEEP>\n");
break;
case '\0':
break;
case 0x1b:
@@ -663,7 +673,7 @@ console_write(void *cookie, off_t pos, const void *buffer, size_t *_length)
{
const char *input = (const char *)buffer;
dprintf("console_write (%lu bytes): \"", *_length);
for (int32 i = 0; i < *_length; i++) {
for (uint32 i = 0; i < *_length; i++) {
if (input[i] < ' ')
dprintf("(%d:0x%x)", input[i], input[i]);
else