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

Small correct for r2093

Browse Source 
git-svn-id: svn://kolibrios.org@2105 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2011-08-23 10:56:32 +00:00
parent 7f63a7e064
commit 20ffb9aae0
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
programs/develop/fasm/trunk/fasm.asm
View File

@ -113,9 +113,7 @@ red: ; Redraw
call draw_window call draw_window
still: still:
push 10 ; Wait here for event mcall 10 ; Wait here for event
pop eax
mcall
cmp al,6 cmp al,6
je call_mouse je call_mouse
dec eax dec eax
@ -123,8 +121,7 @@ still:
dec eax dec eax
jne button ; Button in buffer jne button ; Button in buffer
key: ; Key key: ; Key
mov al,2 ; Read it and ignore mcall 2 ; Read it and ignore
mcall
push dword edit1 push dword edit1
call [edit_box_key] call [edit_box_key]
@ -139,9 +136,7 @@ call_mouse:
jmp still jmp still
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
button: ; Button in Window button: ; Button in Window
mov al,17 mcall 17
mcall
cmp ah,1 cmp ah,1
jne noclose jne noclose
or eax,-1 or eax,-1
@ -190,13 +185,12 @@ draw_window:
pusha pusha
mcall 12,1 ; Start of draw mcall 12,1 ; Start of draw
;get_sys_colors 1,0 ;get_sys_colors 1,0
xor eax,eax
mov ebx,100*65536+280
mov ecx,90*65536+260
mov edx,[sc.work] mov edx,[sc.work]
or edx,0x33000000 or edx,0x33000000
mov edi,fullpath_open ;title ; Draw Window Label Text xor eax,eax
mcall xor esi,esi
mcall ,<100,280>,<90,260>,,,title ; Draw Window Label Text
mcall 9,PROCESSINFO,-1 mcall 9,PROCESSINFO,-1
@ -229,11 +223,7 @@ draw_window:
mpack ebx,6,0 ; Draw Window Text mpack ebx,6,0 ; Draw Window Text
add ebx,1+ 14/2-3 add ebx,1+ 14/2-3
mov ecx,[sc.work_text] mcall 4,,[sc.work_text],text,text.line_size ;InFile
mov edx,text
mov esi,text.line_size
mov eax,4
mcall ;InFile
add ebx, 16 ;14 add ebx, 16 ;14
add edx,text.line_size add edx,text.line_size
@ -363,7 +353,6 @@ fun_opn_dlg: ;
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
draw_messages: draw_messages:
mov eax,13 ; clear work area
mpack ebx,7-2,[pinfo.box.width] mpack ebx,7-2,[pinfo.box.width]
sub ebx,5*2+7*2-1-2*2 sub ebx,5*2+7*2-1-2*2
mpack ecx,0,[pinfo.box.height] mpack ecx,0,[pinfo.box.height]
@ -372,8 +361,7 @@ draw_messages:
mov word[bottom_right],cx mov word[bottom_right],cx
msub [bottom_right],7,11 msub [bottom_right],7,11
add [bottom_right],7 shl 16 + 53 add [bottom_right],7 shl 16 + 53
mov edx,[sc.work] mcall 13,,,[sc.work] ; clear work area
mcall
_cy = 0 _cy = 0
_sy = 2 _sy = 2
_cx = 4 _cx = 4