upgrade

git-svn-id: svn://kolibrios.org@1228 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/libraries/box_lib/asm/trunk/editbox_ex.mac

@@ -1,3 +1,25 @@
+ed_width        equ [edi]               ;è¨à¨­  ª®¬¯®­¥­â 
+ed_left         equ [edi+4]             ;¯®«®¦¥­¨¥ ¯® ®á¨ å
+ed_top          equ [edi+8]             ;¯®«®¦¥­¨¥ ¯® ®á¨ ã
+ed_color        equ [edi+12]            ;梥â ä®­  ª®¬¯®­¥­â 
+shift_color     equ [edi+16]            ;=0x6a9480 ¤«ï ¯à¨¬¥à  ¢®§ì¥¬ ¦¥«¥­ë© 梥⠡®ªá 
+ed_focus_border_color   equ [edi+20]    ;梥â à ¬ª¨ ª®¬¯®­¥­â 
+ed_blur_border_color    equ [edi+24]    ;梥⠭¥  ªâ¨¢­®£® ª®¬¯®­¥­â 
+ed_text_color   equ [edi+28]            ;梥â ⥪áâ 
+ed_max          equ [edi+32]                    ;ª®«-¢® ᨬ¢®«®¢ ª®â®àë¥ ¬®¦­® ¬ ªá¨¬ «ì­® ¢¢¥áâ¨
+ed_text         equ [edi+36]                    ;㪠§ â¥«ì ­  ¡ãä¥à
+ed_mouse_variable 	equ [edi+40]	; 㪠§ â¥«ì ­  ¯¥à¥¬¥­­ãî ¤«ï ¡®ªá /£à㯯ë 
+ed_flags        equ [edi+44]            ;ä« £¨
+bp_flags	equ [ebp+44]		;¢ ­¥ª®â®àëå ¯à®æ¥¤ãà å edi ¨á¯®«ì§ã¥âáï, ¢§ ¬¥­ 㪠§ â¥«ì åà ­¨âìáï ¢ ebp
+ed_size equ [edi+48]                    ;ª®«-¢® ᨬ¢®«®¢
+bp_size equ [ebp+48]			;ª®«-¢® ᨬ¢¯®«®¢, ¤«ï  ¤à¥á æ¨¨ ¨á¯«ì§ã¥âáï ebp¡ edi § ­ïâ
+ed_pos  equ [edi+52]                    ;¯®§¨æ¨ï ªãàá®à 
+ed_offset       equ [edi+56]            ;ᬥ饭¨¥
+cl_curs_x       equ [edi+60]            ;¯à¥¤ë¤ã饥 ª®®à¤¨­ â  ªãàá®à  ¯® å
+cl_curs_y       equ [edi+64]            ;¯à¥¤ë¤ã饥 ª®®à¤¨­ â  ªãàá®à  ¯® ã
+ed_shift_pos    equ [edi+68]            ;¯®«®¦¥­¨¥ ªãàá®à 
+ed_shift_pos_old equ [edi+72]           ;áâ à®¥ ¯®«®¦¥­¨¥ ªãàá®à 
+
 ed_struc_size=76
 struc  edit_box width,left,top,color,shift_color,focus_border_color,\
        blur_border_color,text_color,max,text,mouse_variable,flags,size,pos
@@ -47,6 +69,49 @@ ed_height=14 ;
 .shift   dd 0
 .shift_old   dd 0
 }
+macro edit_boxes_set_sys_color start,end,color_table
+{
+        mov     edi,start
+        mov     ecx,((end-start)/ed_struc_size)
+        mov     esi,color_table
+@@:
+        mov     eax,dword [esi+36]
+        mov     ebx,dword [esi+20]
+        push	dword eax
+	pop     dword ed_focus_border_color
+        shr     bh,1
+        shr     bl,1
+        shr     ah,1
+        shr     al,1
+        add     ah,bh
+        add     al,bl
+        ror     eax,16
+        ror     ebx,16
+        shr     bl,1
+        shr     al,1
+        add     al,bl
+        ror     eax,16
+	mov	dword ed_blur_border_color,eax
+	mov	dword shift_color,eax
+        add     edi,ed_struc_size
+        loop    @b
+}
+macro get_sys_colors col_buf
+{
+        ;mov     eax,48
+        push    48
+        pop     eax
+        ;mov     ebx,3
+        push    3
+        pop     ebx
+        ;mov     ecx,col_buf
+        push    col_buf
+        pop     ecx
+        ;mov     edx,40
+        push    40
+        pop     edx
+        mcall
+}
 struc check_box left,top,ch_text_margin,ch_size,color,border_color,text_color,text,ch_text_length,flags
 {        ;áâŕăŞâăŕ  Ż ŕ ŹĽâ஢ ¤Ťď 缪 ĄŽŞá 
 ch_flag_en=10b

programs/develop/libraries/box_lib/trunk/editbox.mac

@@ -1,18 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;Basic macros for use editbox                             ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-macro init_editbox
-{
-pushad
-	mcall
-
-popad
-}
-
-
-macro use_editbox_draw
-{
-edit_box:
 ed_width        equ [edi]               ;è¨à¨­  ª®¬¯®­¥­â 
 ed_left         equ [edi+4]             ;¯®«®¦¥­¨¥ ¯® ®á¨ å
 ed_top          equ [edi+8]             ;¯®«®¦¥­¨¥ ¯® ®á¨ ã
@@ -58,6 +46,19 @@ ed_mouse_on_off=1111111011111111b
 ed_height=14 ; ¢ëá®â 
 
 
+
+macro init_editbox
+{
+pushad
+	mcall
+
+popad
+}
+
+
+macro use_editbox_draw
+{
+edit_box:
 .draw:
         pushad
 ;--- à¨á㥬 à ¬ªã ---
@@ -1334,55 +1335,6 @@ macro   debug_func
         ret         ;¢¥à­ãâìáï ç¥­ì ¨­â¥à¥á­ë© 室 â.ª. ¯®ª  ¢ á⥪¥ åà ­¨âìáï ª®«-¢® ¢ë§®¢®¢ â® á⮫쪮 à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
 }
 
-;;;;;;;;;;;;;;;
-;For LibGui
-;;;;;;;;;;;;;;;
-macro srt_ed_libgui
-{
-ed_width        equ [EditBox.ed_width]            ;è¨à¨­  ª®¬¯®­¥­â 
-ed_left         equ [EditBox.ed_left]             ;¯®«®¦¥­¨¥ ¯® ®á¨ å
-ed_top          equ [EditBox.ed_top]              ;¯®«®¦¥­¨¥ ¯® ®á¨ ã
-ed_color        equ [EditBox.ed_color]            ;梥â ä®­  ª®¬¯®­¥­â 
-shift_color     equ [EditBox.shift_color]         ;=0x6a9480
-ed_focus_border_color   equ [EditBox.ed_focus_border_color]   ;梥â à ¬ª¨ ª®¬¯®­¥­â 
-ed_blur_border_color    equ [EditBox.ed_blur_border_color]    ;梥⠭¥  ªâ¨¢­®£® ª®¬¯®­¥­â 
-ed_text_color   equ [EditBox.ed_text_color]       ;梥â ⥪áâ 
-ed_max          equ [EditBox.ed_max]              ;ª®«-¢® ᨬ¢®«®¢ ª®â®àë¥ ¬®¦­® ¬ ªá¨¬ «ì­® ¢¢¥áâ¨
-ed_text         equ [EditBox.ed_text]             ;㪠§ â¥«ì ­  ¡ãä¥à
-ed_flags        equ [EditBox.ed_flags]            ;ä« £¨
-ed_size equ [EditBox.ed_size]                     ;ª®«-¢® ᨬ¢®«®¢
-ed_pos  equ [EditBox.ed_poz]                      ;¯®§¨æ¨ï ªãàá®à 
-ed_offset       equ [EditBox.ed_offset]           ;ᬥ饭¨¥
-cl_curs_x       equ [EditBox.cl_curs_x]           ;¯à¥¤ë¤ã饥 ª®®à¤¨­ â  ªãàá®à  ¯® å
-cl_curs_y       equ [EditBox.cl_curs_y]           ;¯à¥¤ë¤ã饥 ª®®à¤¨­ â  ªãàá®à  ¯® ã
-ed_shift_pos    equ [EditBox.ed_shift_pos]        ;¯®«®¦¥­¨¥ ªãàá®à 
-ed_shift_pos_old equ [EditBox.ed_shift_pos_old]   ;áâ à®¥ ¯®«®¦¥­¨¥ ªãàá®à 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;Bit mask from editbox 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-ed_figure_only= 1000000000000000b   ;®¤­¨ ᨬ¢®«ë 
-ed_always_focus= 100000000000000b
-ed_focus=                     10b   ;䮪ãá ¯à¨«®¦¥­¨ï
-ed_shift_on=                1000b   ;¥á«¨ ­¥ ãáâ ­®¢«¥­ -§­ ç¨â ¢¯¥à¢ë¥ ­ ¦ â shift,¥á«¨ ¡ë« ãáâ ­®¢«¥­, §­ ç¨â ¬ë 㦥 çâ® - â® ¤¥« «¨ 㤥ন¢ ï shift
-ed_shift_on_off=1111111111110111b
-ed_shift=                    100b   ;¢ª«îç ¥âáï ¯à¨ ­ ¦ â¨¨ ­  shift â.¥. ¥á«¨ ­ ¦¨¬ î
-ed_shift_off=   1111111111111011b
-ed_shift_bac=              10000b   ;¡¨â ¤«ï ®ç¨á⪨ ¢ë¤¥«¥­®£® shift â.¥. ¯à¨ ãáâ ­®¢ª¥ £®¢®à¨â çâ® ¥áâì ¢ë¤¥«¥­¨¥
-ed_shift_bac_cl=1111111111101111b   ;®ç¨á⪠ ¯à¨ 㤠«¥­¨¨ ¢ë¤¥«¥­¨ï
-ed_shift_cl=    1111111111100011b
-ed_shift_mcl=   1111111111111011b
-ed_left_fl=               100000b
-ed_right_fl=    1111111111011111b
-ed_offset_fl=            1000000b
-ed_offset_cl=   1111111110111111b
-ed_insert=              10000000b
-ed_insert_cl=   1111111101111111b
-ed_mouse_on =          100000000b
-ed_mous_adn_b=         100011000b
-ed_mouse_on_off=1111111011111111b
-ed_height=24 ; ¢ëá®â 
-}
-
 ed_struc_size=76
 struc  edit_box width,left,top,color,shift_color,focus_border_color,\
        blur_border_color,text_color,max,text,mouse_variable,flags,size,pos

programs/media/scrshoot/scrshoot.asm

@@ -4,15 +4,15 @@
 ; 01.02.07 - ®¡­®¢«ñ­ editbox
 ; 31.01.07 - ¢áñ ⥯¥àì à¨áã¥âáï ®â­®á¨â¥«ì­® ª«¨¥­â᪮© ®¡« áâ¨
 
-title equ 'Screenshooter v 0.91' ; ‡ £®«®¢®ª ®ª­ 
+title equ 'Screenshooter v 0.92' ; ‡ £®«®¢®ª ®ª­ 
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
 ;include '../../develop/examples/editbox/trunk/editbox.inc'
 include '../../macros.inc'
-include 'scrshoot.mac'
 include 'txtbut.inc'
 include 'label.inc'
 include 'textwork.inc'
+include 'scrshoot.mac'
 
 ;include 'macros.inc'  ; ¢áâ ¢«ï¥¬ ¬ ªà®áë
 ;        meos_header  cmdstr ; ¢áâ ¢«ï¥¬ § £®«®¢®ª ¯à®£à ¬¬ë
@@ -28,13 +28,13 @@ use32
     dd cur_dir_path
 
 align 4
-include 'scrwin.inc'  ; ¢áâ ¢«ï¥¬ ª®¤ ®ª­  ¯à¤¯à®á¬®âà 
-include 'scrsavef.inc'; ¢áâ ¢«ï¥¬ ¯à®æ¥¤ãàã á®åà ­¥­¨ï ä ©« 
-
         @use_library
         use_txt_button                          ;  |
         use_label                               ;  |-- GUI ª®¬¯®­¥­âë ¨ ­¥ª®â®àë¥ ¯à®æ¥¤ãàë
         use_text_work                           ; /
+include 'scrwin.inc'  ; ¢áâ ¢«ï¥¬ ª®¤ ®ª­  ¯à¤¯à®á¬®âà 
+include 'scrsavef.inc'; ¢áâ ¢«ï¥¬ ¯à®æ¥¤ãàã á®åà ­¥­¨ï ä ©« 
+
 include 'gp.inc'
 include 'srectwin.inc'
 include 'lang.inc'
@@ -556,7 +556,7 @@ show_set_rect_window:
 ret
 
 @@:
-        mov    eax,18
+        mov     eax,18
         mov     ebx,eax
         mov     ecx,[set_rect_window_pid]
         mcall
@@ -602,10 +602,10 @@ status label 5,201,0,no_shoot
 labels_end:
 
 editboxes:
-edit1 edit_box 300,5,35,cl_white,0xaabbcc,0,0,0,300,ed_buffer.1,mouse_dd,ed_focus,10,10        ; ¯ãâì ª ä ©«ã
+edit1 edit_box 300,5,35,cl_white,0,0,0,0,300,ed_buffer.1,mouse_dd,ed_focus,10,10        ; ¯ãâì ª ä ©«ã
-edit2 edit_box 35,75,134,cl_white,0xaabbcc,0,0,0,9,ed_buffer.2,mouse_dd,ed_figure_only,3,3         ; § ¤¥à¦ª 
+edit2 edit_box 35,75,134,cl_white,0,0,0,0,9,ed_buffer.2,mouse_dd,ed_figure_only,3,3         ; § ¤¥à¦ª 
-edit3 edit_box 35,165,164,cl_white,0xaabbcc,0,0,0,9,ed_buffer.3,mouse_dd,ed_figure_only    ;  ¢â®­ã¬¥à æ¨ï
+edit3 edit_box 35,165,164,cl_white,0,0,0,0,9,ed_buffer.3,mouse_dd,ed_figure_only    ;  ¢â®­ã¬¥à æ¨ï
-edit4 edit_box 16,165,181,cl_white,0xaabbcc,0,0,0,1,sign_n_input,mouse_dd,ed_figure_only,1
+edit4 edit_box 16,165,181,cl_white,0,0,0,0,1,sign_n_input,mouse_dd,ed_figure_only,1
 editboxes_end:
 
 buttons:

programs/media/scrshoot/scrshoot.mac

@@ -127,34 +127,6 @@ macro get_key
         pop     eax
         mcall
 }
-macro edit_boxes_set_sys_color start,end,color_table
-{
-
-ed_focus_border_color   equ [edi+20]    ;öâåò ðàìêè êîìïîíåíòà
-ed_blur_border_color    equ [edi+24]    ;öâåò íå àêòèâíîãî êîìïîíåíòà
-        mov     edi,start
-        mov     ecx,((end-start)/ed_struc_size)
-        mov     esi,color_table
-@@:
-        mov     eax,[esi+36]
-        mov     ebx,[esi+20]
-        mov     dword ed_focus_border_color,eax
-        shr     bh,1
-        shr     bl,1
-        shr     ah,1
-        shr     al,1
-        add     ah,bh
-        add     al,bl
-        ror     eax,16
-        ror     ebx,16
-        shr     bl,1
-        shr     al,1
-        add     al,bl
-        ror     eax,16
-        mov     dword ed_blur_border_color,eax
-        add     edi,ed_struc_size
-        loop    @b
-}
 ;--- ïîëó÷èòü êîä íàæàòîé êíîïêè ---
 macro get_pressed_button
 {
@@ -188,22 +160,6 @@ else
 end if
         mcall
 }
-macro get_sys_colors col_buf
-{
-        ;mov     eax,48
-        push    48
-        pop     eax
-        ;mov     ebx,3
-        push    3
-        pop     ebx
-        ;mov     ecx,col_buf
-        push    col_buf
-        pop     ecx
-        ;mov     edx,40
-        push    40
-        pop     edx
-        mcall
-}
 macro get_screen_prop  struc_ptr
 {
         mov     eax,61

programs/media/scrshoot/srectwin.inc

@@ -260,17 +260,14 @@ aOption_box_draw  db 'option_box_draw',0
 aOption_box_mouse db 'option_box_mouse',0
 aVersion_op       db 'version_op',0
 
-
+;width,left,top,color,shift_color,focus_border_color,\
+;       blur_border_color,text_color,max,text,mouse_variable,flags,size,pos
 
 rect_input:
-.left   edit_box 35,95,5,cl_white,0,0,0,5,rect_input_buffer.left,\
+.left   edit_box 35,95,5, cl_white,0,0,0,5,rect_input_buffer.left,mouse_dd1,ed_figure_only+ed_focus
-mouse_dd1,ed_figure_only+ed_focus
+.top    edit_box 35,95,25,cl_white,0,0,0,5,rect_input_buffer.top,mouse_dd1,ed_figure_only
-.top    edit_box 35,95,25,cl_white,0,0,0,5,rect_input_buffer.top,\
+.width  edit_box 35,95,45,cl_white,0,0,0,5,rect_input_buffer.width,mouse_dd1,ed_figure_only
-mouse_dd1,ed_figure_only
+.height edit_box 35,95,65,cl_white,0,0,0,5,rect_input_buffer.height,mouse_dd1,ed_figure_only
-.width  edit_box 35,95,45,cl_white,0,0,0,5,rect_input_buffer.width,\
-mouse_dd1,ed_figure_only
-.height edit_box 35,95,65,cl_white,0,0,0,5,rect_input_buffer.height,\
-mouse_dd1,ed_figure_only
 rect_input_end:
 mouse_dd1	rd 1
 rect_input_labels:

programs/system/cpu/trunk/cpu.asm

@@ -38,6 +38,8 @@ err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
     
 ;main loop when process name isn't edited.    
 red:    
+        mcall   48,3,sc,40
+        edit_boxes_set_sys_color edit1,edit1_end,sc
 	xor	ebp,ebp
 	inc	ebp
 ;    mov  ebp,1
@@ -659,7 +661,7 @@ aEdit_box_mouse db 'edit_box_mouse',0
 ;aVersion_op       db 'version_op',0
 
 edit1 edit_box 350,(64-offset_x),(398-offset_y),0xffffff,0x6f9480,0,0xAABBCC,0,start_application_c,start_application,mouse_dd,ed_focus,start_application_e,start_application_e
-
+edit1_end:
 list_start  dd 0
 
 sys_reboot:
@@ -722,6 +724,7 @@ rb	60
 start_application_c=$-start_application-1
 
 I_END:
+sc system_colors
 winxpos  rd 1
 winypos  rd 1
 mouse_dd	rd 1

programs/system/rdsave/trunk/rdsave.asm

@@ -31,8 +31,8 @@ include '../../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
 	@use_library
 
 ;use_edit_box
-al equ eax      ; \ decrease kpack'ed size
+;al equ eax      ; \ decrease kpack'ed size
-purge mov       ; /
+;purge mov       ; /
 
 ;---------------------------------------------------------------------
 ;---  <20>€—€‹Ž <20><>Žƒ<C5BD>€ŒŒ›  ----------------------------------------------
@@ -44,10 +44,17 @@ err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
         cmp     eax,-1
         jz      close
 
+
    mov eax, 40
    mov ebx, 100111b
    mcall
 red:                    ; ¯¥à¥à¨á®¢ âì ®ª­®
+   mov  eax,48
+   mov  ebx,3
+   mov  ecx,sc
+   mov  edx,sizeof.system_colors
+   mcall
+        edit_boxes_set_sys_color editbox,editbox_end,sc
     call draw_window    ; ¢ë§ë¢ ¥¬ ¯à®æ¥¤ãàã ®âà¨á®¢ª¨ ®ª­ 
 
 ;---------------------------------------------------------------------
@@ -167,12 +174,6 @@ clear_err:
 
 draw_window:
 
-   mov  eax,48
-   mov  ebx,3
-   mov  ecx,sc
-   mov  edx,sizeof.system_colors
-   mcall
-
    mov eax,12                            ; äã­ªæ¨ï 12: á®®¡é¨âì Ž‘ ®¡ ®âà¨á®¢ª¥ ®ª­ 
    mov bl,1                              ; 1 - ­ ç¨­ ¥¬ à¨á®¢ âì
    mcall
@@ -343,7 +344,7 @@ myimport:
 edit_box_draw   dd      aEdit_box_draw
 edit_box_key    dd      aEdit_box_key
 edit_box_mouse  dd      aEdit_box_mouse
-version_ed      dd      aVersion_ed
+;version_ed      dd      aVersion_ed
 
                 dd      0
                 dd      0
@@ -351,7 +352,7 @@ version_ed      dd      aVersion_ed
 aEdit_box_draw  db 'edit_box',0
 aEdit_box_key   db 'edit_box_key',0
 aEdit_box_mouse db 'edit_box_mouse',0
-aVersion_ed     db 'version_ed',0
+;aVersion_ed     db 'version_ed',0
 
 
 ;mouse_flag: dd 0x0
@@ -367,8 +368,8 @@ rb 514
 
 sc     system_colors
 mouse_dd	rd 1
-cur_dir_path    rb 4096
+cur_dir_path    rb 1096
-library_path    rb 4096
+library_path    rb 1096
 align 4
 rb 0x100        ; for stack
 I_END:                             ; ¬¥âª  ª®­æ  ¯à®£à ¬¬ë

programs/system/run/trunk/run.asm

@@ -45,6 +45,7 @@ err_message_found_lib, head_f_l, myimport, err_message_import, head_f_i
         mcall   40,EVM_MOUSE+EVM_BUTTON+EVM_KEY+EVM_REDRAW
 red:
         mcall   48,3,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]
@@ -240,7 +241,7 @@ ret
 run_but txt_button 0,5,15,25,2,0,0,run_but_text,
 input_fn edit_box 0,5,5,0xffffff,0x6a9480,0,0xaaaaaa,0,511,fn,mouse_dd,ed_focus+ed_always_focus
 ;mouse_flag: dd 0x0
-
+input_fn_end:
 if lang eq ru
 hello db '‚¢¥¤¨â¥ ¯®«­ë© ¯ãâì ª ä ©«ã ¨ ­ ¦¬¨â¥ Enter',0
 bad_file_sys db '<27>¥¨§¢¥áâ­ ï ä ©«®¢ ï á¨á⥬ ',0 ; 3
@@ -307,7 +308,7 @@ file_info:
 dd 0,0
 .name rb 512
 
-flags dw ?
+flags rw 1
 
 sc system_colors