BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/branches/Kolibri-acpi/video/ @ 3554

  → /kernel/branches/Kolibri-acpi/video/ @ 3555

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 3554 → Rev 3555

/kernel/branches/Kolibri-acpi/video/cursors.inc
846,7 → 846,7
add eax, ebx
mov ebx, eax
shl eax, 2
cmp [ScreenBPP], byte 32
cmp byte [_display.bpp], 32
je @f
sub eax, ebx
;--------------------------------------
921,7 → 921,7
add ecx, ebx
mov ebx, ecx
shl ecx, 2
cmp [ScreenBPP], byte 24
cmp byte [_display.bpp], 24
je .24
and eax, 0xFFFFFF
mov [ecx + cur_saved_data], eax ;store new color to
991,21 → 991,15
test word [SCR_MODE], 0x4000
jz .fail
; jmp .fail
mov ebx, restore_32
mov ecx, move_cursor_32
movzx eax, byte [ScreenBPP]
cmp eax, 32
je @F
mov edx, Vesa20_putpixel32_new
mov eax, [_display.bpp]
cmp al, 32
jne .24
mov ebx, restore_24
mov ecx, move_cursor_24
cmp eax, 24
jne .fail
;--------------------------------------
align 4
@@:
.set:
mov [_display.select_cursor], select_cursor
mov [_display.move_cursor], ecx
mov [_display.restore_cursor], ebx
1014,16 → 1008,7
cmp [PUTPIXEL], dword VGA_putpixel
je @f
cmp [ScreenBPP], byte 32
je .32
mov [PUTPIXEL], dword Vesa20_putpixel24_new
jmp @f
;--------------------------------------
align 4
.32:
mov [PUTPIXEL], dword Vesa20_putpixel32_new
;--------------------------------------
align 4
mov [PUTPIXEL], edx
@@:
stdcall load_cursor, clock_arrow, dword LOAD_FROM_MEM
mov [def_cursor_clock], eax
1030,8 → 1015,14
stdcall load_cursor, def_arrow, dword LOAD_FROM_MEM
mov [def_cursor], eax
ret
;--------------------------------------
align 4
.24:
mov ebx, restore_24
mov ecx, move_cursor_24
mov edx, Vesa20_putpixel24_new
cmp al, 24
je .set
.fail:
xor eax, eax
mov [_display.select_cursor], eax

/kernel/branches/Kolibri-acpi/video/vesa20.inc
231,7 → 231,7
mov [putimg.winmap_newline], eax
; screen new line increment
mov eax, [BytesPerScanLine]
movzx ebx, byte [ScreenBPP]
mov ebx, [_display.bpp]
shr ebx, 3
imul ecx, ebx
sub eax, ecx
266,7 → 266,7
;--------------------------------------
; get process number
mov ebx, [CURRENT_TASK]
cmp byte [ScreenBPP], 32
cmp byte [_display.bpp], 32
je put_image_end_32
;--------------------------------------
put_image_end_24:
534,7 → 534,7
.finish:
add esp, putimg.stack_data
popad
cmp [SCR_MODE], dword 0x12
cmp [SCR_MODE], 0x12
jne @f
call VGA__putimage
;--------------------------------------
1229,7 → 1229,7
mov [drbar.line_inc_map], eax
; line_inc_scr
mov eax, [drbar.real_sx]
movzx ebx, byte [ScreenBPP]
mov ebx, [_display.bpp]
shr ebx, 3
imul eax, ebx
neg eax
1268,7 → 1268,7
rol eax, 8
mov bh, al ; 0x80 drawing gradient bars
ror eax, 8
cmp byte [ScreenBPP], 24
cmp byte [_display.bpp], 24
jne draw_bar_end_32
;--------------------------------------
align 4
1508,7 → 1508,7
.end:
add esp, drbar.stack_data
popad
cmp [SCR_MODE], dword 0x12
cmp [SCR_MODE], 0x12
jne @f
call VGA_draw_bar
;--------------------------------------
1653,7 → 1653,7
add ebp, eax
add ebp, eax
add ebp, eax
cmp [ScreenBPP], byte 24 ; 24 or 32 bpp ? - x size
cmp byte [_display.bpp], 24 ; 24 or 32 bpp ? - x size
jz @f
add ebp, eax
;--------------------------------------
1733,7 → 1733,7
;--------------------------------------
align 4
@@:
cmp [ScreenBPP], byte 25 ; 24 or 32 bpp?
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
1757,7 → 1757,7
jbe dp2
popad
mov [EGA_counter], 1
cmp [SCR_MODE], dword 0x12
cmp [SCR_MODE], 0x12
jne @f
call VGA_drawbackground
;--------------------------------------
1799,7 → 1799,7
add ebp, eax
add ebp, eax
add ebp, eax
cmp [ScreenBPP], byte 24 ; 24 or 32 bpp ? - x size
cmp byte [_display.bpp], 24 ; 24 or 32 bpp ? - x size
jz @f
add ebp, eax
;--------------------------------------
1918,7 → 1918,7
;--------------------------------------
align 4
snbgp:
cmp [ScreenBPP], byte 25
cmp byte [_display.bpp], 25
sbb edi, -4
add ebp, 1
mov eax, [esp+20]
1944,7 → 1944,7
sub edi, eax
sub edi, eax
sub edi, eax
cmp [ScreenBPP], byte 24
cmp byte [_display.bpp], 24
jz @f
sub edi, eax
;--------------------------------------
1981,7 → 1981,7
add esp, 44
popad
mov [EGA_counter], 1
cmp [SCR_MODE], dword 0x12
cmp [SCR_MODE], 0x12
jne @f
call VGA_drawbackground
;--------------------------------------

/kernel/branches/Kolibri-acpi/video/vga.inc
150,7 → 150,7
;------------------------------------------------------------------------------
align 4
checkVga_N13:
cmp [SCR_MODE], dword 0x13
cmp [SCR_MODE], 0x13
jne @f
pushad
403,7 → 403,7
align 4
.no_mouseunder:
shl ebx, 9
lea ebx, [ebx+ebx*4] ; óìíîæåíèå íà 5
lea ebx, [ebx+ebx*4] ; умножение на 5
lea edx, [ebx+ecx*4] ; + x*BytesPerPixel (Vesa2.0 32)
mov edi, edx
add edi, [LFBAddress] ; + LFB address
501,7 → 501,7
add eax, [temp.cx]
and eax, 0xfff8
shl ebx, 9
lea ebx, [ebx+ebx*4]; óìíîæåíèå íà 5
lea ebx, [ebx+ebx*4]; умножение на 5
lea ebx, [ebx+eax*4] ; + x*BytesPerPixel (Vesa2.0 32)
mov esi, ebx
add esi, [LFBAddress] ; + LFB address