WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/trunk/editbox.mac

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;Basic macros for use editbox                             ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 macro use_editbox_draw
+{
 edit_box:
 .draw:
+        pushad
+        mov     edi,[esp+36]
+        and     dword ed_text_color,17FFFFFFh
+        mov     ecx,ed_text_color
+        mov     ebx,ecx
+        shr     ecx,28
+        shl     ebx,4
+        shr     ebx,28
+        inc     ebx
+        mov     eax,6
+        jecxz   @f
-        pushad
+        mov     al, 8
+@@:
-.draw_1:
+        mul     bl
+        mov     ed_char_width,eax
+        mov     al, 9
+        jecxz   @f
+        mov     al, 16
+@@:
+        mul     bl
-;--- à¨áã¥¬ à ¬ªã ---
+        add     eax,4
-        mov     edi,dword [esp+36]
+        mov     ed_height,eax
         call    .draw_border
-.draw_bg_cursor_text:
-;--- ¨§¬¥ï¥¬ á¬¥é¥¨¥, ¥á«¨  ¤® ---
+.draw_bg_cursor_text:
-        call    .check_offset
-;--- à¨áã¥¬ ¢ãâà¥îî ®¡« áâì ---
+        call    .check_offset
-        call    .draw_bg
-;--- à¨áã¥¬ ¢ë¤¥«¥¨¥, ¯® shift ¥á«¨ ¥áâì ---
+        call    .draw_bg
         call    .draw_shift
 .draw_cursor_text:
-        call    .draw_text
-;--- à¨áã¥¬ ªãàá®à ---
-        ;--- ¬®¦¥â ¥£® ¥  ¤® à¨á®¢ âì ---
+        call    .draw_text
         test    word ed_flags,ed_focus
         jz      .editbox_exit
         call    .draw_cursor
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 .editbox_exit:
         popad
         ret 4
+}
 macro use_editbox_key
+{
 ;==========================================================
 ;=== ®¡à ¡®âª  ª« ¢¨ âãàë =================================
 ;==========================================================
 edit_box_key:
-pushad
+        pushad
-        mov     edi,dword [esp+36]
+        mov     edi,[esp+36]
         test    word ed_flags,ed_focus ; ¥á«¨ ¥ ¢ ä®ªãá¥, ¢ëå®¤¨¬
         jz      edit_box.editbox_exit
         test    word ed_flags,ed_mouse_on or ed_disabled
-        jnz     edit_box.editbox_exit
         jnz     edit_box.editbox_exit
 ;--------------------------------------
 ; this code for Win-keys, works with
 ; kernel SVN r.3356 or later
         push    eax
         jz      @f
 .win_key_pressed:
         pop     ebx
         pop     eax
         jmp     edit_box.editbox_exit
-@@:
-        pop     ebx
+@@:     pop     ebx
         pop     eax
 ;--------------------------------------
 ;à®¢¥àª   ¦ â shift ?
         call    edit_box_key.check_shift_ctrl_alt
 ;----------------------------------------------------------
 ;=== ®¡à ¡®âª  ¬ëè¨ =======================================
 ;==========================================================
 ;save for stdcall ebx,esi,edi,ebp
 edit_box_mouse:
-pushad
+        pushad
-        mov     edi,dword [esp+36]
+        mov     edi,[esp+36]
         test    word ed_flags,ed_disabled
         jnz     edit_box.editbox_exit
 ;debug
 ;----------------------------------------------------------
 ;--- ¯®«ãç ¥¬ á®áâ®ï¨¥ ª®¯®ª ¬ëè¨ -----------------------
 ;--- ¯à®¢¥àï¥¬ á®áâ®ï¨¥ ----------------------------------
 ;----------------------------------------------------------
         test    eax,1
         jnz     edit_box_mouse.mouse_left_button
         and     word ed_flags,ed_mouse_on_off
-        mov     ebx,dword ed_mouse_variable
+        mov     ebx,ed_mouse_variable
         push    0
         pop     dword [ebx]
-;        mov     dword [ebx],ebx
         jmp     edit_box.editbox_exit
 .mouse_left_button:
 ;----------------------------------------------------------
 ;--- ¡«®ª¨à®¢ª  ®â ä®ªãá¨à®¢ª¨ ¢ ¤àã£¨å ¡®ªá å ¯à¨ ¯®¯ ¤ ¨¨   ¨å ªãàá®à
 ;----------------------------------------------------------
-        mov     eax,dword ed_mouse_variable
+        mov     eax,ed_mouse_variable
         push    dword [eax]
         pop     eax
         test    eax,eax
         jz      @f
         cmp     eax,edi
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;Bit mask from editbox
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+}
 ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ;¨¦¥ à á¯®«®¦¥ë äãªæ¨¨ ª®â®àë¬¨ à¥ «¨§ã¥âáï ¢¥áì  «£®à¨â¬
 ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ; ªà®á ¤«ï ¢ë¢®¤  ®á®¢ëå äãªæ¨© ª®â®àë¥ ¨á¯®«ì§ãîâáï ¡®ªá®¬
 ;----------------------------------------------------------
 edit_box.draw_shift:
         test    word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         jz      @f
         mov     ebp,shift_color
-        mov     ebx,dword ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
 @@:     ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ â¥ªáâ  --------------------------
 ;----------------------------------------------------------
 edit_box.draw_text:
-;--- ¢ëç¨á«ï¥¬, áª®«ìª® ¯®¬¥é ¥âáï á¨¬¢®«®¢ ---
         call    edit_box.get_n
         mov     esi,ed_size
-        mov     ebx,ed_offset
+        sub     esi,ed_offset
-        sub     esi,ebx
         cmp     eax,esi
-        jae     @F
+        jae     @f
         mov     esi,eax
+@@:
-;--- à¨áã¥¬ â¥ªáâ ---
+        test    esi,esi
+        jz      @f
-@@:     mov     eax,4
+        mov     eax,4
         mov     ebx,ed_left
-        mov     edx,ed_offset
         add     ebx,2
         shl     ebx,16
         add     ebx,ed_top
+        add     ebx,2
         mov     ecx,ed_text_color
-        add     ebx,4
+        test    dword ed_flags,ed_pass
-        add     edx,ed_text
+        jnz     .password
-        test    word ed_flags,ed_pass
+        mov     edx,ed_text
-        jnz     edit_box.draw_password
+        add     edx,ed_offset
         mcall
+@@:
         ret
-txt_pass db '*',0
-proc edit_box.draw_password
-locals
-        s_len dw ? ;¤«¨  ¢ë¢®¤¨¬®£® â¥ªáâ
-endl
-        cmp esi,1
+.password:
-        jl .end_f ;¥á«¨ áâà®ª  ¯ãáâ ï
-        mov [s_len],si
+        mov     ebp,esi
-        xor esi,esi
+        mov     esi,1
-        inc esi
-        lea edx,[txt_pass]
+        mov     edx,txt_pass
 @@:
         mcall
-        add ebx,6 shl 16 ;¤®¡ ¢«ï¥¬ áâ ¤ àâãî è¨à¨ã á¨¬¢®«
+        rol     ebx,16
-        dec word[s_len]
+        add     ebx,ed_char_width
-        cmp word[s_len],0
+        rol     ebx,16
-        jg @b
+        dec     ebp
-.end_f:
+        jnz     @b
         ret
-endp
+txt_pass db '*'
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ä®  ----------------------------
-;¢å®¤ë¥ ¤ ë¥
-;eax
-;edx - color
 ;----------------------------------------------------------
 edit_box.draw_bg:
         mov     ebx,ed_left
-        add     ebx,1
+        inc     ebx
-        mov     edx,ed_color
-        test    word ed_flags, ed_disabled
-        jz      @f
-        mov     edx, 0x00cacaca         ; TODO: add new value disabled_color to editbox struct
-  @@:
         shl     ebx,16
         add     ebx,ed_width
-        sub     ebx,1
+        dec     ebx
+        mov     edx,ed_color
+        test    word ed_flags, ed_disabled
-;¢å®¤ â®«ìª® æ¢¥â edx
+        jz      edit_box.draw_bg_eax
+        mov     edx, 0xCACACA   ; TODO: add disabled_color field to editbox struct
 edit_box.draw_bg_eax:
         mov     ecx,ed_top
-        mov     eax,13
-        add     ecx,1
+        inc     ecx
         shl     ecx,16
         add     ecx,ed_height
         dec     ecx
-        mcall
+        mcall   13
-ret
+        ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ¯®«ãç¥¨ï ª®«¨ç¥áâ¢  á¨¬¢®«®¢ ¢ â¥ªãé¥© è¨à¨¥ ª®¬¯®¥â
 ;----------------------------------------------------------
 edit_box.get_n:
-        mov     eax,ed_width    ;¯®«ãç¥¬ è¨à¨ã ª®¬¯®¥â
+        mov     eax,ed_width
-        xor     edx,edx   ;à¥§ã«ìâ â à á¯®« £ ¥âáï ¢ ¯ à¥ edx:eax ¢ eax - ®áâ â®ª
-        sub     eax,4           ;¢ëçâ¥¬ 4
+        sub     eax,4
-        mov     ebx,6           ;§ £àã§¨¬ ¤¥«¨â¥«ì
+        xor     edx,edx
-        div     ebx             ;à §¤¥«¨¬   6
+        div     word ed_char_width
-ret
+        ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  à¨á®¢ ¨ï ªãàá®à  --------------------------
 ;----------------------------------------------------------
 ;¢å®¤ë¥ ebp- æ¢¥â
 edit_box.clear_cursor:
         mov     edx,ebp
         mov     ebx,cl_curs_x
         mov     ecx,cl_curs_y
         jmp     edit_box.draw_curs
-edit_box.draw_cursor:
-        mov     edx,ed_text_color
-        mov     ebx,ed_pos
-        mov     ecx,ed_offset
-        sub     ebx,ecx
+edit_box.draw_cursor:
-        lea     ebx,[ebx*2+ebx]
+        mov     eax,ed_pos
+        sub     eax,ed_offset
-        shl     ebx,1
+        mul     dword ed_char_width
-        ;imul   ebx,6
+        mov     ebx,eax
-        add     ebx,ed_left
-        mov     ecx,ed_top
+        add     ebx,ed_left
-        inc     ebx
-        add     ecx,2
+        inc     ebx
-        mov     ebp,ebx
+        mov     edx,ebx
+        shl     ebx,16
-        shl     ebx,16
+        add     ebx,edx
+        mov     ecx,ed_top
-        mov     bx,bp
+        add     ecx,2
-        mov     ebp,ecx
         mov     edx,ecx
         shl     ecx,16
-        mov     cx,bp
+        add     ecx,edx
-        add     ecx,ed_height-4
+        add     ecx,ed_height
         sub     ecx,4
         mov     cl_curs_x,ebx
+        mov     cl_curs_y,ecx
-        mov     cl_curs_y,ecx
+        mov     edx,ed_text_color
 edit_box.draw_curs:
         mcall   38
+        ret
 ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  à¨á®¢ ¨ï à ¬ª¨ ----------------------------
 ;----------------------------------------------------------
 edit_box.draw_border:
         mov     ebx,ebp
         shl     ebx,16
         mov     bx,bp
         mcall
-ret
+        ret
 ;----------------------------------------------------------
 ;--- ¯à®¢¥àª , § è¥« «¨ ªãàá®à §  £à ¨æë ¨, ¥á«¨  ¤®, ---
 ;--- ¨§¬¥ï¥¬ á¬¥é¥¨¥ ------------------------------------
 ;--- ¥á«¨ á¬¥é¥¨¥ ¡ë«®, ãáâ ®¢ª  ä« £  ed_offset_cl, ¨ ç¥,
 ; ¥á«¨ ¨ç¥£® ¥ ¨§¬¥¨«®áì, â® ¢ëáâ ¢«¥¨¥ ed_offset_fl
-pushad
+        pushad
         mov     ecx,ed_pos
         mov     ebx,ed_offset
         cmp     ebx,ecx
         ja      edit_box.sub_8
         push    ebx
-        call    edit_box.get_n  ;¯®«ãç¨¬ ª®«-¢® á¨¬¢®«®¢ ª®â®àë¥ ã¬¥é îâáï ¢ è¨à¨¥ ª®¬¯®¥â , ¢ ¯ à¥ à¥£¨áâà®¢ edx:eax
+        call    edit_box.get_n
         pop     ebx
         mov     edx,ebx
-        add     edx,eax         ;ed_offset+width editbox
+        add     edx,eax
-        inc     edx             ;¥®¡å®¤¨¬® ¤«ï ®à¬ «ì®£® ¯®«®¦¥¨ï ªãàá®à  ¢ ªà ©¥© «¥¢®© ¯®§¨æ¨¨
+        inc     edx     ;¥®¡å®¤¨¬® ¤«ï ®à¬ «ì®£® ¯®«®¦¥¨ï ªãàá®à  ¢ ªà ©¥© «¥¢®© ¯®§¨æ¨¨
         cmp     edx,ecx
         ja      @f
         mov     edx,ed_size
         cmp     edx,ecx
         je      edit_box.add_end
         sub     edx,ecx
         cmp     edx,8
         jbe     edit_box.add_8
         add     ebx,8
         jmp     edit_box.chk_d
+@@:     or      word ed_flags,ed_offset_fl
+        popad
+        ret
 edit_box.sub_8:
-        test    ecx,ecx
-        jz      edit_box.sub_min
+        test    ecx,ecx
-        cmp     ebx,8
-        jbe     edit_box.sub_min
+        jz      @f
         sub     ebx,8   ;ebx=ed_offset
-        jmp     edit_box.chk_d
+        ja      edit_box.chk_d
-edit_box.sub_min:
+@@:
         xor     ebx,ebx
         jmp     edit_box.chk_d
 edit_box.add_end:
-edit_box.add_end:sub    edx,eax
+        sub     edx,eax
+        mov     ebx,edx
+        jmp     edit_box.chk_d
-        mov     ebx,edx
+edit_box.add_8:
-        jmp     edit_box.chk_d
+        add     ebx,edx
-edit_box.add_8: add     ebx,edx
+edit_box.chk_d:
-edit_box.chk_d: mov     ed_offset,ebx
+        mov     ed_offset,ebx
-        call    edit_box.draw_bg
-        and     word ed_flags,ed_offset_cl
-edit_ex
+        call    edit_box.draw_bg
-@@:
-        or      word ed_flags,ed_offset_fl
+        and     word ed_flags,ed_offset_cl
-edit_ex
+        popad
         ret
-align 4
 proc edit_box_set_text, edit:dword, text:dword
-pushad
+        pushad
-        mov edi,dword[edit]
+        mov     edi,[edit]
-        mov ecx,ed_max
+        mov     ecx,ed_max
-        inc ecx ;ãç¨âë¢ ¥¬ ¡ã¤ãé¥¥ ®¡à¥§ ¨¥ áâà®ª¨ ¤«ï ascii 0
+        inc     ecx
-        mov edi,dword[text]
+        mov     edi,[text]
-        xor al,al
+        xor     al,al
-        cld
-        repne scasb ;¯®¨áª ¢ áâà®ª¥ edi á¨¬¢®«  al
+        cld
-        mov ecx,edi ;ecx = text + ¬¨. § ç¥¨¥ ¨§: 1) ed_max ¨«¨ 2) ¤«¨ë áâà®ª¨ text
+        repne scasb
+        mov     ecx,edi
-        mov edi,dword[edit]
+        mov     edi,[edit]
-        mov esi,dword[text]
+        mov     esi,[text]
-        sub ecx,esi ;ecx = ¤«¨  áâà®ª¨ text (® ¥ ¡®«ìè¥ ç¥¬ ed_max)
+        sub     ecx,esi
-        dec ecx
+        dec     ecx
-        mov ed_size,ecx ;áâ ¢¨¬ ®¢ë© à §¬¥à áâà®ª¨
+        mov     ed_size,ecx
-        mov ed_pos,ecx ;áâ ¢¨¬ ªãàá®à ¢ ª®¥æ ®¢®© áâà®ª¨
+        mov     ed_pos,ecx
-        and word ed_flags,ed_shift_cl ;á¨¬ ¥¬ ¢ë¤¥«¥¨¥ ¥á«¨ ®® ¡ë«®
+        and     word ed_flags,ed_shift_cl
-        mov edi,ed_text
+        mov     edi,ed_text
-        repne movsb ;ª®¯¨à®¢ ¨¥ â¥ªáâ®¢®© áâà®ª¨ text ¢ edit_box
+        repne movsb
-        mov byte[edi],0 ;áâ ¢¨¬ ascii 0 ¢ ª®æ¥ áâà®ª¨
+        mov     byte[edi],0
-popad
+        popad
-ret
+        ret
 endp
+}
 macro use_key_func
+{
 ;¡à ¡®âª  Shift ¤«ï áïâ¨ï ¢ë¤¥«¥¨ï ¥¨§¢¥áâ®© ®¡« áâ¨
-edit_box_key.shift: ;;;;;;;SHIFT
-        call    edit_box.draw_bg
+edit_box_key.shift:
-        test    word ed_flags,ed_shift
+        call    edit_box.draw_bg
-        je      edit_box_key.f_exit
+        test    word ed_flags,ed_shift
         je      edit_box_key.f_exit
         mov     ebp,shift_color
-        or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
+        or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
         jmp     edit_box.draw_cursor_text
 ;;;;;;;;;;;;;;;;;;;;;
 edit_box_key.f_exit:
+        call    edit_box.check_offset
-        call    edit_box.check_offset
+        and     word ed_flags,ed_shift_cl
-        and     word ed_flags,ed_shift_cl
         call    edit_box_key.enable_null
         jmp     edit_box.draw_cursor_text
 edit_box_key.sh_cl_:
-;;;;;;SHIFT end
+edit_box_key.sh_cl_:
 ;®¡à ¡®âª  ®ç¨áâª¨, ¯à¨ «¥¢®¬ - ¯à ¢®¬ ¤¢¨¦¥¨¨ ¢ë¤¥«¥¨ï
-;¤«ï ®¡à ¡®âª¨ áïâ¨ï ¢ë¤¥«¥¨ï
-;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
+;¤«ï ®¡à ¡®âª¨ áïâ¨ï ¢ë¤¥«¥¨ï
-        mov     eax,dword       ed_pos
+;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
-        cmp     eax,ebx
+        mov     eax,ed_pos
         cmp     eax,ebx
-        jae     edit_box_key.sh_n
+        jae     edit_box_key.sh_n
         push    eax  ;¬¥ìè¥¥ ¢ eax
         push    ebx  ;¡®«ìè¥¥
         jmp     edit_box_key.sh_n1
                      ;¥á«¨ ¨ ç¥
 edit_box_key.sh_n:
         mov     ecx,ed_offset
         add     eax,ecx ;eax = w_off= ed_offset+width
         mov     edx,eax ;save
         pop     ebx     ;¡®«ìè¥¥
         pop     eax     ;¬¥ìè¥¥
         cmp     eax,ecx         ;áà ¢¥¨¥ ¬¥ìè¥£® á offset.
         jae     edit_box_key.f_f            ;¥á«¨ ¡®«ìè¥
         xor     eax,eax
         cmp     edx,ebx         ;cà ¢¨¬ à §¬¥à w_off á ¡®«ìè¨¬
-        jb      @f
+        jnb     @f
-        sub     ebx,ecx
+        mov     ebx,edx
-        jmp     edit_box_key.nxt_f
-@@:     mov     ebx,edx
+@@:
         sub     ebx,ecx
         jmp     edit_box_key.nxt_f
 edit_box_key.f_f:
         sub     eax,ecx
         cmp     edx,ebx         ;cà ¢¨¬ à §¬¥à w_off á ¡®«ìè¨¬
         jle     @f
         sub     ebx,ecx
         sub     ebx,eax
         jmp     edit_box_key.nxt_f
-@@:
-        mov     ebx,edx
+@@:     mov     ebx,edx
         sub     ebx,ecx
         sub     ebx,eax
 edit_box_key.nxt_f:
-        mov     edx,ebx
+        mul     dword ed_char_width
-        lea     ebx,[eax*2+eax]
+        xchg    eax,ebx
-        shl     ebx,1
+        mul     dword ed_char_width
         add     ebx,ed_left
         inc     ebx
         shl     ebx,16
-        lea     ecx,[edx*2+edx]
-        shl     ecx,1
+        inc     eax
-        mov     bx,cx
+        mov     bx, ax
-        inc     ebx
-        mov     edx,ebp;shift_color
+        mov     edx,ebp ;shift_color
         call    edit_box.draw_bg_eax
-@@:     call    edit_box_key.enable_null
+        jmp     edit_box_key.enable_null
-        ret
-;;;;;;;;;;;;;;;;;;;;;
 ;áâ ®¢ª - áïâ¨¥ ¢ë¤¥«¥¨ï ¢ ®¤¨ á¨¬¢®«
-;;;;;;;;;;;;;;;;;;;;;
 edit_box_key.drw_sim:
-        mov     eax,dword       ed_pos
+        mov     eax,ed_pos
-        call    edit_box_key.draw_rectangle   ; à¨á®¢ âì ¯àï¬®ã£®«ì¨ª á § ¤ ë¬ æ¢¥â®¬
+        call    edit_box_key.draw_rectangle
-        jmp     @b
+        jmp     edit_box_key.enable_null
-;;;;;;;;;;;;;;;;;;;;;
 ;ãªæ¨ï ãáâ ®¢ª¨ ¢ë¤¥«¥¨ï ¯à¨ ¤¢¨¦¥¨¨ ¢«¥¢® ¨ ¢¯à ¢® ¨  ¦ â¨¨ shift
-;®£¨ª :
-;;;;;;;;;;
 edit_box_key.draw_wigwag:
-;äãªæ¨ï ãáâ ®¢ª¨ ¯¥à¥¬¥ëå
         mov     ebp,shift_color
         call    edit_box.clear_cursor
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £  ¢ë¤¥«¥®© ®¡« áâ¨
         mov     ebp,shift_color
-        mov     eax,dword       ed_pos
+        mov     eax,ed_pos
         test    word ed_flags,ed_left_fl
-        jz      edit_box_key.low
+        jnz     edit_box_key.draw_rectangle
-        jmp     @f
+        dec     eax
+        jmp     edit_box_key.draw_rectangle
-;;;;;;;;;;
 ;ãªæ¨ï ã¤ «¥¨ï ¢ë¤¥«¥¨ï ¯à¨ ¤¢¨¦¥¨¨ ¢«¥¢® ¨ ¢¯à ¢® ¨  ¦ â¨¨ shift
-;®£¨ª :
-;;;;;;;;;;
 edit_box_key.draw_wigwag_cl:
-;äãªæ¨ï ãáâ ®¢ª¨ ¯¥à¥¬¥ëå
         mov     ebp,ed_color
         call    edit_box.clear_cursor
         mov     ebp,ed_color
-        mov     eax,dword       ed_pos
+        mov     eax,ed_pos
         test    word ed_flags,ed_left_fl
-        jz      edit_box_key.low
+        jnz     edit_box_key.draw_rectangle
-@@:     call    edit_box_key.draw_rectangle  ; à¨á®¢ âì ¯àï¬®ã£®«ì¨ª § ªà è¨¢ ¥¬®© ®¡« áâ¨
-        ret
+        dec     eax
-edit_box_key.low:   dec     eax
+        jmp     edit_box_key.draw_rectangle
-        jmp     @b
 ;¢å®¤®© ¯ à ¬¥âà ebx - ed_pos
 edit_box_key.sh_first_sh:
         test    word ed_flags,ed_shift
         je      @f
-        mov     dword ed_shift_pos_old,ebx
+        mov     ed_shift_pos_old,ebx
         test    word ed_flags,ed_shift_on
         jne     @f
-        mov     dword ed_shift_pos,ebx
+        mov     ed_shift_pos,ebx
         or      word ed_flags,ed_shift_on
 @@:     ret
 ;¡à ¡®âª  ªà ©¨å ¯®«®¦¥¨© ¢ editbox ¯à¨  ¦ â®¬ shift
 ;¯à®¨§¢®¤¨â áïâ¨¥ ¢ë¤¥«¥¨ï, ¥á«¨ ¥â shift
 ;¨ ç¥ ¢®®¡é¥ ¢ëå®¤¨â
         jne     @f
         test    word ed_flags,ed_shift_bac
         je      @f
         call    edit_box.draw_bg
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_  ;®ç¨áâª  ¢ë¤¥«¥®£® äà £¬¥â
         and     word ed_flags,ed_shift_cl ; ®ç¨áâª  ®â â®£®, çâ® ã¡à «¨ ¢ë¤¥«¥¨¥
         jmp     edit_box.draw_cursor_text
-@@:
-        and     word ed_flags,ed_shift_off
+@@:     and     word ed_flags,ed_shift_off
         popad
         ret     4
 ;¯à®¢¥àª  á®áâ®ï¨ï shift, ¡ë« «¨ ®  ¦ â à ìè¥?
 edit_box_key.sh_enable:
         test    word ed_flags,ed_shift
         jne     edit_box_key.sh_ext_en ; à¨á®¢ âì § ªà è¥ë© ¯àï¬®ã£®«ì¨ª
         test    word ed_flags,ed_shift_bac
         je      @f
         call    edit_box.check_offset
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_  ;®ç¨áâª  ¢ë¤¥«¥®£® äà £¬¥â
         call    edit_box_key.draw_wigwag_cl
         and     word ed_flags,ed_shift_cl ; 1¢ à ¥ ã¦®
         ret
 @@:     mov     ebp,ed_color
         call    edit_box.clear_cursor
-        call    edit_box.check_offset
+        jmp     edit_box.check_offset
         ret
 edit_box_key.sh_ext_en:
         call    edit_box.check_offset
         test    word ed_flags,ed_offset_fl
         je      @f
 ;¨á®¢ ¨¥ § ªà è¥ëå ¯àï¬®ã£®«ì¨ª®¢ ¨ ¨å ®ç¨áâª
-        mov     eax,dword       ed_shift_pos
+        mov     eax,ed_shift_pos
-        mov     ebx,dword       ed_pos
+        mov     ebx,ed_pos
-        mov     ecx,dword       ed_shift_pos_old
+        mov     ecx,ed_shift_pos_old
 ;¯à®¢¥àª  ¨ à¨á®¢ ¨¥ § ªà è¥ëå ®¡« áâ¥©
         cmp     eax,ecx
         je      edit_box_key.1_shem
         jb      edit_box_key.smaller
         cmp     ecx,ebx
         ja      edit_box_key.1_shem
         call    edit_box_key.draw_wigwag_cl ;clear
+        jmp     edit_box_key.sh_e_end
         jmp     edit_box_key.sh_e_end
 edit_box_key.smaller:
         cmp     ecx,ebx
         jb      edit_box_key.1_shem
         call    edit_box_key.draw_wigwag_cl ;clear
+        jmp     edit_box_key.sh_e_end
-        jmp     edit_box_key.sh_e_end
-;alike  =
+edit_box_key.1_shem:
+        call    edit_box_key.draw_wigwag
-edit_box_key.1_shem:        call   edit_box_key.draw_wigwag
+edit_box_key.sh_e_end:
-edit_box_key.sh_e_end:      and     word ed_flags,ed_shift_off
+        and     word ed_flags,ed_shift_off
+        ret
         ret
 @@:     mov     ebp,shift_color
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
         jmp     edit_box_key.sh_e_end
 ;äãªæ¨ï ¤«ï ®¡à ¡®âª¨ shift ¯à¨  ¦ â¨¨ home and end
 edit_box_key.sh_home_end:
         mov     ebp,ed_color
         call    edit_box.clear_cursor
         test    word ed_flags,ed_shift_bac
         je      @f
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos_old
+        mov     ebx,ed_shift_pos_old
         call    edit_box_key.sh_cl_
+@@:
-@@:     test    word ed_flags,ed_shift
+        test    word ed_flags,ed_shift
         je      edit_box_key.sh_exit_ ;¢ë©â¨
         mov     ebp,shift_color
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
+        jmp     edit_box_key.sh_e_end
         jmp     edit_box_key.sh_e_end
 edit_box_key.sh_exit_:
         call    edit_box.draw_bg
-        call    edit_box.check_offset
+        jmp     edit_box.check_offset
         ret
 ;äãªæ¨ï ¢¥á¥¨ï 0 ¯®  ¤à¥áã ed_size+1
 edit_box_key.enable_null:
         pusha
         mov     eax,ed_size
         add     eax,ebx
         jne     @f
         inc     eax
 @@:     xor     ebx,ebx
         mov     [eax],bl
+        popad
-edit_ex
+        ret
 ;- ã¤ «¥¨¥ á¨¬¢®«
 ;å®¤ë¥ ¤ ë¥ edx=ed_size;ecx=ed_pos
 edit_box_key.del_char:
         mov     esi,ed_text
         test    word ed_flags,ed_shift_on
         je      @f
-        mov     eax,dword ed_shift_pos
+        mov     eax,ed_shift_pos
         mov     ebx,esi
         cmp     eax,ecx
         jae     edit_box_key.dh_n
         mov     ed_pos,eax      ;çâ®¡ë ¥ ¡ë«® ã¡¥£ ¨ï ªãàá®à
         mov     ebp,ecx
         sub     ebp,eax
         add     ebx,eax  ;eax ¬¥ìè¥
         sub     edx,ecx
         add     esi,ecx
-        mov     dword ed_shift_pos,ebp
+        mov     ed_shift_pos,ebp
         jmp     edit_box_key.del_ch_sh
-                     ;¥á«¨ ¨ ç¥
 edit_box_key.dh_n:
         mov     ebp,eax
         sub     ebp,ecx
         add     ebx,ecx
         sub     edx,eax
         add     esi,eax
-        mov     dword ed_shift_pos,ebp
+        mov     ed_shift_pos,ebp
         jmp     edit_box_key.del_ch_sh
 @@:     add     esi,ecx ;ãª § â¥«ì + á¬¥é¥¨¥ ª à¥ «ì®¬ã ¡ãä¥àã
         mov     ebx,esi
         inc     esi
-        cld
         cld
         sub     edx,ecx
-edit_box_key.del_ch_sh:
 edit_box_key.del_ch_sh:
         push    edi
         mov     edi,ebx
 @@:
         lodsb
         stosb
-        dec edx
+        dec     edx
-        jns @b
         jns     @b
-        pop edi
+        pop     edi
         ret
 ;¢ëç¨á«¨âì § ªà è¨¢ ¥¬ãî ®¡« áâì
 ;á®£« è¥¨¥ ¢ ebp - ¯¥à¥¤ ¥âáï ed_size
 edit_box_key.clear_bg:
         call    edit_box.get_n  ;¯®«ãç¨âì à §¬¥à ¢ á¨¬¢®« å è¨à¨ë ª®¬¯®¥â
         push    eax
         mov     ebx,ed_offset
         add     eax,ebx ;eax = w_off= ed_offset+width
-        mov     ebx,ebp ;ed_size
         mov     ebx,ebp ;ed_size
         cmp     eax,ebx
         jb      @f
         mov     eax,ed_pos
         sub     ebx,eax
         mov     ecx,ed_offset
         sub     eax,ecx
+        jmp     edit_box_key.nxt
         jmp     edit_box_key.nxt
 @@:     mov     ebx,ed_pos
         push    ebx
         sub     eax,ebx
-        mov     ebx,eax ;It is not optimal
         mov     ebx,eax ;It is not optimal
         pop     eax     ;ed_pos
         mov     ecx,ed_offset
         sub     eax,ecx
 edit_box_key.nxt:
         mov     ebp,eax  ;¯à®¢¥àª    ¢ëå®¤ § ªà è¨¢ ¥¬®© ®¡« áâ¨ §  ¯à¥¤¥«ë ¤«¨ë
         add     ebp,ebx
         pop     edx
         cmp     ebp,edx
         je      @f
         inc     ebx
+@@:
-@@:     mov     edx,ebx
+        mul     dword ed_char_width
-        lea     ebx,[eax*2+eax]
+        xchg    eax,ebx
-        shl     ebx,1
+        mul     dword ed_char_width
         add     ebx,ed_left
         inc     ebx
-        shl     ebx,16
-        lea     ecx,[edx*2+edx]
+        shl     ebx,16
-        shl     ecx,1
+        inc     eax
-        mov     bx,cx
+        mov     bx, ax
         mov     edx,ed_color
-        call    edit_box.draw_bg_eax
+        jmp     edit_box.draw_bg_eax
         ret
 ;;;;;;;;;;;;;;;;;;;
 ;;; ¡à ¡®âª  ¯à¨¬¨â¨¢®¢
 ;;;;;;;;;;;;;;;;;;;;
 ; à¨á®¢ âì ¯àï¬®ã£®«ì¨ª, æ¢¥â ¯¥à¥¤ ¥âáï ¢ ebp
 ;¢å®¤ë¥ ¯ à ¬¥âàë:
 ;eax=dword ed_pos
 ;ebp=-æ¢¥â ed_color or shift_color
 edit_box_key.draw_rectangle:
-        mov     ecx,dword ed_offset
+        sub     eax,ed_offset
-        sub     eax,ecx
+        mul     dword ed_char_width
-        lea     ebx,[eax*2+eax]
+        add     eax,ed_left
-        shl     ebx,1
+        inc     eax
-        inc     ebx
+        shl     eax,16
-        add     ebx,ed_left
+        add     eax,ed_char_width
-        shl     ebx,16
-        add     ebx,6
+        mov     ebx,eax
         mov     edx,ebp
-        call    edit_box.draw_bg_eax
+        jmp     edit_box.draw_bg_eax
         ret
 ;;;;;;;;;;;;;;;;;;
 ;;à®¢¥àª   ¦ â «¨ shift
 ;;;;;;;;;;;;;;;;;;
 edit_box_key.check_shift_ctrl_alt:
-pusha   ;á®åà ¨¬ ¢á¥ à¥£¨áâàë
+        pusha
         mcall   66,3
         test    al,11b
         je      @f
         or      word ed_flags,ed_shift   ;ãáâ ®¢¨¬ ä« £ Shift
 @@:
         and     word ed_flags,ed_alt_off ; ®ç¨áâ¨¬ ä« £ Alt
         test    al,110000b
         je      @f
         or      word ed_flags,ed_alt_on   ;ãáâ ®¢¨¬ ä« £ Alt
+@@:
+        popad
-@@:edit_ex
+        ret
+}
 macro use_key_no_process  up,down,esc,enter,tab,numl,capsl,scrolll
+{
 if tab eq
 else
         cmp     ah,9   ;TAB - ª« ¢¨è  ))
         jz      edit_box.editbox_exit
 end if
 if numl eq
 else
         cmp     ah,4   ;Num Lock - ª« ¢¨è  ))
         jz      edit_box.editbox_exit
 end if
 if capsl eq
 else
         cmp     ah,2   ;Caps Lock - ª« ¢¨è  ))
         jz      edit_box.editbox_exit
 end if
 if scrolll eq
 else
         cmp     ah,1   ;Scroll Lock - ª« ¢¨è  ))
         jz      edit_box.editbox_exit
 end if
+}
 macro use_key_figures_only
+{
         jb      edit_box.editbox_exit
         cmp     ah,'9'
         ja      edit_box.editbox_exit
 @@:
+}
 macro are_key_shift_press
+{
         test    word ed_flags,ed_shift_on
         je      @f
-        ;å®¤ë¥ ¤ ë¥ edx=ed_size;ecx=ed_pos
+; edx = ed_size, ecx = ed_pos
         push    eax
         mov     edx,ed_size
         mov     ecx, ed_pos
         pusha
-;;;;;;;;;;;;;;;;;;;;;
-;clear input arrea
+; clear input area
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
         mov     ebp,ed_size
         call    edit_box_key.clear_bg
-;;;;;;;;;;;;;;;;;;;;;
         popa
         call    edit_box_key.del_char
-;;;;
         mov     ebx,ed_size
-        sub     ebx,dword ed_shift_pos
+        sub     ebx,ed_shift_pos
         mov     ed_size,ebx
         pop     eax
 @@:
+}
 macro are_key_cur_end
+{
         mov     ecx,ed_size
         mov     edx, ed_max
         test    word ed_flags,ed_insert
         jne     @f
         cmp     ecx,edx
         jae     edit_box.editbox_exit
 @@:     mov     ebx, ed_pos
         cmp     ebx,edx
-        jl      @f ; ¥á«¨ ¬¥ìè¥ ¨«¨ à ¢®
-        jmp     edit_box.editbox_exit
+        jnl     edit_box.editbox_exit
-@@:     ; á¤¢¨£ ¥¬ á¨¬¢®«ë ¯®á«¥ ªãàá®à  ¢¯à ¢®
         mov     ecx,ed_size
         push    edi eax
         mov     ebp,edi
-        mov     esi,ed_text     ; ª § â¥«ì   ¡ãä¥à
+        mov     esi,ed_text
-                                ;ã¤¥¬ à ¡®â âì á® áâà®ª®©
-        add     esi,ecx         ;add ed_size ¤®¡ ¢¨¬ max size
+        add     esi,ecx
         mov     edi,esi
-        cmp     ecx,ebx         ;á«¨ ã  á ¯®§¨æ¨ï ªãàá®à  = â¥ªãé¥¬ã à §¬¥àã  ¯¥ç â ëå á¨¬¢®«®¢ â.¥. ªãàá®à áâ®¨â ¢ ª®æ¥
+        cmp     ecx,ebx
         je      edit_box_key.In_k
-        test    dword bp_flags,ed_insert ;IF insert is enabled  â.ª. edi ¨§¬¥¥,  ¤à¥áã¥¬ ç¥à¥§ ebp
+        test    dword bp_flags,ed_insert
         jne     edit_box_key.ins_v
-;clear
-pusha
+        pusha
         mov     edi,ebp
         mov     ebp,ed_size
         call    edit_box_key.clear_bg
-popa
+        popa
-        sub     ecx,ebx         ; ©¤¥¬ ª®«-¢® á¨¬¢®«®¢ ¤«ï ¯¥à¥¤¢¨¦¥¨ï.
+        sub     ecx,ebx
-        inc     edi             ;¬¥áâ¨¬  è¨ á¨¬¢®«ë ¢¯à ¢®
+        inc     edi
         std
         inc     ecx
-   @@:
+@@:
-        ;--------
         lodsb
         stosb
-        ;--------
         loop    @b
 edit_box_key.In_k:
         cld
-        pop eax
+        pop     eax
-        mov al,ah
+        mov     al,ah
         stosb
-        pop edi
+        pop     edi
-; ¢áâ ¢«ï¥¬ ª®¤ ª« ¢¨è¨ âã¤ , £¤¥ ªãàá®à
-        ; ã¢¥«¨ç¨¢ ¥¬ § ç¥¨¥ à §¬¥à  ¨ ¯®§¨æ¨¨
-        inc      dword ed_size
+        inc     dword ed_size
-        inc      dword ed_pos
+        inc     dword ed_pos
         call    edit_box_key.draw_all2
         jmp     edit_box_key.shift
+}
 macro use_work_key
+{
+edit_box_key.insert:
-edit_box_key.insert: test   word ed_flags,ed_insert ;not    word ed_insert
+        test    word ed_flags,ed_insert
-         je     @f
+        je      @f
-         and    word ed_flags,ed_insert_cl
+        and     word ed_flags,ed_insert_cl
         jmp     edit_box.editbox_exit
-@@:
-        or      word ed_flags,ed_insert
+@@:     or      word ed_flags,ed_insert
         jmp     edit_box.editbox_exit
 edit_box_key.ins_v:
-;        dec     dword [ebp+48];ed_size    ;processing is insert
         dec     dword bp_size
         sub     esi,ecx
         add     esi,ebx
         mov     edi,esi
-;clear
-pusha
+        pusha
         mov     edi,ebp
         mov     ebp,ed_pos
         call    edit_box_key.clear_bg
-popa
+        popa
         jmp     edit_box_key.In_k
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 edit_box_key.delete:
         mov     edx,ed_size
         mov     ecx,ed_pos
         cmp     edx,ecx
         jg      edit_box_key.bac_del
         test    word ed_flags,ed_shift_on
         jne     edit_box_key.del_bac
         popad
         ret     4
 edit_box_key.bac_del:
         call    edit_box_key.del_char
         jmp     edit_box_key.draw_all
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;---  ¦ â  ª« ¢¨è  backspace ---
 edit_box_key.backspace:
         test    word ed_flags,ed_shift_on
         jne     edit_box_key.delete
-        ; ¯à®¢¥àï¥¬, ªãàá®à ã «¥¢®£® ªà ï?
         mov     ecx,ed_pos
         test    ecx,ecx
         jnz     edit_box_key.del_bac
         popad
         ret     4
         call    edit_box_key.del_char
 @@:     test    word ed_flags,ed_shift_on
         jne     edit_box_key.bac_del
-        dec      dword ed_pos
+        dec     dword ed_pos
 edit_box_key.draw_all:
-        push    edit_box_key.shift;.draw_cursor_text;eax
+        push    edit_box_key.shift
         test    word ed_flags,ed_shift_on
         je      @f
-        mov     eax,dword ed_shift_pos
+        mov     eax,ed_shift_pos
         mov     ebx,ed_size
         sub     ebx,eax
         mov     ed_size,ebx
         mov     ebp,ed_color
         call    edit_box.clear_cursor
         call    edit_box.check_offset
-        call    edit_box.draw_bg
+        jmp     edit_box.draw_bg
-        ret
-@@:     dec      dword ed_size
 @@:     dec     dword ed_size
 edit_box_key.draw_all2:
-        and    word ed_flags,ed_shift_cl
+        and     word ed_flags,ed_shift_cl
         mov     ebp,ed_color
         call    edit_box.clear_cursor
         call    edit_box.check_offset
         mov     ebp,ed_size
-        call    edit_box_key.clear_bg
+        jmp     edit_box_key.clear_bg
-        ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;---  ¦ â  ª« ¢¨è  left ---
 edit_box_key.left:
         mov     ebx,ed_pos
         test    ebx,ebx
-        dec      dword ed_pos
+        dec     dword ed_pos
         call    edit_box.draw_bg
         call    edit_box.draw_shift
         call    edit_box_key.sh_enable
         jmp     edit_box.draw_cursor_text
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;---  ¦ â  ª« ¢¨è  right ---
 edit_box_key.right:
         mov     ebx,ed_pos
         cmp     ebx,ed_size
         je      edit_box_key.sh_st_of
-        inc     dword  ed_pos
+        inc     dword ed_pos
         call    edit_box.draw_bg
         call    edit_box.draw_shift
         call    edit_box_key.sh_enable
         jmp     edit_box.draw_cursor_text
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 edit_box_key.home:
         mov     ebx,ed_pos
         test    ebx,ebx
         jz      edit_box_key.sh_st_of
         call    edit_box_key.sh_first_sh
         mov     ed_pos,eax
         call    edit_box.draw_bg
         call    edit_box.draw_shift
         call    edit_box_key.sh_home_end
         jmp     edit_box.draw_cursor_text
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;---  ¦ â  ª« ¢¨è  end ---
 edit_box_key.end:
         mov     ebx,ed_pos
-        cmp     ebx,dword ed_size
+        cmp     ebx,ed_size
         je      edit_box_key.sh_st_of
         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_key.sh_home_end
         jmp     edit_box.draw_cursor_text
-;-----------------------------------------------------------------------------
 edit_box_key.ctrl_c:
 ; add memory area
         mov     ecx,ed_size
         add     ecx,3*4
         mcall   68,12
         push    eax
         mcall   54,2
         pop     ecx
 ; remove unnecessary memory area
         mcall   68,13
-;--------------------------------------
 .exit:
         jmp     edit_box.editbox_exit
-;-----------------------------------------------------------------------------
 edit_box_key.ctrl_v:
         mcall   54,0
 ; no slots of clipboard ?
         test    eax,eax
         jz      .exit
 ; main list area not found ?
         inc     eax
         test    eax,eax
         jz      .exit
         sub     eax,2
         mov     ecx,eax
         mcall   54,1
 ; main list area not found ?
         inc     eax
         jz      .exit
 ; error ?
         sub     eax,2
         test    eax,eax
         jz      .exit
         inc     eax
 ; check contents of container
         mov     ebx,[eax+4]
 ; check for text
         test    ebx,ebx
         jnz     .no_valid_text
         mov     ebx,[eax+8]
 ; check for cp866
         cmp     bl,1
         jnz     .no_valid_text
         mov     ecx,[eax]
         sub     ecx,3*4
         cmp     ecx,ed_max
         jb      @f
         mov     ecx,ed_max
 @@:
         mov     esi,eax
         add     esi,3*4
         mov     ed_size,ecx
         cld
 @@:
         lodsb
         cmp     al,0x0d ; EOS (end of string)
         je      .replace
         cmp     al,0x0a ; EOS (end of string)
         jne     .continue
 .replace:
         mov     al,0x20 ; space
 .continue:
         stosb
         dec     ecx
         jnz     @b
-;       rep     movsb
         pop     edi eax
-;--------------------------------------
 .no_valid_text:
 ; remove unnecessary memory area
         mov     ecx,eax
         mcall   68,13
-;--------------------------------------
 .exit:
-        jmp     edit_box.draw_1
+        jmp     edit_box.draw_bg_cursor_text
+}
 macro use_mouse_func
-{
-;----------------------------------------------------------
-;--- ¡à ¡®âª  .mouse_wigwag
 ;----------------------------------------------------------
 edit_box_mouse.mouse_wigwag:
         push    eax
         call    edit_box.draw_bg
         call    edit_box.draw_shift
-        pop     eax
-        shr     eax,16
+        pop     eax
-        or      word ed_flags,ed_shift_bac+ed_shift_on+ed_shift
-;;;;;;;;;;;;;;;;;;
+        or      word ed_flags,ed_shift_bac+ed_shift_on+ed_shift
-;;¯à®æ¥¤ãà  ®¡à ¡®âª¨ ¯®«®¦¥¨ï ¢ë¤¥«¥®£® â¥ªáâ , ª®£¤  ¯à®¨áå®¤¨â ¢ëå®¤ §  ¯à¥¤¥«ë editbox
-;;;;;;;;;;;;;;;;;;
+;¡à ¡®âª  ¯®«®¦¥¨ï ¢ë¤¥«¥®£® â¥ªáâ , ª®£¤  ¯à®¨áå®¤¨â ¢ëå®¤ §  ¯à¥¤¥«ë editbox
-        test    ax,0x8000
+        test    eax,eax
-        jnz     edit_box_mouse.mleft
+        js      edit_box_mouse.mleft
-        mov     ebx,ed_left
+        shr     eax,16
-        cmp     eax,ebx
+        sub     eax,ed_left
-        jb      edit_box_mouse.mleft
-        add     ebx,ed_width
+        jc      edit_box_mouse.mleft
-        cmp     eax,ebx
+        cmp     ed_width,eax
-        ja      edit_box_mouse.mright
-        sub     ebx,ed_width
         jc      edit_box_mouse.mright
-        xor     edx,edx
-        sub     eax,ebx ; ¢ëçâ¥¬ ¨§ ª®®à¤¨ â ¬ëèª¨ ¯® ®á¨ å ª®®à¤¨ âë ¤® editbox ¯® ®á¨ å
-        mov     ebx,6
+        xor     edx,edx
-        div     ebx
-;;;;;;;;;;;;;;;;;;
+        div     word ed_char_width
-;;¯à®æ¥¤ãà  ®¡à ¡®âª¨ ¯®«®¦¥¨ï ¢ë¤¥«¥®£® â¥ªáâ , ¢ ¯à¥¤¥« å ®¡« áâ¨ editbox
-;;;;;;;;;;;;;;;;;;
+;¡à ¡®âª  ¯®«®¦¥¨ï ¢ë¤¥«¥®£® â¥ªáâ , ¢ ¯à¥¤¥« å ®¡« áâ¨ editbox
 ;®«ãç¨«¨ ª®®à¤¨ âë ¢ eax ¬ëèª¨, â.¥. ªã¤  ®  ¯¥à¥¬¥áâ¨« áì
 ;¨á®¢ ¨¥ § ªà è¥ëå ¯àï¬®ã£®«ì¨ª®¢ ¨ ¨å ®ç¨áâª
-        add     eax,ed_offset   ;¤®¡ ¢¨¬ á¬¥é¥¨¥
+        add     eax,ed_offset
-        cmp     eax,dword ed_size       ;¥á«¨ ¢ëè«¨ §  ¯à¥¤¥«ë, â® ¨ç¥£® ¥ ¤¥« âì
+        cmp     eax,ed_size
         ja      edit_box_mouse.mwigvag
 edit_box_mouse.mdraw:
-        mov     dword   ed_pos,eax ;á®åà ¨¬ ®¢®¥ § ç¥¨¥
+        mov     ed_pos,eax
 ;¨á®¢ ¨¥ § ªà è¥ëå ¯àï¬®ã£®«ì¨ª®¢ ¨ ¨å ®ç¨áâª
-        mov     ecx,dword       ed_shift_pos
+        mov     ecx,ed_shift_pos
-        mov     ebx,dword       ed_shift_pos_old
+        mov     ebx,ed_shift_pos_old
-        mov     dword   ed_shift_pos_old,eax    ;¢¥á¥¬ ®¢®¥ § ç¥¨¥ áâ à®© ¯®§¨æ¨¨ ªãàá®à
+        mov     ed_shift_pos_old,eax
 ;¯à®¢¥àª  ¨ à¨á®¢ ¨¥ § ªà è¥ëå ®¡« áâ¥©
-        cmp     ecx,ebx         ;¢ëïáï¥¬ ªã¤  ¡ë«® ¤¢¨¦¥¨¥   ®¤¨ è £  § ¤
+        cmp     ecx,ebx
-        je      edit_box_mouse.m1_shem        ;¤¢¨¦¥¨ï ¥ ¡ë«® à ¥¥
+        je      edit_box_mouse.m1_shem  ;¤¢¨¦¥¨ï ¥ ¡ë«® à ¥¥
-        jb      edit_box_mouse.msmaller       ;¤¢¨¦¥¨¥ ¡ë«® ->
+        jb      edit_box_mouse.msmaller ;¡ë«® ¤¢¨¦¥¨¥ ->
-        cmp     ebx,eax         ;¤¢¨¦¥¨¥ ¡ë«® ¤® íâ®£® <- ¨ âãâ ¬ë ¯à®¢¥àï¥¬ á¥©ç á ªã¤  ¤¢¨¦¥¨¥ ¯à®¨áå®¤¨â
+        cmp     ebx,eax
-        ja      edit_box_mouse.m1_shem        ;¥á«¨ ¡ë«® ¤¢¨¦¥¨¥ <- â® ã¦® § ªà á¨âì ®¡« áâì
+        ja      edit_box_mouse.m1_shem  ;¡ë«® ¤¢¨¦¥¨¥ <-
+        je      edit_box_mouse.mwigvag
-        je      edit_box_mouse.mwigvag        ;¥á«¨ ¨§¬¥¥¨ï ¥ ¡ë«®, â® ¨ç¥£® ¥ ¤¥« âì
+        mov     ebp,ed_color
-        mov     ebp,ed_color    ;âãâ ã¦® ®ç¨áâ¨âì ®¡« áâì c ed_pos ed_shift_pos_old
-;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
-        call    edit_box_key.sh_cl_
+        call    edit_box_key.sh_cl_     ;®ç¨áâ¨âì ®¡« áâì c ed_pos ed_shift_pos_old
+        jmp     edit_box_mouse.mwigvag
         jmp     edit_box_mouse.mwigvag
 edit_box_mouse.msmaller:
         cmp     ebx,eax
         jb      edit_box_mouse.m1_shem
-        mov     ebp,ed_color
-;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
+        mov     ebp,ed_color
         call    edit_box_key.sh_cl_
         jmp     edit_box_mouse.mwigvag
 ;alike  =
 edit_box_mouse.m1_shem:
-        mov     ebp,shift_color
-;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
+        mov     ebp,shift_color
         mov     ebx,ecx
-        call    edit_box_key.sh_cl_
-        jmp     edit_box_mouse.mwigvag
+        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
         cmp     eax,0
-        jbe      edit_box_mouse.mwigvag
+        jbe     edit_box_mouse.mwigvag
         mov     ebx,ed_shift_pos
         mov     ebp,shift_color
         call    edit_box_key.sh_cl_
         pop     eax
         jmp     edit_box_mouse.mdraw
 edit_box_mouse.mright:
         mov     eax,ed_pos
         mov     ebx,ed_size
         cmp     eax,ebx
         jae     edit_box_mouse.mwigvag
         pop     eax
         jmp     edit_box_mouse.mdraw
+}
-macro use_work_mouse
-;----------------------------------------------------------
+macro use_work_mouse
-;---  ¥ ã¤¥à¦¨¢ ¥¬ «¨ ¬ë ª« ¢¨èã ¬ëèª¨, ¯¥à¥¬¥é ï ªãàá®à, ¢® ¢á¥ à §ë¥ áâ®à®ë?
-;----------------------------------------------------------
+; ¥ ã¤¥à¦¨¢ ¥¬ «¨ ¬ë ª« ¢¨èã ¬ëèª¨, ¯¥à¥¬¥é ï ªãàá®à?
+{
         test    word ed_flags,ed_mouse_on
-        jne     edit_box_mouse.mouse_wigwag
-;----------------------------------------------------------
+        jne     edit_box_mouse.mouse_wigwag
-;--- ¯à®¢¥àï¥¬, ¯®¯ ¤ ¥â «¨ ªãàá®à ¢ edit box -------------
-;----------------------------------------------------------
+; ¯à®¢¥àï¥¬, ¯®¯ ¤ ¥â «¨ ªãàá®à ¢ edit box
         mov     ebx,ed_top
         cmp     ax,bx
-        jl      edit_box_mouse._blur;.mouse_end_no_focus
         jl      edit_box_mouse._blur
         add     ebx,ed_height
         cmp     ax,bx
-        jg      edit_box_mouse._blur;.mouse_end_no_focus
         jg      edit_box_mouse._blur
-        shr     eax,16
         shr     eax,16
         mov     ebx,ed_left
         cmp     ax,bx
-        jl      edit_box_mouse._blur;.mouse_end_no_focus
         jl      edit_box_mouse._blur
-        add     ebx,ed_width
         add     ebx,ed_width
         cmp     ax,bx
-        jg      edit_box_mouse._blur;.mouse_end_no_focus
+        jg      edit_box_mouse._blur
-;--- ¨§¬¥ï¥¬ ¯®§¨æ¨î ªãàá®à  ---
+; ¨§¬¥ï¥¬ ¯®§¨æ¨î ªãàá®à
         push    eax
         mov     ebp,ed_color
         call    edit_box.clear_cursor
         pop     eax
 edit_box_mouse._mvpos:
         xor     edx,edx
-        sub     eax,ed_left
-        mov     ebx,6
+        sub     eax,ed_left
-        div     bx
+        div     word ed_char_width
         add     eax,ed_offset
         cmp     eax,ed_size
         jna     edit_box_mouse._mshift
-        mov     eax,ed_size
         mov     eax,ed_size
-edit_box_mouse._mshift:
-;;;;;;;
+edit_box_mouse._mshift:
-;;¥ªæ¨ï ®¡à ¡®âª¨ shift ¨ ¢ë¤¥«¥¨ï ¯® shift
-;;;;;;;
+; á¥ªæ¨ï ®¡à ¡®âª¨ shift ¨ ¢ë¤¥«¥¨ï ¯® shift
         test    word ed_flags,ed_shift_bac
         je      @f
-        mov     ebp,dword       ed_color
+        mov     ebp,ed_color
-        mov     ebx,dword ed_shift_pos
+        mov     ebx,ed_shift_pos
         push    eax
         call    edit_box_key.sh_cl_
         and     word ed_flags,ed_shift_bac_cl
         pop     eax
 @@:
         test    word ed_flags,ed_mouse_on
         jne     @f
-        mov     dword ed_shift_pos,eax
+        mov     ed_shift_pos,eax
         or      word  ed_flags,ed_mouse_on
-        mov     dword ed_pos,eax
+        mov     ed_pos,eax
-        mov     ebx,dword ed_mouse_variable
+        mov     ebx,ed_mouse_variable
         push    edi
         pop     dword [ebx]
-        bts     word ed_flags,1                 ;ãáâ ®¢ª  ä®ªãá
+        bts     word ed_flags,1
         call    edit_box.draw_bg
         jmp     edit_box_mouse.m_sh
-@@:
-        cmp     eax,dword ed_shift_pos  ;¥á«¨ ¯®§¨æ¨¨ ¥ ¨§¬¥¨«¨áì
+@@:     cmp     eax,ed_shift_pos
         je      edit_box.editbox_exit
         mov     ed_pos,eax
         call    edit_box.draw_bg
-        mov     ebp,dword shift_color
+        mov     ebp,shift_color
-        mov     ebx,dword ed_shift_pos
+        mov     ebx,ed_shift_pos
         call    edit_box_key.sh_cl_
-        or      word ed_flags,ed_mous_adn_b     ;ãáâ ®¢¨¬ ¡¨â, çâ® ¬ë ¢ë¤¥«¨«¨ +shift_on +
+        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_cursor
-;--- ¯à®æ¥¤ãà  ãáâ ®¢ª¨ ä®ªãá  ---------------------------
-;----------------------------------------------------------
+; ¯à®æ¥¤ãà  ãáâ ®¢ª¨ ä®ªãá
+        jmp     edit_box_mouse.drc
         jmp     edit_box_mouse.drc
 edit_box_mouse._blur:
         test    word ed_flags,ed_always_focus
         jne     edit_box.editbox_exit
         btr     word ed_flags,1 ; ¥á«¨ ¥ ¢ ä®ªãá¥, ¢ëå®¤¨¬
-        jnc     edit_box.editbox_exit
         jnc     edit_box.editbox_exit
         mov     ebp,ed_color
+        call    edit_box.clear_cursor
-        call    edit_box.clear_cursor
+edit_box_mouse.drc:
-edit_box_mouse.drc:   call    edit_box.draw_border
+        call    edit_box.draw_border
         jmp     edit_box.editbox_exit
-}
-;  ªà®á ¢ëå®¤
-macro edit_ex
-{
-popad
 ret
 macro debug
+{
-        ;-----------  ®â« ¤ª
-        pushad
-;        mov     dword [ed_buffer.2],0
+        ;-----------  ®â« ¤ª
-;        mov     eax,edi
+        pushad
         mov eax,dword [ed_buffer.2]
         mov edi,ed_buffer.3
         call .str
         stosb       ;§ ¯¨á âì í«¥¬¥â ¨§ à¥£¨áâà  al ¢ ïç¥©ªã ¯ ¬ïâ¨ es:edi
         ret         ;¢¥àãâìáï ®ç¥ì ¨â¥à¥áë© å®¤, â.ª. ¯®ª  ¢ áâ¥ª¥ åà ¨âáï ª®«-¢® ¢ë§®¢®¢, â® áâ®«ìª® à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
 }

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/editbox.mac – Rev 5692 → 6675