Subversion Repositories Kolibri OS

Rev

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

Rev 3232 Rev 3555
Line 3... Line 3...
3 
;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
 3 
;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
4 
;; Distributed under terms of the GNU General Public License    ;;
 4 
;; Distributed under terms of the GNU General Public License    ;;
5 
;;                                                              ;;
 5 
;;                                                              ;;
6 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 6 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Line 7... Line 7...
7 
 
 7 
 
Line 8... Line 8...
8 
$Revision: 3232 $
 8 
$Revision: 3555 $
9 
 
 9 
 
10 
 
 10 
 
Line 844... Line 844...
844 
; eax = offset x
 844 
; eax = offset x
845 
        imul    ebx, [cur.w]     ;y
 845 
        imul    ebx, [cur.w]     ;y
846 
        add     eax, ebx
 846 
        add     eax, ebx
847 
        mov     ebx, eax
 847 
        mov     ebx, eax
848 
        shl     eax, 2
 848 
        shl     eax, 2
849 
        cmp     [ScreenBPP], byte 32
 849 
        cmp     byte [_display.bpp], 32
850 
        je      @f
 850 
        je      @f
851 
        sub     eax, ebx
 851 
        sub     eax, ebx
852 
;--------------------------------------
 852 
;--------------------------------------
853 
align 4
 853 
align 4
854 
@@:
 854 
@@:
Line 919... Line 919...
919 
        push    ebx ecx
 919 
        push    ebx ecx
920 
        imul    ecx, [cur.w]    ;y
 920 
        imul    ecx, [cur.w]    ;y
921 
        add     ecx, ebx
 921 
        add     ecx, ebx
922 
        mov     ebx, ecx
 922 
        mov     ebx, ecx
923 
        shl     ecx, 2
 923 
        shl     ecx, 2
924 
        cmp     [ScreenBPP], byte 24
 924 
        cmp     byte [_display.bpp], 24
925 
        je      .24
 925 
        je      .24
926 
        and     eax, 0xFFFFFF
 926 
        and     eax, 0xFFFFFF
927 
        mov     [ecx + cur_saved_data], eax   ;store new color  to
 927 
        mov     [ecx + cur_saved_data], eax   ;store new color  to
928 
        jmp     @f
 928 
        jmp     @f
929 
;--------------------------------------
 929 
;--------------------------------------
Line 989... Line 989...
989 
        cmp     [SCR_MODE], word 0x13
 989 
        cmp     [SCR_MODE], word 0x13
990 
        jbe     .fail
 990 
        jbe     .fail
Line 991... Line 991...
991 
 
 991 
 
992 
        test    word [SCR_MODE], 0x4000
 992 
        test    word [SCR_MODE], 0x4000
993 
        jz      .fail
 - 
 
Line 994... Line 993...
994 
;        jmp      .fail
 993 
        jz      .fail
995 
 
 994 
 
- 
 
 995 
        mov     ebx, restore_32
996 
        mov     ebx, restore_32
 996 
        mov     ecx, move_cursor_32
997 
        mov     ecx, move_cursor_32
 997 
        mov     edx, Vesa20_putpixel32_new
998 
        movzx   eax, byte [ScreenBPP]
 998 
        mov     eax, [_display.bpp]
Line 999... Line -...
999 
        cmp     eax, 32
 - 
 
1000 
        je      @F
 - 
 
1001 
 
 - 
 
1002 
        mov     ebx, restore_24
 - 
 
1003 
        mov     ecx, move_cursor_24
 - 
 
1004 
        cmp     eax, 24
 - 
 
1005 
        jne     .fail
 999 
        cmp     al, 32
1006 
;--------------------------------------
 1000 
        jne     .24
1007 
align 4
 1001 
 
1008 
@@:
 1002 
.set:
1009 
        mov     [_display.select_cursor], select_cursor
 1003 
        mov     [_display.select_cursor], select_cursor
1010 
        mov     [_display.move_cursor], ecx
 1004 
        mov     [_display.move_cursor], ecx
Line 1011... Line 1005...
1011 
        mov     [_display.restore_cursor], ebx
 1005 
        mov     [_display.restore_cursor], ebx
1012 
        mov     [_display.check_mouse], check_mouse_area_for_putpixel_new
 1006 
        mov     [_display.check_mouse], check_mouse_area_for_putpixel_new
1013 
        mov     [_display.check_m_pixel], check_mouse_area_for_getpixel_new
 1007 
        mov     [_display.check_m_pixel], check_mouse_area_for_getpixel_new
1014 
 
 - 
 
1015 
        cmp     [PUTPIXEL], dword VGA_putpixel
 - 
 
1016 
        je      @f
 - 
 
1017 
        cmp     [ScreenBPP], byte 32
 - 
 
1018 
        je      .32
 - 
 
1019 
        mov     [PUTPIXEL], dword Vesa20_putpixel24_new
 - 
 
1020 
        jmp     @f
 - 
 
1021 
;--------------------------------------
 - 
 
1022 
align 4
 - 
 
1023 
.32:
 1008 
 
1024 
        mov     [PUTPIXEL], dword Vesa20_putpixel32_new
 1009 
        cmp     [PUTPIXEL], dword VGA_putpixel
1025 
;--------------------------------------
 1010 
        je      @f
1026 
align 4
 1011 
        mov     [PUTPIXEL], edx
1027 
@@:
 1012 
@@:
1028 
        stdcall load_cursor, clock_arrow, dword LOAD_FROM_MEM
 1013 
        stdcall load_cursor, clock_arrow, dword LOAD_FROM_MEM
- 
 
 1014 
        mov     [def_cursor_clock], eax
- 
 
 1015 
        stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
- 
 
 1016 
        mov     [def_cursor], eax
- 
 
 1017 
        ret
1029 
        mov     [def_cursor_clock], eax
 1018 
 
1030 
        stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
 1019 
.24:
- 
 
 1020 
        mov     ebx, restore_24
- 
 
 1021 
        mov     ecx, move_cursor_24
1031 
        mov     [def_cursor], eax
 1022 
        mov     edx, Vesa20_putpixel24_new
1032 
        ret
 1023 
        cmp     al, 24
1033 
;--------------------------------------
 1024 
        je      .set
1034 
align 4
 1025 
 
1035 
.fail:
 1026 
.fail: