From 07d3467c12aa49c16bb239f0e1556a28852fbb4b Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Wed, 19 Jun 2013 14:11:23 +0000 Subject: [PATCH] Console: when set cursor command is given without attributes, assume 0. git-svn-id: svn://kolibrios.org@3686 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/libraries/console/console.asm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/develop/libraries/console/console.asm b/programs/develop/libraries/console/console.asm index 531262fdd5..4c3933aa08 100644 --- a/programs/develop/libraries/console/console.asm +++ b/programs/develop/libraries/console/console.asm @@ -845,7 +845,9 @@ con.write_special_char: ret .setcursor: cmp [con_esc_attr_n], 2 - jnz .nosetcursor + je @f + xor eax, eax +@@: mov eax, [con_esc_attrs] cmp eax, [con.scr_width] jae @f @@ -2109,7 +2111,7 @@ con.draw_window: int 0x40 mov eax,[ebx+70] mov [window_status],eax - test [window_status],100b ; window is rolled up + test [window_status],100b ; window is rolled up jnz .exit test [window_status],10b ; window is minimized to panel jnz .exit @@ -2122,7 +2124,7 @@ con.draw_window: push 2 pop ebx int 0x40 - + ret con.draw_image: @@ -2310,7 +2312,7 @@ struc process_info rb (1024-71) } process_info_buffer process_info -window_status rd 1 +window_status rd 1 con.vscroll_pt dd -1 @@ -2320,7 +2322,7 @@ EXPORTS: dd szVersion, 0x00020007 dd szcon_init, con_init dd szcon_write_asciiz, con_write_asciiz - dd szcon_write_string, con_write_length + dd szcon_write_string, con_write_length dd szcon_printf, con_printf dd szcon_exit, con_exit dd szcon_get_flags, con_get_flags @@ -2356,7 +2358,7 @@ szStart db 'START',0 szcon_init db 'con_init',0 szcon_write_asciiz db 'con_write_asciiz',0 -szcon_write_string db 'con_write_string',0 +szcon_write_string db 'con_write_string',0 szcon_printf db 'con_printf',0 szcon_exit db 'con_exit',0 szVersion db 'version',0