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

 .draw:
         pushad
 .draw_1:
 ;--- à¨áã¥¬ à ¬ªã ---
         mov     edi,dword [esp+36]
-        call    .draw_border            ; ãªæ¨ï áâ ¡¨«ì
+        call    .draw_border
 .draw_bg_cursor_text:
 ;--- ¨§¬¥ï¥¬ á¬¥é¥¨¥, ¥á«¨  ¤® ---
-        call    .check_offset           ;¢ëç¨á«¥¨¥ ¯®§¨æ¨¨ ªãàá®à  áâ ¡¨«ì
+        call    .check_offset
 ;--- à¨áã¥¬ ¢ãâà¥îî ®¡« áâì ---
-        call    .draw_bg                ; à¨á®¢ âì ¯àï¬®ã£®«ì¨ª à ¡®ç¥© ®¡« áâ¨
+        call    .draw_bg
-;---- à¨áã¥¬ ¢ë¤¥«¥¨¥, ¯® shift ¥á«¨ ¥áâì
+;--- à¨áã¥¬ ¢ë¤¥«¥¨¥, ¯® shift ¥á«¨ ¥áâì ---
         call    .draw_shift
 .draw_cursor_text:
+        call    .draw_text
 ;--- à¨áã¥¬ ªãàá®à ---
-        ;--- ¬®¦¥â ¥£® ¥  ¤® à¨á®¢ âì ----
+        ;--- ¬®¦¥â ¥£® ¥  ¤® à¨á®¢ âì ---
         test    word ed_flags,ed_focus
-        jz      @f
+        jz      .editbox_exit
         call    .draw_cursor
-@@:
-        call    .draw_text
-;        ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;¡é¨© ¢ëå®¤ ¨§ editbox ¤«ï ¢á¥å äãªæ¨© ¨ ¯®áâ ®¡à ¡®âç¨ª®¢;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 .editbox_exit:
         popad
 ; ªà®á ¤«ï ¢ë¢®¤  ®á®¢ëå äãªæ¨© ª®â®àë¥ ¨á¯®«ì§ãîâáï ¡®ªá®¬
 macro use_general_func
+{
 ;debug_func
 ;----------------------------------------------------------
-;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ¢ë¤¥«¥®© ç áâ¨ -----------------
+;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ ¢ë¤¥«¥®© ç áâ¨ ----------------
 ;----------------------------------------------------------
 edit_box.draw_shift:
         test    word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         jz      @f
         mov     ebp,shift_color
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ â¥ªáâ  --------------------------
 ;----------------------------------------------------------
 edit_box.draw_text:
 ;--- ¢ëç¨á«ï¥¬, áª®«ìª® ¯®¬¥é ¥âáï á¨¬¢®«®¢ ---
-;--- çâ®¡ë ¬ãá®à ¥ à¨á®¢ âì ---
         call    edit_box.get_n
         mov     esi,ed_size
         mov     ebx,ed_offset
         sub     esi,ebx
         cmp     eax,esi
         jae     @F
-        mov     esi,eax         ;çâ®¡ë ¥ ¢ëå®¤¨âì §  ¯à¥¤¥«ë íªà
+        mov     esi,eax
 ;--- à¨áã¥¬ â¥ªáâ ---
 @@:     mov     eax,4
         mov     ebx,ed_left
         mov     edx,ed_offset
         add     ebx,2
         add     ebx,ed_top
         mov     ecx,ed_text_color
         add     ebx,4
         add     edx,ed_text
-                test    word ed_flags,ed_pass
+        test    word ed_flags,ed_pass
-                jz      @f
-                call    edit_box.draw_password
+        jnz     edit_box.draw_password
-                jmp     .end_f
-@@:
         mcall
-.end_f:
-ret
+        ret
 txt_pass db '*',0
 proc edit_box.draw_password
 locals
         s_len dw ? ;¤«¨  ¢ë¢®¤¨¬®£® â¥ªáâ
 endl
         cmp esi,1
 macro use_key_func
+{
 ;¡à ¡®âª  Shift ¤«ï áïâ¨ï ¢ë¤¥«¥¨ï ¥¨§¢¥áâ®© ®¡« áâ¨
+edit_box_key.shift: ;;;;;;;SHIFT
-edit_box_key.shift: ;;;;;;;SHIFT
+        call    edit_box.draw_bg
         test    word ed_flags,ed_shift
         je      edit_box_key.f_exit
-@@:     mov     ebp,shift_color
+        mov     ebp,shift_color
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         mov     ebx,dword       ed_shift_pos
         call    edit_box_key.sh_cl_
 edit_box_key.sh_st_of:
         test    word ed_flags,ed_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
         call    edit_box_key.sh_cl_  ;®ç¨áâª  ¢ë¤¥«¥®£® äà £¬¥â
         and     word ed_flags,ed_shift_cl ; ®ç¨áâª  ®â â®£®, çâ® ã¡à «¨ ¢ë¤¥«¥¨¥
         jmp     edit_box.draw_cursor_text
         test    ebx,ebx
         jz      edit_box_key.sh_st_of
         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_key.sh_enable
         jmp     edit_box.draw_cursor_text
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;---  ¦ â  ª« ¢¨è  right ---
 edit_box_key.right:
         cmp     ebx,ed_size
         je      edit_box_key.sh_st_of
         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_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
         xor     eax,eax
         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.end:
         mov     ebx,ed_pos
         cmp     ebx,dword 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
+{
 ;----------------------------------------------------------
 ;--- ¡à ¡®âª  .mouse_wigwag
 ;----------------------------------------------------------
 edit_box_mouse.mouse_wigwag:
+        push    eax
+        call    edit_box.draw_bg
+        call    edit_box.draw_shift
+        pop     eax
         shr     eax,16
         or      word ed_flags,ed_shift_bac+ed_shift_on+ed_shift
 ;;;;;;;;;;;;;;;;;;
 ;;¯à®æ¥¤ãà  ®¡à ¡®âª¨ ¯®«®¦¥¨ï ¢ë¤¥«¥®£® â¥ªáâ , ª®£¤  ¯à®¨áå®¤¨â ¢ëå®¤ §  ¯à¥¤¥«ë editbox
 ;;;;;;;;;;;;;;;;;;
         call    edit_box_key.sh_cl_
         jmp     edit_box_mouse.mwigvag
 edit_box_mouse.mwigvag:
         and     word ed_flags,ed_shift_mcl
         jmp     edit_box.draw_cursor_text
-;       popa
-;       ret
 edit_box_mouse.mleft:
         mov     eax,ed_pos
         cmp     eax,0
         jbe      edit_box_mouse.mwigvag
         dec     eax
         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
         or      word  ed_flags,ed_mouse_on
         mov     dword ed_pos,eax
-;        mov     dword [mouse_flag],edi          ;ãáâ ®¢¨¬ ¨¤¥â¨ä¨ª â®à
         mov     ebx,dword ed_mouse_variable
         push    edi
         pop     dword [ebx]
         bts     word ed_flags,1                 ;ãáâ ®¢ª  ä®ªãá
+        call    edit_box.draw_bg
         jmp     edit_box_mouse.m_sh
 @@:
         cmp     eax,dword ed_shift_pos  ;¥á«¨ ¯®§¨æ¨¨ ¥ ¨§¬¥¨«¨áì
         je      edit_box.editbox_exit
         mov     ed_pos,eax
+        call    edit_box.draw_bg
         mov     ebp,dword shift_color
         mov     ebx,dword ed_shift_pos
         call    edit_box_key.sh_cl_
         or      word ed_flags,ed_mous_adn_b     ;ãáâ ®¢¨¬ ¡¨â, çâ® ¬ë ¢ë¤¥«¨«¨ +shift_on +
 edit_box_mouse.m_sh:

Subversion Repositories Kolibri OS

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