WebSVN – Kolibri OS – Diff – /kernel/trunk/video/cursors.inc

 ;; Copyright (C) KolibriOS team 2004-2008. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1313 $
+$Revision: 1316 $
 virtual at 0
   BI BITMAPINFOHEADER
 end virtual
 align 4
-proc vesa_init_cursor stdcall, dst:dword, src:dword
+proc init_cursor stdcall, dst:dword, src:dword
            locals
              rBase    dd ?
              pQuad    dd ?
              pBits    dd ?
 ; param
 ;  eax= pid
 ;  ebx= src
 ;  ecx= flags
-vesa_cursor:
+create_cursor:
 .src     equ esp
 .flags   equ esp+4
 .hcursor equ esp+8
            movzx ecx, word [esi+10]
            movzx edx, word [esi+12]
            mov [edi+CURSOR.hot_x], ecx
            mov [edi+CURSOR.hot_y], edx
+           stdcall init_cursor, eax, esi
+           mov eax, [.hcursor]
+           lea eax, [eax+CURSOR.list_next]
+           lea edx, [_display.cr_list.next]
+           pushfd
+           cli
+           mov ecx, [edx]
+           mov [eax], ecx
+           mov [eax+4], edx
+           mov [ecx+4], eax
+           mov [edx], eax
+           popfd
+           mov eax, [.hcursor]
+.check_hw:
+           cmp [_display.init_cursor], 0
+           je .fail
+           push eax
+           call [_display.init_cursor]
+           add esp, 4
            stdcall vesa_init_cursor, eax, esi
            mov eax, [.hcursor]
 .fail:
            add esp, 12
            ret
            xchg edi, eax
            mov ecx, 1024
            cld
            rep movsd
-           add esp, 12
-           ret
+           jmp .check_hw
 align 4
 proc load_cursor stdcall, src:dword, flags:dword
            mov eax, [CURRENT_TASK]
            shl eax, 5
            mov eax, [CURRENT_TASK+eax+4]
            mov ebx, [src]
            mov ecx, [flags]
-           call [create_cursor]    ;eax, ebx, ecx
+           call create_cursor    ;eax, ebx, ecx
            mov [handle], eax
            cmp word [flags], LOAD_FROM_FILE
            jne .exit
            endl
            mov esi, [hcursor]
            cmp [esi+CURSOR.magic], 'CURS'
-           jne .fail
-;           cmp [esi+CURSOR.size], CURSOR_SIZE
-;           jne .fail
+           jne .fail
            mov ebx, [CURRENT_TASK]
            shl ebx, 5
            call destroy_kernel_object
            ret
 align 4
-select_cursor:
+select_cursor:
+           mov eax, [esp+4]
            mov [_display.cursor], eax
            ret 4
-align 4
-proc init_cursors
-           cmp [SCR_MODE],word 0x13
-           jbe .fail
-           test word [SCR_MODE], 0x4000
-           jz .fail
-           movzx eax, byte [ScreenBPP]
-           mov ebx, [BytesPerScanLine]
-           cmp eax, 32
-           jne @F
-           sub ebx, 128
-           jmp .init
-@@:
-           cmp eax, 24
-           jne .fail
-           sub ebx, 96
-.init:
-           mov [cur_def_interl], ebx
-           stdcall load_driver, szHwMouse
-           mov [hw_cursor], eax
-           test eax, eax
-           jz .sw_mouse
-           stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
-           mov [def_cursor], eax
-           ret
-.sw_mouse:
-           mov [create_cursor], vesa_cursor
-           stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
-           mov [def_cursor], eax
-           mov ecx, [Screen_Max_X]
-           mov edx, [Screen_Max_Y]
-           inc ecx
-           inc edx
-           mov [scr_width], ecx
-           mov [scr_height], edx
-           movzx ebx, byte [ScreenBPP]
-           cmp ebx, 32
-           jne @F
-           mov dword [select_hw_cursor], select_cursor
-           mov dword [set_hw_cursor], cursor_32
-           mov dword [hw_restore], restore_32
-           ret
-@@:
-           mov dword [select_hw_cursor], select_cursor
-           mov dword [set_hw_cursor], cursor_24
-           mov dword [hw_restore], restore_24
-           ret
-.fail:
-           xor eax, eax
-           mov dword [select_hw_cursor], eax
-           mov dword [set_hw_cursor], eax
-           mov dword [hw_restore], eax
-           ret
-endp
-align 4
-proc restore_24 stdcall, x:dword, y:dword
-           locals
-             w  dd ?
+align 4
+proc restore_24 stdcall, x:dword, y:dword
-           endl
+           push ebx
            mov edi, [cur_saved_base]
-           mov edx, [cur_saved_h]
+           mov ebx, [cur_saved_base]
+           mov edx, [cur.h]
+           test edx, edx
+           jz  .ret
            mov ebx, [cur_saved_interl]
-           test edx, edx
-           jz  .ret
+           push esi
            push edi
+           mov esi, cur_saved_data
+           mov ecx, [cur.w]
+           lea ecx, [ecx+ecx*2]
+           push ecx
+@@:
-           mov esi, cur_saved_data
+           mov edi, ebx
-@@:
-           mov ecx, [cur_saved_w]
+           add ebx, [BytesPerScanLine]
            lea ecx, [ecx+ecx*2]
+           mov ecx, [esp]
+           rep movsb
+           dec edx
+           jnz @B
            rep movsb
+           pop ecx
-           add edi, ebx
+           pop edi
-           dec edx
+           pop esi
-           jnz @B
+.ret:
-.ret:
+           pop ebx
-           ret
-endp
-align 4
+           ret
+endp
-proc restore_32 stdcall, x:dword, y:dword
-           locals
+align 4
-             w  dd ?
+proc restore_32 stdcall, x:dword, y:dword
            endl
+           push ebx
+           mov ebx, [cur_saved_base]
            mov edx, [cur.h]
-           mov edi, [cur_saved_base]
+           test edx, edx
+           jz  .ret
+           push esi
-           mov edx, [cur_saved_h]
+           push edi
            mov ebx, [cur_saved_interl]
-           test edx, edx
-           jz  .ret
+           mov esi, cur_saved_data
 @@:
+           mov edi, ebx
+           add ebx, [BytesPerScanLine]
            mov esi, cur_saved_data
+           mov ecx, [cur.w]
+           rep movsd
-@@:
+           dec edx
-           mov ecx, [cur_saved_w]
+           jnz @B
            rep movsd
-           add edi, ebx
+           pop edi
-           dec edx
+.ret:
-           jnz @B
-.ret:
+           pop esi
-           ret
-endp
+           pop ebx
            ret
-align 4
+endp
 proc cursor_24 stdcall, hcursor:dword, x:dword, y:dword
            mov eax, [y]
            mov ebx, [BytesPerScanLine]
            xor edx, edx
+           sub ecx, [esi+CURSOR.hot_x]
-           sub ecx, [esi+CURSOR.hot_x]
+           lea ebx, [ecx+32-1]
            mov [x], ecx
            sets dl
            dec edx
+           and ecx, edx       ;clip x to 0<=x
-           and ecx, edx       ;clip x to 0<=x
+           mov [cur.left], ecx
            mov edi, ecx
            sub edi, [x]
            mov [_dx], edi
+           xor edx, edx
-           xor edx, edx
+           sub eax, [esi+CURSOR.hot_y]
-           sub eax, [esi+CURSOR.hot_y]
+           lea edi, [eax+32-1]
            mov [y], eax
            sets dl
+           dec edx
-           dec edx
+           and eax, edx       ;clip y to 0<=y
-           and eax, edx       ;clip y to 0<=y
+           mov [cur.top], eax
-           mov edi, eax
+           mov edx, eax
-           sub edi, [y]
-           mov [_dy], edi
+           sub edx, [y]
+           mov [_dy], edx
-           mul ebx
-           lea esi, [ecx+ecx*2]
+           mul dword [BytesPerScanLine]
-           add esi, [LFBAddress]
-           add esi, eax
-           mov [cur_saved_base],esi
-           mov edi, [scr_width]
-           mov edx, [scr_height]
-           mov eax, 32
-           sub edi, ecx
-           cmp edi, eax
-           jng @F
+           lea edx, [LFB_BASE+ecx*3]
-           mov edi, eax
+           add edx, eax
+           mov [cur_saved_base],edx
-@@:
+           cmp ebx, [Screen_Max_X]
-           sub edi, [_dx]
+           jbe @F
+           mov ebx, [Screen_Max_X]
-           sub edx, [y]
+@@:
+           cmp edi, [Screen_Max_Y]
-           cmp edx, eax
+           jbe @F
-           jng @F
+           mov edi, [Screen_Max_Y]
-           mov edx, eax
+@@:
-@@:
-           sub edx, [_dy]
-           mov [w], edi
+           mov [cur.right],  ebx
-           mov [h], edx
-           mov [cur_saved_w], edi
-           mov [cur_saved_h], edx
+           mov [cur.bottom], edi
+           sub ebx, [x]
+           sub edi, [y]
+           inc ebx
+           inc edi
            sub eax, edi
-           shl eax, 2       ;lea eax, [eax+eax*2]
+           mov [cur.w], ebx
+           mov [cur.h], edi
+           mov [h], edi
-           lea edi, [edi+edi*2]
-           sub ebx, edi
+           mov eax, edi
-           mov [cur_saved_interl], ebx
+           mov edi, cur_saved_data
-           mov edi, cur_saved_data
+@@:
-@@:
+           mov esi, edx
-           mov ecx, [w]
+           add edx, [BytesPerScanLine]
-           lea ecx, [ecx+ecx*2]
-           rep movsb
+           mov ecx, [cur.w]
-           add esi, ebx
+           lea ecx, [ecx+ecx*2]
-           dec edx
+           rep movsb
-           jnz @B
+           dec eax
-;draw cursor
+           jnz @B
            mov edx, eax
-           mov edi, [cur_saved_base]
+;draw cursor
-           mov eax, [_dy]
+           mov ebx, [cur_saved_base]
-           shl eax, 5
+           mov eax, [_dy]
+           shl eax, 5
+           add eax, [_dx]
+           mov esi, [hcursor]
-           add eax, [_dx]
+           mov esi, [esi+CURSOR.base]
-           shl eax, 2
+           lea edx, [esi+eax*4]
 .row:
-           mov esi, [hcursor]
+           mov ecx, [cur.w]
-           mov esi, [esi+CURSOR.base]
-           add esi, eax
+           mov esi, edx
-.row:
+           mov edi, ebx
-           mov ecx, [w]
+           add edx, 32*4
-.pix:
+           add ebx, [BytesPerScanLine]
-           lodsd
+.pix:
-           test eax, 0xFF000000
+           lodsd
-           jz @F
+           test eax, 0xFF000000
-           mov word [edi], ax
-           shr eax, 16
+           jz @F
-           mov [edi+2],al
+           mov [edi], ax
-@@:
+           shr eax, 16
-           add edi, 3
+           mov [edi+2],al
+@@:
-           dec ecx
+           add edi, 3
-           jnz .pix
+           dec ecx
            jnz .pix
-           add esi, edx
            add edi, ebx
-           dec [h]
-           jnz .row
+           dec [h]
-           ret
+           jnz .row
-endp
+           ret
 endp
 align 4
 proc cursor_32 stdcall, hcursor:dword, x:dword, y:dword
-           locals
-             w      dd ?
+align 4
-             h      dd ?
+proc move_cursor_32 stdcall, hcursor:dword, x:dword, y:dword
+           locals
-             st     dd ?
+             h      dd ?
              _dx     dd ?
              _dy     dd ?
            endl
            mov esi, [hcursor]
-           mov esi, [hcursor]
+           mov ecx, [x]
-           mov ecx, [x]
+           mov eax, [y]
            mov eax, [y]
-           mov ebx, [BytesPerScanLine]
+           xor edx, edx
+           sub ecx, [esi+CURSOR.hot_x]
            lea ebx, [ecx+32-1]
-           xor edx, edx
+           mov [x], ecx
-           sub ecx, [esi+CURSOR.hot_x]
+           sets dl
-           mov [x], ecx
+           dec edx
+           and ecx, edx       ;clip x to 0<=x
-           sets dl
+           mov [cur.left], ecx
-           dec edx
+           mov edi, ecx
-           and ecx, edx       ;clip x to 0<=x
+           sub edi, [x]
-           mov edi, ecx
+           mov [_dx], edi
-           sub edi, [x]
-           mov [_dx], edi
+           xor edx, edx
-           xor edx, edx
-           sub eax, [esi+CURSOR.hot_y]
-           mov [y], eax
-           sets dl
-           dec edx
-           and eax, edx       ;clip y to 0<=y
-           mov edi, eax
-           sub edi, [y]
-           mov [_dy], edi
-           mul ebx
+           sub eax, [esi+CURSOR.hot_y]
-           lea esi, [eax+ecx*4]
+           lea edi, [eax+32-1]
+           mov [y], eax
+           sets dl
-           add esi, [LFBAddress]
+           dec edx
-           mov [cur_saved_base],esi
+           and eax, edx       ;clip y to 0<=y
+           mov [cur.top], eax
-           mov edi, [scr_width]
+           mov edx, eax
+           sub edx, [y]
-           mov edx, [scr_height]
+           mov [_dy], edx
-           mov eax, 32
+           mul dword [BytesPerScanLine]
-           sub edi, ecx
+           lea edx, [LFB_BASE+eax+ecx*4]
-           cmp edi, eax
+           mov [cur_saved_base],edx
-           jng @F
-           mov edi, eax
+           cmp ebx, [Screen_Max_X]
-@@:
-           sub edi, [_dx]
+           jbe @F
+           mov ebx, [Screen_Max_X]
-           sub edx, [y]
+@@:
-           cmp edx, eax
+           cmp edi, [Screen_Max_Y]
-           jng @F
+           jbe @F
+           mov edi, [Screen_Max_Y]
+@@:
-           mov edx, eax
+           mov [cur.right],  ebx
-@@:
+           mov [cur.bottom], edi
-           sub edx, [_dy]
-           mov [w], edi
+           sub ebx, [x]
-           mov [h], edx
+           sub edi, [y]
-           mov [cur_saved_w], edi
-           mov [cur_saved_h], edx
+           inc ebx
            inc edi
            sub eax, edi
-           shl eax, 2
+           mov [cur.w], ebx
-           shl edi, 2
-           sub ebx, edi
+           mov [cur.h], edi
-           mov [cur_saved_interl], ebx
+           mov [h], edi
-           mov edi, cur_saved_data
+           mov eax, edi
-@@:
+           mov edi, cur_saved_data
+@@:
+           mov esi, edx
+           add edx, [BytesPerScanLine]
+           mov ecx, [cur.w]
-           mov ecx, [w]
+           rep movsd
-           rep movsd
+           dec eax
-           add esi, ebx
+           jnz @B
            dec edx
-           jnz @B
+;draw cursor
            mov ebx, [cur_saved_base]
-;draw cursor
+           mov eax, [_dy]
-           mov edx, eax
+           shl eax, 5
-           mov edi, [cur_saved_base]
+           add eax, [_dx]
-           mov eax, [_dy]
-           shl eax, 5
-           add eax, [_dx]
+           mov esi, [hcursor]
-           shl eax, 2
+           mov esi, [esi+CURSOR.base]
            lea edx, [esi+eax*4]
-           mov esi, [hcursor]
+.row:
+           mov ecx, [cur.w]
+           mov esi, edx
+           mov edi, ebx
+           add edx, 32*4
+           add ebx, [BytesPerScanLine]
+.pix:
+           lodsd
+           test eax, 0xFF000000
+           jz @F
+           mov [edi], eax
+@@:
+           add edi, 4
+           dec ecx
+           jnz .pix
+           dec [h]
+           jnz .row
+           ret
+endp
+align 4
+get_display:
+           mov eax, _display
+           ret
+align 4
+init_display:
+           xor eax, eax
+           mov edi, _display
+           mov [edi+display_t.init_cursor],    eax
+           mov [edi+display_t.select_cursor],  eax
+           mov [edi+display_t.show_cursor],    eax
+           mov [edi+display_t.move_cursor],    eax
+           mov [edi+display_t.restore_cursor], eax
+           lea ecx, [edi+display_t.cr_list.next]
+           mov [edi+display_t.cr_list.next], ecx
+           mov [edi+display_t.cr_list.prev], ecx
+           cmp [SCR_MODE],word 0x13
+           jbe .fail
+           test word [SCR_MODE], 0x4000
+           jz .fail
+           mov ebx, restore_32
+           mov ecx, move_cursor_32
+           movzx eax, byte [ScreenBPP]
+           cmp eax, 32
+           je @F
+           mov ebx, restore_24
+           mov ecx, move_cursor_24
+           cmp eax, 24
+           jne .fail
+@@:
+           mov [_display.select_cursor],  select_cursor
+           mov [_display.move_cursor],    ecx
-           mov esi, [esi+CURSOR.base]
+           mov [_display.restore_cursor], ebx
            add esi, eax
-.row:
+           stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM

Subversion Repositories Kolibri OS

(root)/kernel/trunk/video/cursors.inc – Rev 1313 → 1316