badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

just a minor optimisation

Browse Source 
git-svn-id: svn://kolibrios.org@1930 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Artem Jerdev (art_zh) 2011-05-13 13:11:10 +00:00
parent 883ade9e49
commit 83c504b87c
3 changed files with 25 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/branches/Kolibri-A/trunk/data32.inc
View File

@ -315,22 +315,22 @@ srv.fd rd 1
srv.bk rd 1 srv.bk rd 1
align 64 ;align 64
img_draw_core_fn rd 1 ; putimage variables & helpers ;img_draw_core_fn rd 1 ; putimage variables & helpers
img_draw_edge_fn rd 1 ;img_draw_edge_fn rd 1
img_lfb_origin rd 1 ;img_lfb_origin rd 1
img_buf_origin rd 1 ;img_buf_origin rd 1
img_buf_line_size rd 1 ;img_buf_line_size rd 1
img_palette rd 1 ;img_palette rd 1
img_bitoffset rd 1 ;img_bitoffset rd 1
img_edgeoffset rd 1 ;img_edgeoffset rd 1
img_bytes_per_pix rd 1 ;img_bytes_per_pix rd 1
img_map_right rd 1 ;img_map_right rd 1
img_map_x rd 1 ;img_map_x rd 1
img_pix_x rd 1 ; real Xsize ;img_pix_x rd 1 ; real Xsize
img_pix_y rd 1 ; real Ysize ;img_pix_y rd 1 ; real Ysize
img_screen_x rd 1 ;img_screen_x rd 1
img_screen_y rd 1 ;img_screen_y rd 1
align 64 align 64
;_WinMapWidth rd 1 ;_WinMapWidth rd 1

2
kernel/branches/Kolibri-A/trunk/gui/window.inc
View File

@ -1632,7 +1632,7 @@ window._.set_screen: ;/////////////////////////////////////////////////////////
; get WinMap start ; get WinMap start
push esi push esi
mov edi, [Screen_Max_X] mov edi, [_display.width] ; = ([Screen_Max_X] + 1)
mov esi, edi mov esi, edi
imul edi, ebx imul edi, ebx
add edi, eax add edi, eax

45
kernel/branches/Kolibri-A/trunk/kernel.asm
View File

@ -727,6 +727,7 @@ end if
mov esi,boot_setmouse mov esi,boot_setmouse
call boot_log call boot_log
; call setmouse ; call setmouse
; mov [MOUSE_PICTURE],dword mousepointer
cli cli
; STACK AND FDC ; STACK AND FDC
@ -3208,23 +3209,13 @@ drawbackground:
; call [draw_pointer] ; call [draw_pointer]
; ret ; ret
inc [mouse_pause] inc [mouse_pause]
cmp [SCR_MODE],word 0x12
je dbrv20
dbrv12:
cmp [SCR_MODE],word 0100000000000000b
jge dbrv20
dec [mouse_pause]
call [draw_pointer]
ret
dbrv20:
cmp [BgrDrawMode],dword 1 cmp [BgrDrawMode],dword 1
jne bgrstr jne .bgrstr
call vesa20_drawbackground_tiled call vesa20_drawbackground_tiled
dec [mouse_pause] jmp @f
call [draw_pointer] .bgrstr:
ret
bgrstr:
call vesa20_drawbackground_stretch call vesa20_drawbackground_stretch
@@:
dec [mouse_pause] dec [mouse_pause]
call [draw_pointer] call [draw_pointer]
ret ret
@ -3653,8 +3644,7 @@ __sys_drawbar:
add edx,[esi+APPDATA.wnd_clientbox.top] add edx,[esi+APPDATA.wnd_clientbox.top]
.forced: .forced:
inc [mouse_pause] inc [mouse_pause]
; dbv20: call vesa20_drawbar
call drawbar
dec [mouse_pause] dec [mouse_pause]
jmp [draw_pointer] jmp [draw_pointer]
@ -3757,25 +3747,6 @@ kb_cmd:
ret ret
;setmouse: ; set mousepicture -pointer
; ps2 mouse enable
; mov [MOUSE_PICTURE],dword mousepointer
; cli
; ret
;if used _rdtsc
;_rdtsc:
; bt [cpu_caps], CAPS_TSC
; jnc ret_rdtsc
; rdtsc
; ret
; ret_rdtsc:
; mov edx,0xffffffff
; mov eax,0xffffffff
; ret
;end if
rerouteirqs: rerouteirqs:
cli cli
@ -4096,8 +4067,8 @@ syscall_setpixel: ; SetPixel
mov ebx, ecx mov ebx, ecx
mov ecx, edx mov ecx, edx
xor edi, edi ; no force xor edi, edi ; no force
; call [_display.disable_mouse] call [_display.disable_mouse]
jmp __sys_putpixel jmp [putpixel]
align 4 align 4