WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 396 and /programs/ Rev 395

Regard whitespace Rev 396 → Rev 395

 /programs/develop/examples/editbox/trunk/EDITBOX.INC
 ,4 → 1,3
-; <Lrz> 07.03.2007 ®¯¨á « ã¯à ¢«¥¨¥ á shift home + end ãá¯à ¢¨« ¥áª®«ìª® ¡ £®¢
 ; <Lrz> 06.03.2007 ¥à¥¯¨á « ¯®«®áâìî  «£®à¨â¬ ã¯à ¢«¥¨ï shift
 ; <Lrz> 15.02.2007 ã«ãçè¥¨¥ áïâ¨ï ¢ë¤¥«¥¨ï ¨ ¯¥à¥à¨á®¢ª¨ ®ç¨é ¥¬®© ®¡« áâ¨, § ç¨â¥«ì® ¯à¨ïâ¥¥ à ¡®â ¥â ª®¬¯®¥â
 ; <Lrz> 13.02.2007 ã¡à « ¯® ¢®§¬®¦®áâ¨ ¬¥àæ ¨¥, ã«ãçè¥  ®¡à ¡®âª  ¯¥à¥à¨á®¢ª¨ ä®
 ,8 → 69,8
 ed_offset       equ [edi+46]            ;á¬¥é¥¨¥
 cl_curs_x       equ [edi+50]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® å
 cl_curs_y       equ [edi+54]            ;¯à¥¤ë¤ãé¥¥ ª®®à¤¨ â  ªãàá®à  ¯® ã
-ed_shift_pos    equ [edi+58]            ;¯®«®¦¥¨¥ ªãàá®à
-ed_shift_pos_old equ [edi+62]           ;áâ à®¥ ¯®«®¦¥¨¥ ªãàá®à
+ed_shift_pos    equ [edi+58]
+ed_shift_pos_old equ [edi+62]
 ;==========================================================
 ;=== ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ =================================
 ;==========================================================
 ,6 → 93,26
         call    .draw_text
 popa
 ret
+;.str:
+;       mov ecx,0x0a ;§ ¤ ¥âáï á¨áâ¥¬  áç¨á«¥¨ï ¨§¬¥ïîâáï à¥£¨áâàë ebx,eax,ecx,edx ¢å®¤ë¥ ¯ à ¬¥âàë eax - ç¨á«®
+;        ;¯à¥à¥¢®¤ ç¨á«  ¢ ASCII áâà®ªã ¢§®¤ë¥ ¤ ë¥ ecx=á¨áâ¥¬  áç¨á«¥ï edi  ¤à¥á ªã¤  § ¯¨áë¢ âì, ¡ã¤¥¬ áâà®ªã, ¯à¨ç¥¬ ª®¥æ ¯¥à¥¬¥®©
+;       cmp eax,ecx  ;áà ¢¨âì ¥á«¨ ¢ eax ¬¥ìè¥ ç¥¬ ¢ ecx â® ¯¥à¥©â¨   @@-1 â.¥.   pop eax
+;       jb @f
+;       xor edx,edx  ;®ç¨áâ¨âì edx
+;       div ecx      ;à §¤¥«¨âì - ®áâ â®ª ¢ edx
+;       push edx     ;¯®«®¦¨âì ¢ áâ¥ª
+;       ;dec edi             ;á¬¥é¥¨¥ ¥®¡å®¤¨¬®¥ ¤«ï § ¯¨á¨ á ª®æ  áâà®ª¨
+;       call .str;¯¥à¥©â¨   á ¬ã á¥¡ï â.¥. ¢ë§¢ âì á ¬ã á¥¡ï ¨ â ª ¤® â®£® ¬®¬¥â  ¯®ª  ¢ eax ¥ áâ ¥â ¬¥ìè¥ ç¥¬ ¢ ecx
+;       pop eax
+;       @@: ;cmp al,10 ;¯à®¢¥à¨âì ¥ ¬¥ìè¥ «¨ § ç¥¨¥ ¢ al ç¥¬ 10 (¤«ï á¨áâ¥¬ë áç¨á«¥ï 10 ¤  ï ª®¬ ¤  - «¨è ï))
+;       ;sbb al,$69  ;- ç¥áâ® ¤  ï ¨áâàãªæ¨ï ¬¥ï § áâ ¢«ï¥â § ¤ã¬ âìáï â.¥. ï ¥ § î ª ª íâ® à ¡®â ¥â
+;       ;das        ;¯®á«¥ ¤ ®© ª®¬ ¤ë ª ª ¡ë ¯à®¨áå®¤¨â ã¬¥ìè¥¨¥ al   66h  (¢ ª¨£¥  ¯¨á ® ¤àã£®¥)
+;       or al,0x30  ;¤  ï ª®¬ ¤  ª®à®ç¥  ç¥¬ ¤¢¥ ¢ëè¥
+;       stosb       ;§ ¯¨á âì í«¥¬¥â ¨§ à¥£¨áâà  al ¢ ïç¥ªã ¯ ¬ïâ¨ es:edi
+ ;
+;       ret         ;¢¥àãâìáï ç¥ì ¨â¥à¥áë© å®¤ â.ª. ¯®ª  ¢ áâ¥ª¥ åà ¨âìáï ª®«-¢® ¢ë§®¢®¢ â® áâ®«ìª® à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  ¯à®à¨á®¢ª¨ â¥ªáâ  --------------------------
 ;----------------------------------------------------------
 ,6 → 172,7
         mov     ebx,6           ;§ £àã§¬¨ ¤¥«¨â¥«ì
         div     ebx             ;à §¬¤¥«¨¬   6
 ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  à¨á®¢ ¨ï ªãàá®à  --------------------------
 ;----------------------------------------------------------
 ,7 → 183,9
         mov     ecx,cl_curs_y
         jmp     .draw_curs
 .draw_cursor:
         mov     edx,ed_text_color
+;@@:
         mov     ebx,ed_pos
         mov     ecx,ed_offset
         sub     ebx,ecx
 ,12 → 212,13
         mov     eax,38
         int     0x40
 ret
 ;----------------------------------------------------------
 ;--- ¯à®æ¥¤ãà  à¨á®¢ ¨ï à ¬ª¨ ----------------------------
 ;----------------------------------------------------------
 .draw_border:
 ;--- æ¢¥â à ¬ª¨ ---
-        test    word ed_flags,ed_focus
+        test    dword ed_flags,ed_focus
         mov     edx,ed_focus_border_color
         jne     @f
         mov     edx,ed_blur_border_color
 ,11 → 303,11
 .add_8: add     ebx,edx
 .chk_d: mov     ed_offset,ebx
         call    .draw_bg
-        and     word ed_flags,ed_offset_cl
+        ;mov    dword [esp+28],-1
 popa
         ret
 @@:
-        or      word ed_flags,ed_offset_fl
+        mov     dword [esp+28],0
 popa
         ret
 ;==========================================================
 ,6 → 327,7
         test    al,0x03
         je      @f
         or      word ed_flags,ed_shift   ;ãáâ ®¢¨¬ ä« £
 @@:     pop     eax   ;¢®ááâ ®¢¨¬ áç¨â ë© á¨¬¢®« á ª« ¢¨ âãàë
 ;----------------------------------------------------------
 ;--- ¯à®¢¥àï¥¬, çâ®  ¦ â® --------------------------------
 ,23 → 362,29
         jb      .no_figure
         cmp     ah,'9'
         ja      .no_figure
 ;¯à®¢¥àª    shift
 @@:     test    word ed_flags,ed_shift_on
         je      @f
         ;å®¤ë¥ ¤ ë¥ edx=ed_size;ecx=ed_pos
         push    eax
         mov     edx,ed_size
         mov     ecx,ed_pos
         pusha
+        ;cmp    edx,ecx
+        ;jne    .sh_cl
 ;clear
         mov     ebp,edx ;ed_size
         call    .clear_bg
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_
 .sh_nxt:popa
         call    .del_char
 ;;;;
         mov     eax,dword ed_shift_pos
         mov     ebx,ed_size
 ,6 → 391,7
         sub     ebx,eax
         mov     ed_size,ebx
         pop     eax
         ; ¯à®¢¥àï¥¬,  å®¤¨âáï «¨ ªãàá®à ¢ ª®æ¥
 @@:     mov     ecx,ed_size
         mov     edx, ed_max
 ,7 → 512,9
         call    .clear_cursor
         call    .check_offset
         call    .draw_bg
         ret
 @@:     dec      dword ed_size
 .draw_all2:
 ,6 → 525,7
         mov     ebp,ed_size
         call    .clear_bg
         ret
+        ;jmp    .shift
 ;---  ¦ â  ª« ¢¨è  left ---
 .left:  mov     ebx,ed_pos
         test    ebx,ebx
 ,7 → 557,6
         mov     ebx,ed_pos
         cmp     ebx,dword ed_size
         je      .sh_st_of
-        call    .sh_first_sh
         mov     eax,ed_size
         mov     ed_pos,eax
         call    .sh_home_end
 ,7 → 568,6
 @@:     mov     ebp,shift_color
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_
         jmp     .draw_cursor_text
 ;;;;;;;;;;;;;;;;;;;;;
 ,9 → 579,9
 ;;;;;;SHIFT end
 ;®¡à ¡®âª  ®ç¨áâª¨, ¯à¨ «¥¢®¬ - ¯à ¢®¬ ¤¢¨¦¥¨¨ ¢ë¤¥«¥¨ï
 ;¤«ï ®¡à ¡®âª¨ áïâ¨ï ¢ë¤¥«¥¨ï
-;¢å®¤ë¥ ¯ à ¬¥âàë ebp=color ebx=ed_shift_pos
+;       or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         mov     eax,dword       ed_pos
-;       mov     ebx,dword       ed_shift_pos
+        mov     ebx,dword       ed_shift_pos
         cmp     eax,ebx
         jae     .sh_n
         push    eax  ;¬¥ìè¥¥ ¢ eax
 ,8 → 592,11
         push    eax
 .sh_n1:
         call    .check_offset
+;       test    eax,eax
+;       jz      .drw_sim
         call    .get_n
         mov     edx,eax ;size of ed_box
+;       push    eax
         mov     ecx,ed_offset
         add     eax,ecx ;eax = w_off= ed_offset+width
         mov     edx,eax ;save
 ,6 → 613,7
 @@:     mov     ebx,edx
         sub     ebx,ecx
         jmp     .nxt_f
 .f_f:
         sub     eax,ecx
         cmp     edx,ebx         ;cà ¢¨¬ à §¬¥à w_off á ¡®«ìè¨¬
 ,7 → 639,9
         mov     edx,ebp;shift_color
         call    .draw_bg_eax
-@@:     call    .enable_null
+@@:     ;and    word ed_flags,1111111111111011b
+        call    .enable_null
+        ;mov    dword   ed_shift_pos,0
         ret
 ;;;;;;;;;;;;;;;;;;;;;
 ;áâ ®¢ª - áïâ¨¥ ¢ë¤¥«¥¨ï ¢ ®¤¨ á¨¬¢®«
 ,6 → 651,8
         call    .draw_rectangle   ; à¨á®¢ âì ¯àï¬®ã£®«ì¨ª á § ¤ ë¬ æ¢¥â®¬
         jmp     @b
 ;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;
 ;ãªæ¨ï ãáâ ®¢ª¨ ¢ë¤¥«¥¨ï ¯à¨ ¤¢¨¦¥¨ï ¢«¥¢® ¨ ¢¯à ¢® ¨  ¦ â¨¨ shift
 ;®£¨ª :
 ;;;;;;;;;;
 ,8 → 664,11
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         mov     ebp,shift_color
         mov     eax,dword       ed_pos
+        ;mov    ebx,dword       ed_shift_pos
         test    word ed_flags,ed_left_fl
         jz      .low
+;       sub     eax,2
+        ;dec    eax
         jmp     @f
 ;;;;;;;;;;
 ;ãªæ¨ï ã¤ «¥¨ï ¢ë¤¥«¥¨ï ¯à¨ ¤¢¨¦¥¨ï ¢«¥¢® ¨ ¢¯à ¢® ¨  ¦ â¨¨ shift
 ,6 → 681,7
         mov     ebp,ed_color
         mov     eax,dword       ed_pos
+        ;mov    ebx,dword       ed_shift_pos
         test    word ed_flags,ed_left_fl
         jz      .low
         ;dec    eax
 ,6 → 699,7
         mov     dword ed_shift_pos,ebx
         or      word ed_flags,ed_shift_on
 @@:     ret
 ;¡à ¡®âª  ªà ©¨å ¯®«®¦¥¨© ¢ editbox ¯à¨  ¦ â®¬ shift
 ;¯à®¨§¢®¤¨â áïâ¨¥ ¢ë¤¥«¥¨¥, ¥á«¨ ¥â shift
 ;¨ ç¥ ¢®®¡é¥ ¢ëå®¤¨â
 ,11 → 709,32
         test    word ed_flags,ed_shift_bac
         je      @f
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_  ;®ç¨áâª  ¢ë¤¥«¥®£® äà £¬¥â
+        call    .draw_wigwag_cl
         and     word ed_flags,ed_shift_cl ; ®ç¨áâª  ®â â®£® çâ® ã¡à «¨ ¢ë¤¥«¥¨¥
         jmp     .draw_cursor_text
 @@:
+        ;-----------  ®â« ¤ª
+;       pushad
+;       mov     dword [ed_buffer.3],0
+;       mov eax,ebx;word ed_flags
+;       mov edi,ed_buffer.3
+;       call .str
+;       ;à¨á®¢ ¨¥ ä®
+;       mov eax,13
+;       mov ebx,178*65536+70
+;       mov ecx,28*65536+10
+;       xor edx,edx
+;       int 0x40
+;       ;¢ë¢®¤ § ç¥¨ï   íªà
+;       mov eax,4
+;       mov ebx,180*65536+30
+;       mov ecx,0x10DDBBCC
+;       mov edx,ed_buffer.3
+;       mov esi,8
+;       int 0x40
+;       popad
+        ;----------- ®â« ¤ª
         and     word ed_flags,ed_shift_off
         popa
         ret
 ,7 → 749,6
         call    .check_offset
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_  ;®ç¨áâª  ¢ë¤¥«¥®£® äà £¬¥â
         call    .draw_wigwag_cl
         and     word ed_flags,ed_shift_cl ; 1¢ à ¥ ã¦®
 ,8 → 760,8
         ret
 .sh_ext_en:
         call    .check_offset
-        test    word ed_flags,ed_offset_fl
-        jne     @f
+        test    eax,eax
+        jnz     @f
 ;¨á®¢ ¨¥ § ªà è¥ëå ¯àï¬®ã£®«ì¨ª®¢ ¨ ®ç¨áâª  ¨å
         mov     eax,dword       ed_shift_pos
         mov     ebx,dword       ed_pos
 ,7 → 784,6
 .sh_e_end:      and     word ed_flags,ed_shift_off
         ret
 @@:     mov     ebp,shift_color
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_
         jmp     .sh_e_end
 ;äãªæ¨ï ¤«ï ®¡à ¡®âª¨ shift ¯à¨  ¦ â¨¨ home and end
 ,18 → 793,29
         test    word ed_flags,ed_shift_bac
         je      @f
         mov     ebp,ed_color
-        mov     ebx,dword       ed_shift_pos_old
         call    .sh_cl_
 @@:     test    word ed_flags,ed_shift
         je      .sh_exit_ ; à¨á®¢ âì § ªà è¥ë© ¯àï¬®ã£®«ì¨ª (®¡« áâì)
+        call    .check_offset
         mov     ebp,shift_color
-        mov     ebx,dword       ed_shift_pos
         call    .sh_cl_
         or      word ed_flags,ed_shift_bac ;ãáâ ®¢ª  ä« £ , ¢ë¤¥«¥®© ®¡« áâ¨
         jmp     .sh_e_end
-.sh_exit_:      call    .check_offset
-        ret
+.sh_exit_:      ret
+;       test    word ed_flags,ed_shift_bac
+;        je      @f
 ;äãªæ¨ï ¢¥á¥¨ï 0 ¯®  ¤à¥áã ed_size+1
 .enable_null:
         pusha
 ,6 → 827,7
         mov     [eax],bl
         popa
         ret
 ;- ã¤ «¥¨¥ á¨¬¢®«
 ;å®¤ë¥ ¤ ë¥ edx=ed_size;ecx=ed_pos
 .del_char:
 ,6 → 876,7
         pop edi
         ret
 ;¢ëç¨á«¨âì § ªà è¨¢ ¥¬ãî ®¡« áâì
 ;á®£« è¥¨¥ ¢ ebp - ¯¥à¥¤ ¥âáï ed_size
 .clear_bg:
 ,6 → 930,7
 ;eax=dword ed_pos
 ;ebp=-æ¢¥â ed_color or shift_color
 .draw_rectangle:
+;        mov    eax,dword ed_pos
         mov     ecx,dword ed_offset
         sub     eax,ecx
         lea     ebx,[eax*2+eax]
 ,6 → 1014,8
         jc      @f
         call    .draw_cursor
         jmp     .drc
 ._blur:
         test    word ed_flags,ed_always_focus
         jne     @f
 ,9 → 1042,9
 ;popa
 ;ret
 }
-ed_figure_only= 1000000000000000b   ;®¤¨ á¨¬¢®«ë
+ed_figure_only= 1000000000000000b
 ed_always_focus= 100000000000000b
-ed_focus=                     10b   ;ä®ªãá ¯à¨«®¦¥¨ï
+ed_focus=10b
 ed_shift_on=                1000b   ;¥á«¨ ¥ ãáâ ®¢«¥ -§ ç¨â ¢¯¥à¢ë¥  ¦ â shift,¥á«¨ ¡ë« ãáâ ®¢«¥, § ç¨â ¬ë ã¦¥ çâ® - â® ¤¥« «¨ ã¤¥à¦¨¢ ï shift
 ed_shift=                    100b   ;¢ª«îç ¥âáï ¯à¨  ¦ â¨¨   shift â.¥. ¥á«¨  ¦¨¬ î
 ed_shift_off=   1111111111111011b
 ,8 → 1052,6
 ed_shift_cl=    1111111111100011b
 ed_left_fl=               100000b
 ed_right_fl=    1111111111011111b
-ed_offset_fl=            1000000b
-ed_offset_cl=   1111111110111111b
 ed_insert=              10000000b
 ed_insert_cl=   1111111101111111b
 ed_height=14 ; ¢ëá®â
 ,15 → 1081,13
         mov     edi,start
         mov     ecx,((end-start)/ed_struc_size)
 @@:
-;       push    eax
         call    edit_box.key
-;       pop     eax
         add     edi,ed_struc_size
         loop    @b
 }
 ed_struc_size=66
 struc  edit_box width,left,top,color,focus_border_color,\
-       blur_border_color,text_color,max,text,flags
+       blur_border_color,text_color,max,text,flags,size
 {
 .width dd width
 .left dd left
 ,7 → 1099,7
 .max dd max
 .text dd text
 .flags dw flags+0
-.size dd 0
+.size dd size+0
 .pos dd 0
 .offset dd 0
 .cl_curs_x dd 0

 /programs/develop/examples/editbox/trunk/editbox.asm
 ,22 → 81,22
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 ;DATA ¤ ë¥
 editboxes:
-edit1 edit_box 168,5,10,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only
-edit2 edit_box 168,5,30,0xffffff,0,0,0,512,ed_buffer.1,ed_focus
+edit1 edit_box 168,5,30,0xffffff,0,0,0,512,ed_buffer.1,ed_focus
+edit2 edit_box 168,5,10,0xffffff,0,0,0,99,ed_buffer.2,ed_figure_only
 edit3 edit_box 35,5,50,0xffffff,0,0,0,9,ed_buffer.3,ed_figure_only
 edit4 edit_box 16,5,70,0xffffff,0,0,0,1,ed_buffer.4,ed_figure_only
 editboxes_end:
-data_of_code dd 0
+;data_of_code dd 0
 ed_buffer:
-.1: rb 514;256
-.2: rb 101
-.3: rb 11
-.4: rb 3
-;¤¢  § ¯ áëå ¡ ©â  ¥®¡å®¤¨¬ë ¤«ï â®£® çâ® ¡ë ¥ ¯¥¯¥à¥¯¨á âì á«¥¤ãîé¨¥© ¡ ©âë, ¢ ª®æ¥ ¡ãä¥à  0
+.1: rb 513;256
+.2: rb 100
+.3: rb 10
+.4: rb 2
 ;text_b: db '®«-¢® á¨¬¢®«®¢'
 ;buffer: dd 0
 buffer_end:
-hed db   'EDITBOX optimization and retype <Lrz> date 07.03.2007',0
+hed db   'EDITBOX optimization and retype <Lrz> date 06.03.2007',0
 i_end1:
 rb 1024
-i_end:
+i_end:
+keymap:

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 396 → Rev 395