Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 415 → Rev 427

/kernel/branches/flat_kernel/gui/button.inc
164,13 → 164,12
sys_button:
 
push edi
mov edi,[CURRENT_TASK]
shl edi,8
mov edi,[current_slot]
rol eax,16
add ax,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.left]
add ax,word[edi+APPDATA.wnd_clientbox.left]
rol eax,16
rol ebx,16
add bx,word[edi+SLOT_BASE+APPDATA.wnd_clientbox.top]
add bx,word[edi+APPDATA.wnd_clientbox.top]
rol ebx,16
pop edi
.forced:
/kernel/branches/flat_kernel/gui/event.inc
114,9 → 114,8
cld
rep movsd
@@:
mov ecx, [CURRENT_TASK]
shl ecx,8
add ecx, SLOT_BASE+APP_OBJ_OFFSET
mov ecx, [current_slot]
add ecx, APP_OBJ_OFFSET
 
pushfd
cli
217,12 → 216,11
proc get_event_ex stdcall, p_ev:dword, timeout:dword
 
.wait:
mov edx,[CURRENT_TASK]
shl edx,8
mov edx,[current_slot]
; cmp [SLOT_BASE+edx+APPDATA.ev_count], 0
; je .switch
 
add edx, SLOT_BASE+APP_EV_OFFSET
add edx, APP_EV_OFFSET
 
mov eax, [edx+APPOBJ.fd]
cmp eax, edx
300,9 → 298,7
test [eax+EVENT.state], MANUAL_RESET
jnz .done
 
mov edx,[CURRENT_TASK]
shl edx,8
add edx, SLOT_BASE
mov edx,[current_slot]
 
pushfd
cli ;remove event from events
575,11 → 571,10
;mov edi,[TASK_BASE] ; mouse event
test [edi+TASKDATA.event_mask],dword 00100000b
jz no_mouse_event
mov eax,[CURRENT_TASK]
shl eax,8
test [eax+SLOT_BASE+APPDATA.event_mask],dword 00100000b
mov eax,[current_slot]
test [eax+APPDATA.event_mask],dword 00100000b
jz no_mouse_event
and [eax+SLOT_BASE+APPDATA.event_mask],dword 0xffffffff-00100000b
and [eax+APPDATA.event_mask],dword 0xffffffff-00100000b
popad
mov eax,6
ret
599,11 → 594,10
;mov edi,[TASK_BASE] ; IPC
test [edi+TASKDATA.event_mask],dword 01000000b
jz no_ipc
mov eax,[CURRENT_TASK]
shl eax,8
test [eax+SLOT_BASE+APPDATA.event_mask],dword 01000000b
mov eax,[current_slot]
test [eax+APPDATA.event_mask],dword 01000000b
jz no_ipc
and [eax+SLOT_BASE+APPDATA.event_mask],dword 0xffffffff-01000000b
and [eax+APPDATA.event_mask],dword 0xffffffff-01000000b
popad
mov eax,7
ret
613,11 → 607,10
;mov edi,[TASK_BASE] ; STACK
test [edi+TASKDATA.event_mask],dword 10000000b
jz no_stack_event
mov eax,[CURRENT_TASK]
shl eax,8
test [eax+SLOT_BASE+APPDATA.event_mask],dword 10000000b
mov eax,[current_slot]
test [eax+APPDATA.event_mask],dword 10000000b
jz no_stack_event
and [eax+SLOT_BASE+APPDATA.event_mask],dword 0xffffffff-10000000b
and [eax+APPDATA.event_mask],dword 0xffffffff-10000000b
popad
mov eax,8
ret
625,11 → 618,10
 
test byte [edi+TASKDATA.event_mask+1], 1 ; DEBUG
jz .test_IRQ
mov eax, [CURRENT_TASK]
shl eax, 8
test byte [eax+SLOT_BASE+APPDATA.event_mask+1], byte 1
mov eax, [current_slot]
test byte [eax+APPDATA.event_mask+1], byte 1
jz .test_IRQ
and byte [eax+SLOT_BASE+APPDATA.event_mask+1], not 1
and byte [eax+APPDATA.event_mask+1], not 1
popad
mov eax, 9
ret
/kernel/branches/flat_kernel/gui/window.inc
1773,17 → 1773,14
 
test eax, eax
jne rsw_no_address
mov eax,[CURRENT_TASK]
shl eax,8
 
mov [eax+SLOT_BASE+APPDATA.wnd_shape],ebx
mov eax,[current_slot]
mov [eax+APPDATA.wnd_shape],ebx
rsw_no_address:
 
cmp eax,1
jne rsw_no_scale
mov eax,[CURRENT_TASK]
shl eax,8
mov byte [eax+SLOT_BASE+APPDATA.wnd_shape_scale], bl
mov eax,[current_slot]
mov byte [eax+APPDATA.wnd_shape_scale], bl
rsw_no_scale:
 
ret