WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/gui/window.inc

 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 4423 $
+$Revision: 5201 $
 ;==============================================================================
   common
     name#.sizeof.#table_name = $ - name#.#table_name
+}
 uglobal
-  common_colours rd 32
+  common_colours rd 48
   draw_limits    RECT
 endg
 align 4
 ;------------------------------------------------------------------------------
 syscall_draw_window: ;///// system function 0 /////////////////////////////////
 ;------------------------------------------------------------------------------
-;?
+;? .
 ;------------------------------------------------------------------------------
         mov     eax, edx
         shr     eax, 24
 ;------------------------------------------------------------------------------
 align 4
 syscall_display_settings.02:
         dec     ebx
         mov     esi, ecx
-        and     edx, 127
+        cmp     edx, 192
+        jnae    @f
+        mov     edx, 192 ; max size
+      @@:
         mov     edi, common_colours
         mov     ecx, edx
         rep movsb
         mov     [windowtypechanged], ebx
         ret
 ;------------------------------------------------------------------------------
 align 4
 syscall_display_settings.03:
         mov     edi, ecx
-        and     edx, 127
+        cmp     edx, 192
+        jnae    @f
+        mov     edx, 192 ; max size
+      @@:
         mov     esi, common_colours
         mov     ecx, edx
         rep movsb
         ret
 ;------------------------------------------------------------------------------
 ;------------------------------------------------------------------------------
 align 4
 syscall_display_settings.06:
         xor     esi, esi
-        mov     edi, [_display.width]
+        mov     edi, [Screen_Max_X]
         mov     eax, ecx
         movsx   ebx, ax
         sar     eax, 16
         cmp     eax, ebx
 @@:
         mov     [screen_workarea.right], ebx
 ;--------------------------------------
 align 4
 .check_horizontal:
-        mov     edi, [_display.height]
+        mov     edi, [Screen_Max_Y]
         mov     eax, edx
         movsx   ebx, ax
         sar     eax, 16
         cmp     eax, ebx
         jge     .check_if_redraw_needed
 ;------------------------------------------------------------------------------
 align 4
 syscall_display_settings._.calculate_whole_screen:
         xor     eax, eax
         xor     ebx, ebx
-        mov     ecx, [_display.width]
+        mov     ecx, [Screen_Max_X]
-        mov     edx, [_display.height]
+        mov     edx, [Screen_Max_Y]
         jmp     calculatescreen
 ;------------------------------------------------------------------------------
 align 4
 syscall_display_settings._.redraw_whole_screen:
         xor     eax, eax
         mov     [draw_limits.left], eax
         mov     [draw_limits.top], eax
-        mov     eax, [_display.width]
+        mov     eax, [Screen_Max_X]
-        dec     eax
         mov     [draw_limits.right], eax
-        mov     eax, [_display.height]
+        mov     eax, [Screen_Max_Y]
-        dec     eax
         mov     [draw_limits.bottom], eax
         mov     eax, window_data
         jmp     redrawscreen
 ;------------------------------------------------------------------------------
 align 4
         test    [edi + WDATA.fl_wstate], WSTATE_MAXIMIZED
         jnz     .fix_maximized
         mov     eax, [edi + WDATA.box.left]
         add     eax, [edi + WDATA.box.width]
-        mov     ebx, [_display.width]
+        mov     ebx, [Screen_Max_X]
         cmp     eax, ebx
-        jl     .fix_vertical
+        jle     .fix_vertical
         mov     eax, [edi + WDATA.box.width]
         sub     eax, ebx
         jle     @f
         mov     [edi + WDATA.box.width], ebx
 ;--------------------------------------
 align 4
 .fix_vertical:
         mov     eax, [edi + WDATA.box.top]
         add     eax, [edi + WDATA.box.height]
-        mov     ebx, [_display.height]
+        mov     ebx, [Screen_Max_Y]
         cmp     eax, ebx
-        jl     .fix_client_box
+        jle     .fix_client_box
         mov     eax, [edi + WDATA.box.height]
         sub     eax, ebx
         jle     @f
         mov     [edi + WDATA.box.height], ebx
 ;--------------------------------------
         mov     edi, [esi + WDATA.cl_workarea]
         test    edi, 0x40000000
         jnz     .exit
-        ; does client area have a positive size on screen?
-        mov     edx, [esi + WDATA.box.top]
-        add     edx, 21 + 5
-        mov     ebx, [esi + WDATA.box.top]
+        ; does client area have a positive size on screen?
-        add     ebx, [esi + WDATA.box.height]
-        cmp     edx, ebx
+        cmp     [esi + WDATA.box.height], 21
-        jg      .exit
+        jle     .exit
         ; okay, let's draw it
         mov     eax, 1
         mov     eax, [edi + WDATA.box.left]
         mov     ebx, [edi + WDATA.box.top]
         mov     ecx, [edi + WDATA.box.width]
         mov     edx, [edi + WDATA.box.height]
-        mov     esi, [_display.width]
+        mov     esi, [Screen_Max_X]
         cmp     ecx, esi
-        jae     .fix_width_high
+        ja      .fix_width_high
 ;--------------------------------------
 align 4
 .check_left:
         or      eax, eax
         cmp     eax, esi
         jg      .fix_left_high
 ;--------------------------------------
 align 4
 .check_height:
-        mov     esi, [_display.height]
+        mov     esi, [Screen_Max_Y]
         cmp     edx, esi
-        jae     .fix_height_high
+        ja      .fix_height_high
 ;--------------------------------------
 align 4
 .check_top:
         or      ebx, ebx
         jl      .fix_top_low
         cmp     edx, [ff_xsz]
         jb      .ff_new_x
         sub     ebp, [ff_xsz]
         add     ebp, [ff_x]
-        add     ebp, [_display.width]  ; screen.x
+        add     ebp, [Screen_Max_X]  ; screen.x
         inc     ebp
         inc     ebx
         cmp     ebx, [ff_ysz]

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/gui/window.inc – Rev 4423 → 5201