WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 2511 $
+$Revision: 2513 $
 nosb2:
         cmp     ebx, 3                     ; DRAW BACKGROUND
         jnz     nosb3
-draw_background_temp:
-;    cmp   [bgrchanged],1 ;0
-;    je    nosb31
-;draw_background_temp:
-;    mov   [bgrchanged],1 ;0
+draw_background_temp:
-        mov     [background_defined], 1
-        mov     byte[BACKGROUND_CHANGED], 1
+        mov     [background_defined], 1
         call    force_redraw_background
    nosb31:
         ret
   nosb3:
         cmp     ebx, 4                     ; TILED / STRETCHED
         jnz     nosb4
         cmp     ecx, [BgrDrawMode]
-        je      nosb41
-        mov     [BgrDrawMode], ecx
+        je      nosb41
-;    mov   [bgrchanged],1
+        mov     [BgrDrawMode], ecx
    nosb41:
         ret
 endg
 uglobal
 background_defined    db    0    ; diamond, 11.04.2006
-endg
+endg
 ;-----------------------------------------------------------------------------
-align 4
-; check misc
 align 4
-checkmisc:
 checkmisc:
         cmp     [ctrl_alt_del], 1
         jne     nocpustart
         mov     ebp, cpustring
+        call    fs_execute_from_sysdir
-        call    fs_execute_from_sysdir
         mov     [ctrl_alt_del], 0
-        mov     [ctrl_alt_del], 0
+;--------------------------------------
 align 4
 nocpustart:
         shl     eax, 8
         push    eax
         movzx   eax, word [MOUSE_X]
-        movzx   edx, word [MOUSE_Y]
+        movzx   edx, word [MOUSE_Y]
 ;--------------------------------------
 align 4
 .set_mouse_event:
         add     edi, 256
         add     ebx, 32
         test    [ebx+TASKDATA.event_mask], 0x80000000
         jz      .pos_filter
+        cmp     edi, [esp]                      ; skip if filtration active
-        cmp     edi, [esp]                      ; skip if filtration active
+        jne     .skip
-        jne     .skip
+;--------------------------------------
 align 4
 .pos_filter:
         test    [ebx+TASKDATA.event_mask], 0x40000000
         cmp     edx, esi
         jb      .skip
         add     esi, [ebx-twdw+WDATA.box.height]
         cmp     edx, esi
         ja      .skip
+;--------------------------------------
+align 4
 .set:
-        or      [edi+SLOT_BASE+APPDATA.event_mask], 100000b
+        or      [edi+SLOT_BASE+APPDATA.event_mask], 100000b  ; set event 6
+;--------------------------------------
+align 4
 .skip:
         loop    .set_mouse_event
+        pop     eax
-        pop     eax
+;--------------------------------------
 align 4
-mouse_not_active:
-        cmp     byte[BACKGROUND_CHANGED], 0
-        jz      no_set_bgr_event
-        xor     edi, edi
-        mov     ecx, [TASK_COUNT]
-set_bgr_event:
-        add     edi, 256
-        or      [edi+SLOT_BASE+APPDATA.event_mask], 16
-        loop    set_bgr_event
-        mov     byte[BACKGROUND_CHANGED], 0
-no_set_bgr_event:
+mouse_not_active:
         cmp     byte[REDRAW_BACKGROUND], 0         ; background update ?
         jz      nobackgr
         cmp     [background_defined], 0
-        jz      nobackgr
-;    mov   [draw_data+32 + RECT.left],dword 0
+        jz      nobackgr
-;    mov   [draw_data+32 + RECT.top],dword 0
+;--------------------------------------
-;    mov   eax,[Screen_Max_X]
-;    mov   ebx,[Screen_Max_Y]
-;    mov   [draw_data+32 + RECT.right],eax
-;    mov   [draw_data+32 + RECT.bottom],ebx
+align 4
 @@:
+        call    drawbackground
+;--------- set event 5 start ----------
+        push    ecx edi
+        xor     edi, edi
+        mov     ecx, [TASK_COUNT]
+;--------------------------------------
+align 4
+set_bgr_event:
+        add     edi, 256
+        or      [edi+SLOT_BASE+APPDATA.event_mask], 10000b  ; set event 5
+        loop    set_bgr_event
+        pop     edi ecx
-        call    drawbackground
+;--------- set event 5 stop -----------
         xor     eax, eax
         xchg    al, [REDRAW_BACKGROUND]
         test    al, al                             ; got new update request?
+        jnz     @b
         jnz     @b
         mov     [draw_data+32 + RECT.left], eax
         mov     [draw_data+32 + RECT.top], eax
         mov     [draw_data+32 + RECT.right], eax
         mov     [draw_data+32 + RECT.bottom], eax
+        mov     [MOUSE_BACKGROUND], byte 0
-        mov     [MOUSE_BACKGROUND], byte 0
+;--------------------------------------
 align 4
-nobackgr:
 nobackgr:
-    ; system shutdown request
 ; system shutdown request
         cmp     [SYS_SHUTDOWN], byte 0
         je      noshutdown
         jne     no_mark_system_shutdown
         lea     ecx, [edx-1]
         mov     edx, OS_BASE+0x3040
+        jecxz   @f
+;--------------------------------------
-        jecxz   @f
+align 4
 markz:
         mov     [edx+TASKDATA.state], byte 3
         add     edx, 0x20
+        loop    markz
+;--------------------------------------
-        loop    markz
+align 4
-@@:
 @@:
-  no_mark_system_shutdown:
 no_mark_system_shutdown:
         dec     byte [SYS_SHUTDOWN]
+        je      system_shutdown
-        je      system_shutdown
+;--------------------------------------
 align 4
-noshutdown:
 noshutdown:
         mov     eax, [TASK_COUNT]           ; termination
         mov     ebx, TASK_DATA+TASKDATA.state
+        mov     esi, 1
-        mov     esi, 1
+;--------------------------------------
 align 4
 newct:
         mov     cl, [ebx]
         cmp     cl, byte 3
+        jz      terminate
         jz      terminate
         cmp     cl, byte 4
         jz      terminate
         add     ebx, 0x20
         inc     esi
         dec     eax
-        jnz     newct
+        jnz     newct
         ret
-; redraw screen
+;-----------------------------------------------------------------------------
-redrawscreen:
+align 4
 redrawscreen:
 ; eax , if process window_data base is eax, do not set flag/limits
         pushad
         push    eax
+;;;         mov   ebx,2
+;;;         call  delay_hs
 ;;;         mov   ebx,2
-;;;         call  delay_hs
          ;mov   ecx,0               ; redraw flags for apps
-         ;mov   ecx,0               ; redraw flags for apps
+        xor     ecx, ecx
-        xor     ecx, ecx
+;--------------------------------------
-       newdw2:
+align 4
         jb      ricino
         mov     eax, [draw_limits.left]  ; eax = area x start     ecx = window x end
         cmp     ecx, eax
+        jb      ricino
-        jb      ricino
+;--------------------------------------
 align 4
-        bgli:
 bgli:
         cmp     dword[esp], 1
-        jnz     .az
-;         cmp   byte[BACKGROUND_CHANGED], 0
+        jnz     .az
 ;         jnz   newdw8
         cmp     byte[REDRAW_BACKGROUND], 0
+        jz      .az
         jz      .az
         mov     dl, 0
         lea     eax, [edi+draw_data-window_data]
         mov     ebx, [draw_limits.left]
         cmp     ebx, [eax+RECT.left]
+        jae     @f
         jae     @f
         mov     [eax+RECT.left], ebx
+        mov     dl, 1
+;--------------------------------------
-        mov     dl, 1
+align 4
-        @@:
+@@:
         mov     ebx, [draw_limits.top]
         cmp     ebx, [eax+RECT.top]
+        jae     @f
         jae     @f
         mov     [eax+RECT.top], ebx
+        mov     dl, 1
+;--------------------------------------
-        mov     dl, 1
+align 4
-        @@:
+@@:
         mov     ebx, [draw_limits.right]
         cmp     ebx, [eax+RECT.right]
+        jbe     @f
         jbe     @f
         mov     [eax+RECT.right], ebx
+        mov     dl, 1
+;--------------------------------------
-        mov     dl, 1
+align 4
-        @@:
+@@:
         mov     ebx, [draw_limits.bottom]
         cmp     ebx, [eax+RECT.bottom]
+        jbe     @f
         jbe     @f
         mov     [eax+RECT.bottom], ebx
+        mov     dl, 1
+;--------------------------------------
-        mov     dl, 1
+align 4
-        @@:
+@@:
         add     byte[REDRAW_BACKGROUND], dl
+        jmp     newdw8
+;--------------------------------------
-        jmp     newdw8
+align 4
-        .az:
 .az:
         mov     eax, edi
         add     eax, draw_data-window_data
         sub     eax, draw_data-window_data
         cmp     dword [esp], 1
         jne     nobgrd
+        inc     byte[REDRAW_BACKGROUND]
-        inc     byte[REDRAW_BACKGROUND]
+;--------------------------------------
 align 4
-       newdw8:
+newdw8:
-       nobgrd:
+nobgrd:
+        mov     [eax + WDATA.fl_redraw], byte 1  ; mark as redraw
-        mov     [eax + WDATA.fl_redraw], byte 1  ; mark as redraw
+;--------------------------------------
-       ricino:
+align 4
-       not_this_task:
+ricino:
 not_this_task:
         pop     ecx
         cmp     ecx, [TASK_COUNT]
-        jle     newdw2
         jle     newdw2
         pop     eax
         popad
         ret
 ;-----------------------------------------------------------------------------
-calculatebackground:   ; background
+align 4
 calculatebackground:   ; background
         mov     edi, [_WinMapAddress]              ; set os to use all pixels
         mov     eax, 0x01010101
-        mov     ecx, [_WinMapSize]
-        shr     ecx, 2
-        rep stosd
+        mov     ecx, [_WinMapSize]
+        shr     ecx, 2
-        mov     byte[REDRAW_BACKGROUND], 0            ; do not draw background!
+        rep stosd
         mov     byte[BACKGROUND_CHANGED], 0
         mov     byte[REDRAW_BACKGROUND], 0            ; do not draw background!
-        ret
+        ret
-uglobal
+;-----------------------------------------------------------------------------
-  imax    dd 0x0
+uglobal
-endg
   imax    dd 0x0
 endg
-delay_ms:     ; delay in 1/1000 sec
+;-----------------------------------------------------------------------------
 align 4
         in      al, 0x61
         and     al, 0x10
         mov     ah, al
+        cld
-        cld
+;--------------------------------------
 align 4
- cnt1:
+cnt1:
         in      al, 0x61
         and     al, 0x10
         cmp     al, ah
         mov     ah, al
         loop    cnt1
         pop     ecx
-        pop     eax
         pop     eax
-        ret
+        ret
 ;-----------------------------------------------------------------------------
 align 4
 set_app_param:
         mov     edi, [TASK_BASE]
         mov     eax, ebx
         btr     eax, 3                           ; move MOUSE_FILTRATION
         mov     ebx, [current_slot]              ; bit into event_filter
         setc    byte [ebx+APPDATA.event_filter]
         xchg    eax, [edi + TASKDATA.event_mask] ; set new event mask
         mov     [esp+32], eax                    ; return old mask value
-        ret
+        ret
+;-----------------------------------------------------------------------------
 align 4
 delay_hs:     ; delay in 1/100 secs
 ; ebx = delay time
         push    ecx
         push    edx
+        mov     edx, [timer_ticks]
-        mov     edx, [timer_ticks]
+;--------------------------------------
 align 4
-      newtic:
+newtic:
         mov     ecx, [timer_ticks]
         sub     ecx, edx
         cmp     ecx, ebx
         jae     zerodelay
+        call    change_task
         call    change_task
         jmp     newtic
-        jmp     newtic
+;--------------------------------------
-      zerodelay:
+align 4
-        pop     edx
+zerodelay:
-        pop     ecx
+        pop     edx
         pop     ecx
-        ret
         ret
-align 16        ;very often call this subrutine
+;-----------------------------------------------------------------------------
-memmove:       ; memory move in bytes
+align 16        ;very often call this subrutine
 memmove:       ; memory move in bytes
 ; eax = from
         shr     ecx, 2
         rep movsd
         pop     ecx
         and     ecx, 11b
         jz      .finish
+;--------------------------------------
+align 4
-  @@:
+@@:
         rep movsb
+;--------------------------------------
+align 4
-  .finish:
+.finish:
         pop     ecx edi esi
+;--------------------------------------
+align 4
-  .ret:
+.ret:
         ret
+;-----------------------------------------------------------------------------
 ;  Sysfunction 34, read_floppy_file, is obsolete. Use 58 or 70 function instead.
 ;align 4
+;
 ;read_floppy_file:
+;

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm @ 9221 – Rev 2511 → 2513