From 56719856b713d3ec405462b8227f890140c68eba Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 16 Sep 2011 14:09:21 +0000 Subject: [PATCH] VNCclient: appearance small fixes git-svn-id: svn://kolibrios.org@2196 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/VNCclient/VNCclient.asm | 10 +++------- programs/network/VNCclient/logon.inc | 9 ++++----- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/programs/network/VNCclient/VNCclient.asm b/programs/network/VNCclient/VNCclient.asm index 17a7f2132b..b1644a1649 100644 --- a/programs/network/VNCclient/VNCclient.asm +++ b/programs/network/VNCclient/VNCclient.asm @@ -151,9 +151,7 @@ START: ; start of execution DEBUGF 1,'Drawing window\n' - mov eax,12 - mov ebx,1 - mcall + mcall 12, 1 mov eax,0 ; draw window mov ebx,dword[framebuffer] @@ -162,7 +160,7 @@ START: ; start of execution shr ebx,16 add ebx,2*xpos add ecx,ypos+xpos - mov edx,0x03ffffff + mov edx,0xffffff mcall mov eax,4 ; label @@ -175,9 +173,7 @@ START: ; start of execution call drawbuffer - mov eax,12 - mov ebx,2 - mcall + mcall 12, 2 jmp mainloop diff --git a/programs/network/VNCclient/logon.inc b/programs/network/VNCclient/logon.inc index bd0f61dca7..92b799e47e 100644 --- a/programs/network/VNCclient/logon.inc +++ b/programs/network/VNCclient/logon.inc @@ -123,7 +123,7 @@ pusha mov eax, 8 mov ebx, 105*65536+200 - mov ecx, 33*65536+12 + mov ecx, 31*65536+13 mov edx, 4 mov esi, 0xEBEBEB mcall @@ -174,9 +174,7 @@ connect_logon: draw_window_logon: - mov eax, 12 ; function 12_logon:tell os about windowdraw - mov ebx, 1 ; 1, start of draw - mcall + mcall 12, 1 ; start window draw pusha ; DRAW WINDOW xor eax, eax ; function 0 _logon: define and draw window @@ -193,6 +191,7 @@ draw_window_logon: mov esi, 0xCCCCCC mcall + call print_text_logon cmp byte[mode],0 @@ -205,7 +204,7 @@ draw_window_logon: mov esi, passstr-userstr ; text length mcall - add bl,16 + add bl,19 mov edx, passstr ; pointer to text beginning mov esi, connect-passstr ; text length mcall