VNC Viewer: Don't send cursorevents to server when cursor is out of window, fixed bug in GUI.

git-svn-id: svn://kolibrios.org@5771 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2015-08-24 14:29:14 +00:00
parent 7e3fbc4991
commit 5387a45d03
2 changed files with 4 additions and 5 deletions

View File

@ -163,7 +163,7 @@ draw_gui:
test [work], WORK_GUI test [work], WORK_GUI
jnz .redraw jnz .redraw
cmp [status], STATUS_CONNECTED cmp [status], STATUS_CONNECTED
je .connected je connected
mcall 23, 10 ; wait for event mcall 23, 10 ; wait for event
dec eax ; redraw request ? dec eax ; redraw request ?
@ -176,8 +176,6 @@ draw_gui:
jz .mouse jz .mouse
jmp .loop jmp .loop
.connected:
ret
.key: ; key event handler .key: ; key event handler
mcall 2 ; read key mcall 2 ; read key

View File

@ -195,9 +195,10 @@ end if
@@: @@:
; Present the user with the GUI and wait for network connection ; Present the user with the GUI and wait for network connection
call draw_gui.first_time jmp draw_gui.first_time
; Create main window ; Create main window
connected:
mcall 71, 1, name ; reset window caption (add server name) mcall 71, 1, name ; reset window caption (add server name)
mov edx, dword[screen] mov edx, dword[screen]
@ -207,7 +208,7 @@ end if
add esi, ypos+xpos add esi, ypos+xpos
mcall 67, 10, 10 ; resize the window mcall 67, 10, 10 ; resize the window
mcall 40, EVM_MOUSE + EVM_MOUSE_FILTER + EVM_KEY + EVM_REDRAW + EVM_BUTTON mcall 40, EVM_CURSOR_FILTER + EVM_MOUSE_FILTER + EVM_MOUSE + EVM_KEY + EVM_REDRAW + EVM_BUTTON
mcall 66, 1, 1 ; Switch keyboard to scancode mode mcall 66, 1, 1 ; Switch keyboard to scancode mode