KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

fix function name 'edit_box' to 'edit_box_draw'

Browse Source 
git-svn-id: svn://kolibrios.org@9568 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2022-01-03 21:03:06 +00:00
parent c4f3315ffd
commit 0311a61f7f
49 changed files with 297 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/develop/fasm/1.73/fasm.asm
View File

@ -531,7 +531,7 @@ include 'core/messages.inc'
library box_lib,'box_lib.obj',\
proc_lib,'proc_lib.obj'
import box_lib,edit_box_draw,'edit_box',\
import box_lib,edit_box_draw,'edit_box_draw',\
edit_box_key,'edit_box_key',\
edit_box_mouse,'edit_box_mouse',\
edit_box_set_text,'edit_box_set_text',\

2
programs/develop/fasm/tags/1.71/fasm.asm
View File

@ -514,7 +514,7 @@ check_box_mouse dd aCheck_box_mouse
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aEdit_box_set_text db 'edit_box_set_text',0

47
programs/develop/h2d2b/trunk/h2d2b.asm
View File

@ -13,9 +13,9 @@
WIN_W = 364
use32
org 0x0
org 0
db 'MENUET01'
dd 0x01,start,i_end,e_end,e_end,0,sys_path
dd 1,start,i_end,e_end,e_end,0,sys_path
include '../../../proc32.inc'
include '../../../macros.inc' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
@ -32,17 +32,18 @@ start:
mov ebp,lib_0
cmp dword [ebp+ll_struc_size-4],0
jz @f
mcall -1 ;exit not correct
mcall SF_TERMINATE_PROCESS
@@:
mcall 40,0x80000027
mcall 48, 3, sys_colors, 40
mcall SF_SET_EVENTS_MASK,0x80000027
mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, sys_colors, 40
edit_boxes_set_sys_color edit1,editboxes_end,sys_colors
red:
call draw_window
align 4
still:
mcall 10 ; äã­ªæ¨ï 10 - ¦¤ âì ᮡëâ¨ï
mcall SF_WAIT_EVENT
cmp eax,1 ; ¯¥à¥à¨á®¢ âì ®ª­® ?
je red ; ¥á«¨ ¤  - ­  ¬¥âªã red
@ -58,7 +59,7 @@ still:
;---------------------------------------------------------------------
key: ; ­ ¦ â  ª« ¢¨è  ­  ª« ¢¨ âãà¥
mcall 2
mcall SF_GET_KEY
cmp ah,13 ;®¡à ¡®âª  ª­®¯ª¨ Enter
je @f
stdcall [edit_box_key], dword edit1
@ -124,10 +125,10 @@ next_digit:
;---------------------------------------------------------------------
button:
mcall 17 ; 17 - ¯®«ãç¨âì ¨¤¥­â¨ä¨ª â®à ­ ¦ â®© ª­®¯ª¨
mcall SF_GET_BUTTON
cmp ah, 1 ; ¥á«¨ <20>… ­ ¦ â  ª­®¯ª  á ­®¬¥à®¬ 1,
jne @f
mcall -1
mcall SF_TERMINATE_PROCESS
@@:
cmp ah, 2
jne @f
@ -158,19 +159,19 @@ mouse:
jmp still
;------------------------------------------------
draw_window:
draw_window:
;------------------------------------------------
mcall 48, 3, sys_colors, 40
mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, sys_colors, 40
mcall 12, 1
mcall SF_REDRAW, SSF_BEGIN_DRAW
mov edx, 0x14000000
or edx, [sys_colors.work]
;mov esi, 0x80000000
;or esi, [sys_colors.grab_text]
mcall 0, 200*65536+WIN_W, 200*65536+179, ,,title
mcall SF_CREATE_WINDOW, 200*65536+WIN_W, 200*65536+179, ,,title
mcall 8, 15*65536+42,106*65536+ 21, 2, [sys_colors.work_button] ; ª­®¯ª  shl
mcall SF_DEFINE_BUTTON, 15*65536+42,106*65536+ 21, 2, [sys_colors.work_button] ; ª­®¯ª  shl
mcall , 70*65536+42, , , ; ª­®¯ª  sal
mcall , (WIN_W-55)*65536+42, , 3, ; ª­®¯ª  shr
mcall ,(WIN_W-111)*65536+42, , 4, ; ª­®¯ª  sar
@ -178,7 +179,7 @@ mouse:
mov ecx, 0x90000000
or ecx, [sys_colors.work_text]
mcall 4, 15*65536+30, , binstr,
mcall SF_DRAW_TEXT, 15*65536+30, , binstr,
mcall , 15*65536+46, , decstr,
mcall , 15*65536+62, ,sdecstr,
mcall , 15*65536+78, , hexstr,
@ -193,9 +194,9 @@ mouse:
mov esi, [sys_colors.work_text]
or esi, 0x90000000
mcall 47, 10*65536, ,(WIN_W-92)*65536+62, ; 10-­ ï á® §­ ª®¬
mcall SF_DRAW_NUMBER, 10*65536, ,(WIN_W-92)*65536+62, ; 10-­ ï á® §­ ª®¬
BIN_LINE_BLOCK_W = 76
mcall 47, 8*65536+512,,(WIN_W-BIN_LINE_BLOCK_W)*65536+30 ; 2-­ ï
mcall SF_DRAW_NUMBER, 8*65536+512,,(WIN_W-BIN_LINE_BLOCK_W)*65536+30 ; 2-­ ï
ror ecx, 8
mov edx, (WIN_W-BIN_LINE_BLOCK_W*2)*65536+30
mcall
@ -214,10 +215,10 @@ mouse:
mcall , 10*65536, ,(WIN_W-92)*65536+46, ; 10-­ ï
mcall , 8*65536+256,,(WIN_W-76)*65536+78, ; 16-­ ï
mov ecx,esi
mcall 4, (WIN_W-102)*65536+61, , minus, 1
mcall 38, 15*65536+WIN_W-15, 137*65536+137, [sys_colors.work_graph]
mcall SF_DRAW_TEXT, (WIN_W-102)*65536+61, , minus, 1
mcall SF_DRAW_LINE, 15*65536+WIN_W-15, 137*65536+137, [sys_colors.work_graph]
stdcall [edit_box_draw], edit1
mcall 12, 2 ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ®¡ ®âà¨á®¢ª¥ ®ª­ 
mcall SF_REDRAW, SSF_END_DRAW
ret
@ -274,13 +275,9 @@ string1_end:
if lang eq ru
numstr db '—¨á«®:',0
Okstr db '‚¢®¤',0
head_f_i:
head_f_l db '‘¨á⥬­ ï ®è¨¡ª ',0
else
numstr db 'Number:',0
Okstr db 'Enter',0
head_f_i:
head_f_l db 'System error',0
end if
mouse_dd dd 0
@ -304,7 +301,7 @@ import_box_lib:
;edit_box_set_text dd sz_edit_box_set_text
dd 0,0
;sz_init1 db 'lib_init',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
;sz_edit_box_set_text db 'edit_box_set_text',0

132
programs/develop/heed/trunk/heed.asm
View File

@ -498,10 +498,10 @@ mouse:
mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
shr eax,16
cmp ax,[scroll_bar_data_vertical.start_x]
cmp ax,[scroll_bar_data_vertical.x_pos]
jb .horizontal
sub ax,[scroll_bar_data_vertical.start_x]
cmp ax,[scroll_bar_data_vertical.size_x]
sub ax,[scroll_bar_data_vertical.x_pos]
cmp ax,[scroll_bar_data_vertical.x_size]
jge still
@ -567,10 +567,10 @@ mouse:
jbe .other
mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
cmp ax,[scroll_bar_data_horizontal.start_y]
cmp ax,[scroll_bar_data_horizontal.y_pos]
jb still
sub ax,[scroll_bar_data_horizontal.start_y]
cmp ax,[scroll_bar_data_horizontal.size_y]
sub ax,[scroll_bar_data_horizontal.y_pos]
cmp ax,[scroll_bar_data_horizontal.y_size]
jge still
; mouse event for Horizontal ScrollBar
@ -586,10 +586,10 @@ mouse:
; mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
; shr eax,16
; cmp ax,[scroll_bar_data_vertical.start_x]
; cmp ax,[scroll_bar_data_vertical.x_pos]
; jb .horizontal
; sub ax,[scroll_bar_data_vertical.start_x]
; cmp ax,[scroll_bar_data_vertical.size_x]
; sub ax,[scroll_bar_data_vertical.x_pos]
; cmp ax,[scroll_bar_data_vertical.x_size]
; jge still
;@@:
; mouse event for Vertical ScrollBar
@ -1039,9 +1039,9 @@ main_area:
shl ecx,16
mov ebx,edx
shr ebx,16
cmp bx,[scroll_bar_data_vertical.start_x]
cmp bx,[scroll_bar_data_vertical.x_pos]
jge .ls1
mov ax,[scroll_bar_data_vertical.start_x]
mov ax,[scroll_bar_data_vertical.x_pos]
sub ax,bx
shl ebx,16
mov bx,ax
@ -1067,9 +1067,9 @@ main_area:
mov dx,16
mov ecx,edx
mov edx,frgrd_color
movzx ebx,[scroll_bar_data_vertical.start_x]
movzx ebx,[scroll_bar_data_vertical.x_pos]
mov ax,[scroll_bar_data_vertical.size_x]
mov ax,[scroll_bar_data_vertical.x_size]
test ax,ax
jnz .no_inc_ebx
inc ebx
@ -1084,15 +1084,15 @@ main_area:
shl ecx,16
mov ebx,edx
shr ebx,16
cmp bx,[scroll_bar_data_vertical.start_x]
cmp bx,[scroll_bar_data_vertical.x_pos]
jge .10
mov ax,[scroll_bar_data_vertical.start_x]
mov ax,[scroll_bar_data_vertical.x_pos]
sub ax,bx
shl ebx,16
mov bx,ax
mov cx,16
mov ax,[scroll_bar_data_vertical.size_x]
mov ax,[scroll_bar_data_vertical.x_size]
test ax,ax
jnz .no_inc_ebx_2
inc ebx
@ -1430,22 +1430,22 @@ draw_window:
mov ebx,[bytes_per_line]
xor edx,edx
div ebx
mov [scroll_bar_data_vertical.size_x],0
mov [scroll_bar_data_vertical.x_size],0
cmp eax,[number_strings]
jl @f
mov [scroll_bar_data_vertical.size_x],scroll_width_size
mov [scroll_bar_data_vertical.x_size],scroll_width_size
@@:
mov eax,dword [threath_buf+62] ;è¨à¨­  ª«¨¥­â᪮© ®¡« áâ¨
sub ax,[scroll_bar_data_vertical.size_x]
mov [scroll_bar_data_vertical.start_x],ax
sub ax,[scroll_bar_data_vertical.x_size]
mov [scroll_bar_data_vertical.x_pos],ax
mov eax,dword [threath_buf+66] ;¢ëá®â  ª«¨¥­â᪮© ®¡« áâ¨
sub eax,24+24-11
mov [scroll_bar_data_vertical.size_y],ax
mov [scroll_bar_data_vertical.y_size],ax
mov ebx,eax
push eax
add ebx,20
mov [scroll_bar_data_vertical.max_area],ebx
mov ebx,[scroll_bar_data_vertical.btn_high]
mov ebx,[scroll_bar_data_vertical.btn_height]
shl ebx,1
add ebx,20
mov [scroll_bar_data_vertical.cur_area],ebx
@ -1518,7 +1518,7 @@ draw_window:
shl ecx,16
add cx,dx
sub ecx,1*65536
movzx ebx, word [scroll_bar_data_vertical.start_x]
movzx ebx, word [scroll_bar_data_vertical.x_pos]
inc ebx
mcall SF_DRAW_RECT,,,frgrd_color
@ -1559,15 +1559,15 @@ draw_window:
mov [beg_str_scr],ebx
movzx eax,word [threath_buf+66]
sub eax,34
mov [scroll_bar_data_horizontal.start_y],ax
mov [scroll_bar_data_horizontal.y_pos],ax
;cur_area/(size_x-30)=len_str_scr/string_size
;cur_area/(x_size-30)=len_str_scr/string_size
mov eax,dword [threath_buf+62]
sub ax,[scroll_bar_data_vertical.size_x]
mov [scroll_bar_data_horizontal.size_x],ax
sub eax,[scroll_bar_data_horizontal.btn_high]
sub eax,[scroll_bar_data_horizontal.btn_high]
sub ax,[scroll_bar_data_vertical.x_size]
mov [scroll_bar_data_horizontal.x_size],ax
sub eax,[scroll_bar_data_horizontal.btn_height]
sub eax,[scroll_bar_data_horizontal.btn_height]
mov [scroll_bar_data_horizontal.max_area],eax
xor edx,edx
mov ebx,[len_str_scr]
@ -2895,8 +2895,7 @@ ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
;OpenDialog__Version dd aOpenDialog_Version
dd 0
dd 0
dd 0,0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
;aOpenDialog_Version db 'Version_OpenDialog',0
@ -2922,10 +2921,9 @@ menu_bar_draw dd aMenu_bar_draw
menu_bar_mouse dd aMenu_bar_mouse
version_menu_bar dd aVersion_menu_bar
dd 0
dd 0
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0
@ -2945,72 +2943,10 @@ aMenu_bar_mouse db 'menu_bar_mouse',0
aVersion_menu_bar db 'version_menu_bar',0
;---------------------------------------------------------------------
align 4
scroll_bar_data_vertical:
.x:
.size_x dw scroll_width_size;+0
.start_x dw 565 ;+2
.y:
.size_y dw 284 ;+4
.start_y dw 19 ;+6
.btn_high dd scroll_width_size ;+8
.type dd 0 ;+12
.max_area dd 300+20 ;+16
.cur_area dd 50 ;+20
.position dd 0 ;+24
.bckg_col dd 0xAAAAAA ;+28
.frnt_col dd 0xCCCCCC ;+32
.line_col dd 0 ;+36
.redraw dd 0 ;+40
.delta dw 0 ;+44
.delta2 dw 0 ;+46
.run_x:
.r_size_x dw 0 ;+48
.r_start_x dw 0 ;+50
.run_y:
.r_size_y dw 0 ;+52
.r_start_y dw 0 ;+54
.m_pos dd 0 ;+56
.m_pos_2 dd 0 ;+60
.m_keys dd 0 ;+64
.run_size dd 0 ;+68
.position2 dd 0 ;+72
.work_size dd 0 ;+76
.all_redraw dd 0 ;+80
.ar_offset dd 10 ;+84
scroll_bar_data_vertical scrollbar scroll_width_size, 565, 284, 19, scroll_width_size, 300+20, 50, 0, 0xAAAAAA, 0xCCCCCC, 0, 10
;---------------------------------------------------------------------
align 4
scroll_bar_data_horizontal:
.x:
.size_x dw 300 ;0 ;+0
.start_x dw 0 ;0 ;+2
.y:
.size_y dw scroll_width_size ;0 ;+4
.start_y dw 300 ;0 ;+6
.btn_high dd scroll_width_size ;+8
.type dd 0 ;+12
.max_area dd 300 ;+16
.cur_area dd 30 ;+20
.position dd 1 ;+24
.bckg_col dd 0xAAAAAA ;+28
.frnt_col dd 0xCCCCCC ;+32
.line_col dd 0 ;+36
.redraw dd 0 ;+40
.delta dw 0 ;+44
.delta2 dw 0 ;+46
.run_x:
.r_size_x dw 0 ;+48
.r_start_x dw 0 ;+50
.run_y:
.r_size_y dw 0 ;+52
.r_start_y dw 0 ;+54
.m_pos dd 0 ;+56
.m_pos_2 dd 0 ;+60
.m_keys dd 0 ;+64
.run_size dd 0 ;+68
.position2 dd 0 ;+72
.work_size dd 0 ;+76
.all_redraw dd 0 ;+80
.ar_offset dd 10 ;+84
scroll_bar_data_horizontal scrollbar 300, 0, scroll_width_size, 300, scroll_width_size, 300, 30, 1, 0xAAAAAA, 0xCCCCCC, 0, 10
;---------------------------------------------------------------------
align 4
menu_data_1:

2
programs/develop/info3ds/info3ds.asm
View File

@ -1231,7 +1231,7 @@ import_box_lib:
dd 0,0
sz_init1 db 'lib_init',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
sz_edit_box_set_text db 'edit_box_set_text',0

2
programs/develop/info3ds/info3ds_u.asm
View File

@ -1301,7 +1301,7 @@ import_box_lib:
dd 0,0
sz_init1 db 'lib_init',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
sz_edit_box_set_text db 'edit_box_set_text',0

2
programs/develop/kol_f_edit/kol_f_edit.asm
View File

@ -1462,7 +1462,7 @@ dd 0,0
alib_init2 db 'lib_init',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aEdit_box_set_text db 'edit_box_set_text',0

11
programs/develop/libraries/box_lib/asm/trunk/ctrldemo.asm
View File

@ -29,21 +29,20 @@
;---------------------------------------------------------------------
use32
org 0x0
org 0
db 'MENUET01'
dd 0x01
dd 1
dd START
dd IM_END
dd I_END
dd stacktop
dd 0x0
dd 0
dd path
include '../../../../../macros.inc'
include '../../load_lib.mac'
;include 'macros.inc'
;include 'load_lib.mac'
include '../../../../../KOSfuncs.inc'
include '../../../../../load_lib.mac'
@use_library
;---------------------------------------------------------------------

46
programs/develop/libraries/box_lib/asm/trunk/data.inc
View File

@ -26,35 +26,20 @@ system_dir_ProcLib db '/sys/lib/proc_lib.obj',0
;... «î¡ ï ¯®á«¥¤®¢ â¥«ì­®áâì ¤àã£¨å ª®¬ ­¤ ¨ ®¯à¥¤¥«¥­¨©.
;library_name db 'box_lib.obj',0
;library_name db 'box_lib.obj',0
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
ihead_f_i:
ihead_f_l db 'System error',0
er_message_found_lib db 'Sorry I cannot load library box_lib.obj',0
er_message_import db 'Error on load import library box_lib.obj',0
er_message_found_lib2 db 'cnv_png.obj - Not found!',0
er_message_import2 db 'cnv_png.obj - Wrong import!',0
er_message_found_lib3 db 'archiver.obj - Not found!',0
er_message_import3 db 'archiver.obj - Wrong import!',0
er_message_found_lib4 db 'proc_lib.obj - Not found!',0
er_message_import4 db 'proc_lib.obj - Wrong import!',0
;---------------------------------------------------------------------
align 4
l_libs_start:
library01 l_libs system_dir_Boxlib+9, path, file_name, system_dir_Boxlib,\
er_message_found_lib, ihead_f_l, Box_lib_import, er_message_import, ihead_f_i, plugins_directory
library01 l_libs system_dir_Boxlib+9, file_name, system_dir_Boxlib,\
Box_lib_import, plugins_directory
library02 l_libs system_dir_CnvPNG+9, path, file_name, system_dir_CnvPNG,\
er_message_found_lib2, ihead_f_l, cnv_png_import, er_message_import2, ihead_f_i, plugins_directory
library02 l_libs system_dir_CnvPNG+9, file_name, system_dir_CnvPNG,\
cnv_png_import, plugins_directory
library03 l_libs system_dir_UNPACK+9, path, file_name, system_dir_UNPACK,\
er_message_found_lib3, ihead_f_l, UNPACK_import, er_message_import3, ihead_f_i, plugins_directory
library03 l_libs system_dir_UNPACK+9, file_name, system_dir_UNPACK,\
UNPACK_import, plugins_directory
library04 l_libs system_dir_ProcLib+9, path, file_name, system_dir_ProcLib, \
er_message_found_lib4, ihead_f_l, ProcLib_import, er_message_import4, ihead_f_i, plugins_directory
library04 l_libs system_dir_ProcLib+9, file_name, system_dir_ProcLib, \
ProcLib_import, plugins_directory
end_l_libs:
;---------------------------------------------------------------------
@ -63,8 +48,7 @@ ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
;OpenDialog__Version dd aOpenDialog_Version
dd 0
dd 0
dd 0,0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
;aOpenDialog_Version db 'Version_OpenDialog',0
@ -75,8 +59,7 @@ cnv_png_import:
.Version dd aCP_Version
.Check dd aCP_Check
.Assoc dd aCP_Assoc
dd 0
dd 0
dd 0,0
aCP_Start db 'START',0
aCP_Version db 'version',0
aCP_Check db 'Check_Header',0
@ -99,9 +82,7 @@ UNPACK_import:
;unpack_Close dd aUnpack_Close
unpack_DeflateUnpack dd aUnpack_DeflateUnpack
unpack_DeflateUnpack2 dd aUnpack_DeflateUnpack2
dd 0
dd 0
dd 0,0
;aUnpack_Version db 'version',0
;aUnpack_PluginLoad db 'plugin_load',0
;aUnpack_OpenFilePlugin db 'OpenFilePlugin',0
@ -187,13 +168,12 @@ menu_bar_activate dd aMenu_bar_activate
PathShow_prepare dd sz_PathShow_prepare
PathShow_draw dd sz_PathShow_draw
;Version_path_show dd szVersion_path_show
dd 0
dd 0
dd 0,0
;a_init db 'lib_init',0
;a_version db 'version',0
;aEdit_box_draw db 'edit_box',0
;aEdit_box_draw db 'edit_box_draw',0
;aEdit_box_key db 'edit_box_key',0
;aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0

39
programs/develop/libraries/box_lib/asm/trunk/editbox_ex.asm
View File

@ -1,28 +1,28 @@
;§ £®«®¢®ª ¯à¨«®¦¥­¨ï
use32 ; âà ­á«ïâ®à, ¨á¯®«ì§ãî騩 32 à §à來ëå ª®¬ ­¤ë
org 0x0 ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0x0
org 0 ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0
db 'MENUET01' ; ¨¤¥­â¨ä¨ª â®à ¨á¯®«­ï¥¬®£® ä ©«  (8 ¡ ©â)
dd 0x1 ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«­ï¥¬®£® ä ©« 
dd 1 ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«­ï¥¬®£® ä ©« 
dd start ;  ¤à¥á, ­  ª®â®àë© á¨á⥬  ¯¥à¥¤ ñâ ã¯à ¢«¥­¨¥
; ¯®á«¥ § £à㧪¨ ¯à¨«®¦¥­¨ï ¢ ¯ ¬ïâì
dd i_end ; à §¬¥à ¯à¨«®¦¥­¨ï
dd mem ; Ž¡ê¥¬ ¨á¯®«ì§ã¥¬®© ¯ ¬ïâ¨, ¤«ï á⥪  ®â¢¥¤¥¬ 0å100 ¡ ©â ¨ ¢ë஢­¨¬ ­  £à­¨æã 4 ¡ ©â 
dd mem ; à á¯®«®¦¨¬ ¯®§¨æ¨î á⥪  ¢ ®¡« á⨠¯ ¬ïâ¨, áࠧ㠧  ⥫®¬ ¯à®£à ¬¬ë. ‚¥à設  á⥪  ¢ ¤¨ ¯ §®­¥ ¯ ¬ïâ¨, 㪠§ ­­®¬ ¢ëè¥
dd 0x0 ; 㪠§ â¥«ì ­  áâபã á ¯ à ¬¥âà ¬¨.
dd 0 ; 㪠§ â¥«ì ­  áâபã á ¯ à ¬¥âà ¬¨.
dd cur_dir_path ; 㪠§ â¥«ì ­   ¤à¥á, ªã¤  ¯®¬¥é ¥âáï áâப , ᮤ¥à¦ é ï ¯ãâì ¤® ¯à®£à ¬¬ë ¢ ¬®¬¥­â § ¯ã᪠.
include '../../../../../macros.inc'
include '../../trunk/box_lib.mac'
include '../../load_lib.mac'
include '../../../../../KOSfuncs.inc'
include '../../../../../load_lib.mac'
@use_library ;use load lib macros
start:
;universal load library/librarys
sys_load_library library_name, cur_dir_path, library_path, system_path, \
err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
sys_load_library library_name, library_path, system_path, myimport
;if return code =-1 then exit, else nornary work
cmp eax,-1
jz exit
mcall 40,0x27 ;ãáâ ­®¢¨âì ¬ áªã ¤«ï ®¦¨¤ ¥¬ëå ᮡë⨩
mcall SF_SET_EVENTS_MASK,0x80000027 ;ãáâ ­®¢¨âì ¬ áªã ¤«ï ®¦¨¤ ¥¬ëå ᮡë⨩
push dword check1 ;¯®¤áçñâ ¤¨­ë ⥪áâ  ¤«ï Checkbox'®¢
call [init_checkbox]
@ -34,7 +34,7 @@ red_win:
call draw_window ;¯¥à¢®­ ç «ì­® ­¥®¡å®¤¨¬® ­ à¨á®¢ âì ®ª­®
align 4
still: ;®á­®¢­®© ®¡à ¡®â稪
mcall 10 ;Ž¦¨¤ âì ᮡëâ¨ï
mcall SF_WAIT_EVENT
dec eax
jz red_win
dec eax
@ -63,13 +63,13 @@ still: ;
jmp still ;¥á«¨ ­¨ç¥£® ¨§ ¯¥à¥ç¨á«¥­­®£® â® á­®¢  ¢ 横«
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
button:
mcall 17 ;¯®«ãç¨âì ¨¤¥­â¨ä¨ª â®à ­ ¦ â®© ª« ¢¨è¨
mcall SF_GET_BUTTON
test ah,ah ;¥á«¨ ¢ ah 0, â® ¯¥à¥©â¨ ­  ®¡à ¡®â稪 ᮡë⨩ still
jz still
exit:
mcall -1
mcall SF_TERMINATE_PROCESS
key:
mcall 2 ;§ £à㧨¬ §­ ç¥­¨¥ 2 ¢ ॣ¨áâ®à eax ¨ ¯®«ã稬 ª®¤ ­ ¦ â®© ª« ¢¨è¨
mcall SF_GET_KEY
push dword edit1
call [edit_box_key]
@ -82,8 +82,8 @@ key:
;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
align 4
draw_window: ;à¨á®¢ ­¨¥ ®ª­  ¯à¨«®¦¥­¨ï
mcall 12,1
mcall 0,(50*65536+390),(30*65536+200),0x33AABBCC,0x805080DD,hed
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_CREATE_WINDOW,(50*65536+390),(30*65536+200),0x33AABBCC,0x805080DD,hed
push dword edit1
call [edit_box_draw]
@ -103,7 +103,7 @@ draw_window: ;
push dword Option_boxs2
call [option_box_draw]
mcall 12,2
mcall SF_REDRAW, SSF_END_DRAW
ret
;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
;DATA ¤ ­­ë¥
@ -116,12 +116,6 @@ library_name db 'box_lib.obj',0
;library_name db 'box_lib.obj',0
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
err_message_found_lib db 'Sorry I cannot load library box_lib.obj',0
head_f_i:
head_f_l db 'System error',0
err_message_import db 'Error on load import library box_lib.obj',0
myimport:
edit_box_draw dd aEdit_box_draw
@ -138,10 +132,9 @@ option_box_draw dd aOption_box_draw
option_box_mouse dd aOption_box_mouse
version_op dd aVersion_op
dd 0
dd 0
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0

32
programs/develop/libraries/box_lib/asm/trunk/tooltip_demo.asm
View File

@ -3,15 +3,15 @@
; - ¯¥à¥¤¥« ­ ª ª ¯à¨¬¥à ¨á¯®«ì§®¢ ­¨ï tooltip
use32 ; ¢ª«îç¨âì 32-¡¨â­ë© ०¨¬  áᥬ¡«¥à 
org 0x0 ;  ¤à¥á æ¨ï á ­ã«ï
org 0 ;  ¤à¥á æ¨ï á ­ã«ï
db 'MENUET01' ; 8-¡ ©â­ë© ¨¤¥­â¨ä¨ª â®à MenuetOS
dd 0x01 ; ¢¥àá¨ï § £®«®¢ª  (¢á¥£¤  1)
dd 1 ; ¢¥àá¨ï § £®«®¢ª  (¢á¥£¤  1)
dd START ;  ¤à¥á ¯¥à¢®© ª®¬ ­¤ë
dd CODE_END ; à §¬¥à ¯à®£à ¬¬ë
dd DATA_END ; ª®«¨ç¥á⢮ ¯ ¬ïâ¨
dd STACK_END ;  ¤à¥á ¢¥à設ë áâíª 
dd 0x0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢
dd 0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢
dd cur_dir_path ; 㪠§ â¥«ì ­   ¤à¥á, ªã¤  ¯®¬¥é ¥âáï áâப , ᮤ¥à¦ é ï ¯ãâì ¤® ¯à®£à ¬¬ë ¢ ¬®¬¥­â § ¯ã᪠.
include '../../../../../proc32.inc'
@ -19,10 +19,8 @@ include '../../../../../macros.inc'
include '../../../../../KOSfuncs.inc'
include '../../../../../dll.inc' ; malloc fn
include '../../trunk/box_lib.mac'
include '../../load_lib.mac'
;include 'proc32.inc'
;include 'macros.inc'
;include 'KOSfuncs.inc'
include '../../../../../load_lib.mac'
;---------------------------------------------------------------------
;--- <20>€—€‹Ž <20><>Žƒ<C5BD>€ŒŒ› ----------------------------------------------
@ -30,24 +28,17 @@ include '../../load_lib.mac'
; íâ®â ¬ ªà®á ®¡ï§ â¥«¥­ ¤«ï ¢á¥å ª®¬¯®­¥â®¢, ¨á¯®«ì§ãîé¨å heap
; ªà®¬¥ ⮣®, ®¡ï§ â¥«ì­® ¨¬®àâ¨à®¢ âì lib_init - ¯à¨ ¨¬¯®à⥠®¯à¥¤¥«ïîâáï
; ä㭪樨 娯  ¤«ï ¡¨¡«¨®â¥ª¨
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
START:
;---------------------------------------------------------------------
;--- ˆ<>ˆ–ˆ€‹ˆ‡€–ˆŸ ----------------------------------------
;---------------------------------------------------------------------
;mov eax, mem_alloc
;mov [mem.alloc], eax
;mov eax, mem_realloc
;mov [mem.realloc], eax
;mov eax, mem_free
;mov [mem.free], eax
mcall 68, 11
mcall 40, $C0000027 ; ¬ áª  ᮡë⨩ - ¬ëèì ⮫쪮 ¢  ªâ¨¢­®¬ ®ª­¥
sys_load_library lib_name, cur_dir_path, lib_path, sys_path, \
e_notfound_lib, head_f_l, myimport, e_import, head_f_i
sys_load_library lib_name, lib_path, sys_path, myimport
test eax,eax
jz @f
mcall -1 ; alarm exit
@ -144,12 +135,6 @@ lib_name db 'box_lib.obj',0
cur_dir_path rb 4096
lib_path rb 4096
e_notfound_lib db 'Sorry I cannot load library box_lib.obj',0
head_f_i:
head_f_l db 'System error',0
e_import db 'Error on load import library box_lib.obj',0
myimport:
dd sz_lib_init ;äã­ªæ¨ï § ¯ã᪠¥âáï ¬ ªà®á®¬ 1 à § ¯à¨ ¯®¤ª«î祭¨¨
;¡¨¡«¨®â¥ª¨, ¯®â®¬ã ¢ ¯à®£à ¬¬¥ ¬¥âª  ­  ­¥¥ ­¥ ­ã¦­ 
@ -158,8 +143,7 @@ tooltip_delete dd sz_tooltip_delete
tooltip_test_show dd sz_tooltip_test_show
tooltip_mouse dd sz_tooltip_mouse
get_font_size dd sz_get_font_size
dd 0
dd 0
dd 0,0
sz_lib_init db 'lib_init',0
sz_tooltip_init db 'tooltip_init', 0

4
programs/develop/libraries/box_lib/trunk/box_lib.asm
View File

@ -183,7 +183,8 @@ EXPORTS:
dd sz_init, lib_init
dd sz_version, 0x00000001
dd sz_edit_box, edit_box
dd sz_edit_box, edit_box_draw ;old function name
dd sz_edit_box_draw, edit_box_draw
dd sz_edit_box_key, edit_box_key
dd sz_edit_box_mouse, edit_box_mouse
dd sz_edit_box_set_text, edit_box_set_text
@ -298,6 +299,7 @@ sz_init db 'lib_init',0
sz_version db 'version',0
sz_edit_box db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
sz_edit_box_set_text db 'edit_box_set_text',0

161
programs/develop/libraries/box_lib/trunk/editbox.asm
View File

@ -2,8 +2,7 @@ SCAN_LWIN_RELEASE = 0xDB
SCAN_RWIN_RELEASE = 0xDC
align 16
edit_box:
.draw:
edit_box_draw:
pushad
mov edi,[esp+36]
and dword ed_text_color,17FFFFFFh
@ -26,25 +25,25 @@ edit_box:
mul bl
add eax,4
mov ed_height,eax
call .draw_border
.draw_bg_cursor_text:
call .border
.bg_cursor_text:
;test word ed_flags,ed_focus ; for unfocused controls =>
;jz .skip_offset ; do not recalculate offset
call .check_offset
call edit_box.check_offset
;.skip_offset:
call .draw_bg
call edit_box_draw.bg
test word ed_flags,ed_focus ; do not draw selection(named shift)
jz .draw_cursor_text ;
call .draw_shift
.draw_cursor_text:
call .draw_text
jz .cursor_text ;
call .shift
.cursor_text:
call .text
test word ed_flags,ed_focus ; and dosn`t draw cursor
jz .editbox_exit
call .draw_cursor
jz edit_box_exit
call .cursor
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;Ž¡é¨© ¢ë室 ¨§ editbox ¤«ï ¢á¥å ä㭪権 ¨ ¯®áâ ®¡à ¡®â稪®¢;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
.editbox_exit:
edit_box_exit:
popad
ret 4
@ -56,15 +55,15 @@ edit_box_key:
pushad
mov edi,[esp+36]
test word ed_flags,ed_focus ; ¥á«¨ ­¥ ¢ 䮪ãá¥, ¢ë室¨¬
jz edit_box.editbox_exit
jz edit_box_exit
test word ed_flags,ed_mouse_on or ed_disabled
jnz edit_box.editbox_exit
jnz edit_box_exit
;--------------------------------------
; this code for Win-keys, works with
; kernel SVN r.3356 or later
mcall SF_KEYBOARD,SSF_GET_CONTROL_KEYS
test ah,$06 ; LWin ($02) & RWin ($04)
jnz edit_box.editbox_exit
jnz edit_box_exit
;--------------------------------------
;<3B>஢¥àª  ­ ¦ â shift ?
test al,$03
@ -98,26 +97,26 @@ edit_box_key:
je edit_box_key.ctrl_v
cmp ah,SCAN_CODE_A ; Ctrl + A
je edit_box_key.ctrl_a
jmp edit_box.editbox_exit
jmp edit_box_exit
@@:
cmp ah,SCAN_CODE_SPACE
ja @F
cmp al,ASCII_KEY_BACK
jz edit_box_key.backspace
cmp ah,SCAN_CODE_ESCAPE
jz edit_box.editbox_exit
jz edit_box_exit
cmp ah,SCAN_CODE_TAB
jz edit_box.editbox_exit
jz edit_box_exit
cmp ah,SCAN_CODE_RETURN
jz edit_box.editbox_exit
jz edit_box_exit
jmp .printable_character
@@:
cmp ah,SCAN_CODE_DELETE
ja edit_box.editbox_exit
ja edit_box_exit
cmp ah,SCAN_CODE_HOME
jb edit_box.editbox_exit
jb edit_box_exit
cmp ax,SCAN_CODE_CLEAR shl 8 + ASCII_KEY_CLEAR ; not operate numpad unlocked 5
jz edit_box.editbox_exit
jz edit_box_exit
;here best place to filter up,down,pgup,pgdown
cmp al,ASCII_KEY_LEFT
jb .printable_character
@ -126,23 +125,23 @@ edit_box_key:
jmp dword[ebx+eax*4]
.unlock_numpad_filtration \
dd edit_box_key.left, \ ; LEFT
edit_box.editbox_exit,\ ; DOWN
edit_box.editbox_exit,\ ; UP
edit_box_exit,\ ; DOWN
edit_box_exit,\ ; UP
edit_box_key.right, \ ; RIGHT
edit_box_key.home, \ ; HOME
edit_box_key.end, \ ; END
edit_box_key.delete, \ ; DELETE
edit_box.editbox_exit,\ ; PGDN
edit_box.editbox_exit,\ ; PGUP
edit_box_exit,\ ; PGDN
edit_box_exit,\ ; PGUP
edit_box_key.insert ; INSERT
.printable_character:
test word ed_flags,ed_figure_only ; ⮫쪮 æ¨äàë?
jz @f
cmp al,'0'
jb edit_box.editbox_exit
jb edit_box_exit
cmp al,'9'
ja edit_box.editbox_exit
ja edit_box_exit
@@:
; restore ascii code
rol eax,8
@ -179,10 +178,10 @@ edit_box_key:
test word ed_flags,ed_insert
jne @f
cmp ecx,edx
jae edit_box.editbox_exit
jae edit_box_exit
@@: mov ebx, ed_pos
cmp ebx,edx
jnl edit_box.editbox_exit
jnl edit_box_exit
mov ecx,ed_size
push edi eax
mov ebp,edi
@ -222,7 +221,7 @@ edit_box_key.In_k:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;
edit_box_key.insert:
xor word ed_flags,ed_insert
jmp edit_box.editbox_exit
jmp edit_box_exit
edit_box_key.ins_v:
dec dword bp_size
@ -280,7 +279,7 @@ edit_box_key.draw_all:
call edit_box.clear_cursor
call edit_box.check_offset
and word ed_flags,ed_shift_cl
jmp edit_box.draw_bg
jmp edit_box_draw.bg
@@: dec dword ed_size
edit_box_key.draw_all2:
@ -299,10 +298,10 @@ edit_box_key.left:
or word ed_flags,ed_left_fl
call edit_box_key.sh_first_sh
dec dword ed_pos
call edit_box.draw_bg
call edit_box.draw_shift
call edit_box_draw.bg
call edit_box_draw.shift
call edit_box_key.sh_enable
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
;--- ­ ¦ â  ª« ¢¨è  right ---
edit_box_key.right:
@ -312,10 +311,10 @@ edit_box_key.right:
and word ed_flags,ed_right_fl
call edit_box_key.sh_first_sh
inc dword ed_pos
call edit_box.draw_bg
call edit_box.draw_shift
call edit_box_draw.bg
call edit_box_draw.shift
call edit_box_key.sh_enable
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
edit_box_key.home:
mov ebx,ed_pos
@ -324,10 +323,10 @@ edit_box_key.home:
call edit_box_key.sh_first_sh
xor eax,eax
mov ed_pos,eax
call edit_box.draw_bg
call edit_box.draw_shift
call edit_box_draw.bg
call edit_box_draw.shift
call edit_box_key.sh_home_end
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
;--- ­ ¦ â  ª« ¢¨è  end ---
edit_box_key.end:
@ -337,10 +336,10 @@ edit_box_key.end:
call edit_box_key.sh_first_sh
mov eax,ed_size
mov ed_pos,eax
call edit_box.draw_bg
call edit_box.draw_shift
call edit_box_draw.bg
call edit_box_draw.shift
call edit_box_key.sh_home_end
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
;----------------------------------------
StrInsert:
; SizeOf(TmpBuf) >= StrLen(Src) + StrLen(Dst) + 1
@ -412,13 +411,13 @@ restore DstCount
;----------------------------------------
edit_box_key.ctrl_x:
test word ed_flags,ed_shift_on
jz edit_box.editbox_exit
jz edit_box_exit
push dword 'X' ; this value need below to determine which action is used
jmp edit_box_key.ctrl_c.pushed
edit_box_key.ctrl_c:
test word ed_flags,ed_shift_on
jz edit_box.editbox_exit
jz edit_box_exit
push dword 'C' ; this value need below to determine which action is used
.pushed:
; add memory area
@ -466,7 +465,7 @@ edit_box_key.ctrl_c:
pop eax ; determine current action (ctrl+X or ctrl+C)
cmp eax, 'X'
je edit_box_key.delete
jmp edit_box.editbox_exit
jmp edit_box_exit
edit_box_key.ctrl_v:
mcall SF_CLIPBOARD,SSF_GET_SLOT_COUNT
@ -556,7 +555,7 @@ edit_box_key.ctrl_v:
mov ecx,eax
mcall SF_SYS_MISC,SSF_MEM_FREE
.exit:
jmp edit_box.draw_bg_cursor_text
jmp edit_box_draw.bg_cursor_text
edit_box_key.ctrl_a:
mov eax,ed_size
@ -564,7 +563,7 @@ edit_box_key.ctrl_a:
xor eax,eax
mov ed_shift_pos,eax
or word ed_flags,ed_shift_bac+ed_shift_on
jmp edit_box.draw_bg_cursor_text
jmp edit_box_draw.bg_cursor_text
;==========================================================
;=== ®¡à ¡®âª  ¬ëè¨ =======================================
@ -575,7 +574,7 @@ edit_box_mouse:
pushad
mov edi,[esp+36]
test word ed_flags,ed_disabled
jnz edit_box.editbox_exit
jnz edit_box_exit
;----------------------------------------------------------
;--- ¯®«ãç ¥¬ á®áâ®ï­¨¥ ª­®¯®ª ¬ëè¨ -----------------------
@ -590,7 +589,7 @@ edit_box_mouse:
mov ebx,ed_mouse_variable
push 0
pop dword [ebx]
jmp edit_box.editbox_exit
jmp edit_box_exit
.mouse_left_button:
;----------------------------------------------------------
@ -662,26 +661,26 @@ edit_box_mouse._mshift:
push edi
pop dword [ebx]
bts word ed_flags,1
call edit_box.draw_bg
call edit_box_draw.bg
jmp edit_box_mouse.m_sh
@@: cmp ax,ed_shift_pos
je edit_box.editbox_exit
je edit_box_exit
mov ed_pos,eax
call edit_box.draw_bg
call edit_box_draw.bg
mov ebp,shift_color
movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_
or word ed_flags,ed_mous_adn_b
edit_box_mouse.m_sh:
call edit_box.draw_text
call edit_box.draw_cursor
call edit_box_draw.text
call edit_box_draw.cursor
; ¯à®æ¥¤ãà  ãáâ ­®¢ª¨ 䮪ãá 
jmp edit_box_mouse.drc
edit_box_mouse._remove_selection:
and word ed_flags,ed_shift_cl
jmp edit_box.draw_bg_cursor_text
jmp edit_box_draw.bg_cursor_text
edit_box_mouse._blur:
test word ed_flags,ed_always_focus
@ -691,7 +690,7 @@ edit_box_mouse._blur:
mov ebp,ed_color
call edit_box.clear_cursor
edit_box_mouse.drc:
call edit_box.draw_border
call edit_box_draw.border
jmp edit_box_mouse._remove_selection
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -699,7 +698,7 @@ edit_box_mouse.drc:
;----------------------------------------------------------
;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ¢ë¤¥«¥­­®© ç á⨠----------------
;----------------------------------------------------------
edit_box.draw_shift:
edit_box_draw.shift:
test word ed_flags,ed_shift_bac ;ãáâ ­®¢ª  ä« £ , ¢ë¤¥«¥­­®© ®¡« áâ¨
jz @f
mov ebp,shift_color
@ -709,7 +708,7 @@ edit_box.draw_shift:
;----------------------------------------------------------
;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ⥪áâ  --------------------------
;----------------------------------------------------------
edit_box.draw_text:
edit_box_draw.text:
call edit_box.get_n
mov esi,ed_size
sub esi,ed_offset
@ -751,7 +750,7 @@ txt_pass db '*'
;----------------------------------------------------------
;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ä®­  ----------------------------
;----------------------------------------------------------
edit_box.draw_bg:
edit_box_draw.bg:
mov ebx,ed_left
inc ebx
shl ebx,16
@ -759,9 +758,9 @@ edit_box.draw_bg:
dec ebx
mov edx,ed_color
test word ed_flags, ed_disabled
jz edit_box.draw_bg_eax
jz edit_box_draw.bg_eax
mov edx, 0xCACACA ; TODO: add disabled_color field to editbox struct
edit_box.draw_bg_eax:
edit_box_draw.bg_eax:
mov ecx,ed_top
inc ecx
shl ecx,16
@ -796,11 +795,11 @@ edit_box.clear_cursor:
mov edx, ebp
movzx ecx, word cl_curs_y
cmp ecx, ed_top
jg edit_box.draw_curs
jg edit_box_draw.curs
@@:
ret
edit_box.draw_cursor:
edit_box_draw.cursor:
mov edx, ed_text_color
mov eax, ed_pos
sub eax, ed_offset
@ -812,7 +811,7 @@ edit_box.draw_cursor:
add ecx, 2
mov cl_curs_x, bx
mov cl_curs_y, cx
edit_box.draw_curs:
edit_box_draw.curs:
mov eax, ebx
shl ebx, 16
or ebx, eax
@ -827,7 +826,7 @@ edit_box.draw_curs:
;----------------------------------------------------------
;--- ¯à®æ¥¤ãà  à¨á®¢ ­¨ï à ¬ª¨ ----------------------------
;----------------------------------------------------------
edit_box.draw_border:
edit_box_draw.border:
test word ed_flags,ed_focus
mov edx,ed_focus_border_color
jne @f
@ -916,7 +915,7 @@ edit_box.add_8:
add ebx,edx
edit_box.chk_d:
mov ed_offset,ebx
call edit_box.draw_bg
call edit_box_draw.bg
and word ed_flags,ed_offset_cl
popad
ret
@ -952,20 +951,20 @@ endp
;Ž¡à ¡®âª  Shift ¤«ï á­ïâ¨ï ¢ë¤¥«¥­¨ï ­¥¨§¢¥áâ­®© ®¡« áâ¨
edit_box_key.shift:
call edit_box.draw_bg
call edit_box_draw.bg
test word ed_flags,ed_shift
je edit_box_key.f_exit
mov ebp,shift_color
or word ed_flags,ed_shift_bac ;ãáâ ­®¢ª  ä« £ , ¢ë¤¥«¥­­®© ®¡« áâ¨
movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
edit_box_key.f_exit:
call edit_box.check_offset
and word ed_flags,ed_shift_cl
call edit_box_key.enable_null
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
edit_box_key.sh_cl_:
;®¡à ¡®âª  ®ç¨á⪨, ¯à¨ «¥¢®¬ - ¯à ¢®¬ ¤¢¨¦¥­¨¨ ¢ë¤¥«¥­¨ï
@ -1020,7 +1019,7 @@ edit_box_key.nxt_f:
inc eax
mov bx, ax
mov edx,ebp ;shift_color
call edit_box.draw_bg_eax
call edit_box_draw.bg_eax
jmp edit_box_key.enable_null
;“áâ ­®¢ª - á­ï⨥ ¢ë¤¥«¥­¨ï ¢ ®¤¨­ ᨬ¢®«
@ -1070,12 +1069,12 @@ edit_box_key.sh_st_of:
jne @f
test word ed_flags,ed_shift_bac
je @f
call edit_box.draw_bg
call edit_box_draw.bg
mov ebp,ed_color
movzx ebx, word ed_shift_pos
call edit_box_key.sh_cl_ ;®ç¨á⪠ ¢ë¤¥«¥­®£® äà £¬¥­â 
and word ed_flags,ed_shift_cl ; ®ç¨á⪠ ®â ⮣®, çâ® ã¡à «¨ ¢ë¤¥«¥­¨¥
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
@@: and word ed_flags,ed_shift_off
popad
@ -1150,7 +1149,7 @@ edit_box_key.sh_home_end:
jmp edit_box_key.sh_e_end
edit_box_key.sh_exit_:
call edit_box.draw_bg
call edit_box_draw.bg
jmp edit_box.check_offset
;äã­ªæ¨ï ¢­¥á¥­¨ï 0 ¯®  ¤à¥áã ed_size+1
@ -1248,7 +1247,7 @@ edit_box_key.nxt:
inc eax
mov bx, ax
mov edx,ed_color
jmp edit_box.draw_bg_eax
jmp edit_box_draw.bg_eax
;;;;;;;;;;;;;;;;;;;
;;; Ž¡à ¡®âª  ¯à¨¬¨â¨¢®¢
@ -1266,15 +1265,15 @@ edit_box_key.draw_rectangle:
add eax,ed_char_width
mov ebx,eax
mov edx,ebp
jmp edit_box.draw_bg_eax
jmp edit_box_draw.bg_eax
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;”㭪樨 ¤«ï à ¡®âë á mouse
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
edit_box_mouse.mouse_wigwag:
push eax
call edit_box.draw_bg
call edit_box.draw_shift
call edit_box_draw.bg
call edit_box_draw.shift
pop eax
or word ed_flags,ed_shift_bac+ed_shift_on+ed_shift
;Ž¡à ¡®âª  ¯®«®¦¥­¨ï ¢ë¤¥«¥­­®£® ⥪áâ , ª®£¤  ¯à®¨á室¨â ¢ë室 §  ¯à¥¤¥«ë editbox
@ -1323,7 +1322,7 @@ edit_box_mouse.m1_shem:
call edit_box_key.sh_cl_
edit_box_mouse.mwigvag:
and word ed_flags,ed_shift_mcl
jmp edit_box.draw_cursor_text
jmp edit_box_draw.cursor_text
edit_box_mouse.mleft:
mov eax,ed_pos

2
programs/develop/libraries/crypt_des/example/crypt_files.asm
View File

@ -535,7 +535,7 @@ import_box_lib:
dd 0,0
;sz_init1 db 'lib_init',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
;sz_edit_box_set_text db 'edit_box_set_text',0

5
programs/develop/libraries/fontslib/trunk/font_ex.asm
View File

@ -156,10 +156,9 @@ edit_box_key dd aEdit_box_key
edit_box_mouse dd aEdit_box_mouse
version_ed dd aVersion_ed
dd 0
dd 0
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0

2
programs/develop/libraries/http/examples/deflate.asm
View File

@ -315,7 +315,7 @@ import lib_http, \
HTTP_free, 'free'
import box_lib, \
edit_box_draw, 'edit_box', \
edit_box_draw, 'edit_box_draw', \
edit_box_key, 'edit_box_key', \
edit_box_mouse, 'edit_box_mouse', \
PathShow_prepare, 'PathShow_prepare', \

2
programs/develop/libraries/http/examples/get.asm
View File

@ -288,7 +288,7 @@ import lib_http, \
HTTP_free , 'free'
import box_lib, \
edit_box_draw, 'edit_box', \
edit_box_draw, 'edit_box_draw', \
edit_box_key, 'edit_box_key', \
edit_box_mouse, 'edit_box_mouse', \
PathShow_prepare, 'PathShow_prepare', \

4
programs/develop/str_double/trunk/str_double.asm
View File

@ -251,7 +251,7 @@ proc conv_str_to_int uses ebx ecx esi, buf:dword
endp
;-------------------------------------------------
title db 'string to double 20.08.19',0
title db 'string to double 03.01.21',0
hexstr db 'hex:',0
decstr db 'dec:',0
binstr db 'bin:',0
@ -301,7 +301,7 @@ import_box_lib:
;version_op dd aVersion_op
dd 0,0
;sz_init1 db 'lib_init',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
;sz_edit_box_set_text db 'edit_box_set_text',0

5
programs/emulator/PrMK/trunk/PrMK.asm
View File

@ -1696,10 +1696,9 @@ scrollbar_ver_draw dd aScrollbar_ver_draw
scrollbar_ver_mouse dd aScrollbar_ver_mouse
version_scrollbar dd aVersion_scrollbar
dd 0
dd 0
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0

2
programs/fs/opendial/opendial.asm
View File

@ -2662,7 +2662,7 @@ PathShow_draw dd sz_PathShow_draw
;a_init db 'lib_init',0
;a_version db 'version',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0

2
programs/fs/unz/unz.asm
View File

@ -842,7 +842,7 @@ import proc_lib,\
OpenDialog_Init ,'OpenDialog_init',\
OpenDialog_Start ,'OpenDialog_start'
import box_lib,\
edit_box_draw ,'edit_box',\
edit_box_draw ,'edit_box_draw',\
edit_box_key ,'edit_box_key',\
edit_box_mouse ,'edit_box_mouse'

2
programs/games/sudoku/trunk/sudoku.asm
View File

@ -1061,7 +1061,7 @@ edit_box_mouse dd aEdit_box_mouse
version_ed dd aVersion_ed
dd 0
dd 0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0

2
programs/media/log_el/trunk/le_libs.inc
View File

File diff suppressed because one or more lines are too long

5
programs/media/scrshoot/srectwin.inc
View File

@ -252,8 +252,7 @@ ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
;OpenDialog__Version dd aOpenDialog_Version
dd 0
dd 0
dd 0,0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
;aOpenDialog_Version db 'Version_OpenDialog',0
@ -286,7 +285,7 @@ PathShow_draw dd sz_PathShow_draw
;a_init db 'lib_init',0
;a_version db 'version',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aEdit_box_set_text db 'edit_box_set_text',0

2
programs/media/zsea/data.inc
View File

File diff suppressed because one or more lines are too long

2
programs/network/downloader/downloader.asm
View File

@ -348,7 +348,7 @@ import lib_http, \
HTTP_free, 'free'
import box_lib, \
edit_box_draw, 'edit_box', \
edit_box_draw, 'edit_box_draw', \
edit_box_key, 'edit_box_key', \
edit_box_mouse, 'edit_box_mouse', \
progressbar_draw, 'progressbar_draw', \

2
programs/network/ftpc/gui.inc
View File

@ -1106,7 +1106,7 @@ align 4
library box_lib, 'box_lib.obj', libimg, 'libimg.obj'
import box_lib, \
edit_box_draw, 'edit_box', \
edit_box_draw, 'edit_box_draw', \
edit_box_key, 'edit_box_key', \
edit_box_mouse, 'edit_box_mouse', \
edit_box_set_text, 'edit_box_set_text', \

2
programs/network/ircc/ircc.asm
View File

@ -589,7 +589,7 @@ import libini,\
ini.get_int, 'ini_get_int'
import boxlib,\
edit_box_draw, 'edit_box',\
edit_box_draw, 'edit_box_draw',\
edit_box_key, 'edit_box_key',\
edit_box_mouse, 'edit_box_mouse',\
scrollbar_draw, 'scrollbar_v_draw',\

2
programs/other/cnc_control/cnc_control.asm
View File

@ -911,7 +911,7 @@ import_box_lib:
sz_Option_box_mouse db 'option_box_mouse',0
;sz_Version_op db 'version_op',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
sz_edit_box_set_text db 'edit_box_set_text',0

2
programs/other/cnc_editor/cnc_editor.asm
View File

@ -2280,7 +2280,7 @@ import_box_lib:
sz_Option_box_mouse db 'option_box_mouse',0
;sz_Version_op db 'version_op',0
sz_edit_box_draw db 'edit_box',0
sz_edit_box_draw db 'edit_box_draw',0
sz_edit_box_key db 'edit_box_key',0
sz_edit_box_mouse db 'edit_box_mouse',0
sz_edit_box_set_text db 'edit_box_set_text',0

20
programs/other/ha/HACONFIG.ASM
View File

@ -1390,11 +1390,11 @@ saveKey:
align 16
@IMPORT:
library box_lib, 'box_lib.obj'
import box_lib,\
edit_box_draw, 'edit_box',\
edit_box_draw, 'edit_box_draw',\
edit_box_key, 'edit_box_key',\
edit_box_mouse, 'edit_box_mouse',\
init_checkbox, 'init_checkbox2',\
@ -1579,24 +1579,24 @@ copyPath:
IntToStr: ;in esi - ñòðîêà; eñx - ÷èñëî
push eax ecx edx esi
cmp ecx, 0
jne @f
mov byte[esi], 48 ; '0'
or ecx, ecx
jnz @f
mov byte[esi], '0'
inc esi
jmp .end
@@:
mov eax, ecx
mov ecx, 10
.next:
mov edx, 0
xor edx, edx
div ecx
add edx, 48
add edx, '0'
mov byte[esi], dl
inc esi
cmp eax, 0
je .end
or eax, eax
jz .end
jmp .next
.end:
mov byte[esi], 0 ;êëàäÞì çàâåðøàþùèé íîëü

2
programs/other/kpack/trunk/const_var.inc
View File

@ -86,7 +86,7 @@ check_box_mouse dd aCheck_box_mouse
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0

21
programs/other/outdated/dictionary/dictionary.ASM
View File

@ -1,14 +1,14 @@
use32 ; âà ­á«ïâ®à, ¨á¯®«ì§ãî騩 32 à §à來ëå ª®¬ ­¤ë
org 0x0 ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0x0
org 0 ; ¡ §®¢ë©  ¤à¥á ª®¤ , ¢á¥£¤  0x0
db 'MENUET01' ; ¨¤¥­â¨ä¨ª â®à ¨á¯®«­ï¥¬®£® ä ©«  (8 ¡ ©â)
dd 0x1 ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«­ï¥¬®£® ä ©« 
dd start ;  ¤à¥á, ­  ª®â®àë© á¨á⥬  ¯¥à¥¤ ñâ ã¯à ¢«¥­¨¥
; ¯®á«¥ § £à㧪¨ ¯à¨«®¦¥­¨ï ¢ ¯ ¬ïâì
dd i_end ; à §¬¥à ¯à¨«®¦¥­¨ï
dd mem ; Ž¡ê¥¬ ¨á¯®«ì§ã¥¬®© ¯ ¬ïâ¨, ¤«ï á⥪  ®â¢¥¤¥¬ 0å100 ¡ ©â ¨ ¢ë஢­¨¬ ­  £à­¨æã 4 ¡ ©â 
dd mem ; à á¯®«®¦¨¬ ¯®§¨æ¨î á⥪  ¢ ®¡« á⨠¯ ¬ïâ¨, áࠧ㠧  ⥫®¬ ¯à®£à ¬¬ë. ‚¥à設  á⥪  ¢ ¤¨ ¯ §®­¥ ¯ ¬ïâ¨, 㪠§ ­­®¬ ¢ëè¥
dd 0x0 ; 㪠§ â¥«ì ­  áâபã á ¯ à ¬¥âà ¬¨.
dd 1 ; ¢¥àá¨ï ä®à¬ â  § £®«®¢ª  ¨á¯®«­ï¥¬®£® ä ©« 
dd start ;  ¤à¥á, ­  ª®â®àë© á¨á⥬  ¯¥à¥¤ ñâ ã¯à ¢«¥­¨¥
; ¯®á«¥ § £à㧪¨ ¯à¨«®¦¥­¨ï ¢ ¯ ¬ïâì
dd i_end ; à §¬¥à ¯à¨«®¦¥­¨ï
dd mem ; Ž¡ê¥¬ ¨á¯®«ì§ã¥¬®© ¯ ¬ïâ¨, ¤«ï á⥪  ®â¢¥¤¥¬ 0å100 ¡ ©â ¨ ¢ë஢­¨¬ ­  £à­¨æã 4 ¡ ©â 
dd mem ; à á¯®«®¦¨¬ ¯®§¨æ¨î á⥪  ¢ ®¡« á⨠¯ ¬ïâ¨, áࠧ㠧  ⥫®¬ ¯à®£à ¬¬ë. ‚¥à設  á⥪  ¢ ¤¨ ¯ §®­¥ ¯ ¬ïâ¨, 㪠§ ­­®¬ ¢ëè¥
dd 0 ; 㪠§ â¥«ì ­  áâபã á ¯ à ¬¥âà ¬¨.
dd 0;pathprog ;¯ãâì ¨ ¨¬ï ¯à®£¨
include "../../../macros.inc"
@ -16,7 +16,8 @@ include "../../../proc32.inc"
include "API.INC"
include "../../../dll.inc"
include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
include '../../../develop/libraries/box_lib/load_lib.mac'
;include '../../../KOSfuncs.inc'
;include '../../../load_lib.mac'
start:
mcall 68,11 ;¨­¨æ¨ «¨§¨à㥬 ªãçã
@ -379,7 +380,7 @@ NextPerev:
@IMPORT:
library box_lib,'box_lib.obj',msgbox,'msgbox.obj'
import box_lib,\
edit_box_draw,'edit_box',\
edit_box_draw,'edit_box_draw',\
edit_box_key,'edit_box_key';,\
;edit_box_mouse,'edit_box_mouse'
import msgbox,\

2
programs/other/planet_v/pl_import.inc
View File

@ -49,7 +49,7 @@ boxlib_import:
dd 0,0
alib_init2 db 'lib_init',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
; aVersion_ed db 'version_ed',0

2
programs/other/t_edit/t_data.inc
View File

File diff suppressed because one or more lines are too long

2
programs/other/t_edit_synt/te_data.inc
View File

@ -75,7 +75,7 @@ PathShow_draw dd sz_PathShow_draw
dd 0,0
alib_init2 db 'lib_init',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0

4
programs/system/MyKey/trunk/MyKey.asm
View File

@ -1000,7 +1000,7 @@ edit_box_mouse dd aEdit_box_mouse
version_ed dd aVersion_ed
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0
@ -1013,7 +1013,7 @@ library \
; libio, 'libio.obj', \
;import boxlib, \
;edit_box_draw , 'edit_box', \
;edit_box_draw , 'edit_box_draw', \
;edit_box_key , 'edit_box_key', \
;edit_box_mouse , 'edit_box_mouse', \
;version_ed , 'version_ed'

2
programs/system/colrdial/i_data.inc
View File

@ -79,7 +79,7 @@ Frame_draw dd sz_Frame_draw
;a_init db 'lib_init',0
;a_version db 'version',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aEdit_box_set_text db 'edit_box_set_text',0

2
programs/system/format/format.asm
View File

@ -715,7 +715,7 @@ align 16
library box_lib, 'box_lib.obj'
import box_lib,\
edit_box_draw, 'edit_box',\
edit_box_draw, 'edit_box_draw',\
edit_box_key, 'edit_box_key',\
edit_box_mouse, 'edit_box_mouse',\
init_checkbox, 'init_checkbox2',\

5
programs/system/hdd_info/trunk/hdd_info.asm
View File

@ -1750,13 +1750,12 @@ option_box_mouse dd aOption_box_mouse
PathShow_prepare dd sz_PathShow_prepare
PathShow_draw dd sz_PathShow_draw
;Version_path_show dd szVersion_path_show
dd 0
dd 0
dd 0,0
;a_init db 'lib_init',0
;a_version db 'version',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0

2
programs/system/icon_new/icon.asm
View File

@ -1074,7 +1074,7 @@ import archiver,\
unpack_DeflateUnpack2 ,'deflate_unpack2'
import box_lib,\
edit_box_draw ,'edit_box',\
edit_box_draw ,'edit_box_draw',\
edit_box_key ,'edit_box_key',\
edit_box_mouse ,'edit_box_mouse',\
scrollbar_h_draw ,'scrollbar_h_draw',\

37
programs/system/rdsave/trunk/rdsave.asm
View File

@ -31,7 +31,8 @@ include '../../../debug.inc'
end if
include '../../../proc32.inc'
include '../../../dll.inc'
include '../../../develop/libraries/box_lib/load_lib.mac'
include '../../../KOSfuncs.inc'
include '../../../load_lib.mac'
include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
include 'str.inc'
@ -493,27 +494,16 @@ system_dir_Boxlib db '/sys/lib/box_lib.obj',0
system_dir_ProcLib db '/sys/lib/proc_lib.obj',0
system_dir_libini db '/sys/lib/libini.obj',0
;---------------------------------------------------------------------
head_f_i:
head_f_l db 'System error',0
err_message_found_lib1 db 'box_lib.obj - Not found!',0
err_message_found_lib2 db 'proc_lib.obj - Not found!',0
err_message_found_lib3 db 'libini.obj - Not found!',0
err_message_import1 db 'box_lib.obj - Wrong import!',0
err_message_import2 db 'proc_lib.obj - Wrong import!',0
err_message_import3 db 'libini.obj - Wrong import!',0
;---------------------------------------------------------------------
l_libs_start:
library01 l_libs system_dir_Boxlib+9, cur_dir_path, library_path, system_dir_Boxlib, \
err_message_found_lib1, head_f_l, Box_lib_import, err_message_import1, head_f_i
library01 l_libs system_dir_Boxlib+9, library_path, system_dir_Boxlib, \
Box_lib_import
library02 l_libs system_dir_ProcLib+9, cur_dir_path, library_path, system_dir_ProcLib, \
err_message_found_lib2, head_f_l, ProcLib_import, err_message_import2, head_f_i
library02 l_libs system_dir_ProcLib+9, library_path, system_dir_ProcLib, \
ProcLib_import
library03 l_libs system_dir_libini+9, cur_dir_path, library_path, system_dir_libini, \
err_message_found_lib3, head_f_l, libini_import, err_message_import3, head_f_i
library03 l_libs system_dir_libini+9, library_path, system_dir_libini, \
libini_import
end_l_libs:
;---------------------------------------------------------------------
@ -563,8 +553,7 @@ align 4
ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
dd 0
dd 0
dd 0,0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
;---------------------------------------------------------------------
@ -592,10 +581,9 @@ Box_lib_import:
PathShow_prepare dd sz_PathShow_prepare
PathShow_draw dd sz_PathShow_draw
Frame_draw dd sz_Frame_draw
dd 0
dd 0
dd 0,0
;aEdit_box_draw db 'edit_box',0
;aEdit_box_draw db 'edit_box_draw',0
;aEdit_box_key db 'edit_box_key',0
;aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0
@ -631,8 +619,7 @@ ini_get_str dd aini_get_str
ini_get_int dd aini_get_int
ini_set_str dd aini_set_str
ini_set_int dd aini_set_int
dd 0
dd 0
dd 0,0
a_init db 'lib_init',0
aini_get_str db 'ini_get_str',0
aini_get_int db 'ini_get_int',0

62
programs/system/run/trunk/run.asm
View File

@ -1,16 +1,17 @@
window_h=85
window_w=430
;--- ¤à㣨¥ ¬ ªà®áë ---
include '../../../develop/libraries/box_lib/load_lib.mac'
include '../../../KOSfuncs.inc'
include '../../../load_lib.mac'
include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
include 'txtbut.inc'
include '../../../macros.inc'
include 'run.mac'
include 'lang.inc'
use32
org 0x0
org 0
db 'MENUET01'
dd 0x1
dd 1
dd start
dd i_end
dd mem
@ -27,23 +28,22 @@ use32
;load system lib
align 4
start:
sys_load_library library_name, cur_dir_path, library_path, system_path, \
err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
sys_load_library library_name, library_path, system_path, myimport
cmp eax,-1
jz close
cmp [par],byte 0
jne read_par
mcall 40,EVM_MOUSE+EVM_BUTTON+EVM_KEY+EVM_REDRAW+EVM_MOUSE_FILTER
mcall SF_SET_EVENTS_MASK, EVM_MOUSE+EVM_BUTTON+EVM_KEY+EVM_REDRAW+EVM_MOUSE_FILTER
red:
mcall 48,3,sc,40
mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,40
edit_boxes_set_sys_color input_fn,input_fn_end,sc
set_sys_colors_txt_button run_but,sc
push dword [sc.work_graph]
pop [input_fn.focus_border_color]
call draw_window
still: ;®á­®¢­®© ®¡à ¡®â稪
mcall 10 ;Ž¦¨¤ âì ᮡëâ¨ï
mcall SF_WAIT_EVENT
dec eax
jz red
dec eax
@ -56,7 +56,7 @@ still: ;
jmp still ;¥á«¨ ­¨ç¥£® ¨§ ¯¥à¥ç¨á«¥­­®£® â® á­®¢  ¢ 横«
key:
mcall 2
mcall SF_GET_KEY
cmp ah,13
je run
; key_edit_box input_fn
@ -65,7 +65,7 @@ key:
jmp still
button:
mcall 17
mcall SF_GET_BUTTON
dec ah
jz close
dec ah
@ -133,7 +133,7 @@ copy_par:
inc edi
jmp @b
.stop:
mcall 70,file_info
mcall SF_FILE,file_info
cmp eax,0
jl error
@ -141,7 +141,7 @@ copy_par:
call draw_status
jmp still
close:
mcall -1
mcall SF_TERMINATE_PROCESS
error:
neg eax
@ -158,13 +158,13 @@ error:
jmp still
draw_window:
mcall 48,5
mcall SF_STYLE_SETTINGS,SSF_GET_SCREEN_AREA
mov si,bx
mcall 12,1
mcall 48,4
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
mov dx,ax
mcall 14
mcall SF_GET_SCREEN_SIZE
xor ecx,ecx
sub cx,window_h+40
sub cx,dx
@ -181,9 +181,9 @@ draw_window:
or edx,0x33000000
xor esi,esi
mov edi,grab_text
mcall 0
mcall SF_CREATE_WINDOW
mcall 9,procinfo,-1
mcall SF_THREAD_INFO,procinfo,-1
mov eax,[procinfo.box.width]
sub eax,20
@ -200,7 +200,7 @@ draw_window:
; shl ecx,16
; pop cx
; mov edx,[sc.work_graph]
; mcall 38
; mcall SF_DRAW_LINE
; draw_edit_box input_fn
push dword input_fn
@ -210,7 +210,7 @@ draw_window:
call draw_status_text
mcall 12,2
mcall SF_REDRAW, SSF_END_DRAW
ret
draw_status:
@ -218,7 +218,7 @@ draw_status:
sub bx,10
mov ecx,(60)*65536+15
mov edx,[sc.work]
mcall 13
mcall SF_DRAW_RECT
draw_status_text:
mov edx,[status]
xor esi,esi
@ -230,7 +230,7 @@ draw_status_text:
@@:
mov ecx,[sc.work_text]
or ecx,0x90000000
mcall 4,5*65536+(60)
mcall SF_DRAW_TEXT,5*65536+(60)
ret
run_but txt_button 0,5,20,33,2,0,0x90000000,run_but_text,
@ -286,17 +286,6 @@ system_path db '/sys/lib/'
library_name db 'box_lib.obj',0
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
if lang eq ru
err_message_found_lib db 'Žè¨¡ª  ¯à¨ ¯®¨áª¥ box_lib.obj',0
head_f_i:
head_f_l db '‘¨á⥬­ ï ®è¨¡ª ',0
err_message_import db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠box_lib.obj',0
else
err_message_found_lib db 'Sorry I cannot load library box_lib.obj',0
head_f_i:
head_f_l db 'System error',0
err_message_import db 'Error on load import library box_lib.obj',0
end if
myimport:
@ -305,10 +294,9 @@ edit_box_key dd aEdit_box_key
edit_box_mouse dd aEdit_box_mouse
version_ed dd aVersion_ed
dd 0
dd 0
dd 0,0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
aVersion_ed db 'version_ed',0
@ -317,7 +305,7 @@ aVersion_ed db 'version_ed',0
file_info:
.mode dd 7
.mode dd SSF_START_APP
.flags dd 0
.par dd run_par
dd 0,0

22
programs/system/skincfg/trunk/idata.inc
View File

@ -121,26 +121,17 @@ aButtonStyle db 'buttons_gradient',0
;---------------------------------------------------------------------
l_libs_start:
library01 l_libs system_dir_Boxlib+9, cur_dir_path, library_path, system_dir_Boxlib, \
err_message_found_lib1, head_f_l, Box_lib_import, err_message_import1, head_f_i
library01 l_libs system_dir_Boxlib+9, library_path, system_dir_Boxlib, \
Box_lib_import
library02 l_libs system_dir_ProcLib+9, cur_dir_path, library_path, system_dir_ProcLib, \
err_message_found_lib2, head_f_l, ProcLib_import, err_message_import2, head_f_i
library02 l_libs system_dir_ProcLib+9, library_path, system_dir_ProcLib, \
ProcLib_import
end_l_libs:
;---------------------------------------------------------------------
system_dir_Boxlib db '/sys/lib/box_lib.obj',0
system_dir_ProcLib db '/sys/lib/proc_lib.obj',0
head_f_i:
head_f_l db 'System error',0
err_message_found_lib1 db 'box_lib.obj - Not found!',0
err_message_found_lib2 db 'proc_lib.obj - Not found!',0
err_message_import1 db 'box_lib.obj - Wrong import!',0
err_message_import2 db 'proc_lib.obj - Wrong import!',0
;---------------------------------------------------------------------
align 4
@ -207,13 +198,12 @@ PathShow_draw dd sz_PathShow_draw
Frame_draw dd sz_Frame_draw
;Version_frame dd szVersion_frame
dd 0
dd 0
dd 0,0
;a_init db 'lib_init',0
;a_version db 'version',0
;aEdit_box_draw db 'edit_box',0
;aEdit_box_draw db 'edit_box_draw',0
;aEdit_box_key db 'edit_box_key',0
;aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0

3
programs/system/skincfg/trunk/skincfg.asm
View File

@ -34,7 +34,8 @@ include '../../../string.inc'
include '../../../dll.inc'
include 'kglobals.inc'
include 'unpacker.inc'
include '../../../develop/libraries/box_lib/load_lib.mac'
include '../../../KOSfuncs.inc'
include '../../../load_lib.mac'
@use_library
;******************************************************************************
;--------------------------------------

2
programs/system/terminal/terminal.asm
View File

@ -410,7 +410,7 @@ library box_lib, 'box_lib.obj',\
console, 'console.obj'
import box_lib,\
edit_box_draw, 'edit_box',\
edit_box_draw, 'edit_box_draw',\
edit_box_key, 'edit_box_key',\
edit_box_mouse, 'edit_box_mouse',\
init_checkbox, 'init_checkbox2',\

9
programs/testing/fspeed/fspeed.asm
View File

@ -27,14 +27,14 @@
;*****************************************************************************
;-----------------------------------------------------------------------------
use32
org 0x0
org 0
db 'MENUET01'
dd 0x01
dd 1
dd START
dd IM_END
dd I_END
dd STACK_TOP
dd 0x0
dd 0
dd cur_dir_path
;-----------------------------------------------------------------------------
include 'lang.inc'
@ -43,7 +43,8 @@ define __DEBUG__ 1
define __DEBUG_LEVEL__ 1
include '../../debug-fdo.inc'
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
include '../../develop/libraries/box_lib/load_lib.mac'
include '../../KOSfuncs.inc'
include '../../load_lib.mac'
@use_library
;-----------------------------------------------------------------------------
struct RESULT_SLOT

20
programs/testing/fspeed/idata.inc
View File

@ -26,26 +26,15 @@ include_debug_strings
;-----------------------------------------------------------------------------
l_libs_start:
library01 l_libs system_dir_Boxlib+9, cur_dir_path, library_path, system_dir_Boxlib, \
err_message_found_lib1, head_f_l, Box_lib_import, err_message_import1, head_f_i
library01 l_libs system_dir_Boxlib+9, library_path, system_dir_Boxlib, Box_lib_import
library02 l_libs system_dir_ProcLib+9, cur_dir_path, library_path, system_dir_ProcLib, \
err_message_found_lib2, head_f_l, ProcLib_import, err_message_import2, head_f_i
library02 l_libs system_dir_ProcLib+9, library_path, system_dir_ProcLib, ProcLib_import
end_l_libs:
;-----------------------------------------------------------------------------
system_dir_Boxlib db '/sys/lib/box_lib.obj',0
system_dir_ProcLib db '/sys/lib/proc_lib.obj',0
head_f_i:
head_f_l db 'System error',0
err_message_found_lib1 db 'box_lib.obj - Not found!',0
err_message_found_lib2 db 'proc_lib.obj - Not found!',0
err_message_import1 db 'box_lib.obj - Wrong import!',0
err_message_import2 db 'proc_lib.obj - Wrong import!',0
;-----------------------------------------------------------------------------
align 4
ProcLib_import:
@ -115,13 +104,12 @@ PathShow_draw dd sz_PathShow_draw
;Frame_draw dd sz_Frame_draw
;Version_frame dd szVersion_frame
dd 0
dd 0
dd 0,0
;a_init db 'lib_init',0
;a_version db 'version',0
;aEdit_box_draw db 'edit_box',0
;aEdit_box_draw db 'edit_box_draw',0
;aEdit_box_key db 'edit_box_key',0
;aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0

8
programs/testing/mgb/trunk/mgb.asm
View File

@ -1048,8 +1048,7 @@ ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
;OpenDialog__Version dd aOpenDialog_Version
dd 0
dd 0
dd 0,0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
;aOpenDialog_Version db 'Version_OpenDialog',0
@ -1096,13 +1095,12 @@ edit_box_mouse dd aEdit_box_mouse
;PathShow_prepare dd sz_PathShow_prepare
;PathShow_draw dd sz_PathShow_draw
;Version_path_show dd szVersion_path_show
dd 0
dd 0
dd 0,0
;a_init db 'lib_init',0
;a_version db 'version',0
aEdit_box_draw db 'edit_box',0
aEdit_box_draw db 'edit_box_draw',0
aEdit_box_key db 'edit_box_key',0
aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0