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

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 4287 $
+$Revision: 4288 $
         mov     [launcher_start], al
         movzx   eax, word [BOOT_VARS+BOOT_X_RES]; X max
         mov     [_display.width], eax
         mov     [display_width_standard], eax
         dec     eax
-        mov     [Screen_Max_X], eax
         mov     [screen_workarea.right], eax
         movzx   eax, word [BOOT_VARS+BOOT_Y_RES]; Y max
         mov     [_display.height], eax
         mov     [display_height_standard], eax
         dec     eax
-        mov     [Screen_Max_Y], eax
         mov     [screen_workarea.bottom], eax
         movzx   eax, word [BOOT_VARS+BOOT_VESA_MODE] ; screen mode
         mov     dword [SCR_MODE], eax
 ;        mov     eax, [BOOT_VAR+0x9014]             ; Vesa 1.2 bnk sw add
 ;        mov     [BANK_SWITCH], eax
         mov     eax, [def_cursor]
         mov     [ecx+APPDATA.cursor], eax
         movzx   eax, word [MOUSE_Y]
-        movzx   ebx, word [MOUSE_X]
-;        mov     ecx, [Screen_Max_X]
-;        inc     ecx
-;        mul     ecx
+        movzx   ebx, word [MOUSE_X]
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [_WinMapAddress]
 ; removed here by
 ;     call  mouse_centered
 ;* mouse centered - start code- Mario79
 ;mouse_centered:
 ;        push  eax
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
         shr     eax, 1
         mov     [MOUSE_X], ax
-        mov     eax, [Screen_Max_Y]
+        mov     eax, [_display.height]
         shr     eax, 1
         mov     [MOUSE_Y], ax
         call    wakeup_osloop
 ;        ret
 ;* mouse centered - end code- Mario79
         ret
  .set_pointer_position:
 ;     cmp  ecx,4  ; set mouse pointer position
         dec     ecx
         jnz     .set_mouse_button
-        cmp     dx, word[Screen_Max_Y]
+        cmp     dx, word[_display.width]
-        ja      .end
+        jae     .end
         rol     edx, 16
-        cmp     dx, word[Screen_Max_X]
+        cmp     dx, word[_display.height]
-        ja      .end
+        jae      .end
         mov     [MOUSE_X], edx
         call    wakeup_osloop
         ret
  .set_mouse_button:
 ;     cmp   ecx,5  ; set mouse button features
         pushfd
         cli
         mov     eax, ecx
         mov     ecx, [_display.pitch]
         mov     [_display.width], eax
-        dec     eax
         mov     [_display.height], edx
-        dec     edx
 ; eax - new Screen_Max_X
 ; edx - new Screen_Max_Y
         mov     [do_not_touch_winmap], 1
         call    set_screen
         mov     [do_not_touch_winmap], 0
 nosb8:
         cmp     ebx, 9
         jnz     nosb9
 ; ecx = [left]*65536 + [right]
 ; edx = [top]*65536 + [bottom]
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        mov     ebx, [Screen_Max_Y]
+        mov     ebx, [_display.height]
 ; check [right]
         cmp     cx, ax
-        ja      .exit
+        jae     .exit
 ; check [left]
         ror     ecx, 16
         cmp     cx, ax
-        ja      .exit
+        jae     .exit
 ; check [bottom]
         cmp     dx, bx
-        ja      .exit
+        jae     .exit
 ; check [top]
         ror     edx, 16
         cmp     dx, bx
-        ja      .exit
+        jae     .exit
         movzx   eax, cx  ; [left]
         movzx   ebx, dx  ; [top]
 align 4
 force_redraw_background:
         and     [draw_data+32 + RECT.left], 0
         and     [draw_data+32 + RECT.top], 0
         push    eax ebx
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
-        mov     ebx, [Screen_Max_Y]
+        mov     ebx, [_display.height]
         mov     [draw_data+32 + RECT.right], eax
         mov     [draw_data+32 + RECT.bottom], ebx
         pop     ebx eax
         inc     byte[REDRAW_BACKGROUND]
         call    wakeup_osloop
         mov     edx, [TASK_BASE]      ; return whole screen draw area for this app
         add     edx, draw_data - CURRENT_TASK
         mov     [edx + RECT.left], 0
         mov     [edx + RECT.top], 0
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
         mov     [edx + RECT.right], eax
-        mov     eax, [Screen_Max_Y]
+        mov     eax, [_display.height]
         mov     [edx + RECT.bottom], eax
         mov     [esp+32], eax
         ret
 ;---------------------------------------------------------------------------------------------
-; check if pixel is allowed to be drawn
-;checkpixel:
-;        push    eax edx
-;;        mov     edx, [Screen_Max_X] ; screen x size
-;;        inc     edx
-;;        imul    edx, ebx
-;        mov     edx, [d_width_calc_area + ebx*4]
-;        add     eax, [_WinMapAddress]
-;        mov     dl, [eax+edx]; lea eax, [...]
-;        xor     ecx, ecx
-;        mov     eax, [CURRENT_TASK]
-;        cmp     al, dl
-;        setne   cl
-;        pop     edx eax
 ;        ret
 iglobal
   cpustring db 'CPU',0
         add     word [msg_board_pos+2], 6
         cmp     bl, 10
         jnz     @f
         mov     word [msg_board_pos+2], (42*6)
         add     word [msg_board_pos], 10
-        mov     ax, word [Screen_Max_Y]
+        mov     ax, word [_display.height]
         cmp     word [msg_board_pos], ax
-        jbe     @f
+        jb      @f
         mov     word [msg_board_pos], 10
 @@:
 ; // end if
         or      [esp+32], dword -1
         ret
 .1:                             ; resolution
-        mov     eax, [Screen_Max_X]
+        mov     eax, [_display.width]
         shl     eax, 16
-        mov     ax, word [Screen_Max_Y]
+        mov     ax, word [_display.height]
         add     eax, 0x00010001
         mov     [esp+32], eax
         ret
 .drectr:
         ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
-        mov     ax, word [Screen_Max_X]
+        mov     ax, word [_display.width]
         shl     eax, 16
-        mov     ax, word [Screen_Max_Y]
+        mov     ax, word [_display.height]
         mov     [esp + 32], eax
         ret
 ;        pop     eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_getpixel_WinMap:                       ; GetPixel WinMap
-        cmp     ebx, [Screen_Max_X]
+        cmp     ebx, [_display.width]
-        jbe     @f
+        jb      @f
-        cmp     ecx, [Screen_Max_Y]
+        cmp     ecx, [_display.height]
-        jbe     @f
+        jb      @f
         xor     eax, eax
         jmp     .store
 ;--------------------------------------
 align 4
 @@:
         mov     [esp + 32], eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_getpixel:                       ; GetPixel
-        mov     ecx, [Screen_Max_X]
+        mov     ecx, [_display.width]
-        inc     ecx
         xor     edx, edx
         mov     eax, ebx
         div     ecx
         mov     ebx, edx
         xchg    eax, ebx
 ; edx - new Screen_Max_Y
         pushfd
-        cli
-        mov     [Screen_Max_X], eax
+        cli
         mov     [Screen_Max_Y], edx
         mov     [_display.pitch], ecx
         popad
         call    repos_windows
         xor     eax, eax
         xor     ebx, ebx
-        mov     ecx, [Screen_Max_X]
+        mov     ecx, [_display.width]
-        mov     edx, [Screen_Max_Y]
+        mov     edx, [_display.height]
         call    calculatescreen
         pop     edi
         pop     esi

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/kernel.asm – Rev 4287 → 4288