Subversion Repositories Kolibri OS

Rev

Rev 9715 | Rev 9977 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 9715 Rev 9941
Line 9... Line 9...
9 
;;                                                              ;;
 9 
;;                                                              ;;
10 
;;  Paul Butcher, paul.butcher@asa.co.uk                        ;;
 10 
;;  Paul Butcher, paul.butcher@asa.co.uk                        ;;
11 
;;                                                              ;;
 11 
;;                                                              ;;
12 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 12 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Line 13... Line 13...
13 
 
 13 
 
Line 14... Line 14...
14 
$Revision: 9715 $
 14 
$Revision: 9941 $
15 
 
 15 
 
16 
;------------------------------------------------------------------------------
 16 
;------------------------------------------------------------------------------
Line 380... Line 380...
380 
        mov     ecx, eax
 380 
        mov     ecx, eax
381 
        mov     eax, [esp + 32-8+4] ; color
 381 
        mov     eax, [esp + 32-8+4] ; color
382 
;--------------------------------------
 382 
;--------------------------------------
383 
; check for hardware cursor
 383 
; check for hardware cursor
384 
        cmp     [_display.select_cursor], select_cursor
 384 
        cmp     [_display.select_cursor], select_cursor
385 
        je      @f
 - 
 
386 
        cmp     [_display.select_cursor], 0
 - 
 
387 
        jne     .no_mouseunder
 385 
        jne     .no_mouseunder
388 
;--------------------------------------
 386 
;--------------------------------------
389 
align 4
 387 
align 4
390 
@@:
 - 
 
391 
        push    ecx
 388 
        push    ecx
392 
        shl     ecx, 16
 389 
        shl     ecx, 16
393 
        mov     cx, bx
 390 
        mov     cx, bx
394 
; check mouse area for putpixel
 391 
; check mouse area for putpixel
395 
        test    eax, 0x04000000
 392 
        test    eax, 0x04000000
396 
        jnz     @f
 393 
        jnz     @f
- 
 
 394 
 
397 
        call    [_display.check_mouse]
 395 
        call    [_display.check_mouse]
398 
;--------------------------------------
 396 
;--------------------------------------
399 
align 4
 397 
align 4
400 
@@:
 398 
@@:
401 
        pop     ecx
 399 
        pop     ecx
Line 493... Line 491...
493 
        ret
 491 
        ret
494 
;------------------------------------------------------------------------------
 492 
;------------------------------------------------------------------------------
495 
align 4
 493 
align 4
496 
VGA_draw_bar_1:
 494 
VGA_draw_bar_1:
497 
        mov     [temp.cx], eax
 495 
        mov     [temp.cx], eax
498 
        mov     eax, [current_slot_idx]
 496 
        mov     eax, [current_slot]
499 
        shl     eax, BSF sizeof.WDATA
 497 
        mov     eax, [eax + APPDATA.window]
500 
        add     ebx, [window_data + eax + WDATA.box.top]
 498 
        add     ebx, [eax + WDATA.box.top]
501 
        mov     eax, [window_data + eax + WDATA.box.left]
 499 
        mov     eax, [eax + WDATA.box.left]
502 
        add     eax, [temp.cx]
 500 
        add     eax, [temp.cx]
503 
        and     eax, 0xfff8
 501 
        and     eax, 0xfff8
504 
        shl     ebx, 9
 502 
        shl     ebx, 9
505 
        lea     ebx, [ebx + ebx*4]  ; multiply by 5
 503 
        lea     ebx, [ebx + ebx*4]  ; multiply by 5
506 
        lea     ebx, [ebx + eax*4]  ; + x*BytesPerPixel (Vesa2.0 32)
 504 
        lea     ebx, [ebx + eax*4]  ; + x*BytesPerPixel (Vesa2.0 32)