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

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 5154 $
+$Revision: 5350 $
         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
 ; 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.height]
-        ja      .end
+        jae     .end
         rol     edx, 16
-        cmp     dx, word[Screen_Max_X]
+        cmp     dx, word[_display.width]
-        ja      .end
+        jae     .end
         mov     [MOUSE_X], edx
         mov     [mouse_active], 1
         call    wakeup_osloop
         ret
  .set_mouse_button:
 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]
+        dec     eax
+        dec     ebx
 ; check [right]
         cmp     cx, ax
         ja      .exit
 ; check [left]
         ror     ecx, 16
 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]
+        dec     eax
+        dec     ebx
         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, [_display.width]
-        mov     eax, [Screen_Max_X]
+        dec     eax
         mov     [edx + RECT.right], eax
+        mov     eax, [_display.height]
-        mov     eax, [Screen_Max_Y]
+        dec     eax
         mov     [edx + RECT.bottom], eax
         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.width]
         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]
+        shl     eax, 16
-        add     eax, 0x00010001
+        mov     ax, word [_display.height]
         mov     [esp+32], eax
         ret
 .2:                             ; bits per pixel
 .drectr:
         ret
 align 4
 syscall_getscreensize:                  ; GetScreenSize
+        mov     ax, word [_display.width]
-        mov     ax, word [Screen_Max_X]
+        dec     ax
         shl     eax, 16
+        mov     ax, word [_display.height]
-        mov     ax, word [Screen_Max_Y]
+        dec     ax
         mov     [esp + 32], eax
         ret
 ;-----------------------------------------------------------------------------
 align 4
         and     [cd_status], 0
         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, [_display.height]
+        dec     ecx
-        mov     edx, [Screen_Max_Y]
+        dec     edx
         call    calculatescreen
         pop     edi
         pop     esi

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 5154 → 5350