/kernel/trunk/video/vesa12.inc |
---|
208,8 → 208,8 |
mov ebx,3 |
mul ebx |
mov [imax],eax |
mov eax,[draw_data+32+0] |
mov ebx,[draw_data+32+4] |
mov eax,[draw_data+32+RECT.left] |
mov ebx,[draw_data+32+RECT.top] |
mov edi,0 ;no force |
v12dp3: |
330,15 → 330,15 |
popa |
add esi,3 |
inc eax |
cmp eax,[draw_data+32+8] |
cmp eax,[draw_data+32+RECT.right] |
jg v12nodp31 |
jmp v12dp3 |
v12nodp31: |
mov eax,[draw_data+32+0] |
mov eax,[draw_data+32+RECT.left] |
inc ebx |
cmp ebx,[draw_data+32+12] |
cmp ebx,[draw_data+32+RECT.bottom] |
jg v12dp4 |
jmp v12dp3 |
365,8 → 365,8 |
push ecx |
push edx |
mov ecx,[0x3010] |
add eax,[ecx-twdw] |
add ebx,[ecx-twdw+4] |
add eax,[ecx-twdw+WDATA.box.left] |
add ebx,[ecx-twdw+WDATA.box.top] |
push eax |
mov eax,ebx ; y |
mov ebx,[0xfe08] |
403,16 → 403,16 |
push eax |
push ecx |
mov eax,[0x3010] |
mov ecx,[eax+draw_data-0x3000+0] |
mov ecx,[eax+draw_data-0x3000+RECT.left] |
cmp ecx,0 |
jnz dbcblimitlset12 |
mov ecx,[eax+draw_data-0x3000+4] |
mov ecx,[eax+draw_data-0x3000+RECT.top] |
cmp ecx,0 |
jnz dbcblimitlset12 |
mov ecx,[eax+draw_data-0x3000+8] |
mov ecx,[eax+draw_data-0x3000+RECT.right] |
cmp ecx,[0xfe00] |
jnz dbcblimitlset12 |
mov ecx,[eax+draw_data-0x3000+12] |
mov ecx,[eax+draw_data-0x3000+RECT.bottom] |
cmp ecx,[0xfe04] |
jnz dbcblimitlset12 |
pop ecx |
726,8 → 726,8 |
movzx eax,word [esp+2] |
movzx ebx,word [esp+0] |
mov ecx,[0x3010] |
add eax,[ecx-twdw] |
add ebx,[ecx-twdw+4] |
add eax,[ecx-twdw+WDATA.box.left] |
add ebx,[ecx-twdw+WDATA.box.top] |
push eax |
mov eax,ebx ; y |
mov ebx,[0xfe08] |
765,16 → 765,16 |
push eax |
push ecx |
mov eax,[0x3010] |
mov ecx,[eax+draw_data-0x3000+0] |
mov ecx,[eax+draw_data-0x3000+RECT.left] |
cmp ecx,0 |
jnz dbcblimitlset212 |
mov ecx,[eax+draw_data-0x3000+4] |
mov ecx,[eax+draw_data-0x3000+RECT.top] |
cmp ecx,0 |
jnz dbcblimitlset212 |
mov ecx,[eax+draw_data-0x3000+8] |
mov ecx,[eax+draw_data-0x3000+RECT.right] |
cmp ecx,[0xfe00] |
jnz dbcblimitlset212 |
mov ecx,[eax+draw_data-0x3000+12] |
mov ecx,[eax+draw_data-0x3000+RECT.bottom] |
cmp ecx,[0xfe04] |
jnz dbcblimitlset212 |
pop ecx |
/kernel/trunk/video/vesa20.inc |
---|
118,15 → 118,15 |
; calculate absolute (i.e. screen) coordinates |
mov eax, [0x3010] |
mov ebx, [eax-twdw + 0] |
mov ebx, [eax-twdw + WDATA.box.left] |
add ebx, [putimg.image_cx] |
mov [putimg.abs_cx], ebx |
mov ebx, [eax-twdw + 4] |
mov ebx, [eax-twdw + WDATA.box.top] |
add ebx, [putimg.image_cy] |
mov [putimg.abs_cy], ebx |
; real_sx = MIN(wnd_sx-image_cx, image_sx); |
mov ebx, [eax-twdw + 8] ; ebx = wnd_sx |
mov ebx, [eax-twdw + WDATA.box.width] ; ebx = wnd_sx |
sub ebx, [putimg.image_cx] |
ja @f |
add esp, putimg.stack_data |
142,7 → 142,7 |
mov [putimg.real_sx], ebx |
; init real_sy |
mov ebx, [eax-twdw + 12] ; ebx = wnd_sy |
mov ebx, [eax-twdw + WDATA.box.height] ; ebx = wnd_sy |
sub ebx, [putimg.image_cy] |
ja @f |
add esp, putimg.stack_data |
602,13 → 602,13 |
mov [drbar.bar_cy], ebx |
mov edi, [0x3010] |
add eax, [edi-twdw + 0] ; win_cx |
add ebx, [edi-twdw + 4] ; win_cy |
add eax, [edi-twdw + WDATA.box.left] ; win_cx |
add ebx, [edi-twdw + WDATA.box.top] ; win_cy |
mov [drbar.abs_cx], eax |
mov [drbar.abs_cy], ebx |
; real_sx = MIN(wnd_sx-bar_cx, bar_sx); |
mov ebx, [edi-twdw + 8] ; ebx = wnd_sx |
mov ebx, [edi-twdw + WDATA.box.width] ; ebx = wnd_sx |
sub ebx, [drbar.bar_cx] |
ja @f |
.exit: ;// mike.dld, 2005-01-29 |
626,7 → 626,7 |
mov [drbar.real_sx], ebx |
; real_sy = MIN(wnd_sy-bar_cy, bar_sy); |
mov ebx, [edi-twdw + 12] ; ebx = wnd_sy |
mov ebx, [edi-twdw + WDATA.box.height] ; ebx = wnd_sy |
sub ebx, [drbar.bar_cy] |
ja @f |
add esp, drbar.stack_data |
852,8 → 852,8 |
add edx,dword [WinMapAddress-8] ; +B |
push edx |
mov ebp,[draw_data+32+0] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+4] ; y start:=(y+Ywin) |
mov ebp,[draw_data+32+RECT.left] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+RECT.top] ; y start:=(y+Ywin) |
mov eax,[BytesPerScanLine] |
mul ebx |
934,7 → 934,7 |
inc edi ; ptrBuffer++ |
add esi,3 ; ptrImage+=3 |
inc eax |
cmp eax,[draw_data+32+8] ; X > xend? |
cmp eax,[draw_data+32+RECT.right] ; X > xend? |
; jg nodp3 |
; jmp dp3 |
; |
941,7 → 941,7 |
; nodp3: |
jle dp3 |
mov ebp,[draw_data+32+0] |
mov ebp,[draw_data+32+RECT.left] |
inc ebx |
961,7 → 961,7 |
call calculate_edi |
cmp ebx,[draw_data+32+12] |
cmp ebx,[draw_data+32+RECT.bottom] |
; jg dp4 |
; |
; jmp dp3 |
997,8 → 997,8 |
add edx,dword [WinMapAddress-8] ; +B |
push edx |
mov ebp,[draw_data+32+0] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+4] ; y start:=(y+Ywin) |
mov ebp,[draw_data+32+RECT.left] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+RECT.top] ; y start:=(y+Ywin) |
mov eax,[BytesPerScanLine] |
mul ebx |
1070,10 → 1070,10 |
inc edi ; ptrBuffer++ |
add esi,3 ; ptrImage+=3 |
inc eax |
cmp eax,[draw_data+32+8] ; X > xend? |
cmp eax,[draw_data+32+RECT.right] ; X > xend? |
jle sdp3 |
mov ebp,[draw_data+32+0] |
mov ebp,[draw_data+32+RECT.left] |
inc ebx |
1093,7 → 1093,7 |
call calculate_edi |
cmp ebx,[draw_data+32+12] |
cmp ebx,[draw_data+32+RECT.bottom] |
jle sdp3 |
add esp,4 |
/kernel/trunk/video/vga.inc |
---|
71,8 → 71,8 |
movzx eax,word [esp+2] ; eax:=x |
movzx ebx,word [esp+0] ; ebx:=y |
mov ecx,[0x3010] ; |
add eax,[ecx-twdw] ; eax+=Xwin |
add ebx,[ecx-twdw+4] ; ebx+=Ywin |
add eax,[ecx-twdw+WDATA.box.left] ; eax+=Xwin |
add ebx,[ecx-twdw+WDATA.box.top] ; ebx+=Ywin |
mov ecx,ebx ; ecx = y+Ywin |
mov edx,eax ; edx = x+Xwin |
104,19 → 104,19 |
push eax ; LFB address |
mov eax,[0x3010] |
mov ecx,[eax+draw_data-0x3000+0] |
mov ecx,[eax+draw_data-0x3000+RECT.left] |
cmp ecx,0 |
jnz dbcblimitlset_vga |
mov ecx,[eax+draw_data-0x3000+4] |
mov ecx,[eax+draw_data-0x3000+RECT.top] |
cmp ecx,0 |
jnz dbcblimitlset_vga |
mov ecx,[eax+draw_data-0x3000+8] |
mov ecx,[eax+draw_data-0x3000+RECT.right] |
cmp ecx,[0xfe00] ; ecx <> Screen X size |
jnz dbcblimitlset_vga |
mov ecx,[eax+draw_data-0x3000+12] |
mov ecx,[eax+draw_data-0x3000+RECT.bottom] |
cmp ecx,[0xfe04] ; ecx <> Screen Y size |
jnz dbcblimitlset_vga |
323,8 → 323,8 |
push edx ; +0 |
mov ecx,[0x3010] ; |
add eax,[ecx-twdw] ; eax:=Xwin+x |
add ebx,[ecx-twdw+4] ; ebx:=Ywin+y |
add eax,[ecx-twdw+WDATA.box.left] ; eax:=Xwin+x |
add ebx,[ecx-twdw+WDATA.box.top] ; ebx:=Ywin+y |
mov ecx, eax ; ecx:=(x+Xwin) |
mov edx, ebx ; edx:=(y+Ywin) |
377,19 → 377,19 |
mov eax,[0x3010] |
mov ecx,[eax+draw_data-0x3000+0] |
mov ecx,[eax+draw_data-0x3000+RECT.left] |
cmp ecx,0 |
jnz dbcblimitlset_vga2 |
mov ecx,[eax+draw_data-0x3000+4] |
mov ecx,[eax+draw_data-0x3000+RECT.top] |
cmp ecx,0 |
jnz dbcblimitlset_vga2 |
mov ecx,[eax+draw_data-0x3000+8] |
mov ecx,[eax+draw_data-0x3000+RECT.right] |
cmp ecx,[0xfe00] |
jnz dbcblimitlset_vga2 |
mov ecx,[eax+draw_data-0x3000+12] |
mov ecx,[eax+draw_data-0x3000+RECT.bottom] |
cmp ecx,[0xfe04] |
jnz dbcblimitlset_vga2 |
514,8 → 514,8 |
add edx,dword [WinMapAddress-8] ; +B |
push edx |
mov eax,[draw_data+32+0] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+4] ; y start:=(y+Ywin) |
mov eax,[draw_data+32+RECT.left] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+RECT.top] ; y start:=(y+Ywin) |
mov ecx,eax |
mov edx,ebx |
587,7 → 587,7 |
nbgpvga: |
inc eax ; x++ |
cmp eax,[draw_data+32+8] ; X > xend? |
cmp eax,[draw_data+32+RECT.right] ; X > xend? |
jg nodp3vga |
test eax,0x07 ; x test modulo 8 |
602,7 → 602,7 |
nodp3vga: |
mov eax,[draw_data+32+0] ; x+Xwin |
mov eax,[draw_data+32+RECT.left] ; x+Xwin |
inc ebx ; y position |
mov ecx,eax |
mov edx,ebx |
622,7 → 622,7 |
call calculate_edi |
cmp ebx,[draw_data+32+12] ; Y > yend |
cmp ebx,[draw_data+32+RECT.bottom] ; Y > yend |
jg dp4vga |
jmp dp3vga |
657,8 → 657,8 |
add edx,dword [WinMapAddress-8] ; +B |
push edx |
mov eax,[draw_data+32+0] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+4] ; y start:=(y+Ywin) |
mov eax,[draw_data+32+RECT.left] ; x start:=(x+Xwin) |
mov ebx,[draw_data+32+RECT.top] ; y start:=(y+Ywin) |
mov ecx,eax |
mov edx,ebx |
731,7 → 731,7 |
snbgpvga: |
inc eax ; x++ |
cmp eax,[draw_data+32+8] ; X > xend? |
cmp eax,[draw_data+32+RECT.right] ; X > xend? |
jg snodp3vga |
test eax,0x07 ; x test modulo 8 |
746,7 → 746,7 |
snodp3vga: |
mov eax,[draw_data+32+0] ; x+Xwin |
mov eax,[draw_data+32+RECT.left] ; x+Xwin |
inc ebx ; y position |
mov ecx,eax |
mov edx,ebx |
766,7 → 766,7 |
call calculate_edi |
cmp ebx,[draw_data+32+12] ; Y > yend |
cmp ebx,[draw_data+32+RECT.bottom] ; Y > yend |
jg sdp4vga |
jmp sdp3vga |