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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;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_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+40]            ;ä« £¨
+ed_flags        equ [edi+44]            ;ä« £¨
-ed_size equ [edi+44]                    ;ª®«-¢® á¨¬¢®«®¢
+ed_size equ [edi+48]                    ;ª®«-¢® á¨¬¢®«®¢
-ed_pos  equ [edi+48]                    ;¯®§¨æ¨ï ªãàá®à
+ed_pos  equ [edi+52]                    ;¯®§¨æ¨ï ªãàá®à
-ed_offset       equ [edi+52]            ;á¬¥é¥¨¥
+ed_offset       equ [edi+56]            ;á¬¥é¥¨¥
-cl_curs_x       equ [edi+56]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® å
+cl_curs_x       equ [edi+60]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® å
-cl_curs_y       equ [edi+60]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® ã
+cl_curs_y       equ [edi+64]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® ã
-ed_shift_pos    equ [edi+64]            ;¯®«®¦¥¨¥ ªãàá®à
+ed_shift_pos    equ [edi+68]            ;¯®«®¦¥¨¥ ªãàá®à
-ed_shift_pos_old equ [edi+68]           ;áâ à®¥ ¯®«®¦¥¨¥ ªãàá®à
+ed_shift_pos_old equ [edi+72]           ;áâ à®¥ ¯®«®¦¥¨¥ ªãàá®à
 ed_figure_only= 1000000000000000b   ;®¤¨ á¨¬¢®«ë
 ed_always_focus= 100000000000000b
 ed_focus=                     10b   ;ä®ªãá ¯à¨«®¦¥¨ï
         call    .draw_shift
 .draw_cursor_text:
 ;--- à¨áã¥¬ ªãàá®à ---
         ;--- ¬®¦¥â ¥£® ¥  ¤® à¨á®¢ âì ----
         test    word ed_flags,ed_focus
-        je     @f
+        jz     	@f
         call    .draw_cursor
 @@:
         call    .draw_text
 ;        ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;--- ¯à®¢¥àï¥¬ á®áâ®ï¨¥ ----------------------------------
 ;----------------------------------------------------------
         test    eax,1
         jnz     edit_box_mouse.mouse_left_button
         and     word ed_flags,ed_mouse_on_off
+	mov	ebx,dword ed_mouse_variable
+	push	0
-        xor     ebx,ebx
+	pop	dword [ebx]
-        mov     dword [mouse_flag],ebx
+;        mov     dword [ebx],ebx
         jmp     edit_box.editbox_exit
 .mouse_left_button:
 ;----------------------------------------------------------
 ;--- ¡«®ª¨à®¢ª  ®â ä®ªãá¨à®¢ª¨ ¢ ¤àã£¨å ¡®ªá å ¯à¨ ¯®¯ ¤ ¨¨   ¨å ªãàá®à
 ;----------------------------------------------------------
-        mov     eax,dword [mouse_flag]
+        mov     eax,dword ed_mouse_variable
+	push	dword [eax]
+	pop	eax
         test    eax,eax
         jz      @f
         cmp     eax,edi
         je      @f
         jmp     edit_box_mouse._blur
         jae     edit_box_key.sh_n
         push    eax  ;¬¥ìè¥¥ ¢ eax
         push    ebx  ;¡®«ìè¥¥
         jmp     edit_box_key.sh_n1
                      ;¥á«¨ ¨ ç¥
-edit_box_key.sh_n:  push    ebx
+edit_box_key.sh_n:
+	push    ebx
         push    eax
 edit_box_key.sh_n1:
         call    edit_box.check_offset
         call    edit_box.get_n
         mov     edx,eax ;size of ed_box
         ;--------
         lodsb
         stosb
         ;--------
         loop    @b
-edit_box_key.In_k:  cld
+edit_box_key.In_k:
+	cld
         pop eax
         mov al,ah
         stosb
         pop edi
 ; ¢áâ ¢«ï¥¬ ª®¤ ª« ¢¨è¨ âã¤ , £¤¥ ªãàá®à
         mov     ebp,ed_size
         call    edit_box_key.clear_bg
         ret
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;---  ¦ â  ª« ¢¨è  left ---
+edit_box_key.left:
-edit_box_key.left:  mov     ebx,ed_pos
+	mov     ebx,ed_pos
         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_key.sh_enable
         jmp     edit_box.draw_cursor_text
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;---  ¦ â  ª« ¢¨è  right ---
-edit_box_key.right: mov     ebx,ed_pos
+edit_box_key.right:
+	mov     ebx,ed_pos
         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
         jne     @f
         mov     dword ed_shift_pos,eax
         or      word  ed_flags,ed_mouse_on
+        mov     dword ed_pos,eax
-        mov     dword ed_pos,eax
+;        mov     dword [mouse_flag],edi          ;ãáâ ®¢¨¬ ¨¤¥â¨ä¨ª â®à
+       	mov	ebx,dword ed_mouse_variable
+	push	edi
+	pop	dword [ebx]
         mov     dword [mouse_flag],edi          ;ãáâ ®¢¨¬ ¨¤¥â¨ä¨ª â®à
         bts     word ed_flags,1                 ;ãáâ ®¢ª  ä®ªãá
         jmp     edit_box_mouse.m_sh
 @@:
         cmp     eax,dword ed_shift_pos  ;¥á«¨ ¯®§¨æ¨¨ ¥ ¨§¬¥¨«¨áì
         je      edit_box.editbox_exit
         mov     ed_pos,eax
         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 +
-        or      word ed_flags,ed_mous_adn_b     ;ãáâ ®¢¨¬ ¡¨â çâ® ¬ë ¢ë¤¥«¨«¨ +shift_on +
+edit_box_mouse.m_sh:
-edit_box_mouse.m_sh:  call    edit_box.draw_text
+	call    edit_box.draw_text
         call    edit_box.draw_cursor
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ãáâ ®¢ª¨ ä®ªãá  ---------------------------
 ;----------------------------------------------------------
 ed_mous_adn_b=         100011000b
 ed_mouse_on_off=1111111011111111b
 ed_height=24 ; ¢ëá®â
+}
-ed_struc_size=72
+ed_struc_size=76
 struc  edit_box width,left,top,color,shift_color,focus_border_color,\
-       blur_border_color,text_color,max,text,flags,size,pos
+       blur_border_color,text_color,max,text,mouse_variable,flags,size,pos
+{
 .width dd width
 .left dd left
 .top dd top
 .focus_border_color dd focus_border_color
 .blur_border_color dd blur_border_color
 .text_color dd text_color
 .max dd max
 .text dd text
+.mouse_variable dd mouse_variable
 .flags dd flags+0
 .size dd size+0
 .pos dd pos+0
 .offset dd 0
 .cl_curs_x dd 0

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/editbox.mac – Rev 1113 → 1214