WebSVN – Kolibri OS – Diff – /kernel/trunk/video/vesa20.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2012. All rights reserved. ;;
+;; Copyright (C) KolibriOS team 2004-2014. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;  VESA20.INC                                                  ;;
 ;;                                                              ;;
 ;;  Vesa 2.0 functions for MenuetOS                             ;;
 ;;                                                              ;;
 ;;  See file COPYING for details                                ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+$Revision: 5154 $
+uglobal
+align 4
+        bgr_cur_line    rd 1920         ; maximum width of screen
-$Revision: 3606 $
+        bgr_next_line   rd 1920
-; If you're planning to write your own video driver I suggest
-; you replace the VESA12.INC file and see those instructions.
+endg
-;Screen_Max_X             equ     0xfe00
-;Screen_Max_Y            equ     0xfe04
-;BytesPerScanLine        equ     0xfe08
+iglobal
-;LFBAddress              equ     0xfe80
+align 4
-;ScreenBPP               equ     0xfbf1
+        overlapping_of_points_ptr       dd overlapping_of_points
-;-----------------------------------------------------------------------------
+endg
-; getpixel
-;
-; in:
-; eax = x coordinate
 ; ebx = y coordinate
-;
+;-----------------------------------------------------------------------------
+; eax = x
+; ebx = y
+align 4
+Vesa20_getpixel16:
-; ret:
+        ; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
+        je      @f
+        cmp     [_display.select_cursor], 0
-; ecx = 00 RR GG BB
+        jne     .no_mouseunder
+  @@:
+        ; check mouse area for putpixel
+        test    ecx, 0x04000000         ; don't load to mouseunder area
+        jnz     .no_mouseunder
+        call    [_display.check_m_pixel]
+        test    ecx, ecx                ; 0xff000000
+        jnz     @f
+  .no_mouseunder:
+;        imul    ebx, [BytesPerScanLine] ; ebx = y * y multiplier
+        mov     ebx, [BPSLine_calc_area+ebx*4]
+        lea     edi, [eax*2]            ; edi = x*2
+        add     edi, ebx                ; edi = x*2+(y*y multiplier)
+        movzx   ecx, word[LFB_BASE+edi]
-;-----------------------------------------------------------------------------
+        shl     ecx, 3
+        ror     ecx, 8
+        shl     cx, 2
-align 4
+        ror     ecx, 8
+        shl     cl, 3
-getpixel:
+        rol     ecx, 16
-        push    eax ebx edx edi
-        call    dword [GETPIXEL]
-        pop     edi edx ebx eax
+  @@:
-        ret
+        and     ecx, 0x00ffffff
+        ret
 ;-----------------------------------------------------------------------------
+; eax = x
-align 4
+; ebx = y
 Vesa20_getpixel24:
-; eax = x
+align 4
-; ebx = y
+Vesa20_getpixel24:
 ;--------------------------------------
-; check for hardware cursor
-        cmp     [_display.select_cursor], select_cursor
-        je      @f
+        ; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
-        cmp     [_display.select_cursor], 0
+        je      @f
-        jne     .no_mouseunder
+        cmp     [_display.select_cursor], 0
-;--------------------------------------
+        jne     .no_mouseunder
-align 4
+  @@:
 @@:
-; check mouse area for putpixel
+        ; check mouse area for putpixel
-        test    ecx, 0x04000000  ; don't load to mouseunder area
-        jnz     .no_mouseunder
+        test    ecx, 0x04000000         ; don't load to mouseunder area
-        call    [_display.check_m_pixel]
+        jnz     .no_mouseunder
-        test    ecx, ecx        ;0xff000000
-        jnz     @f
+        call    [_display.check_m_pixel]
-;--------------------------------------
+        test    ecx, ecx                ; 0xff000000
-align 4
+        jnz     @f
 .no_mouseunder:
+  .no_mouseunder:
-;--------------------------------------
+;        imul    ebx, [BytesPerScanLine] ; ebx = y * y multiplier
-;        imul    ebx, [BytesPerScanLine] ; ebx = y * y multiplier
-        mov     ebx, [BPSLine_calc_area+ebx*4]
-        lea     edi, [eax+eax*2]; edi = x*3
+        mov     ebx, [BPSLine_calc_area+ebx*4]
-        add     edi, ebx      ; edi = x*3+(y*y multiplier)
+        lea     edi, [eax+eax*2]        ; edi = x*3
-        mov     ecx, [LFB_BASE+edi]
+        add     edi, ebx                ; edi = x*3+(y*y multiplier)
-;--------------------------------------
+        mov     ecx, [LFB_BASE+edi]
+  @@:
+        and     ecx, 0x00ffffff
+        ret
 align 4
-@@:
+;-----------------------------------------------------------------------------
-        and     ecx, 0xffffff
+; eax = x
-        ret
+; ebx = y
 ;-----------------------------------------------------------------------------
 align 4
 Vesa20_getpixel32:
 ;--------------------------------------
-; check for hardware cursor
-        cmp     [_display.select_cursor], select_cursor
-        je      @f
+        ; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
-        cmp     [_display.select_cursor], 0
+        je      @f
-        jne     .no_mouseunder
+        cmp     [_display.select_cursor], 0
-;--------------------------------------
+        jne     .no_mouseunder
-align 4
+  @@:
 @@:
-; check mouse area for putpixel
+        ; check mouse area for putpixel
-        test    ecx, 0x04000000  ; don't load to mouseunder area
-        jnz     .no_mouseunder
+        test    ecx, 0x04000000         ; don't load to mouseunder area
-        call    [_display.check_m_pixel]
+        jnz     .no_mouseunder
-        test    ecx, ecx        ;0xff000000
-        jnz     @f
+        call    [_display.check_m_pixel]
-;--------------------------------------
+        test    ecx, ecx                ; 0xff000000
-align 4
+        jnz     @f
-.no_mouseunder:
+  .no_mouseunder:
-;--------------------------------------
-;        imul    ebx, [BytesPerScanLine] ; ebx = y * y multiplier
-        mov     ebx, [BPSLine_calc_area+ebx*4]
+;        imul    ebx, [BytesPerScanLine] ; ebx = y * y multiplier
-        lea     edi, [ebx+eax*4]; edi = x*4+(y*y multiplier)
+        mov     ebx, [BPSLine_calc_area+ebx*4]
-        mov     ecx, [LFB_BASE+edi]
+        lea     edi, [ebx+eax*4]        ; edi = x*4+(y*y multiplier)
-;--------------------------------------
+        mov     ecx, [LFB_BASE+edi]
+  @@:
+        and     ecx, 0x00ffffff
+        ret
+;-----------------------------------------------------------------------------
+; ebx = pointer
+; ecx = size [x|y]
+; edx = coordinates [x|y]
+; ebp = pointer to 'get' function
+; esi = pointer to 'init' function
-align 4
+; edi = parameter for 'get' function
 @@:
-        and     ecx, 0xffffff
+align 16
-        ret
+vesa20_putimage:
 ;-----------------------------------------------------------------------------
    .ecx         dd      ?
    .eax         dd      ?
    .ret_addr    dd      ?
    .arg_0       dd      ?
 end virtual
-;-----------------------------------------------------------------------------
-align 16
-; ebx = pointer
-; ecx = size [x|y]
-; edx = coordinates [x|y]
-; ebp = pointer to 'get' function
-; esi = pointer to 'init' function
-; edi = parameter for 'get' function
-vesa20_putimage:
         pushad
         sub     esp, putimg.stack_data
 ; save pointer to image
         mov     [putimg.pti], ebx
 ; unpack the size
         mov     ebx, [eax-twdw + WDATA.box.top]
         add     ebx, [putimg.image_cy]
         mov     [putimg.abs_cy], ebx
 ; real_sx = MIN(wnd_sx-image_cx, image_sx);
-        mov     ebx, [eax-twdw + WDATA.box.width]; ebx = wnd_sx
+        mov     ebx, [eax-twdw + WDATA.box.width]       ; ebx = wnd_sx
-; \begin{diamond}[20.08.2006]
-; note that WDATA.box.width is one pixel less than real window x-size
+        inc     ebx                                     ; WDATA.box.width is one pixel less than real window x-size
-        inc     ebx
-; \end{diamond}[20.08.2006]
         sub     ebx, [putimg.image_cx]
         ja      @f
         add     esp, putimg.stack_data
         popad
         ret
-;--------------------------------------
-align 4
-@@:
+  @@:
         cmp     ebx, [putimg.image_sx]
         jbe     .end_x
         mov     ebx, [putimg.image_sx]
-;--------------------------------------
-align 4
-.end_x:
+  .end_x:
         mov     [putimg.real_sx], ebx
 ; init real_sy
-        mov     ebx, [eax-twdw + WDATA.box.height]; ebx = wnd_sy
+        mov     ebx, [eax-twdw + WDATA.box.height]      ; ebx = wnd_sy
-; \begin{diamond}[20.08.2006]
         inc     ebx
-; \end{diamond}[20.08.2006]
         sub     ebx, [putimg.image_cy]
         ja      @f
         add     esp, putimg.stack_data
         popad
         ret
-;--------------------------------------
-align 4
-@@:
+  @@:
         cmp     ebx, [putimg.image_sy]
         jbe     .end_y
         mov     ebx, [putimg.image_sy]
-;--------------------------------------
-align 4
-.end_y:
+  .end_y:
         mov     [putimg.real_sy], ebx
 ; line increment
         mov     eax, [putimg.image_sx]
         mov     ecx, [putimg.real_sx]
         inc     eax
         sub     eax, [putimg.real_sx]
         mov     [putimg.winmap_newline], eax
 ; screen new line increment
         mov     eax, [_display.pitch]
-        mov     ebx, [_display.bpp]
+        mov     ebx, [_display.bytes_per_pixel]
-        shr     ebx, 3
         imul    ecx, ebx
         sub     eax, ecx
         mov     [putimg.screen_newline], eax
 ; pointer to image
         mov     esi, [putimg.pti]
 ; pointer to screen
         mov     edx, [putimg.abs_cy]
 ;        imul    edx, [BytesPerScanLine]
         mov     edx, [BPSLine_calc_area+edx*4]
         mov     eax, [putimg.abs_cx]
-;        movzx   ebx, byte [ScreenBPP]
-;        shr     ebx, 3
         imul    eax, ebx
         add     edx, eax
 ; pointer to pixel map
         mov     eax, [putimg.abs_cy]
 ;        imul    eax, [Screen_Max_X]
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [putimg.abs_cx]
         add     eax, [_WinMapAddress]
-        xchg    eax, ebp
+        xchg    eax, ebp
 ;--------------------------------------
         mov     ecx, [putimg.real_sx]
         add     ecx, [putimg.abs_cx]
         mov     [putimg.real_sx_and_abs_cx], ecx
         mov     ecx, [putimg.real_sy]
         add     ecx, [putimg.abs_cy]
-        mov     [putimg.real_sy_and_abs_cy], ecx
+        mov     [putimg.real_sy_and_abs_cy], ecx
 ;--------------------------------------
 ; get process number
+        mov     ebx, [CURRENT_TASK]
+        cmp     byte [_display.bits_per_pixel], 16
+        je      put_image_end_16
+        cmp     byte [_display.bits_per_pixel], 24
-        mov     ebx, [CURRENT_TASK]
+        je      put_image_end_24
-        cmp     byte [_display.bpp], 32
+        cmp     byte [_display.bits_per_pixel], 32
+        je      put_image_end_32
+;------------------------------------------------------------------------------
+put_image_end_16:
+        mov     edi, [putimg.real_sy]
+; check for hardware cursor
+        mov     ecx, [_display.select_cursor]
+        cmp     ecx, select_cursor
+        je      put_image_end_16_new
+        cmp     ecx, 0
+        je      put_image_end_16_old
+  .new_line:
+        mov     ecx, [putimg.real_sx]
+  .new_x:
+        push    [putimg.edi]
+        mov     eax, [putimg.ebp+4]
+        call    eax
+        cmp     [ebp], bl
+        jne     .skip
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [LFB_BASE+edx], ax
+  .skip:
+        add     edx, 2
+        inc     ebp
+        dec     ecx
+        jnz     .new_x
+        add     esi, [putimg.line_increment]
+        add     edx, [putimg.screen_newline]
+        add     ebp, [putimg.winmap_newline]
+        cmp     [putimg.ebp], putimage_get1bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get4bpp
+        jnz     @f
+  .correct:
+        mov     eax, [putimg.edi]
+        mov     byte [eax], 80h
+  @@:
+        dec     edi
+        jnz     .new_line
+  .finish:
+        add     esp, putimg.stack_data
+        popad
+        ret
+;------------------------------------------------------------------------------
+align 4
+put_image_end_16_old:
+  .new_line:
+        mov     ecx, [putimg.real_sx]
+  .new_x:
+        push    [putimg.edi]
+        mov     eax, [putimg.ebp+4]
+        call    eax
+        cmp     [ebp], bl
+        jne     .skip
+        push    ecx
+        neg     ecx
+        add     ecx, [putimg.real_sx_and_abs_cx + 4]
+        shl     ecx, 16
+        add     ecx, [putimg.real_sy_and_abs_cy + 4]
+        sub     ecx, edi
+; check mouse area for putpixel
+        call    check_mouse_area_for_putpixel
+        pop     ecx
+; convert to 16 bpp and store to LFB
+;;        and     eax, 00000000111110001111110011111000b
+;;        shr     ah, 2
+;;        shr     ax, 3
+;;        ror     eax, 8
+;;        add     al, ah
+;;        rol     eax, 8
+        mov     [LFB_BASE+edx], ax
+  .skip:
+        inc     edx
+        inc     edx
+        inc     ebp
+        dec     ecx
+        jnz     .new_x
+        add     esi, [putimg.line_increment]
+        add     edx, [putimg.screen_newline]
+        add     ebp, [putimg.winmap_newline]
+        cmp     [putimg.ebp], putimage_get1bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get4bpp
+        jnz     @f
+  .correct:
+        mov     eax, [putimg.edi]
+        mov     byte [eax], 80h
+  @@:
+        dec     edi
+        jnz     .new_line
+        jmp     put_image_end_16.finish
-        je      put_image_end_32
+;------------------------------------------------------------------------------
+align 4
+put_image_end_16_new:
+  .new_line:
+        mov     ecx, [putimg.real_sx]
+  .new_x:
+        push    [putimg.edi]
+        mov     eax, [putimg.ebp+4]
+        call    eax
+        cmp     [ebp], bl
+        jne     .skip
+        push    ecx
+  .sh:
+        neg     ecx
+        add     ecx, [putimg.real_sx_and_abs_cx + 4]
+; check for X
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
+        jae     .no_mouse_area
+        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
+        jb      .no_mouse_area
+        shl     ecx, 16
+        add     ecx, [putimg.real_sy_and_abs_cy + 4]
+        sub     ecx, edi
+; check for Y
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     .no_mouse_area
+        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      .no_mouse_area
+; check mouse area for putpixel
+        call    check_mouse_area_for_putpixel_new.1
+        cmp     ecx, -1                 ; SHIT HAPPENS?
+        jne     .no_mouse_area
+        mov     ecx, [esp]
+        jmp     .sh
+  .no_mouse_area:
+        pop     ecx
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [LFB_BASE+edx], ax
+  .skip:
+        add     edx, 2
+        inc     ebp
+        dec     ecx
+        jnz     .new_x
+        add     esi, [putimg.line_increment]
+        add     edx, [putimg.screen_newline]
+        add     ebp, [putimg.winmap_newline]
+        cmp     [putimg.ebp], putimage_get1bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
+        cmp     [putimg.ebp], putimage_get4bpp
+        jnz     @f
+  .correct:
+        mov     eax, [putimg.edi]
+        mov     byte [eax], 80h
+  @@:
+        dec     edi
+        jnz     .new_line
+        jmp     put_image_end_16.finish
+;------------------------------------------------------------------------------
-;--------------------------------------
+align 4
+put_image_end_24:
 put_image_end_24:
-        mov     edi, [putimg.real_sy]
+        mov     edi, [putimg.real_sy]
 ;--------------------------------------
 ; check for hardware cursor
         mov     ecx, [_display.select_cursor]
         cmp     ecx, select_cursor
         je      put_image_end_24_new
         cmp     ecx, 0
-        je      put_image_end_24_old
-;--------------------------------------
-align 4
+        je      put_image_end_24_old
-.new_line:
+  .new_line:
-        mov     ecx, [putimg.real_sx]
-;--------------------------------------
-align 4
+        mov     ecx, [putimg.real_sx]
-.new_x:
+  .new_x:
         push    [putimg.edi]
         mov     eax, [putimg.ebp+4]
         call    eax
         cmp     [ebp], bl
-        jne     .skip
+        jne     .skip
-;--------------------------------------
-; store to real LFB
+; store to LFB
         mov     [LFB_BASE+edx], ax
         shr     eax, 16
-        mov     [LFB_BASE+edx+2], al
-;--------------------------------------
+        mov     [LFB_BASE+edx+2], al
 align 4
-.skip:
+  .skip:
         add     edx, 3
         inc     ebp
         dec     ecx
         jnz     .new_x
         add     esi, [putimg.line_increment]
-        add     edx, [putimg.screen_newline];[BytesPerScanLine]
+        add     edx, [putimg.screen_newline]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     ebp, [putimg.winmap_newline]
         cmp     [putimg.ebp], putimage_get1bpp
         jz      .correct
         cmp     [putimg.ebp], putimage_get2bpp
-        jz      .correct
-        cmp     [putimg.ebp], putimage_get4bpp
-        jnz     @f
+        jz      .correct
-;--------------------------------------
+        cmp     [putimg.ebp], putimage_get4bpp
-align 4
+        jnz     @f
-.correct:
-        mov     eax, [putimg.edi]
-        mov     byte [eax], 80h
+  .correct:
-;--------------------------------------
+        mov     eax, [putimg.edi]
-align 4
+        mov     byte [eax], 80h
-@@:
-        dec     edi
-        jnz     .new_line
+  @@:
-;--------------------------------------
+        dec     edi
-align 4
+        jnz     .new_line
-.finish:
+  .finish:
+        add     esp, putimg.stack_data
-        add     esp, putimg.stack_data
+        popad
+        ret
         popad
-        ret
+;------------------------------------------------------------------------------
-;------------------------------------------------------------------------------
-align 4
-put_image_end_24_old:
+align 4
-;--------------------------------------
+put_image_end_24_old:
 align 4
-.new_line:
+  .new_line:
         mov     ecx, [putimg.real_sx]
 ;--------------------------------------
 align 4
 .new_x:
         push    [putimg.edi]
         mov     eax, [putimg.ebp+4]
-        call    eax
-        cmp     [ebp], bl
+        call    eax
-        jne     .skip
+        cmp     [ebp], bl
-;--------------------------------------
+        jne     .skip
         push    ecx
         push    ecx
         neg     ecx
         add     ecx, [putimg.real_sx_and_abs_cx + 4]
         shl     ecx, 16
         add     ecx, [putimg.real_sy_and_abs_cy + 4]
         sub     ecx, edi
 ; check mouse area for putpixel
         call    check_mouse_area_for_putpixel
-        pop     ecx
-; store to real LFB
+        pop     ecx
-        mov     [LFB_BASE+edx], ax
+; store to LFB
-        shr     eax, 16
+        mov     [LFB_BASE+edx], ax
-        mov     [LFB_BASE+edx+2], al
+        shr     eax, 16
-;--------------------------------------
+        mov     [LFB_BASE+edx+2], al
 align 4
-.skip:
+  .skip:
         add     edx, 3
         inc     ebp
         dec     ecx
         jnz     .new_x
         add     esi, [putimg.line_increment]
-        add     edx, [putimg.screen_newline];[BytesPerScanLine]
+        add     edx, [putimg.screen_newline]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     ebp, [putimg.winmap_newline]
-        cmp     [putimg.ebp], putimage_get1bpp
-        jz      .correct
+        cmp     [putimg.ebp], putimage_get1bpp
-        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
-        jz      .correct
+        cmp     [putimg.ebp], putimage_get2bpp
-        cmp     [putimg.ebp], putimage_get4bpp
-        jnz     @f
+        jz      .correct
-;--------------------------------------
+        cmp     [putimg.ebp], putimage_get4bpp
-align 4
+        jnz     @f
 .correct:
-        mov     eax, [putimg.edi]
+  .correct:
+        mov     eax, [putimg.edi]
         mov     byte [eax], 80h
-;--------------------------------------
+  @@:
-align 4
+        dec     edi
-@@:
-        dec     edi
+        jnz     .new_line
-        jnz     .new_line
+        jmp     put_image_end_24.finish
         jmp     put_image_end_24.finish
-;------------------------------------------------------------------------------
-align 4
+;------------------------------------------------------------------------------
 put_image_end_24_new:
-;--------------------------------------
+align 4
-align 4
+put_image_end_24_new:
 .new_line:
-        mov     ecx, [putimg.real_sx]
+  .new_line:
-;--------------------------------------
+        mov     ecx, [putimg.real_sx]
-align 4
-.new_x:
+  .new_x:
-        push    [putimg.edi]
-        mov     eax, [putimg.ebp+4]
-        call    eax
+        push    [putimg.edi]
-        cmp     [ebp], bl
+        mov     eax, [putimg.ebp+4]
-        jne     .skip
+        call    eax
-;--------------------------------------
+        cmp     [ebp], bl
-        push    ecx
+        jne     .skip
 ;--------------------------------------
-align 4
+        push    ecx
-.sh:
+  .sh:
         shl     ecx, 16
-        add     ecx, [putimg.real_sy_and_abs_cy + 4]
+        add     ecx, [putimg.real_sy_and_abs_cy + 4]
         sub     ecx, edi
 ;--------------------------------------
 ; check for Y
         cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
         jae     .no_mouse_area
         sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
         jb      .no_mouse_area
 ;--------------------------------------
 ; check mouse area for putpixel
         call    check_mouse_area_for_putpixel_new.1
-        cmp     ecx, -1   ;SHIT HAPPENS?
+        cmp     ecx, -1         ; SHIT HAPPENS?
-        jne     .no_mouse_area
+        jne     .no_mouse_area
         mov     ecx, [esp]
-        jmp     .sh
+        mov     ecx, [esp]
+        jmp     .sh
-;--------------------------------------
-align 4
+  .no_mouse_area:
-.no_mouse_area:
+        pop     ecx
         pop     ecx
-; store to real LFB
-        mov     [LFB_BASE+edx], ax
+; store to LFB
-        shr     eax, 16
+        mov     [LFB_BASE+edx], ax
-        mov     [LFB_BASE+edx+2], al
+        shr     eax, 16
-;--------------------------------------
+        mov     [LFB_BASE+edx+2], al
 align 4
-.skip:
+  .skip:
         add     edx, 3
         inc     ebp
         dec     ecx
         jnz     .new_x
         add     esi, [putimg.line_increment]
-        add     edx, [putimg.screen_newline];[BytesPerScanLine]
+        add     edx, [putimg.screen_newline]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     ebp, [putimg.winmap_newline]
-        cmp     [putimg.ebp], putimage_get1bpp
-        jz      .correct
+        cmp     [putimg.ebp], putimage_get1bpp
-        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
-        jz      .correct
+        cmp     [putimg.ebp], putimage_get2bpp
-        cmp     [putimg.ebp], putimage_get4bpp
+        jz      .correct
-        jnz     @f
-;--------------------------------------
+        cmp     [putimg.ebp], putimage_get4bpp
-align 4
+        jnz     @f
 .correct:
-        mov     eax, [putimg.edi]
+  .correct:
-        mov     byte [eax], 80h
+        mov     eax, [putimg.edi]
+        mov     byte [eax], 80h
 ;--------------------------------------
+  @@:
-align 4
+        dec     edi
-@@:
+        jnz     .new_line
+        jmp     put_image_end_24.finish
         dec     edi
-        jnz     .new_line
+;------------------------------------------------------------------------------
         jmp     put_image_end_24.finish
-;------------------------------------------------------------------------------
+align 4
-align 4
+put_image_end_32:
 put_image_end_32:
         mov     edi, [putimg.real_sy]
 ;--------------------------------------
-; check for hardware cursor
-        mov     ecx, [_display.select_cursor]
+; check for hardware cursor
-        cmp     ecx, select_cursor
+        mov     ecx, [_display.select_cursor]
-        je      put_image_end_32_new
+        cmp     ecx, select_cursor
-        cmp     ecx, 0
-        je      put_image_end_32_old
+        je      put_image_end_32_new
-;--------------------------------------
+        cmp     ecx, 0
-align 4
+        je      put_image_end_32_old
 .new_line:
-        mov     ecx, [putimg.real_sx]
+  .new_line:
-;--------------------------------------
+        mov     ecx, [putimg.real_sx]
 align 4
-.new_x:
+  .new_x:
         push    [putimg.edi]
         mov     eax, [putimg.ebp+4]
-        call    eax
-        cmp     [ebp], bl
+        call    eax
-        jne     .skip
+        cmp     [ebp], bl
-;--------------------------------------
+        jne     .skip
 ; store to real LFB
-        mov     [LFB_BASE+edx], eax
+; store to LFB
-;--------------------------------------
+        mov     [LFB_BASE+edx], eax
 align 4
-.skip:
+  .skip:
         add     edx, 4
         inc     ebp
         dec     ecx
         jnz     .new_x
         add     esi, [putimg.line_increment]
-        add     edx, [putimg.screen_newline];[BytesPerScanLine]
+        add     edx, [putimg.screen_newline]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     ebp, [putimg.winmap_newline]
         cmp     [putimg.ebp], putimage_get1bpp
-        jz      .correct
+        cmp     [putimg.ebp], putimage_get1bpp
-        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
-        jz      .correct
-        cmp     [putimg.ebp], putimage_get4bpp
+        cmp     [putimg.ebp], putimage_get2bpp
-        jnz     @f
+        jz      .correct
-;--------------------------------------
+        cmp     [putimg.ebp], putimage_get4bpp
-align 4
+        jnz     @f
-.correct:
-        mov     eax, [putimg.edi]
-        mov     byte [eax], 80h
+  .correct:
-;--------------------------------------
+        mov     eax, [putimg.edi]
-align 4
+        mov     byte [eax], 80h
 @@:
-        dec     edi
+  @@:
-        jnz     .new_line
+        dec     edi
-;--------------------------------------
-align 4
-.finish:
+        jnz     .new_line
         add     esp, putimg.stack_data
-        popad
+  .finish:
+        add     esp, putimg.stack_data
-        cmp     [SCR_MODE], 0x12
+        popad
+        cmp     [SCR_MODE], 0x12
         jne     @f
         call    VGA__putimage
-;--------------------------------------
-align 4
+  @@:
-@@:
+        mov     [EGA_counter], 1
-        mov     [EGA_counter], 1
+        ret
-        ret
-;------------------------------------------------------------------------------
 align 4
-put_image_end_32_old:
+;------------------------------------------------------------------------------
 ;--------------------------------------
 align 4
-.new_line:
+put_image_end_32_old:
         mov     ecx, [putimg.real_sx]
-;--------------------------------------
-align 4
+  .new_line:
-.new_x:
+        mov     ecx, [putimg.real_sx]
-        push    [putimg.edi]
+  .new_x:
-        mov     eax, [putimg.ebp+4]
+        push    [putimg.edi]
-        call    eax
+        mov     eax, [putimg.ebp+4]
-        cmp     [ebp], bl
+        call    eax
-        jne     .skip
+        cmp     [ebp], bl
-;--------------------------------------
+        jne     .skip
         push    ecx
+        push    ecx
         neg     ecx
-        add     ecx, [putimg.real_sx_and_abs_cx + 4]
-        shl     ecx, 16
+        add     ecx, [putimg.real_sx_and_abs_cx + 4]
-        add     ecx, [putimg.real_sy_and_abs_cy + 4]
+        shl     ecx, 16
-        sub     ecx, edi
+        add     ecx, [putimg.real_sy_and_abs_cy + 4]
         sub     ecx, edi
 ; check mouse area for putpixel
-        call    check_mouse_area_for_putpixel
+; check mouse area for putpixel
-        pop     ecx
+        call    check_mouse_area_for_putpixel
-; store to real LFB
+        pop     ecx
-        mov     [LFB_BASE+edx], eax
+; store to LFB
-;--------------------------------------
+        mov     [LFB_BASE+edx], eax
 align 4
-.skip:
+  .skip:
         add     edx, 4
         inc     ebp
         dec     ecx
-        jnz     .new_x
+        jnz     .new_x
         add     esi, [putimg.line_increment]
-        add     edx, [putimg.screen_newline];[BytesPerScanLine]
+        add     esi, [putimg.line_increment]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     edx, [putimg.screen_newline]
-        cmp     [putimg.ebp], putimage_get1bpp
+        add     ebp, [putimg.winmap_newline]
         jz      .correct
-        cmp     [putimg.ebp], putimage_get2bpp
+        cmp     [putimg.ebp], putimage_get1bpp
         jz      .correct
-        cmp     [putimg.ebp], putimage_get4bpp
+        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
-        jnz     @f
+        cmp     [putimg.ebp], putimage_get4bpp
+        jnz     @f
 ;--------------------------------------
-align 4
+  .correct:
-.correct:
         mov     eax, [putimg.edi]
         mov     byte [eax], 80h
 ;--------------------------------------
-align 4
-@@:
+  @@:
         dec     edi
         jnz     .new_line
         jmp     put_image_end_32.finish
 ;------------------------------------------------------------------------------
-align 4
+;------------------------------------------------------------------------------
 put_image_end_32_new:
-;--------------------------------------
+align 4
-align 4
+put_image_end_32_new:
-.new_line:
-        mov     ecx, [putimg.real_sx]
-;--------------------------------------
+  .new_line:
-align 4
+        mov     ecx, [putimg.real_sx]
 .new_x:
-        push    [putimg.edi]
+  .new_x:
-        mov     eax, [putimg.ebp+4]
+        push    [putimg.edi]
-        call    eax
+        mov     eax, [putimg.ebp+4]
-        cmp     [ebp], bl
+        call    eax
-        jne     .skip
-;--------------------------------------
+        cmp     [ebp], bl
-        push    ecx
+        jne     .skip
-;--------------------------------------
 align 4
-.sh:
+        push    ecx
         neg     ecx
-        add     ecx, [putimg.real_sx_and_abs_cx + 4]
+  .sh:
-;--------------------------------------
+        neg     ecx
-; check for X
+        add     ecx, [putimg.real_sx_and_abs_cx + 4]
         cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
-        jae     .no_mouse_area
 ; check for X
-        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
-        jb      .no_mouse_area
+        jae     .no_mouse_area
         sub     cx, [X_UNDER_subtraction_CUR_hot_x]
-        shl     ecx, 16
+        jb      .no_mouse_area
         shl     ecx, 16
         add     ecx, [putimg.real_sy_and_abs_cy + 4]
-        sub     ecx, edi
+        add     ecx, [putimg.real_sy_and_abs_cy + 4]
-;--------------------------------------
+        sub     ecx, edi
-; check for Y
-        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
-        jae     .no_mouse_area
+; check for Y
         cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     .no_mouse_area
         sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
         jb      .no_mouse_area
-;--------------------------------------
-; check mouse area for putpixel
-        call    check_mouse_area_for_putpixel_new.1
+; check mouse area for putpixel
-        cmp     ecx, -1   ;SHIT HAPPENS?
+        call    check_mouse_area_for_putpixel_new.1
-        jne     .no_mouse_area
+        cmp     ecx, -1         ; SHIT HAPPENS?
         jne     .no_mouse_area
         mov     ecx, [esp]
-        jmp     .sh
+        mov     ecx, [esp]
-;--------------------------------------
+        jmp     .sh
-align 4
-.no_mouse_area:
+  .no_mouse_area:
         pop     ecx
 ; store to real LFB
-        mov     [LFB_BASE+edx], eax
+; store to LFB
-;--------------------------------------
+        mov     [LFB_BASE+edx], eax
 align 4
-.skip:
-        add     edx, 4
+  .skip:
-        inc     ebp
+        add     edx, 4
-        dec     ecx
+        inc     ebp
-        jnz     .new_x
+        dec     ecx
-        add     esi, [putimg.line_increment]
+        jnz     .new_x
         add     edx, [putimg.screen_newline];[BytesPerScanLine]
-        add     ebp, [putimg.winmap_newline];[Screen_Max_X]
+        add     esi, [putimg.line_increment]
         add     edx, [putimg.screen_newline]
-        cmp     [putimg.ebp], putimage_get1bpp
+        add     ebp, [putimg.winmap_newline]
-        jz      .correct
-        cmp     [putimg.ebp], putimage_get2bpp
-        jz      .correct
-        cmp     [putimg.ebp], putimage_get4bpp
+        cmp     [putimg.ebp], putimage_get1bpp
-        jnz     @f
+        jz      .correct
-;--------------------------------------
+        cmp     [putimg.ebp], putimage_get2bpp
+        jz      .correct
-align 4
+        cmp     [putimg.ebp], putimage_get4bpp
-.correct:
+        jnz     @f
         mov     eax, [putimg.edi]
+  .correct:
-        mov     byte [eax], 80h
+        mov     eax, [putimg.edi]
+        mov     byte [eax], 80h
 ;--------------------------------------
-align 4
+  @@:
-@@:
+        dec     edi
-        dec     edi
+        jnz     .new_line
-        jnz     .new_line
+        jmp     put_image_end_32.finish
         jmp     put_image_end_32.finish
 ;------------------------------------------------------------------------------
-align 4
+; eax = x coordinate
-__sys_putpixel:
+; ebx = y coordinate
 ; ecx = xx RR GG BB
-; eax = x coordinate
+; xx flags:
-; ebx = y coordinate
+; 0x01000000 color inversion
-; ecx = ?? RR GG BB    ; 0x01000000 negation
+; 0x02000000 used for draw_rectangle without top line (for drawwindow_III and drawwindow_IV)
-                       ; 0x02000000 used for draw_rectangle without top line
-                       ;            for example drawwindow_III and drawwindow_IV
+; edi = 0x00000001 force
 ; edi = 0x00000001 force
+align 4
-;;;        mov  [novesachecksum], dword 0
+__sys_putpixel:
-        pushad
+        pushad
         cmp     [Screen_Max_X], eax
         jb      .exit
+        cmp     [Screen_Max_Y], ebx
-        cmp     [Screen_Max_Y], ebx
+        jb      .exit
-        jb      .exit
+        test    edi, 1          ; force ?
-        test    edi, 1           ; force ?
+        jnz     .forced
         jnz     .forced
-; not forced:
-        mov     edx, [d_width_calc_area + ebx*4]
+; not forced
-        add     edx, [_WinMapAddress]
-        movzx   edx, byte [eax+edx]
+        mov     edx, [d_width_calc_area + ebx*4]
-        cmp     edx, [CURRENT_TASK]
-        jne     .exit
-;--------------------------------------
+        add     edx, [_WinMapAddress]
-align 4
+        movzx   edx, byte [eax+edx]
-.forced:
+        cmp     edx, [CURRENT_TASK]
+        jne     .exit
 ; check if negation
+  .forced:
+; check for color inversion
+        test    ecx, 0x01000000
-        test    ecx, 0x01000000
+        jz      .no_inv
-        jz      .noneg
+        push    eax ebx edx edi
+        call    [GETPIXEL]
+        pop     edi edx ebx eax
+        not     ecx
+        rol     ecx, 8
+        mov     cl, [esp+32-8+3]
+        ror     ecx, 8
+        mov     [esp+32-8], ecx
+  .no_inv:
+        call    [PUTPIXEL]      ; call the real put_pixel function
+  .exit:
+        popad
+        ret
+;-----------------------------------------------------------------------------
+; eax = x
+; ebx = y
+align 4
+Vesa20_putpixel16:
+        mov     ecx, eax
+        shl     ecx, 16
+        mov     cx, bx
+;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        mov     ebx, [BPSLine_calc_area+ebx*4]
+        lea     edi, [eax*2]; edi = x*2
+        mov     eax, [esp+32-8+4]
-        call    getpixel
+; check for hardware cursor
+        cmp     [_display.select_cursor], 0
+        jne     @f
+; check mouse area for putpixel
+        test    eax, 0x04000000
+        jnz     @f
+        call    check_mouse_area_for_putpixel
+  @@:
+; store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [LFB_BASE+ebx+edi], ax
+        ret
+;-----------------------------------------------------------------------------
+; eax = x
+; ebx = y
+align 4
+Vesa20_putpixel16_new:
+        mov     ecx, eax
+        shl     ecx, 16
+        mov     cx, bx
+;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        mov     ebx, [BPSLine_calc_area+ebx*4]
+        lea     edi, [eax*2]; edi = x*2
+        mov     eax, [esp+32-8+4]
+; check for hardware cursor
+        cmp     [_display.select_cursor], select_cursor
+        jne     @f
+; check mouse area for putpixel
+        test    eax, 0x04000000
+        jnz     @f
+; check for Y
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     @f
+        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      @f
+        rol     ecx, 16
+; check for X
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
+        jae     @f
+        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
+        jb      @f
+        ror     ecx, 16
         not     ecx
         call    check_mouse_area_for_putpixel_new.1
-        rol     ecx, 8
+  @@:
-        mov     cl, [esp+32-8+3]
+; store to LFB
-        ror     ecx, 8
+        and     eax, 00000000111110001111110011111000b
-        mov     [esp+32-8], ecx
+        shr     ah, 2
-;--------------------------------------
+        shr     ax, 3
-align 4
+        ror     eax, 8
-.noneg:
+        add     al, ah
-; OK to set pixel
+        rol     eax, 8
         call    dword [PUTPIXEL]; call the real put_pixel function
-;--------------------------------------
+        mov     [LFB_BASE+ebx+edi], ax
-align 4
+        ret
 .exit:
-        popad
+;-----------------------------------------------------------------------------
-        ret
-;-----------------------------------------------------------------------------
-align 4
+; eax = x
+; ebx = y
-Vesa20_putpixel24:
-; eax = x
+align 4
-; ebx = y
+Vesa20_putpixel24:
         mov     ecx, eax
-        shl     ecx, 16
+        mov     ecx, eax
+        shl     ecx, 16
         mov     cx, bx
-;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
         mov     ebx, [BPSLine_calc_area+ebx*4]
-        lea     edi, [eax+eax*2]; edi = x*3
+;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        mov     ebx, [BPSLine_calc_area+ebx*4]
+        lea     edi, [eax+eax*2]; edi = x*3
+        mov     eax, [esp+32-8+4]
-        mov     eax, [esp+32-8+4]
+; check for hardware cursor
-;--------------------------------------
+        cmp     [_display.select_cursor], 0
-; check for hardware cursor
+        jne     @f
-        cmp     [_display.select_cursor], 0
+; check mouse area for putpixel
-        jne     @f
+        test    eax, 0x04000000
-; check mouse area for putpixel
+        jnz     @f
-        test    eax, 0x04000000
+        call    check_mouse_area_for_putpixel
-        jnz     @f
+  @@:
         call    check_mouse_area_for_putpixel
-;--------------------------------------
+; store to LFB
-align 4
+        mov     [LFB_BASE+ebx+edi], ax
-@@:
+        shr     eax, 16
-; store to real LFB
+        mov     [LFB_BASE+ebx+edi+2], al
-        mov     [LFB_BASE+ebx+edi], ax
+        ret
-        shr     eax, 16
-        mov     [LFB_BASE+ebx+edi+2], al
+;-----------------------------------------------------------------------------
-        ret
+; eax = x
-;-----------------------------------------------------------------------------
+; ebx = y
-align 4
 Vesa20_putpixel24_new:
-; eax = x
+align 4
-; ebx = y
-        mov     ecx, eax
+Vesa20_putpixel24_new:
-        shl     ecx, 16
-        mov     cx, bx
+        mov     ecx, eax
         shl     ecx, 16
-;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        mov     cx, bx
-        mov     ebx, [BPSLine_calc_area+ebx*4]
         lea     edi, [eax+eax*2]; edi = x*3
-        mov     eax, [esp+32-8+4]
+;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
-;--------------------------------------
-; check for hardware cursor
+        mov     ebx, [BPSLine_calc_area+ebx*4]
-        cmp     [_display.select_cursor], select_cursor
+        lea     edi, [eax+eax*2]; edi = x*3
-        jne     @f
-; check mouse area for putpixel
-        test    eax, 0x04000000
+        mov     eax, [esp+32-8+4]
-        jnz     @f
-;--------------------------------------
+; check for hardware cursor
-; check for Y
+        cmp     [_display.select_cursor], select_cursor
-        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jne     @f
-        jae     @f
+; check mouse area for putpixel
+        test    eax, 0x04000000
         jnz     @f
-        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
-        jb      @f
-        rol     ecx, 16
+; check for Y
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     @f
+        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      @f
-;--------------------------------------
+        rol     ecx, 16
 ; check for X
-        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
+; check for X
-        jae     @f
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
         jae     @f
         sub     cx, [X_UNDER_subtraction_CUR_hot_x]
         jb      @f
+        ror     ecx, 16
         ror     ecx, 16
         call    check_mouse_area_for_putpixel_new.1
-        call    check_mouse_area_for_putpixel_new.1
+  @@:
-;--------------------------------------
+; store to LFB
-align 4
+        mov     [LFB_BASE+ebx+edi], ax
-@@:
+        shr     eax, 16
-; store to real LFB
+        mov     [LFB_BASE+ebx+edi+2], al
-        mov     [LFB_BASE+ebx+edi], ax
-        shr     eax, 16
-        mov     [LFB_BASE+ebx+edi+2], al
+        ret
         ret
 ;-----------------------------------------------------------------------------
-align 4
+; eax = x
-Vesa20_putpixel32:
+; ebx = y
-; eax = x
+align 4
-; ebx = y
-        mov     ecx, eax
-        shl     ecx, 16
+Vesa20_putpixel32:
         mov     cx, bx
+        mov     ecx, eax
+        shl     ecx, 16
+        mov     cx, bx
 ;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
-;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        mov     ebx, [BPSLine_calc_area+ebx*4]
-        mov     ebx, [BPSLine_calc_area+ebx*4]
+        lea     edi, [ebx+eax*4]        ; edi = x*4+(y*y multiplier)
-        lea     edi, [ebx+eax*4]; edi = x*4+(y*y multiplier)
+        mov     eax, [esp+32-8+4]       ; eax = color
         mov     eax, [esp+32-8+4]; eax = color
-;--------------------------------------
+; check for hardware cursor
-; check for hardware cursor
+        cmp     [_display.select_cursor], 0
-        cmp     [_display.select_cursor], 0
+        jne     @f
-        jne     @f
+; check mouse area for putpixel
-; check mouse area for putpixel
+        test    eax, 0x04000000
-        test    eax, 0x04000000
+        jnz     @f
-        jnz     @f
+        call    check_mouse_area_for_putpixel
-        call    check_mouse_area_for_putpixel
+  @@:
-;--------------------------------------
+        and     eax, 0xffffff
-align 4
+; store to LFB
-@@:
+        mov     [LFB_BASE+edi], eax
-        and     eax, 0xffffff
+        ret
 ; store to real LFB
-        mov     [LFB_BASE+edi], eax
-        ret
+;-----------------------------------------------------------------------------
-;-----------------------------------------------------------------------------
+; eax = x
-align 4
-Vesa20_putpixel32_new:
+; ebx = y
-; eax = x
-; ebx = y
+align 4
-        mov     ecx, eax
+Vesa20_putpixel32_new:
         shl     ecx, 16
-        mov     cx, bx
         mov     ecx, eax
-;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
+        shl     ecx, 16
-        mov     ebx, [BPSLine_calc_area+ebx*4]
-        lea     edi, [ebx+eax*4]; edi = x*4+(y*y multiplier)
+        mov     cx, bx
         mov     eax, [esp+32-8+4]; eax = color
-;--------------------------------------
-; check for hardware cursor
-        cmp     [_display.select_cursor], select_cursor
+;        imul    ebx, [BytesPerScanLine]  ; ebx = y * y multiplier
-        jne     @f
+        mov     ebx, [BPSLine_calc_area+ebx*4]
-; check mouse area for putpixel
+        lea     edi, [ebx+eax*4]        ; edi = x*4+(y*y multiplier)
-        test    eax, 0x04000000
+        mov     eax, [esp+32-8+4]       ; eax = color
         jnz     @f
+; check for hardware cursor
-;--------------------------------------
+        cmp     [_display.select_cursor], select_cursor
+        jne     @f
-; check for Y
+; check mouse area for putpixel
-        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        test    eax, 0x04000000
-        jae     @f
+        jnz     @f
-        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+; check for Y
-        jb      @f
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
         jae     @f
-        rol     ecx, 16
+        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      @f
+        rol     ecx, 16
 ;--------------------------------------
 ; check for X
         cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
-        jae     @f
-        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
-        jb      @f
+        jae     @f
-        ror     ecx, 16
+        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
-        call    check_mouse_area_for_putpixel_new.1
+        jb      @f
-;--------------------------------------
+        ror     ecx, 16
+        call    check_mouse_area_for_putpixel_new.1
-align 4
+  @@:
-@@:
+        and     eax, 0x00ffffff
-        and     eax, 0xffffff
+; store to LFB
-; store to real LFB
+        mov     [LFB_BASE+edi], eax
-        mov     [LFB_BASE+edi], eax
+        ret
         ret
 ;-----------------------------------------------------------------------------
+align 4
-align 4
+calculate_edi:
-calculate_edi:
+;        mov     edi, ebx
-;        mov     edi, ebx
+;        imul    edi, [Screen_Max_X]
-;        imul    edi, [Screen_Max_X]
+;        add     edi, ebx
-;        add     edi, ebx
+        mov     edi, [d_width_calc_area + ebx*4]
-        jg      .no_vline  ; x1 > x2 ?
+        jg      .no_vline       ; x1 > x2 ?
-        mov     edx, ebp   ; else (if x1=x2)
+        mov     edx, ebp        ; else (if x1=x2)
         call    vline
-        push    edx ; necessary to rightly restore stack frame at .exit
+        push    edx             ; necessary to rightly restore stack frame at .exit
         jmp     .exit
-;--------------------------------------
-align 4
-.x2lx1:
+  .x2lx1:
-        neg     esi         ; get esi absolute value
+        neg     esi             ; get esi absolute value
-;--------------------------------------
-align 4
-.no_vline:
+  .no_vline:
 ; checking y-axis...
-        sub     ebp, ebx    ; ebp = y2-y1
+        sub     ebp, ebx        ; ebp = y2-y1
-        push    ebp         ; save y2-y1
+        push    ebp             ; save y2-y1
-        jl      .y2ly1      ; is y2 less than y1 ?
+        jl      .y2ly1          ; is y2 less than y1 ?
-        jg      .no_hline   ; y1 > y2 ?
+        jg      .no_hline       ; y1 > y2 ?
-        mov     edx, [dl_x2]; else (if y1=y2)
+        mov     edx, [dl_x2]    ; else (if y1=y2)
         call    hline
         jmp     .exit
-;--------------------------------------
-align 4
-.y2ly1:
+  .y2ly1:
-        neg     ebp         ; get ebp absolute value
+        neg     ebp             ; get ebp absolute value
-;--------------------------------------
-align 4
-.no_hline:
+  .no_hline:
         cmp     ebp, esi
-        jle     .x_rules    ; |y2-y1| < |x2-x1|  ?
+        jle     .x_rules        ; |y2-y1| < |x2-x1|  ?
-        cmp     [dl_y2], ebx; make sure y1 is at the begining
+        cmp     [dl_y2], ebx    ; make sure y1 is at the begining
         jge     .no_reverse1
         mov     [dl_x2], eax
         mov     [dl_x1], edx
         mov     edx, [dl_y2]
         mov     [dl_y2], ebx
         mov     [dl_y1], edx
-;--------------------------------------
-align 4
-.no_reverse1:
+  .no_reverse1:
         mov     eax, [dl_dx]
-        cdq                 ; extend eax sing to edx
+        cdq                     ; extend eax sing to edx
-        shl     eax, 16     ; using 16bit fix-point maths
+        shl     eax, 16         ; using 16bit fix-point maths
-        idiv    ebp         ; eax = ((x2-x1)*65536)/(y2-y1)
+        idiv    ebp             ; eax = ((x2-x1)*65536)/(y2-y1)
-;--------------------------------------
 ; correction for the remainder of the division
         shl     edx, 1
         cmp     ebp, edx
         jb      @f
         inc     eax
-;--------------------------------------
-align 4
-@@:
+  @@:
-;--------------------------------------
-        mov     edx, ebp    ; edx = counter (number of pixels to draw)
+        mov     edx, ebp        ; edx = counter (number of pixels to draw)
-        mov     ebp, 1 *65536; <<16   ; ebp = dy = 1.0
+        mov     ebp, 1 shl 16   ; ebp = dy = 1.0
-        mov     esi, eax    ; esi = dx
+        mov     esi, eax        ; esi = dx
         jmp     .y_rules
-;--------------------------------------
-align 4
-.x_rules:
+  .x_rules:
-        cmp     [dl_x2], eax ; make sure x1 is at the begining
+        cmp     [dl_x2], eax    ; make sure x1 is at the begining
         jge     .no_reverse2
         neg     dword [dl_dy]
         mov     edx, [dl_x2]
         mov     [dl_x2], eax
         mov     [dl_x1], edx
         mov     edx, [dl_y2]
         mov     [dl_y2], ebx
         mov     [dl_y1], edx
-;--------------------------------------
-align 4
-.no_reverse2:
+  .no_reverse2:
         xor     edx, edx
         mov     eax, [dl_dy]
-        cdq                 ; extend eax sing to edx
+        cdq                     ; extend eax sing to edx
-        shl     eax, 16     ; using 16bit fix-point maths
+        shl     eax, 16         ; using 16bit fix-point maths
-        idiv    esi         ; eax = ((y2-y1)*65536)/(x2-x1)
+        idiv    esi             ; eax = ((y2-y1)*65536)/(x2-x1)
-;--------------------------------------
 ; correction for the remainder of the division
         shl     edx, 1
         cmp     esi, edx
         jb      @f
         inc     eax
-;--------------------------------------
-align 4
-@@:
+  @@:
-;--------------------------------------
-        mov     edx, esi    ; edx = counter (number of pixels to draw)
+        mov     edx, esi        ; edx = counter (number of pixels to draw)
-        mov     esi, 1 *65536;<< 16   ; esi = dx = 1.0
+        mov     esi, 1 shl 16   ; esi = dx = 1.0
-        mov     ebp, eax    ; ebp = dy
+        mov     ebp, eax        ; ebp = dy
-;--------------------------------------
-align 4
-.y_rules:
+  .y_rules:
         mov     eax, [dl_x1]
         mov     ebx, [dl_y1]
         shl     eax, 16
         shl     ebx, 16
-        and     ecx, 0xFBFFFFFF ;negate 0x04000000 save to mouseunder area
-;-----------------------------------------------------------------------------
-align 4
+        and     ecx, 0xFBFFFFFF ; negate 0x04000000 save to mouseunder area
-.draw:
+  .draw:
-        push    eax ebx
+        push    eax ebx
 ;--------------------------------------
 ; correction for the remainder of the division
         test    ah, 0x80
         jz      @f
-        add     eax, 1 shl 16
-;--------------------------------------
-align 4
+        add     eax, 1 shl 16
-@@:
-;--------------------------------------
+  @@:
-        shr     eax, 16
-;--------------------------------------
+        shr     eax, 16
 ; correction for the remainder of the division
         test    bh, 0x80
         jz      @f
-        add     ebx, 1 shl 16
-;--------------------------------------
-align 4
+        add     ebx, 1 shl 16
-@@:
-;--------------------------------------
+  @@:
         shr     ebx, 16
-;        and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
+;        and     ecx, 0xFBFFFFFF  ; negate 0x04000000 save to mouseunder area
 ;        call    [putpixel]
         call    __sys_putpixel
         mov     eax, [dl_x2]
         mov     ebx, [dl_y2]
-;        and     ecx, 0xFBFFFFFF ;negate 0x04000000 save to mouseunder area
+;        and     ecx, 0xFBFFFFFF ;n egate 0x04000000 save to mouseunder area
 ;        call    [putpixel]
         call    __sys_putpixel
-;--------------------------------------
-align 4
-.exit:
+  .exit:
         add     esp, 6*4
         popa
 ;        call    [draw_pointer]
         ret
 ;------------------------------------------------------------------------------
-align 4
-hline:
 ; draw an horizontal line
 ; eax = x1
 ; edx = x2
 ; ebx = y
 ; ecx = color
 ; edi = force ?
+align 4
+hline:
         push    eax edx
         cmp     edx, eax   ; make sure x2 is above x1
         jge     @f
         xchg    eax, edx
-;--------------------------------------
-align 4
-@@:
+  @@:
         and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
-;--------------------------------------
-align 4
-@@:
+  @@:
 ;        call    [putpixel]
         call    __sys_putpixel
         inc     eax
         cmp     eax, edx
         jle     @b
         pop     edx eax
         ret
 ;------------------------------------------------------------------------------
-align 4
-vline:
 ; draw a vertical line
 ; eax = x
 ; ebx = y1
 ; edx = y2
 ; ecx = color
 ; edi = force ?
+align 4
+vline:
         push    ebx edx
         cmp     edx, ebx   ; make sure y2 is above y1
         jge     @f
         xchg    ebx, edx
-;--------------------------------------
-align 4
-@@:
+  @@:
         and     ecx, 0xFBFFFFFF ;negate 0x04000000 save to mouseunder area
-;--------------------------------------
-align 4
-@@:
+  @@:
 ;        call    [putpixel]
         call    __sys_putpixel
         inc     ebx
         cmp     ebx, edx
         jle     @b
         pop     edx ebx
         ret
 ;------------------------------------------------------------------------------
+; eax   cx
+; ebx   cy
+; ecx   xe
+; edx   ye
+; edi   color
 align 4
+vesa20_drawbar:
 virtual at esp
 drbar:
      .bar_sx       dd ?
      .bar_sy       dd ?
      .bar_cx       dd ?
      .line_inc_map dd ?
      .real_sx_and_abs_cx dd ?
      .real_sy_and_abs_cy dd ?
      .stack_data = 4*13
 end virtual
-;--------------------------------------
-align 4
-; eax   cx
-; ebx   cy
-; ecx   xe
-; edx   ye
-; edi   color
-vesa20_drawbar:
         pushad
         sub     esp, drbar.stack_data
         mov     [drbar.color], edi
         sub     edx, ebx
-        jle     .exit       ;// mike.dld, 2005-01-29
+        jle     .exit
         sub     ecx, eax
-        jle     .exit       ;// mike.dld, 2005-01-29
+        jle     .exit
         mov     [drbar.bar_sy], edx
         mov     [drbar.bar_sx], ecx
         mov     [drbar.bar_cx], eax
         mov     [drbar.bar_cy], ebx
         mov     edi, [TASK_BASE]
-        add     ebx, [edi-twdw + WDATA.box.top]; win_cy
+        add     ebx, [edi-twdw + WDATA.box.top]         ; win_cy
         mov     [drbar.abs_cx], eax
         mov     [drbar.abs_cy], ebx
 ; real_sx = MIN(wnd_sx-bar_cx, bar_sx);
-        mov     ebx, [edi-twdw + WDATA.box.width]; ebx = wnd_sx
+        mov     ebx, [edi-twdw + WDATA.box.width]       ; ebx = wnd_sx
-; \begin{diamond}[20.08.2006]
-; note that WDATA.box.width is one pixel less than real window x-size
+        inc     ebx                                     ; WDATA.box.width is one pixel less than real window x-size
-        inc     ebx
-; \end{diamond}[20.08.2006]
         sub     ebx, [drbar.bar_cx]
         ja      @f
-;--------------------------------------
-align 4
+  .exit:
-.exit:                       ;// mike.dld, 2005-01-29
         add     esp, drbar.stack_data
         popad
         xor     eax, eax
         inc     eax
         ret
-;--------------------------------------
-align 4
-@@:
+  @@:
         cmp     ebx, [drbar.bar_sx]
         jbe     .end_x
         mov     ebx, [drbar.bar_sx]
-;--------------------------------------
-align 4
-.end_x:
+  .end_x:
         mov     [drbar.real_sx], ebx
 ; real_sy = MIN(wnd_sy-bar_cy, bar_sy);
-        mov     ebx, [edi-twdw + WDATA.box.height]; ebx = wnd_sy
+        mov     ebx, [edi-twdw + WDATA.box.height]      ; ebx = wnd_sy
-; \begin{diamond}[20.08.2006]
         inc     ebx
-; \end{diamond}
         sub     ebx, [drbar.bar_cy]
         ja      @f
         add     esp, drbar.stack_data
         popad
         xor     eax, eax
         inc     eax
         ret
-;--------------------------------------
-align 4
-@@:
+  @@:
         cmp     ebx, [drbar.bar_sy]
         jbe     .end_y
         mov     ebx, [drbar.bar_sy]
-;--------------------------------------
-align 4
-.end_y:
+  .end_y:
         mov     [drbar.real_sy], ebx
 ; line_inc_map
         mov     eax, [Screen_Max_X]
         sub     eax, [drbar.real_sx]
         inc     eax
         mov     [drbar.line_inc_map], eax
 ; line_inc_scr
         mov     eax, [drbar.real_sx]
-        mov     ebx, [_display.bpp]
+        mov     ebx, [_display.bytes_per_pixel]
-        shr     ebx, 3
         imul    eax, ebx
         neg     eax
         add     eax, [_display.pitch]
         mov     [drbar.line_inc_scr], eax
 ; pointer to screen
         mov     eax, [d_width_calc_area + eax*4]
         add     eax, [drbar.abs_cx]
         add     eax, [_WinMapAddress]
-        xchg    eax, ebp
+        xchg    eax, ebp
 ;--------------------------------------
         mov     ebx, [drbar.real_sx]
         add     ebx, [drbar.abs_cx]
         mov     [drbar.real_sx_and_abs_cx], ebx
         mov     ebx, [drbar.real_sy]
         add     ebx, [drbar.abs_cy]
         mov     [drbar.real_sy_and_abs_cy], ebx
         add     edx, LFB_BASE
 ;--------------------------------------
 ; get process number
         mov     ebx, [CURRENT_TASK]  ; bl - process num
         mov     esi, [drbar.real_sy]
         mov     eax, [drbar.color] ; BBGGRR00
         rol     eax, 8
+        mov     bh, al  ; 0x80 drawing gradient bars
+        ror     eax, 8
-        mov     bh, al  ; 0x80 drawing gradient bars
+        cmp     byte [_display.bits_per_pixel], 16
+        je      draw_bar_end_16
+        cmp     byte [_display.bits_per_pixel], 24
-        ror     eax, 8
+        je      draw_bar_end_24
+        cmp     byte [_display.bits_per_pixel], 32
-        cmp     byte [_display.bpp], 24
+        je      draw_bar_end_32
-        jne     draw_bar_end_32
-;--------------------------------------
 align 4
-draw_bar_end_24:
+;--------------------------------------
 ; eax - color high   RRGGBB
 ; bl - process num
 ; ecx - temp
 ; edx - pointer to screen
+; esi - counter
+; edi - counter
-; esi - counter
+align 4
-; edi - counter
+draw_bar_end_24:
 ;--------------------------------------
 ; check for hardware cursor
         mov     ecx, [_display.select_cursor]
         cmp     ecx, select_cursor
         je      draw_bar_end_24_new
-        cmp     ecx, 0
-        je      draw_bar_end_24_old
-;--------------------------------------
+        cmp     ecx, 0
-align 4
+        je      draw_bar_end_24_old
-.new_y:
-        mov     edi, [drbar.real_sx]
-;--------------------------------------
+  .new_y:
-align 4
+        mov     edi, [drbar.real_sx]
-.new_x:
+  .new_x:
-        cmp     byte [ebp], bl
+        cmp     byte [ebp], bl
         jne     .skip
 ;--------------------------------------
-; store to real LFB
+; store to LFB
         mov     [edx], ax
-        shr     eax, 16
-        mov     [edx + 2], al
-;--------------------------------------
+        shr     eax, 16
-align 4
+        mov     [edx + 2], al
-.skip:
+  .skip:
 ; add pixel
         add     edx, 3
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
-;--------------------------------------
-align 4
-.end:
+  .end:
         add     esp, drbar.stack_data
         popad
         xor     eax, eax
         ret
 ;------------------------------------------------------------------------------
 align 4
 draw_bar_end_24_old:
-;--------------------------------------
-align 4
-.new_y:
+  .new_y:
         mov     edi, [drbar.real_sx]
-;--------------------------------------
-align 4
-.new_x:
+  .new_x:
         cmp     byte [ebp], bl
         jne     .skip
-;--------------------------------------
         mov     ecx, [drbar.real_sx_and_abs_cx]
         sub     ecx, edi
         shl     ecx, 16
         add     ecx, [drbar.real_sy_and_abs_cy]
         sub     ecx, esi
 ; check mouse area for putpixel
         call    check_mouse_area_for_putpixel
-; store to real LFB
+; store to LFB
         mov     [edx], ax
         shr     eax, 16
         mov     [edx + 2], al
         mov     eax, [drbar.color]
-;--------------------------------------
-align 4
-.skip:
+  .skip:
 ; add pixel
         add     edx, 3
         inc     ebp
         dec     edi
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
         jmp     draw_bar_end_24.end
 ;------------------------------------------------------------------------------
 align 4
 draw_bar_end_24_new:
-;--------------------------------------
-align 4
-.new_y:
+  .new_y:
         mov     edi, [drbar.real_sx]
-;--------------------------------------
-align 4
-.new_x:
+  .new_x:
         cmp     byte [ebp], bl
         jne     .skip
-;--------------------------------------
         mov     ecx, [drbar.real_sy_and_abs_cy]
         sub     ecx, esi
-;--------------------------------------
 ; check for Y
         cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
         jae     .no_mouse_area
         sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
         jb      .no_mouse_area
         rol     ecx, 16
         add     ecx, [drbar.real_sx_and_abs_cx]
         sub     ecx, edi
-;--------------------------------------
 ; check for X
         cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
         jae     .no_mouse_area
         sub     cx, [X_UNDER_subtraction_CUR_hot_x]
         jb      .no_mouse_area
         ror     ecx, 16
-;--------------------------------------
 ; check mouse area for putpixel
         push    eax
         call    check_mouse_area_for_putpixel_new.1
         mov     [edx], ax
         shr     eax, 16
         mov     [edx + 2], al
         pop     eax
         jmp     .skip
-; store to real LFB
-;--------------------------------------
-align 4
-.no_mouse_area:
+  .no_mouse_area:
+; store to LFB
         mov     [edx], ax
         ror     eax, 16
         mov     [edx + 2], al
         rol     eax, 16
-;--------------------------------------
-align 4
-.skip:
+  .skip:
 ; add pixel
         add     edx, 3
         inc     ebp
         dec     edi
         jnz     .new_x
 ; add line
         add     edx, [drbar.line_inc_scr]
         add     ebp, [drbar.line_inc_map]
 ; drawing gradient bars
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
         jmp     draw_bar_end_24.end
 ;------------------------------------------------------------------------------
-align 4
-draw_bar_end_32:
 ; eax - color high   RRGGBB
 ; bl - process num
 ; ecx - temp
 ; edx - pointer to screen
 ; esi - counter
 ; edi - counter
-;--------------------------------------
+draw_bar_end_32:
 ; check for hardware cursor
         mov     ecx, [_display.select_cursor]
         cmp     ecx, select_cursor
         je      draw_bar_end_32_new
         cmp     ecx, 0
         je      draw_bar_end_32_old
-;--------------------------------------
-align 4
-.new_y:
+  .new_y:
         mov     edi, [drbar.real_sx]
-;--------------------------------------
-align 4
-.new_x:
+  .new_x:
         cmp     byte [ebp], bl
         jne     .skip
-;--------------------------------------
-; store to real LFB
+; store to LFB
         mov     [edx], eax
         mov     eax, [drbar.color]
-;--------------------------------------
-align 4
-.skip:
+  .skip:
 ; add pixel
         add     edx, 4
         inc     ebp
         dec     edi
         jnz     .new_x
 ; add line
         add     edx, [drbar.line_inc_scr]
         add     ebp, [drbar.line_inc_map]
 ; drawing gradient bars
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
-;--------------------------------------
-align 4
-.end:
+  .end:
         add     esp, drbar.stack_data
         popad
         cmp     [SCR_MODE], 0x12
         jne     @f
         call    VGA_draw_bar
-;--------------------------------------
-align 4
-@@:
+  @@:
         xor     eax, eax
         mov     [EGA_counter], 1
         ret
-;------------------------------------------------------------------------------
-align 4
 draw_bar_end_32_old:
-;--------------------------------------
-align 4
-.new_y:
+  .new_y:
         mov     edi, [drbar.real_sx]
-;--------------------------------------
-align 4
-.new_x:
+  .new_x:
         cmp     byte [ebp], bl
         jne     .skip
-;--------------------------------------
         mov     ecx, [drbar.real_sx_and_abs_cx]
         sub     ecx, edi
         shl     ecx, 16
         add     ecx, [drbar.real_sy_and_abs_cy]
         sub     ecx, esi
 ; check mouse area for putpixel
         call    check_mouse_area_for_putpixel
-; store to real LFB
+; store to LFB
         mov     [edx], eax
-        mov     eax, [drbar.color]
-;--------------------------------------
-align 4
+        mov     eax, [drbar.color]
-.skip:
+  .skip:
 ; add pixel
         add     edx, 4
         inc     ebp
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
         jmp     draw_bar_end_32.end
 ;------------------------------------------------------------------------------
 align 4
 draw_bar_end_32_new:
-;--------------------------------------
-align 4
-.new_y:
+  .new_y:
         mov     edi, [drbar.real_sx]
-;--------------------------------------
-align 4
-.new_x:
+  .new_x:
         cmp     byte [ebp], bl
         jne     .skip
-;--------------------------------------
         mov     ecx, [drbar.real_sy_and_abs_cy]
         sub     ecx, esi
-;--------------------------------------
 ; check for Y
         cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
         jae     .no_mouse_area
         sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
         jb      .no_mouse_area
         rol     ecx, 16
         add     ecx, [drbar.real_sx_and_abs_cx]
         sub     ecx, edi
-;--------------------------------------
 ; check for X
         cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
         jae     .no_mouse_area
         sub     cx, [X_UNDER_subtraction_CUR_hot_x]
         jb      .no_mouse_area
         ror     ecx, 16
-;--------------------------------------
 ; check mouse area for putpixel
         push    eax
         call    check_mouse_area_for_putpixel_new.1
         mov     [edx], eax
         pop     eax
         jmp     .skip
-; store to real LFB
-;--------------------------------------
-align 4
-.no_mouse_area:
+  .no_mouse_area:
+; store to LFB
         mov     [edx], eax
-;--------------------------------------
-align 4
-.skip:
+  .skip:
 ; add pixel
         add     edx, 4
         inc     ebp
         dec     edi
         jnz     .new_x
 ; add line
         add     edx, [drbar.line_inc_scr]
         add     ebp, [drbar.line_inc_map]
 ; drawing gradient bars
         test    bh, 0x80
         jz      @f
         test    al, al
         jz      @f
         dec     al
-;--------------------------------------
-align 4
-@@:
+  @@:
         dec     esi
         jnz     .new_y
         jmp     draw_bar_end_32.end
 ;------------------------------------------------------------------------------
+; eax - color high   RRGGBB
+; bl - process num
+; ecx - temp
+; edx - pointer to screen
+; esi - counter
+; edi - counter
+align 4
+draw_bar_end_16:
+; check for hardware cursor
+        mov     ecx, [_display.select_cursor]
+        cmp     ecx, select_cursor
+        je      draw_bar_end_16_new
+        cmp     ecx, 0
+        je      draw_bar_end_16_old
+  .new_y:
+        mov     edi, [drbar.real_sx]
+  .new_x:
+        cmp     byte [ebp], bl
+        jne     .skip
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [edx], ax
+        mov     eax, [drbar.color]
+  .skip:
+; add pixel
+        add     edx, 2
+        inc     ebp
+        dec     edi
+        jnz     .new_x
+; add line
+        add     edx, [drbar.line_inc_scr]
+        add     ebp, [drbar.line_inc_map]
+; drawing gradient bars
+        test    bh, 0x80
+        jz      @f
+        test    al, al
+        jz      @f
+        dec     al
+  @@:
+        dec     esi
+        jnz     .new_y
+  .end:
+        add     esp, drbar.stack_data
+        popad
+        cmp     [SCR_MODE], 0x12
+        jne     @f
+        call    VGA_draw_bar
+  @@:
+        xor     eax, eax
+        mov     [EGA_counter], 1
+        ret
+;------------------------------------------------------------------------------
+align 4
+draw_bar_end_16_old:
+  .new_y:
+        mov     edi, [drbar.real_sx]
+  .new_x:
+        cmp     byte [ebp], bl
+        jne     .skip
+        mov     ecx, [drbar.real_sx_and_abs_cx]
+        sub     ecx, edi
+        shl     ecx, 16
+        add     ecx, [drbar.real_sy_and_abs_cy]
+        sub     ecx, esi
+; check mouse area for putpixel
+        call    check_mouse_area_for_putpixel
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [edx], ax
+        mov     eax, [drbar.color]
+.skip:
+; add pixel
+        add     edx, 2
+        inc     ebp
+        dec     edi
+        jnz     .new_x
+; add line
+        add     edx, [drbar.line_inc_scr]
+        add     ebp, [drbar.line_inc_map]
+; drawing gradient bars
+        test    bh, 0x80
+        jz      @f
+        test    al, al
+        jz      @f
+        dec     al
+  @@:
+        dec     esi
+        jnz     .new_y
+        jmp     draw_bar_end_16.end
+;------------------------------------------------------------------------------
+align 4
+draw_bar_end_16_new:
+  .new_y:
+        mov     edi, [drbar.real_sx]
+  .new_x:
+        cmp     byte [ebp], bl
+        jne     .skip
+        mov     ecx, [drbar.real_sy_and_abs_cy]
+        sub     ecx, esi
+; check for Y
+        cmp     cx, [Y_UNDER_sub_CUR_hot_y_add_curh]
+        jae     .no_mouse_area
+        sub     cx, [Y_UNDER_subtraction_CUR_hot_y]
+        jb      .no_mouse_area
+        rol     ecx, 16
+        add     ecx, [drbar.real_sx_and_abs_cx]
+        sub     ecx, edi
+; check for X
+        cmp     cx, [X_UNDER_sub_CUR_hot_x_add_curh]
+        jae     .no_mouse_area
+        sub     cx, [X_UNDER_subtraction_CUR_hot_x]
+        jb      .no_mouse_area
+        ror     ecx, 16
+; check mouse area for putpixel
+        push    eax
+        call    check_mouse_area_for_putpixel_new.1
+        push    eax
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [edx], ax
+        pop     eax
+        pop     eax
+        jmp     .skip
+  .no_mouse_area:
+; convert to 16 bpp and store to LFB
+        push    eax
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [edx], ax
+        pop     eax
+  .skip:
+; add pixel
+        add     edx, 2
+        inc     ebp
+        dec     edi
+        jnz     .new_x
+; add line
+        add     edx, [drbar.line_inc_scr]
+        add     ebp, [drbar.line_inc_map]
+; drawing gradient bars
+        test    bh, 0x80
+        jz      @f
+        test    al, al
+        jz      @f
+        dec     al
+  @@:
+        dec     esi
+        jnz     .new_y
+        jmp     draw_bar_end_16.end
+;------------------------------------------------------------------------------
 align 4
 vesa20_drawbackground_tiled:
         pushad
 ; External loop for all y from start to end
         mov     ebx, [draw_data+32+RECT.top]    ; y start
-;--------------------------------------
-align 4
-dp2:
+  dp2:
         mov     ebp, [draw_data+32+RECT.left]   ; x start
 ; 1) Calculate pointers in WinMapAddress (does pixel belong to OS thread?) [ebp]
-;                       and LFB data (output for our function) [edi]
+;    and LFB data (output for our function) [edi]
 ;        mov     eax, [BytesPerScanLine]
 ;        mul     ebx
         mov     eax, [BPSLine_calc_area+ebx*4]
         xchg    ebp, eax
         add     ebp, eax
         add     ebp, eax
+        cmp     byte [_display.bytes_per_pixel], 2
+        je      @f
         add     ebp, eax
-        cmp     byte [_display.bpp], 24    ; 24 or 32 bpp ? - x size
+        cmp     byte [_display.bytes_per_pixel], 3
-        jz      @f
+        je      @f
         add     ebp, eax
-;--------------------------------------
-align 4
-@@:
+  @@:
         add     ebp, LFB_BASE
 ; ebp:=Y*BytesPerScanLine+X*BytesPerPixel+AddrLFB
         call    calculate_edi
         xchg    edi, ebp
 ; eax = x, ebx = y (screen coordinates)
 ; ecx = deltax - number of pixels left in current tile block
 ; edx = 1
 ; esi -> bgr memory, edi -> output
 ; ebp = offset in WinMapAddress
-;--------------------------------------
-align 4
-dp3:
+  dp3:
         cmp     [ebp], dl
-        jnz     nbgp
+        jnz     .next_pix
-;--------------------------------------
-        push    eax ecx
         push    eax ecx
         mov     ecx, eax
         shl     ecx, 16
         add     ecx, ebx
 ; check for hardware cursor
         cmp     [_display.select_cursor], select_cursor
         je      @f
         cmp     [_display.select_cursor], 0
         jne     .no_mouseunder
-;--------------------------------------
-align 4
-@@:
+  @@:
         and     eax, 0xffffff
 ; check mouse area for putpixel
         call    [_display.check_mouse]
-;--------------------------------------
-align 4
-.no_mouseunder:
+  .no_mouseunder:
+        cmp     byte [_display.bits_per_pixel], 16
+        je      .16bpp
-; store to real LFB
+; store to LFB
         mov     [edi], ax
         shr     eax, 16
         mov     [edi+2], al
+        pop     ecx eax
+        jmp     .next_pix
+  .16bpp:
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
         mov     [edi], ax
+        pop     ecx eax
-        pop     ecx eax
-;--------------------------------------
-align 4
+; Advance to next pixel
-nbgp:
+  .next_pix:
         add     esi, 3
-        add     edi, 3
-;--------------------------------------
-align 4
+        add     edi, [_display.bytes_per_pixel]
-@@:
-        cmp     byte [_display.bpp], 25    ; 24 or 32 bpp?
-        sbb     edi, -1         ; +1 for 32 bpp
 ; I do not use 'inc eax' because this is slightly slower then 'add eax,1'
         add     ebp, edx
         add     eax, edx
         cmp     eax, [draw_data+32+RECT.right]
         ja      dp4
         sub     ecx, edx
+        jnz     dp3
         jnz     dp3
 ; next tile block on x-axis
         mov     ecx, [BgrDataWidth]
         sub     esi, ecx
         sub     esi, ecx
         sub     esi, ecx
-        jmp     dp3
-;--------------------------------------
+        jmp     dp3
 align 4
-dp4:
+  dp4:
 ; next scan line
         inc     ebx
         cmp     ebx, [draw_data+32+RECT.bottom]
         jbe     dp2
         popad
         mov     [EGA_counter], 1
         cmp     [SCR_MODE], 0x12
         jne     @f
-        call    VGA_drawbackground
-;--------------------------------------
-align 4
+        call    VGA_drawbackground
-@@:
+  @@:
+        ret
         ret
+;------------------------------------------------------------------------------
 ;------------------------------------------------------------------------------
 align 4
+vesa20_drawbackground_stretch:
 vesa20_drawbackground_stretch:
         pushad
 ; Helper variables
 ; calculate 2^32*(BgrDataWidth-1) mod (ScreenWidth-1)
         mov     eax, [BgrDataWidth]
         div     dword [Screen_Max_X]
         push    eax     ; high
         xor     eax, eax
         div     dword [Screen_Max_X]
         push    eax     ; low
 ; the same for height
         mov     eax, [BgrDataHeight]
         dec     eax
         xor     edx, edx
         div     dword [Screen_Max_Y]
         push    eax     ; high
         xor     eax, eax
         div     dword [Screen_Max_Y]
         push    eax     ; low
 ; External loop for all y from start to end
         mov     ebx, [draw_data+32+RECT.top]    ; y start
         mov     ebp, [draw_data+32+RECT.left]   ; x start
 ; 1) Calculate pointers in WinMapAddress (does pixel belong to OS thread?) [ebp]
 ;                       and LFB data (output for our function) [edi]
 ;        mul     ebx
         mov     eax, [BPSLine_calc_area+ebx*4]
         xchg    ebp, eax
         add     ebp, eax
         add     ebp, eax
+        cmp     byte [_display.bytes_per_pixel], 2
+        jz      @f
         add     ebp, eax
-        cmp     byte [_display.bpp], 24    ; 24 or 32 bpp ? - x size
+        cmp     byte [_display.bytes_per_pixel], 3
         jz      @f
         add     ebp, eax
-;--------------------------------------
-align 4
-@@:
+  @@:
 ; ebp:=Y*BytesPerScanLine+X*BytesPerPixel+AddrLFB
         call    calculate_edi
         xchg    edi, ebp
 ; Now eax=x, ebx=y, edi->output, ebp=offset in WinMapAddress
         push    ebx
         push    eax
 ; 2) Calculate offset in background memory block
         mov     eax, ebx
         lea     esi, [esi*3]
         add     esi, [img_background]
         push    eax
         push    edx
         push    esi
 ; 3) Smooth horizontal
-;--------------------------------------
-align 4
-bgr_resmooth0:
+  bgr_resmooth0:
         mov     ecx, [esp+8]
         mov     edx, [esp+4]
         mov     esi, [esp]
         push    edi
         mov     edi, bgr_cur_line
         call    smooth_line
-;--------------------------------------
-align 4
-bgr_resmooth1:
+  bgr_resmooth1:
         mov     eax, [esp+16+4]
         inc     eax
         cmp     eax, [BgrDataHeight]
         jae     bgr.no2nd
         add     esi, [BgrDataWidth]
         add     esi, [BgrDataWidth]
         add     esi, [BgrDataWidth]
         mov     edi, bgr_next_line
         call    smooth_line
-;--------------------------------------
-align 4
-bgr.no2nd:
+  bgr.no2nd:
         pop     edi
-;--------------------------------------
-align 4
-sdp3:
+  sdp3:
         xor     esi, esi
         mov     ecx, [esp+12]
 ; 4) Loop through redraw rectangle and copy background data
 ; Registers meaning:
 ; esi = offset in current line, edi -> output
 ; ebp = offset in WinMapAddress
 ; dword [esp] = offset in bgr data
 ; dword [esp+20] = x
 ; dword [esp+24] = y
 ; precalculated constants:
 ; qword [esp+28] = 2^32*(BgrDataHeight-1)/(ScreenHeight-1)
 ; qword [esp+36] = 2^32*(BgrDataWidth-1)/(ScreenWidth-1)
-;--------------------------------------
-align 4
-sdp3a:
+  sdp3a:
         mov     eax, [_WinMapAddress]
         cmp     [ebp+eax], byte 1
         jnz     snbgp
         mov     eax, [bgr_cur_line+esi]
         test    ecx, ecx
         jz      .novert
         mov     ebx, [bgr_next_line+esi]
         call    [overlapping_of_points_ptr]
-;--------------------------------------
-align 4
-.novert:
+  .novert:
         push    ecx
 ; check for hardware cursor
         cmp     [_display.select_cursor], select_cursor
         je      @f
         cmp     [_display.select_cursor], 0
         jne     .no_mouseunder
-;--------------------------------------
-align 4
-@@:
+  @@:
         mov     ecx, [esp+20+4]        ;x
         shl     ecx, 16
         add     ecx, [esp+24+4]        ;y
 ; check mouse area for putpixel
         call    [_display.check_mouse]
-;--------------------------------------
-align 4
-.no_mouseunder:
+  .no_mouseunder:
+        cmp     [_display.bits_per_pixel], 16
+        jne     .not_16bpp
+; convert to 16 bpp and store to LFB
+        and     eax, 00000000111110001111110011111000b
+        shr     ah, 2
+        shr     ax, 3
+        ror     eax, 8
+        add     al, ah
+        rol     eax, 8
+        mov     [LFB_BASE+edi], ax
+        pop     ecx
+        jmp     snbgp
+  .not_16bpp:
-; store to real LFB
+; store to LFB
         mov     [LFB_BASE+edi], ax
         shr     eax, 16
         mov     [LFB_BASE+edi+2], al
         pop     ecx
-;--------------------------------------
-align 4
-snbgp:
+  snbgp:
-        cmp     byte [_display.bpp], 25
+        add     edi, [_display.bytes_per_pixel]
-        sbb     edi, -4
         add     ebp, 1
         mov     eax, [esp+20]
         add     eax, 1
         mov     [esp+20], eax
         add     esi, 4
         cmp     eax, [draw_data+32+RECT.right]
         jbe     sdp3a
-;--------------------------------------
-align 4
-sdp4:
+  sdp4:
 ; next y
         mov     ebx, [esp+24]
         add     ebx, 1
         mov     [esp+24], ebx
         cmp     ebx, [draw_data+32+RECT.bottom]
         ja      sdpdone
 ; advance edi, ebp to next scan line
         sub     eax, [draw_data+32+RECT.left]
         sub     ebp, eax
         add     ebp, [Screen_Max_X]
         add     ebp, 1
         sub     edi, eax
         sub     edi, eax
+        cmp     byte [_display.bytes_per_pixel], 2
+        jz      @f
         sub     edi, eax
-        cmp     byte [_display.bpp], 24
+        cmp     byte [_display.bytes_per_pixel], 3
         jz      @f
         sub     edi, eax
-;--------------------------------------
-align 4
-@@:
+  @@:
         add     edi, [_display.pitch]
 ; restore ecx,edx; advance esi to next background line
         mov     eax, [esp+28]
         mov     ebx, [esp+32]
         mov     edi, bgr_cur_line
         mov     ecx, [Screen_Max_X]
         inc     ecx
         rep movsd
         jmp     bgr_resmooth1
-;--------------------------------------
-align 4
-sdpdone:
+  sdpdone:
         add     esp, 44
         popad
         mov     [EGA_counter], 1
         cmp     [SCR_MODE], 0x12
         jne     @f
         call    VGA_drawbackground
-;--------------------------------------
-align 4
-@@:
+  @@:
         ret
-uglobal
-;--------------------------------------
-align 4
-bgr_cur_line    rd      1920    ; maximum width of screen
-bgr_next_line   rd      1920
-;--------------------------------------
 endg
+;--------------------------------------
 ;--------------------------------------
 align 4
 smooth_line:
         mov     al, [esi+2]
         shl     eax, 16
         mov     ax, [esi]
         test    ecx, ecx
         jz      @f
         mov     ebx, [esi+2]
         shr     ebx, 8
-        call    [overlapping_of_points_ptr]
-;--------------------------------------
-align 4
+        call    [overlapping_of_points_ptr]
-@@:
+  @@:
         stosd
         mov     eax, [esp+20+8]
         add     eax, 1
         adc     edx, [esp+40+8]
         sub     eax, edx
         lea     eax, [eax*3]
         sub     esi, eax
         jmp     smooth_line
-;--------------------------------------
-align 4
-@@:
+  @@:
         mov     eax, [draw_data+32+RECT.left]
         mov     [esp+20+8], eax
         ret
 ;------------------------------------------------------------------------------
 align 16
 overlapping_of_points:
 if 0
 ; this version of procedure works, but is slower than next version
         push    ecx edx
         ror     eax, 16
         pop     ecx
         ret
 end if
-iglobal
-;--------------------------------------
-align 4
-overlapping_of_points_ptr       dd      overlapping_of_points
-;--------------------------------------
 endg
+;------------------------------------------------------------------------------
 ;------------------------------------------------------------------------------
 align 4
+init_background:
 init_background:
         mov     edi, BgrAuxTable
-        xor     edx, edx
-;--------------------------------------
+        xor     edx, edx
 align 4
-.loop2:
+  .loop2:
         mov     eax, edx
         shl     eax, 8
         neg     eax
-        mov     ecx, 0x200
-;--------------------------------------
+        mov     ecx, 0x200
 align 4
-.loop1:
+  .loop1:
         mov     byte [edi], ah
         inc     edi
         add     eax, edx
         loop    .loop1
         add     dl, 4
         jnz     .loop2
         test    byte [cpu_caps+(CAPS_MMX/8)], 1 shl (CAPS_MMX mod 8)
         jz      @f
-        mov     [overlapping_of_points_ptr], overlapping_of_points_mmx
-;--------------------------------------
-align 4
+        mov     [overlapping_of_points_ptr], overlapping_of_points_mmx
-@@:
+  @@:
+        ret
         ret
+;------------------------------------------------------------------------------
 ;------------------------------------------------------------------------------
 align 16
+overlapping_of_points_mmx:
 overlapping_of_points_mmx:
         movd    mm0, eax
         movd    mm4, eax
         movd    mm1, ebx
         pxor    mm2, mm2
         pmullw  mm1, mm3
         psrlw   mm1, 8
         packuswb mm1, mm2
         paddb   mm4, mm1
         movd    eax, mm4
         ret
 ;------------------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/trunk/video/vesa20.inc – Rev 3606 → 5154