WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
-;; Copyright (C) KolibriOS team 2004-2011. All rights reserved.
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved.
 ;; PROGRAMMING:
 ;; Ivan Poddubny
 ;; Marat Zakiyanov (Mario79)
 ;; VaStaNi
 ;; Trans
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 2442 $
+$Revision: 2465 $
 tmp_page_tabs   dd ?
-__DEBUG__       fix 1
-__DEBUG_LEVEL__ fix 1
-include 'fdo.inc'
+__DEBUG__       fix 1
 __DEBUG_LEVEL__ fix 1
+include 'init.inc'
-include 'init.inc'
+org OS_BASE+$
-org OS_BASE+$
+include 'fdo.inc'
 ;                    MAIN OS LOOP START                              ;
 ;                                                                    ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 align 32
 osloop:
-        call    [draw_pointer]
+;        call    [draw_pointer]
+        call    __sys_draw_pointer
         call    window_check_events
         call    mouse_check_events
         call    checkmisc
         call    checkVga_N13
         call    stack_handler
     waitterm:            ; wait here for termination
         mov     ebx, 100
         call    delay_hs
         jmp     waitterm
 ;------------------------------------------------------------------------------
+align 4
 restore_default_cursor_before_killing:
         mov     eax, [def_cursor]
         mov     [ecx+APPDATA.cursor], eax
         movzx   eax, word [MOUSE_Y]
         movzx   ebx, word [MOUSE_X]
-        mov     ecx, [Screen_Max_X]
+;        mov     ecx, [Screen_Max_X]
-        inc     ecx
+;        inc     ecx
+;        mul     ecx
+        mov     eax, [d_width_calc_area + eax*4]
         mul     ecx
         add     eax, [_WinMapAddress]
         movzx   edx, byte [ebx+eax]
         shl     edx, 8
+        mov     esi, [edx+SLOT_BASE+APPDATA.cursor]
+        cmp     esi, [current_cursor]
+        je      @f
         mov     esi, [edx+SLOT_BASE+APPDATA.cursor]
         push    esi
         call    [_display.select_cursor]
+        mov     [current_cursor], esi
+@@:
+        mov     [redrawmouse_unconditional], 1
+;        call    [draw_pointer]
-        mov     [current_cursor], esi
+        call    __sys_draw_pointer
         ret
 ;------------------------------------------------------------------------------
 iglobal
 align 4
         add     ecx, CURRENT_TASK+TASKDATA.state
         cmp     byte [ecx], 9
         jz      noprocessterminate
 ;--------------------------------------
         cmp     [_display.select_cursor], 0
-        je      @f
+        je      .restore_end
 ; restore default cursor before killing
         pusha
         mov     ecx, [esp+32]
         shl     ecx, 8
         add     ecx, SLOT_BASE
+        mov     eax, [def_cursor]
+        cmp     [ecx+APPDATA.cursor], eax
+        je      @f
         call    restore_default_cursor_before_killing
-        popa
 @@:
+        popa
+.restore_end:
         add     esp, 4
 ;--------------------------------------
      ;call MEM_Heap_Lock      ;guarantee that process isn't working with heap
         mov     [ecx], byte 3; clear possible i40's
      ;call MEM_Heap_UnLock
         mov     [BgrDataHeight], eax
 @@:
         mov     eax, [BgrDataWidth]
         imul    eax, [BgrDataHeight]
         lea     eax, [eax*3]
+; it is reserved with aligned to the boundary of 4 KB pages,
+; otherwise there may be exceptions a page fault for vesa20_drawbackground_tiled
+; because the 32 bit read is used for  high performance: "mov eax,[esi]"
+        shr     eax, 12
+        inc     eax
+        shl     eax, 12
         mov     [mem_BACKGROUND], eax
 ; get memory for new background
         stdcall kernel_alloc, eax
         test    eax, eax
         jz      .memfailed
 ;---------------------------------------------------------------------------------------------
 ; check if pixel is allowed to be drawn
-checkpixel:
-        push    eax edx
-        mov     edx, [Screen_Max_X] ; screen x size
-        inc     edx
+;checkpixel:
+;        push    eax edx
+;;        mov     edx, [Screen_Max_X] ; screen x size
+;;        inc     edx
+;;        imul    edx, ebx
-        imul    edx, ebx
+;        mov     edx, [d_width_calc_area + ebx*4]
-        add     eax, [_WinMapAddress]
+;        add     eax, [_WinMapAddress]
-        mov     dl, [eax+edx]; lea eax, [...]
+;        mov     dl, [eax+edx]; lea eax, [...]
-        xor     ecx, ecx
+;        xor     ecx, ecx
-        mov     eax, [CURRENT_TASK]
+;        mov     eax, [CURRENT_TASK]
-        cmp     al, dl
+;        cmp     al, dl
-        setne   cl
+;        setne   cl
 drawbackground:
 dbrv20:
         cmp     [BgrDrawMode], dword 1
         jne     bgrstr
         call    vesa20_drawbackground_tiled
-        call    [draw_pointer]
+;        call    [draw_pointer]
+        call    __sys_draw_pointer
         ret
 ;--------------------------------------
 align 4
 bgrstr:
         call    vesa20_drawbackground_stretch
-        call    [draw_pointer]
+;        call    [draw_pointer]
+        call    __sys_draw_pointer
         ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_putimage:                       ; PutImage
 sys_putimage:
         mov     edi, [current_slot]
         add     eax, [edi+APPDATA.wnd_clientbox.left]
         add     ebx, [edi+APPDATA.wnd_clientbox.top]
         xor     edi, edi ; no force
         and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
-        jmp     [putpixel]
+;        jmp     [putpixel]
+        jmp     __sys_putpixel
 align 4
         add     eax, [esi + APPDATA.wnd_clientbox.left]
         add     ebx, [esi + APPDATA.wnd_clientbox.top]
         add     ecx, eax
         add     edx, ebx
+;        jmp     [drawbar]
-        jmp     [drawbar]
+        jmp     vesa20_drawbar
 .drectr:
         ret
         add     ebp, ecx
         shl     ebx, 16
         xor     edi, edi
         add     ebx, ebp
         mov     ecx, edx
-        jmp     [draw_line]
+;        jmp     [draw_line]
+        jmp     __sys_draw_line
         ret
 ;------------------------------------------------------------------------------
 align 4
 calculate_fast_getting_offset_for_WinMapAddress:
 ; calculate data area for fast getting offset to _WinMapAddress
-        mov     eax, [_display.width]
+        xor     eax, eax
         mov     ecx, [_display.height]
         inc     ecx
         mov     edi, d_width_calc_area
         cld
 @@:

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm – Rev 2442 → 2465