WebSVN – Kolibri OS – Diff – /kernel/trunk/gui/window.inc

 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5926 $
+$Revision: 6800 $
 ;==============================================================================
 ;///// public functions ///////////////////////////////////////////////////////
-;==============================================================================
-window.BORDER_SIZE = 5
-macro FuncTable name, table_name, [label]
-{
-  common
-    align 4
-    \label name#.#table_name dword
-  forward
-    dd name#.#label
-  common
+;==============================================================================
     name#.sizeof.#table_name = $ - name#.#table_name
 window.BORDER_SIZE = 5
 .exit:
         ret
 ;------------------------------------------------------------------------------
 syscall_display_settings: ;///// system function 48 ///////////////////////////
 ;------------------------------------------------------------------------------
-;; Redraw screen:
-;< ebx = 0
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set button style:
-;< ebx = 1
-;< ecx = 0 (flat) or 1 (with gradient)
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set system color palette:
-;< ebx = 2
-;< ecx = pointer to color table
-;< edx = size of color table
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get system color palette:
-;< ebx = 3
-;< ecx = pointer to color table buffer
-;< edx = size of color table buffer
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get skinned caption height:
-;< ebx = 4
-;> eax = height in pixels
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get screen working area:
-;< ebx = 5
-;> eax = pack[16(left), 16(right)]
-;> ebx = pack[16(top), 16(bottom)]
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set screen working area:
-;< ebx = 6
-;< ecx = pack[16(left), 16(right)]
-;< edx = pack[16(top), 16(bottom)]
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get skin margins:
-;< ebx = 7
-;> eax = pack[16(left), 16(right)]
-;> ebx = pack[16(top), 16(bottom)]
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set skin:
-;< ebx = 8
-;< ecx = pointer to FileInfoBlock struct
-;> eax = FS error code
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get font smoothing:
-;< ebx = 9
-;> eax = 0 — off, 1 — on, 2 — subpixel
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set font smoothing:
-;< ebx = 10
-;< ecx = 0 — off, 1 — on, 2 — subpixel
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Get font size:
-;< ebx = 11
-;> eax = height in pixels
-; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-;; Set font size:
-;< ebx = 12
-;< ecx = height in pixels
-;------------------------------------------------------------------------------
-        cmp     ebx, .sizeof.ftable / 4
+        cmp     ebx, 13
         ja      @f
-        jmp     [.ftable + ebx * 4]
+        jmp     dword[.ftable + ebx*4]
+align 4
+.ftable:
+dd  .redrawWholeScreen
+dd  .setButtonStyle
+dd  .setSystemColors
+dd  .getSystemColors
+dd  .getCaptionHeight
-;------------------------------------------------------------------------------
+dd  .getScreenWorkingArea
-syscall_display_settings.00:
+dd  .setScreenWorkingArea
+dd  .getSkinMargins
+dd  .setSkin
+dd  .getFontSmoothing
+dd  .setFontSmoothing
+dd  .getFontSize
+dd  .setFontSize
+dd  .setSkinUnicode
+.redrawWholeScreen:
         xor     eax, eax
         inc     ebx
         cmp     [windowtypechanged], ebx
-        jne     @f
+        jne     .ret
         mov     [windowtypechanged], eax
+.redrawScreen:
+        xor     eax, eax
+        mov     [draw_limits.left], eax
+        mov     [draw_limits.top], eax
+        mov     eax, [_display.width]
+        dec     eax
+        mov     [draw_limits.right], eax
-        jmp     syscall_display_settings._.redraw_whole_screen
+        mov     eax, [_display.height]
+        dec     eax
-;------------------------------------------------------------------------------
+        mov     [draw_limits.bottom], eax
+        mov     eax, window_data
-syscall_display_settings.01:
+        jmp     redrawscreen
+.setButtonStyle:
+; in: ecx: 0 = flat, 1 = with gradient
         and     ecx, 1
         cmp     ecx, [buttontype]
-        je      @f
+        je      .ret
         mov     [buttontype], ecx
         mov     [windowtypechanged], ebx
-@@:
+.ret:
         ret
-;------------------------------------------------------------------------------
-syscall_display_settings.02:
+.setSystemColors:
+; in: ecx = pointer to color table, edx = size of color table
         dec     ebx
         mov     esi, ecx
         cmp     edx, 192
         jnae    @f
         mov     edx, 192 ; max size
         mov     edi, common_colours
         mov     ecx, edx
         rep movsb
         mov     [windowtypechanged], ebx
         ret
-;------------------------------------------------------------------------------
-syscall_display_settings.03:
+.getSystemColors:
+; in: ecx = pointer to color table, edx = size of color table
         mov     edi, ecx
         cmp     edx, 192
         jnae    @f
         mov     edx, 192 ; max size
 @@:
         mov     esi, common_colours
         mov     ecx, edx
         rep movsb
         ret
-;------------------------------------------------------------------------------
-syscall_display_settings.04:
+.getCaptionHeight:
         mov     eax, [_skinh]
         mov     [esp + 32], eax
         ret
-;------------------------------------------------------------------------------
-syscall_display_settings.05:
+.getScreenWorkingArea:
+; out: eax = pack[left, right], ebx = pack[top, bottom]
         mov     eax, [screen_workarea.left - 2]
         mov     ax, word[screen_workarea.right]
         mov     [esp + 32], eax
         mov     eax, [screen_workarea.top - 2]
         mov     ax, word[screen_workarea.bottom]
         mov     [esp + 20], eax
         ret
-;------------------------------------------------------------------------------
-syscall_display_settings.06:
+.setScreenWorkingArea:
+; in: ecx = pack[left, right], edx = pack[top, bottom]
         xor     esi, esi
         mov     edi, [_display.width]
         dec     edi
         mov     eax, ecx
         movsx   ebx, ax
 @@:
         mov     [screen_workarea.bottom], ebx
 .check_if_redraw_needed:
         or      esi, esi
         jz      @f
         call    repos_windows
+.calculateScreen:
+        xor     eax, eax
+        xor     ebx, ebx
-        jmp     syscall_display_settings._.calculate_whole_screen
+        mov     ecx, [_display.width]
-;------------------------------------------------------------------------------
+        mov     edx, [_display.height]
+        dec     ecx
+        dec     edx
+        jmp     calculatescreen
-syscall_display_settings.07:
+.getSkinMargins:
+; out: eax = pack[left, right], ebx = pack[top, bottom]
         mov     eax, [_skinmargins + 0]
         mov     [esp + 32], eax
         mov     eax, [_skinmargins + 4]
         mov     [esp + 20], eax
-@@:
         ret
-;------------------------------------------------------------------------------
+.setSkin:
-syscall_display_settings.08:
+; in: ecx -> file path string
         mov     ebx, ecx
         call    read_skin_file
         mov     [esp + 32], eax
         test    eax, eax
-        jnz     @b
+        jnz     .ret
+        call    .calculateScreen
+        jmp     .redrawScreen
-        call    syscall_display_settings._.calculate_whole_screen
-        jmp     syscall_display_settings._.redraw_whole_screen
-;------------------------------------------------------------------------------
-syscall_display_settings.09:
+.getFontSmoothing:
         xor     eax, eax
         mov     al, [fontSmoothing]
         mov     [esp + 32], eax
-        ret
+        ret
-;------------------------------------------------------------------------------
-syscall_display_settings.10:
+.setFontSmoothing:
         mov     [fontSmoothing], cl
-        ret
+        ret
-;------------------------------------------------------------------------------
-syscall_display_settings.11:
+.getFontSize:
         xor     eax, eax
         mov     al, [fontSize]
         mov     [esp + 32], eax
-        ret
+        ret
-;------------------------------------------------------------------------------
-syscall_display_settings.12:
+.setFontSize:
         mov     [fontSize], cl
-        ret
+        ret
-;------------------------------------------------------------------------------
-syscall_display_settings._.calculate_whole_screen:
+.setSkinUnicode:
-        xor     eax, eax
+; in: ecx -> file path string, edx = string encoding
-        xor     ebx, ebx
+        push    ecx edx
-        mov     ecx, [_display.width]
+        stdcall kernel_alloc, maxPathLength
-        mov     edx, [_display.height]
+        mov     edi, eax
-        dec     ecx
+        pop     eax esi
-        dec     edx
+        push    edi
-        jmp     calculatescreen
-;------------------------------------------------------------------------------
-syscall_display_settings._.redraw_whole_screen:
+        call    getFullPath
-        xor     eax, eax
-        mov     [draw_limits.left], eax
+        test    eax, eax
-        mov     [draw_limits.top], eax
+        jz      @f
-        mov     eax, [_display.width]
+        mov     ebx, [esp]
-        dec     eax
+        call    read_skin_file
-        mov     [draw_limits.right], eax
+        mov     [esp + 32 + 4], eax
-        mov     eax, [_display.height]
+@@:
-        dec     eax
-        mov     [draw_limits.bottom], eax
+        call    kernel_free
-        mov     eax, window_data
+        call    .calculateScreen
+        jmp     .redrawScreen
         jmp     redrawscreen
 ;------------------------------------------------------------------------------
 syscall_set_window_shape: ;///// system function 50 ///////////////////////////
 ;------------------------------------------------------------------------------
 ;; Set window shape address:
         sub     eax, [screen_workarea.bottom]
         neg     eax
         mov     [edi + WDATA.box.height], eax
         jmp     .fix_client_box
 ;------------------------------------------------------------------------------
-;align 4
-;------------------------------------------------------------------------------
-;sys_window_mouse: ;////////////////////////////////////////////////////////////
-;------------------------------------------------------------------------------
-;?
-;------------------------------------------------------------------------------
-        ; NOTE: commented out since doesn't provide necessary functionality
-        ;       anyway, to be reworked
-;       push    eax
-;
-;       mov     eax, [timer_ticks]
-;       cmp     [new_window_starting], eax
-;       jb      .exit
-;
-;       mov     byte[MOUSE_BACKGROUND], 0
-;       mov     byte[DONT_DRAW_MOUSE], 0
-;
-;       mov     [new_window_starting], eax
-;
-; .exit:
-;       pop     eax
-;        ret
-;------------------------------------------------------------------------------
 align 4
 ;------------------------------------------------------------------------------
 draw_rectangle: ;//////////////////////////////////////////////////////////////
 ;------------------------------------------------------------------------------
 ;> eax = pack[16(left), 16(right)]
 ; If nothing has changed
         test    edx, edx
         jz      @f
         push    edx
-        call    syscall_display_settings._.calculate_whole_screen
+        call    syscall_display_settings.calculateScreen
-        call    syscall_display_settings._.redraw_whole_screen
+        call    syscall_display_settings.redrawScreen
         pop     edx
 ;--------------------------------------
 align 4
 @@:
 ;==============================================================================
 ;///// private functions //////////////////////////////////////////////////////
 ;==============================================================================
-iglobal
-  FuncTable syscall_display_settings, ftable, \
-, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12
 iglobal
-  align 4
+align 4
-  window_topleft dd \
+window_topleft  dd \
 , 21, \ ;type 0
 ,  0, \ ;type 1
 , 20, \ ;type 2
 ,  ?, \ ;type 3 {set by skin}
 ,  ?    ;type 4 {set by skin}
-endg
-;uglobal
-  ; NOTE: commented out since doesn't provide necessary functionality anyway,
-  ;       to be reworked
-; new_window_starting       dd ?
+endg
 ;endg
 ;------------------------------------------------------------------------------
 align 4
 ;------------------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/trunk/gui/window.inc – Rev 5926 → 6800