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

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1290 $
+$Revision: 1300 $
 ; -----------------------------------------
 ;        movzx eax,byte [BOOT_VAR+0x9010]	; mouse port
 ;        mov   [0xF604],byte 1  ;al
 		mov	al, [BOOT_VAR+0x901F]   	; DMA access
         mov	[allow_dma_access], al
-        mov al,[BOOT_VAR+0x9000]        ; bpp
+        movzx eax, byte [BOOT_VAR+0x9000]        ; bpp
         mov [ScreenBPP],al
+        mov [_display.bpp], eax
+        mov [_display.vrefresh], 60
+        mov [_display.disable_mouse],  __sys_disable_mouse
+        movzx eax,word [BOOT_VAR+0x900A]  ; X max
-        movzx eax,word [BOOT_VAR+0x900A]  ; X max
+        mov [_display.width], eax
         dec   eax
         mov   [Screen_Max_X],eax
         mov   [screen_workarea.right],eax
+        movzx eax,word [BOOT_VAR+0x900C]  ; Y max
-        movzx eax,word [BOOT_VAR+0x900C]  ; Y max
+        mov [_display.height], eax
         dec   eax
         mov   [Screen_Max_Y],eax
         mov   [screen_workarea.bottom],eax
         movzx eax,word [BOOT_VAR+0x9008]  ; screen mode
         mov   [BytesPerScanLine],word 640*4         ; Bytes PerScanLine
         cmp   [SCR_MODE],word 0x13          ; 320x200
         je    @f
         cmp   [SCR_MODE],word 0x12          ; VGA 640x480
         je    @f
-        mov   ax,[BOOT_VAR+0x9001]        ; for other modes
+        movzx eax, word[BOOT_VAR+0x9001]        ; for other modes
         mov   [BytesPerScanLine],ax
+        mov [_display.pitch], eax
 @@:
+        mov eax, [_display.width]
+        mul [_display.height]
+        mov [_WinMapSize], eax
         mov     esi, BOOT_VAR+0x9080
         movzx   ecx, byte [esi-1]
         mov     [NumBiosDisks], ecx
         mov     edi, BiosDisksData
         rep     movsd
         mov     [graph_data_l+2],ax
         shr     eax,16
         mov     [graph_data_l+4],al
         mov     [graph_data_l+7],ah
+        stdcall kernel_alloc, [_WinMapSize]
+        mov [_WinMapAddress], eax
         xor  eax,eax
         inc  eax
         mov [CURRENT_TASK],eax		;dword 1
         mov [TASK_COUNT],eax		;dword 1
         mov [TASK_BASE],dword TASK_DATA
         mov [current_slot], SLOT_BASE+256
-; set background
-;        xor  eax,eax
+; set background
 ;        inc  eax
         mov   [BgrDrawMode],eax
         mov   [BgrDataWidth],eax
         mov   [BgrDataHeight],eax
 ;           ret
 msset:
            ret
-app_load_cursor:
-      ;     add ebx, new_app_base
+app_load_cursor:
            cmp ecx, OS_BASE
            jae msset
            stdcall load_cursor, ecx, edx
            mov [esp+36-4], eax
     and   eax,15
 ;    cmp   eax,0   ; type I    - original style
     jne   nosyswI
     inc   [mouse_pause]
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  sys_set_window
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  drawwindow_I
     ;dec   [mouse_pause]
     ;call   [draw_pointer]
     ;ret
     jmp   draw_window_caption.2
   nosyswI:
     cmp   al,1    ; type II   - only reserve area, no draw
     jne   nosyswII
     inc   [mouse_pause]
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  sys_set_window
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  sys_window_mouse
     dec   [mouse_pause]
     call   [draw_pointer]
     ret
   nosyswII:
     cmp   al,2    ; type III  - new style
     jne   nosyswIII
     inc   [mouse_pause]
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  sys_set_window
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  drawwindow_III
     ;dec   [mouse_pause]
     cmp   al,4    ; type V - skinned window not sized! {not_sized_skin_window}
     jne   nosyswV
   draw_skin_window:
     inc   [mouse_pause]
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     call  sys_set_window
-    call  [disable_mouse]
+    call  [_display.disable_mouse]
     mov   eax, [TASK_COUNT]
     movzx eax, word [WIN_POS + eax*2]
     cmp   eax, [CURRENT_TASK]
     setz  al
     ret
 draw_window_caption:
         inc     [mouse_pause]
-        call    [disable_mouse]
+        call    [_display.disable_mouse]
         xor     eax,eax
         push eax edx
         mov  edx,[Screen_Max_X]     ; screen x size
         inc  edx
+        imul edx, ebx
-        imul edx, ebx
+        add  eax, [_WinMapAddress]
-        mov  dl, [eax+edx+display_data] ; lea eax, [...]
+        mov  dl, [eax+edx] ; lea eax, [...]
         xor  ecx, ecx
         mov  eax, [CURRENT_TASK]
     loop  markz
 @@:
   no_mark_system_shutdown:
-    call [disable_mouse]
+    call [_display.disable_mouse]
          ret
 calculatebackground:   ; background
+        mov   edi, [_WinMapAddress]                ; set os to use all pixels
-        mov   edi,display_data              ; set os to use all pixels
+        mov   eax,0x01010101
-        mov   eax,0x01010101
+        mov   ecx, [_WinMapSize]
-        mov   ecx,1280*1024 / 4
+        shr   ecx, 2
         mov     edi, [current_slot]
         add     eax, [edi+APPDATA.wnd_clientbox.left]
         add     ebx, [edi+APPDATA.wnd_clientbox.top]
         xor     edi, edi ; no force
 ;       mov     edi, 1
-        call    [disable_mouse]
+        call    [_display.disable_mouse]
         jmp     [putpixel]
 align 4
 ;ecx = [size x]*65536 + [size y]
 ;edx = [start x]*65536 + [start y]
      pushad
          inc   [mouse_pause]
 ; Check of use of the hardware cursor.
-      cmp  [disable_mouse],__sys_disable_mouse
+      cmp  [_display.disable_mouse],__sys_disable_mouse
           jne  @f
 ; Since the test for the coordinates of the mouse should not be used,
 ; then use the call [disable_mouse] is not possible!
       cmp  dword [MOUSE_VISIBLE],dword 0
       jne  @f
          dec   ebx
      dec   edx
      jnz   .start_y
      dec        [mouse_pause]
 ; Check of use of the hardware cursor.
-      cmp  [disable_mouse],__sys_disable_mouse
+      cmp  [_display.disable_mouse],__sys_disable_mouse
           jne  @f
          call  [draw_pointer]
 @@:
      popad
      ret
         pushfd
         cli
         mov [Screen_Max_X], eax
+        mov [Screen_Max_Y], edx
-        mov [Screen_Max_Y], edx
+        mov [BytesPerScanLine], ecx
         mov [screen_workarea.right],eax
-        mov [screen_workarea.bottom], edx
-        inc eax
-        shl eax, 2                      ;32 bpp
+        mov [screen_workarea.bottom], edx
         mov [BytesPerScanLine], eax
         push ebx
+        push esi
+        push edi
+        pushad
+        stdcall kernel_free, [_WinMapAddress]
+        mov eax, [_display.width]
+        mul [_display.height]
+        mov [_WinMapSize], eax
+        stdcall kernel_alloc, eax
+        mov [_WinMapAddress], eax
+        test eax, eax
+        jz .epic_fail
-        push esi
+        popad
-        push edi
         call    repos_windows
-        mov     eax, 0
+        xor eax, eax
-        mov     ebx, 0
+        xor ebx, ebx
         mov     ecx, [Screen_Max_X]
         mov     edx, [Screen_Max_Y]
         call    calculatescreen
         pop edi
         pop esi
         pop ebx
+        popfd
+        ret
-        popfd
+.epic_fail:
-        ret
+        hlt                     ; Houston, we've had a problem
 ; --------------- APM ---------------------

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 1290 → 1300