Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 806 → Rev 830

/programs/develop/box_lib/C--/trunk/EditBox2.c--
3,7 → 3,7
 
#pragma option A
#codesize
#include "..\..\lib\kolibri.h--"
#include "..\lib\kolibri.h--"
#include "use_library.h--"
//////////////////////////////////////////////////////////////////
//Bit mask from editbox
62,7 → 62,7
}
 
 
edit_box_mouse stdcall (dword 0,0,#edit1);
edit_box_mouse stdcall (#edit1);
}
/programs/develop/box_lib/C--/trunk/EditBox2.kex
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/programs/develop/box_lib/trunk/box_lib.asm
30,12 → 30,7
ed_shift_pos equ [edi+64] ;¯®«®¦¥­¨¥ ªãàá®à 
ed_shift_pos_old equ [edi+68] ;áâ à®¥ ¯®«®¦¥­¨¥ ªãàá®à 
.draw:
pusha
mov eax,9
push procinfo
pop ebx
or ecx,-1
mcall
pushad
;--- à¨á㥬 à ¬ªã ---
mov edi,dword [esp+36]
call .draw_border ; ”ã­ªæ¨ï áâ ¡¨«ì­ 
59,7 → 54,7
;Ž¡é¨© ¢ë室 ¨§ editbox ¤«ï ¢á¥å ä㭪権 ¨ ¯®áâ ®¡à ¡®â稪®¢
;;;;;;;;;;;;;;;;;;;;;;;;;;
.editbox_exit:
popa
popad
ret 4
 
;==========================================================
66,7 → 61,7
;=== ®¡à ¡®âª  ª« ¢¨ âãàë =================================
;==========================================================
edit_box_key:
pusha
pushad
mov edi,dword [esp+36]
test word ed_flags,ed_focus ; ¥á«¨ ­¥ ¢ 䮪ãá¥, ¢ë室¨¬
je edit_box.editbox_exit
106,18 → 101,7
;==========================================================
;save for stdcall ebx,esi,edi,ebp
edit_box_mouse:
pop eax ;opint to back
pop edx ;scr_w
pop ecx ;ebp ;scr_h
push eax
 
; pop eax
; pop edx ;scr_w
; pop ecx ;scr_h
; push eax ;pointer to back
pusha
mov ebp,ecx
 
pushad
mov edi,dword [esp+36]
;debug
;----------------------------------------------------------
146,7 → 130,7
;----------------------------------------------------------
;--- ¯®«ãç ¥¬ ª®®à¤¨­ âë ¬ëè¨ ®â­®á¨â¥«ì­® 0 â.¥ ¢á¥© ®¡« á⨠íªà ­ 
;----------------------------------------------------------
@@: mcall 37,0
@@: mcall 37,1
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;”ã­ªæ¨ï ®¡à ¡®âª¨ ¬ë誨 ¯®«ã祭¨¥ ª®®à¤¨­ â ¨ ¯à®¢¥àª  ¨å + ¢ë¤¥«¥­¨ï
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
162,7 → 146,7
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;”㭪樨 ¤«ï à ¡®âë á mouse
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
use_mouse_func ;scr_w
use_mouse_func
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;Bit mask from editbox
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
548,4 → 532,3
;;;;;;;;;;;
align 16
mouse_flag dd 0x0
procinfo process_information
/programs/develop/box_lib/trunk/box_lib.obj
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/programs/develop/box_lib/trunk/editbox.mac
154,7 → 154,7
; ¢ ®¡é¥© ¡¨â®¢®© ¬ àà¨æ¥ á®áâ®ï­¨ï ª®¬¯®­¥­â®¢ word ed_flags
;----------------------------------------------------------
edit_box.check_offset:
pusha
pushad
mov ecx,ed_pos
mov ebx,ed_offset
cmp ebx,ecx
830,11 → 830,10
;;;;;;;;;;;;;;;;;;
;;¯à®æ¥¤ãà  ®¡à ¡®âª¨ ¯®«®¦¥­¨ï ¢ë¤¥«¥­­®£® ⥪áâ , ª®£¤  ¯à®¨á室¨â ¢ë室 §  ¯à¥¤¥«ë editbox
;;;;;;;;;;;;;;;;;;
mov ebx,[procinfo.box.left]
add ebx,ed_left
test ax,0x8000
jnz edit_box_mouse.mleft
 
add ebx,dword [esp+20];scr_w
 
mov ebx,ed_left
cmp eax,ebx
jb edit_box_mouse.mleft
 
920,8 → 919,6
}
 
macro use_work_mouse
; pop edx ;scr_h
; pop ebp ;scr_w
;----------------------------------------------------------
;--- € ­¥ 㤥ন¢ ¥¬ «¨ ¬ë ª« ¢¨èã ¬ë誨, ¯¥à¥¬¥é ï ªãàá®à, ¢® ¢á¥ à §­ë¥ áâ®à®­ë?
;----------------------------------------------------------
931,9 → 928,7
;----------------------------------------------------------
;--- ¯à®¢¥à塞, ¯®¯ ¤ ¥â «¨ ªãàá®à ¢ edit box -------------
;----------------------------------------------------------
mov ebx,[procinfo.box.top]
add ebx,ed_top
add ebx,dword [esp+24] ;ecx scr_h
mov ebx,ed_top
cmp ax,bx
jl edit_box_mouse._blur;.mouse_end_no_focus
 
943,16 → 938,15
 
shr eax,16
 
mov ebx,[procinfo.box.left]
add ebx,ed_left
add ebx,dword [esp+20] ;edx scr_w
 
mov ebx,ed_left
cmp ax,bx
jl edit_box_mouse._blur;.mouse_end_no_focus
 
add ebx,ed_width
 
cmp ax,bx
jg edit_box_mouse._blur;.mouse_end_no_focus
 
;--- ¨§¬¥­ï¥¬ ¯®§¨æ¨î ªãàá®à  ---
push eax
mov ebp,ed_color
959,14 → 953,9
call edit_box.clear_cursor
pop eax
edit_box_mouse._mvpos:
mov ebx,dword [procinfo.box.left]
xor edx,edx
sub eax,ed_left
sub eax,ebx
;
add ebx,dword [esp+20] ; scr_w
sub eax,2
;
 
mov ebx,6
div bx
add eax,ed_offset
973,6 → 962,7
cmp eax,ed_size
jna edit_box_mouse._mshift
mov eax,ed_size
 
edit_box_mouse._mshift:
;;;;;;;
;;‘¥ªæ¨ï ®¡à ¡®âª¨ shift ¨ ¢ë¤¥«¥­¨ï ¯® shift
1025,7 → 1015,7
; Œ ªà®á ¢ë室 
macro edit_ex
{
popa
popad
ret
}
macro debug
/programs/develop/box_lib/trunk/editbox_ex.asm
111,13 → 111,9
jz button
 
push dword edit1
push 22
push 5
call [edit_box_mouse]
 
push dword edit2
push 22
push 5
call [edit_box_mouse]
 
push dword check1
/programs/develop/box_lib/trunk/editbox_ex.kex
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/programs/develop/box_lib/trunk/run.bat
1,4 → 1,4
..\FASM\fasm.exe box_lib.asm
..\FASM\fasm.exe editbox_ex.asm editbox_ex.kex
@fasm.exe box_lib.asm
@fasm.exe editbox_ex.asm editbox_ex.kex
REM ..\FASM\kpack.exe editbox_ex
..\emul\klbrinwin.exe editbox_ex.kex
@klbrinwin.exe editbox_ex.kex