Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Compatibility with hardware cursor (fix for r.2430 and later)

Browse Source 
git-svn-id: svn://kolibrios.org@2448 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2012-03-10 17:36:55 +00:00
parent 12f88b2d85
commit 91e683bb90
4 changed files with 141 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trunk/hid/mousedrv.inc
View File

@ -427,9 +427,11 @@ redrawmouse:
call draw_mouse_under call draw_mouse_under
call save_draw_mouse call save_draw_mouse
mov eax, [_display.select_cursor] ; mov eax, [_display.select_cursor]
test eax, eax ; test eax, eax
jz @f ; jz @f
cmp [_display.select_cursor], select_cursor
jne @f
xor eax, eax xor eax, eax
mov esi, [current_cursor] mov esi, [current_cursor]

23
kernel/trunk/video/blitter.inc
View File

@ -380,6 +380,14 @@ align 4
push eax push eax
mov eax, [esi+ecx*4] mov eax, [esi+ecx*4]
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
push ecx push ecx
mov ecx, [esp+4] mov ecx, [esp+4]
@ -391,6 +399,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call [_display.check_mouse] call [_display.check_mouse]
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edi+ecx*4], eax mov [LFB_BASE+edi+ecx*4], eax
pop eax pop eax
@ -439,6 +450,14 @@ align 4
lea edi, [edi+ecx*2] lea edi, [edi+ecx*2]
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder_1
;--------------------------------------
align 4
@@:
push ecx push ecx
mov ecx, [esp+4] mov ecx, [esp+4]
@ -450,7 +469,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call [_display.check_mouse] call [_display.check_mouse]
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder_1:
mov [edi+ecx], ax mov [edi+ecx], ax
shr eax, 16 shr eax, 16
mov [edi+ecx+2], al mov [edi+ecx+2], al

103
kernel/trunk/video/vesa20.inc
View File

@ -53,12 +53,22 @@ Vesa20_getpixel24:
; eax = x ; eax = x
; ebx = y ; ebx = y
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
; check mouse area for putpixel ; check mouse area for putpixel
test ecx, 0x04000000 ; don't load to mouseunder area test ecx, 0x04000000 ; don't load to mouseunder area
jnz .no_mouseunder jnz .no_mouseunder
call [_display.check_m_pixel] call [_display.check_m_pixel]
test ecx, ecx ;0xff000000 test ecx, ecx ;0xff000000
jnz @f jnz @f
;--------------------------------------
align 4
.no_mouseunder: .no_mouseunder:
;-------------------------------------- ;--------------------------------------
; imul ebx, [BytesPerScanLine] ; ebx = y * y multiplier ; imul ebx, [BytesPerScanLine] ; ebx = y * y multiplier
@ -76,12 +86,22 @@ align 4
align 4 align 4
Vesa20_getpixel32: Vesa20_getpixel32:
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
; check mouse area for putpixel ; check mouse area for putpixel
test ecx, 0x04000000 ; don't load to mouseunder area test ecx, 0x04000000 ; don't load to mouseunder area
jnz .no_mouseunder jnz .no_mouseunder
call [_display.check_m_pixel] call [_display.check_m_pixel]
test ecx, ecx ;0xff000000 test ecx, ecx ;0xff000000
jnz @f jnz @f
;--------------------------------------
align 4
.no_mouseunder: .no_mouseunder:
;-------------------------------------- ;--------------------------------------
; imul ebx, [BytesPerScanLine] ; ebx = y * y multiplier ; imul ebx, [BytesPerScanLine] ; ebx = y * y multiplier
@ -280,6 +300,9 @@ align 4
cmp [ebp], bl cmp [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne .no_mouseunder
push ecx push ecx
neg ecx neg ecx
@ -291,6 +314,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call check_mouse_area_for_putpixel call check_mouse_area_for_putpixel
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edx], ax mov [LFB_BASE+edx], ax
shr eax, 16 shr eax, 16
@ -345,6 +371,10 @@ align 4
cmp [ebp], bl cmp [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
push ecx push ecx
mov ecx, [putimg.real_sy_and_abs_cy + 4] mov ecx, [putimg.real_sy_and_abs_cy + 4]
sub ecx, edi sub ecx, edi
@ -373,6 +403,9 @@ align 4
align 4 align 4
.no_mouse_area: .no_mouse_area:
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edx], ax mov [LFB_BASE+edx], ax
shr eax, 16 shr eax, 16
@ -425,6 +458,10 @@ align 4
cmp [ebp], bl cmp [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne .no_mouseunder
push ecx push ecx
neg ecx neg ecx
@ -436,6 +473,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call check_mouse_area_for_putpixel call check_mouse_area_for_putpixel
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edx], eax mov [LFB_BASE+edx], eax
;-------------------------------------- ;--------------------------------------
@ -495,6 +535,9 @@ align 4
cmp [ebp], bl cmp [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
push ecx push ecx
mov ecx, [putimg.real_sy_and_abs_cy + 4] mov ecx, [putimg.real_sy_and_abs_cy + 4]
sub ecx, edi sub ecx, edi
@ -523,6 +566,9 @@ align 4
align 4 align 4
.no_mouse_area: .no_mouse_area:
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edx], eax mov [LFB_BASE+edx], eax
;-------------------------------------- ;--------------------------------------
@ -620,6 +666,9 @@ Vesa20_putpixel24:
lea edi, [eax+eax*2]; edi = x*3 lea edi, [eax+eax*2]; edi = x*3
mov eax, [esp+32-8+4] mov eax, [esp+32-8+4]
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne @f
; check mouse area for putpixel ; check mouse area for putpixel
test eax, 0x04000000 test eax, 0x04000000
jnz @f jnz @f
@ -648,6 +697,9 @@ Vesa20_putpixel24_new:
lea edi, [eax+eax*2]; edi = x*3 lea edi, [eax+eax*2]; edi = x*3
mov eax, [esp+32-8+4] mov eax, [esp+32-8+4]
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne @f
; check mouse area for putpixel ; check mouse area for putpixel
test eax, 0x04000000 test eax, 0x04000000
jnz @f jnz @f
@ -693,6 +745,9 @@ Vesa20_putpixel32:
lea edi, [ebx+eax*4]; edi = x*4+(y*y multiplier) lea edi, [ebx+eax*4]; edi = x*4+(y*y multiplier)
mov eax, [esp+32-8+4]; eax = color mov eax, [esp+32-8+4]; eax = color
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne @f
; check mouse area for putpixel ; check mouse area for putpixel
test eax, 0x04000000 test eax, 0x04000000
jnz @f jnz @f
@ -720,6 +775,9 @@ Vesa20_putpixel32_new:
lea edi, [ebx+eax*4]; edi = x*4+(y*y multiplier) lea edi, [ebx+eax*4]; edi = x*4+(y*y multiplier)
mov eax, [esp+32-8+4]; eax = color mov eax, [esp+32-8+4]; eax = color
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne @f
; check mouse area for putpixel ; check mouse area for putpixel
test eax, 0x04000000 test eax, 0x04000000
jnz @f jnz @f
@ -1153,6 +1211,10 @@ align 4
cmp byte [ebp], bl cmp byte [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne .no_mouseunder
mov ecx, [drbar.real_sx_and_abs_cx] mov ecx, [drbar.real_sx_and_abs_cx]
sub ecx, edi sub ecx, edi
shl ecx, 16 shl ecx, 16
@ -1161,6 +1223,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call check_mouse_area_for_putpixel call check_mouse_area_for_putpixel
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [edx], ax mov [edx], ax
shr eax, 16 shr eax, 16
@ -1208,6 +1273,10 @@ align 4
cmp byte [ebp], bl cmp byte [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne .no_mouse_area
mov ecx, [drbar.real_sy_and_abs_cy] mov ecx, [drbar.real_sy_and_abs_cy]
sub ecx, esi sub ecx, esi
;-------------------------------------- ;--------------------------------------
@ -1288,6 +1357,10 @@ align 4
cmp byte [ebp], bl cmp byte [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
jne .no_mouseunder
mov ecx, [drbar.real_sx_and_abs_cx] mov ecx, [drbar.real_sx_and_abs_cx]
sub ecx, edi sub ecx, edi
shl ecx, 16 shl ecx, 16
@ -1296,6 +1369,9 @@ align 4
; check mouse area for putpixel ; check mouse area for putpixel
call check_mouse_area_for_putpixel call check_mouse_area_for_putpixel
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [edx], eax mov [edx], eax
mov eax, [drbar.color] mov eax, [drbar.color]
@ -1348,6 +1424,10 @@ align 4
cmp byte [ebp], bl cmp byte [ebp], bl
jne .skip jne .skip
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], select_cursor
jne .no_mouse_area
mov ecx, [drbar.real_sy_and_abs_cy] mov ecx, [drbar.real_sy_and_abs_cy]
sub ecx, esi sub ecx, esi
;-------------------------------------- ;--------------------------------------
@ -1483,9 +1563,21 @@ dp3:
add ecx, ebx add ecx, ebx
mov eax, [esi] mov eax, [esi]
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
and eax, 0xffffff and eax, 0xffffff
; check mouse area for putpixel ; check mouse area for putpixel
call [_display.check_mouse] call [_display.check_mouse]
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [edi], ax mov [edi], ax
shr eax, 16 shr eax, 16
@ -1673,11 +1765,22 @@ sdp3a:
align 4 align 4
.novert: .novert:
push ecx push ecx
; check for hardware cursor
cmp [_display.select_cursor], 0
jne @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
mov ecx, [esp+20+4] ;x mov ecx, [esp+20+4] ;x
shl ecx, 16 shl ecx, 16
add ecx, [esp+24+4] ;y add ecx, [esp+24+4] ;y
; check mouse area for putpixel ; check mouse area for putpixel
call [_display.check_mouse] call [_display.check_mouse]
;--------------------------------------
align 4
.no_mouseunder:
; store to real LFB ; store to real LFB
mov [LFB_BASE+edi], ax mov [LFB_BASE+edi], ax
shr eax, 16 shr eax, 16

11
kernel/trunk/video/vga.inc
View File

@ -380,6 +380,14 @@ VGA_putpixel:
mov ecx, eax mov ecx, eax
mov eax, [esp+32-8+4] ; color mov eax, [esp+32-8+4] ; color
;-------------------------------------- ;--------------------------------------
; check for hardware cursor
cmp [_display.select_cursor], 0
je @f
cmp [_display.select_cursor], select_cursor
jne .no_mouseunder
;--------------------------------------
align 4
@@:
push ecx push ecx
shl ecx, 16 shl ecx, 16
mov cx, bx mov cx, bx
@ -391,6 +399,9 @@ VGA_putpixel:
align 4 align 4
@@: @@:
pop ecx pop ecx
;--------------------------------------
align 4
.no_mouseunder:
shl ebx, 9 shl ebx, 9
lea ebx, [ebx+ebx*4] ; óìíîæåíèå íà 5 lea ebx, [ebx+ebx*4] ; óìíîæåíèå íà 5
lea edx, [ebx+ecx*4] ; + x*BytesPerPixel (Vesa2.0 32) lea edx, [ebx+ecx*4] ; + x*BytesPerPixel (Vesa2.0 32)