Rev 2448 | Rev 2453 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2448 | Rev 2451 | ||
---|---|---|---|
Line 15... | Line 15... | ||
15 | ;; ;; |
15 | ;; ;; |
16 | ;; See file COPYING for details ;; |
16 | ;; See file COPYING for details ;; |
17 | ;; ;; |
17 | ;; ;; |
18 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
18 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
Line 19... | Line 19... | ||
19 | 19 | ||
Line 20... | Line 20... | ||
20 | $Revision: 2448 $ |
20 | $Revision: 2451 $ |
21 | 21 | ||
Line 52... | Line 52... | ||
52 | Vesa20_getpixel24: |
52 | Vesa20_getpixel24: |
53 | ; eax = x |
53 | ; eax = x |
54 | ; ebx = y |
54 | ; ebx = y |
55 | ;-------------------------------------- |
55 | ;-------------------------------------- |
56 | ; check for hardware cursor |
56 | ; check for hardware cursor |
57 | cmp [_display.select_cursor], 0 |
- | |
58 | je @f |
- | |
59 | cmp [_display.select_cursor], select_cursor |
57 | cmp [_display.select_cursor], select_cursor |
- | 58 | je @f |
|
- | 59 | cmp [_display.select_cursor], 0 |
|
60 | jne .no_mouseunder |
60 | jne .no_mouseunder |
61 | ;-------------------------------------- |
61 | ;-------------------------------------- |
62 | align 4 |
62 | align 4 |
63 | @@: |
63 | @@: |
64 | ; check mouse area for putpixel |
64 | ; check mouse area for putpixel |
Line 85... | Line 85... | ||
85 | ;----------------------------------------------------------------------------- |
85 | ;----------------------------------------------------------------------------- |
86 | align 4 |
86 | align 4 |
87 | Vesa20_getpixel32: |
87 | Vesa20_getpixel32: |
88 | ;-------------------------------------- |
88 | ;-------------------------------------- |
89 | ; check for hardware cursor |
89 | ; check for hardware cursor |
90 | cmp [_display.select_cursor], 0 |
- | |
91 | je @f |
- | |
92 | cmp [_display.select_cursor], select_cursor |
90 | cmp [_display.select_cursor], select_cursor |
- | 91 | je @f |
|
- | 92 | cmp [_display.select_cursor], 0 |
|
93 | jne .no_mouseunder |
93 | jne .no_mouseunder |
94 | ;-------------------------------------- |
94 | ;-------------------------------------- |
95 | align 4 |
95 | align 4 |
96 | @@: |
96 | @@: |
97 | ; check mouse area for putpixel |
97 | ; check mouse area for putpixel |
Line 1563... | Line 1563... | ||
1563 | add ecx, ebx |
1563 | add ecx, ebx |
Line 1564... | Line 1564... | ||
1564 | 1564 | ||
Line 1565... | Line 1565... | ||
1565 | mov eax, [esi] |
1565 | mov eax, [esi] |
1566 | - | ||
1567 | ; check for hardware cursor |
- | |
1568 | cmp [_display.select_cursor], 0 |
1566 | |
- | 1567 | ; check for hardware cursor |
|
- | 1568 | cmp [_display.select_cursor], select_cursor |
|
1569 | je @f |
1569 | je @f |
1570 | cmp [_display.select_cursor], select_cursor |
1570 | cmp [_display.select_cursor], 0 |
1571 | jne .no_mouseunder |
1571 | jne .no_mouseunder |
1572 | ;-------------------------------------- |
1572 | ;-------------------------------------- |
1573 | align 4 |
1573 | align 4 |
Line 1764... | Line 1764... | ||
1764 | ;-------------------------------------- |
1764 | ;-------------------------------------- |
1765 | align 4 |
1765 | align 4 |
1766 | .novert: |
1766 | .novert: |
1767 | push ecx |
1767 | push ecx |
1768 | ; check for hardware cursor |
1768 | ; check for hardware cursor |
1769 | cmp [_display.select_cursor], 0 |
- | |
1770 | jne @f |
- | |
1771 | cmp [_display.select_cursor], select_cursor |
1769 | cmp [_display.select_cursor], select_cursor |
- | 1770 | jne @f |
|
- | 1771 | cmp [_display.select_cursor], 0 |
|
1772 | jne .no_mouseunder |
1772 | jne .no_mouseunder |
1773 | ;-------------------------------------- |
1773 | ;-------------------------------------- |
1774 | align 4 |
1774 | align 4 |
1775 | @@: |
1775 | @@: |
1776 | mov ecx, [esp+20+4] ;x |
1776 | mov ecx, [esp+20+4] ;x |