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

 ; ¬ ªà®á ¤«ï á¨áâ¥¬®© ¡¨¡«¨®â¥ª¨ box_lib.obj
 ; í«¥¬¥â TextEditor ¤«ï Kolibri OS
-; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 05.05.2010 IgorA
+; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 17.05.2010 IgorA
 ;   ª®¤ ¯à¨¬¥¥  GPL2 «¨æ¥§¨ï
 ;input:
 ; edi = pointer to tedit struct
   tc dd ?   ; +10 ¢à¥¬. á®§¤ ¨ï
   td dd ?   ; +14 ¢à¥¬. ã¤ «¥¨ï
 ends
 ;------------------------------------------------------------------------------
-ted_symbol_tab db 26
+ted_symbol_tab db 26 ;ascii ª®¤ áâà¥«ª¨ ¢¯à ¢®, ¨á¯®«ì§ã¥âáï ¤«ï à¨á®¢ ¨ï â ¡ã«ïæ¨¨ ¢ à¥¦¨¬¥ ¯®ª §  ¥¢¨¤¨¬ëå á¨¬¢®«®¢
 if lang eq ru
 txtOtm db 'Undo',0
 txtBuf db 'Buffer:',0
-end if
+end if
-;------
+;EvChar - â ¡«¨æ  ¤«ï ä¨«ìâà®¢ ¨ï ¤®¡ ¢«ï¥¬ëå á¨¬¢®«®¢, çâ®-¡ë ¥ ¯®¯ «¨ «¨è¨¥ § ª¨
 align 4
 EvChar db 0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+;EvUpper - â ¡«¨æ  ¤«ï ¯à¥®¡à §®¢ ¨ï á¨¬¢®«®¢ ª ¢¥àå¥¬ã à¥£¨áâàã
 EvUpper db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    db 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159
-    db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    db 0,240,0,242,0,244,0,246,0,0,0,0,0,0,0,0
+;EvLover - â ¡«¨æ  ¤«ï ¯à¥®¡à §®¢ ¨ï á¨¬¢®«®¢ ª ¨¦¥¬ã à¥£¨áâàã
 EvLover db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111
     db 112,113,114,115,116,117,118,119,120,121,122,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175
+    db 224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
     db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-    db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    db 241,0,243,0,245,0,247,0,0,0,0,0,0,0,0,0
 conv_table dd 0
 	ret
 endp
 align 4
 proc ted_delete, edit:dword
-  push ecx edi
+	push edi
-  mov edi,dword[edit]
-  mov ecx,ted_tex
+	mov edi,dword[edit]
-  call mem_Free
+	stdcall mem_Free,ted_tex
-  mov ecx,ted_arr_key_pos ;ted_syntax_file
-  call mem_Free
+	stdcall mem_Free,ted_arr_key_pos ;ted_syntax_file
-  pop edi ecx
+	pop edi
-  ret
+	ret
 endp
-  mov ted_tim_ch,0
+	mov ted_tim_ch,0
-  mov ted_tim_ls,0
+	mov ted_tim_ls,0
-  mov ted_tim_co,0
+	mov ted_tim_co,0
-  mov ted_tim_undo,0
+	mov ted_tim_undo,0
-  mov ted_help_id,-1
+	mov ted_help_id,-1
+	mov ecx,sizeof.symbol
+	shl ecx,1
+	add ecx,ted_tex
+	mov ted_ptr_free_symb,ecx
-  mov ecx,ted_scr_w
+	mov ecx,ted_scr_w
-  mov dword[ecx+sb_offs_position],0
+	mov dword[ecx+sb_offs_position],0
-  mov dword[ecx+sb_offs_max_area],100 ;ç¨á«® áâà®ª ¢¨¤¨¬ëå ¢ ®¢®¬ ¤®ªã¬¥â¥
+	mov dword[ecx+sb_offs_max_area],100 ;ç¨á«® áâà®ª ¢¨¤¨¬ëå ¢ ®¢®¬ ¤®ªã¬¥â¥
 			call ted_get_num_lines
 			sub dword[new_lin],eax
 		pop eax
 	@@:
-  mov edx,sizeof.symbol
-  shl edx,1
-  add edx,ted_tex
+	mov edx,ted_ptr_free_symb
-  @@: ;for(i=2;i
+	.beg_cycle: ;for(i=...;i
-    cmp dword [edx+10],0 ;if(!tex[i].tc && !tex[i].td)
+		cmp dword [edx+10],0 ;if(!tex[i].tc && !tex[i].td)
-    jne .u1f
+		jne .u1f
-    cmp dword [edx+14],0
+		cmp dword [edx+14],0
-    jne .u1f
+		jne .u1f
-      add ecx,ted_tex ; *** ecx = tex[po_t] ***
+			add ecx,ted_tex ; *** ecx = tex[po_t] ***
-      add ecx,6   ; *** ecx = tex[po_t].next ***
+			add ecx,6   ; *** ecx = tex[po_t].next ***
-      m2m dword [edx+6],dword [ecx] ;tex[i].next=tex[po_t].next;
+			m2m dword [edx+6],dword [ecx] ;tex[i].next=tex[po_t].next;
-      call ted_get_text_arr_index ;*** eax = i ***
-      cmp eax,ted_max_chars
-      jge @f
+			call ted_get_text_arr_index ;*** eax = i ***
-      mov [ecx],eax ;tex[po_t].next=i; // ááë«ª¨ ¯¥à¥ ¯à ¢«ï¥¬
+			mov [ecx],eax ;tex[po_t].next=i; // ááë«ª¨ ¯¥à¥ ¯à ¢«ï¥¬
-      mov ecx,[edx+6] ; *** ecx = tex[i].next ***
+			mov ecx,[edx+6] ; *** ecx = tex[i].next ***
-      imul ecx,sizeof.symbol
+			imul ecx,sizeof.symbol
-      add ecx,ted_tex ; *** ecx = tex[tex[i].next] ***
+			add ecx,ted_tex ; *** ecx = tex[tex[i].next] ***
-    .u1f:
+		.u1f:
-    add edx,sizeof.symbol
+		add edx,sizeof.symbol
-    cmp edx,ted_tex_end
+		cmp edx,ted_tex_end
-    jge @f ;out of memory
+		jge @f ;out of memory
-    cmp ebx,0
+		cmp ebx,0
-    jne @b
+		jne .beg_cycle
+		mov ted_ptr_free_symb,edx ;¬¥ï¥¬ ãª § â¥«ì   á¢®¡®¤ë© á¨¬¢®«, ¤«ï ¡®«¥¥ ¡ëáâà®£® ¯®¨áª  ¯ ¬ïâ¨
+		jmp .add_all
-  @@:
+	@@:
+	cmp ted_increase_size,0
+	je .add_all
+		call ted_memory_increase
+		cmp ebx,0
+		jne .beg_cycle
+	.add_all: ;¢á¥ á¨¬¢®«ë ¤®¡ ¢«¥ë
-  call ted_text_colored
+	call ted_text_colored
-  popad
+	popad
-  ret
+	ret
 endp
+;input:
+;  edx = pointer to sumbol, when insert
+;  edi = pointer to tedit struct
+;output:
+;  edx = new pointer to sumbol, when insert
+align 4
+proc ted_memory_increase
+	cmp ted_increase_size,0
+	je @f
+		push eax ebx ecx
+		mov ecx,ted_increase_size
+		add ecx,ted_max_chars
+		mov ted_max_chars,ecx
+		imul ecx,sizeof.symbol
+		stdcall mem_ReAlloc, ted_tex,ecx
+		mov ebx,ted_tex
+		mov ted_tex,eax
+		mov ted_tex_1,eax
+		add ted_tex_1,sizeof.symbol
+			sub edx,ebx
+			add edx,eax
+			mov ted_ptr_free_symb,edx
+		add eax,ecx
+		mov ted_tex_end,eax
+		pop ecx ebx eax
+	@@:
+	ret
+endp
 ;input:
 ;  ecx = position to free insert cell
 ;  edx = pointer to sumbol, when insert
 ;  esi = pointer to added symbol
     cmp eax,ebx
     je .end_f
     inc ted_tim_ch
-    mov edx,eax ;i=p0;
-    mov ecx,2
+    mov edx,eax ;i=p0;
-    ConvertIndexToPointer ecx
+    mov ecx,ted_ptr_free_symb
     @@:
       mov esi,[edx]
       and esi,0xff
       add esi,[conv_table] ;EvUpper
       mov ebx,[edx+6]
       imul ebx,sizeof.symbol
       add ebx,ted_tex;.perv
       m2m dword [ebx+2],dword [edx+2] ;tex[tex[i].next].perv=tex[i].perv;
+cmp ted_ptr_free_symb,edx
+jle .no_u1
   mov ted_ptr_free_symb,edx ;¬¥ï¥¬ ãª § â¥«ì   á¢®¡®¤ë© á¨¬¢®«, ¤«ï ¡®«¥¥ ¡ëáâà®£® ¯®¨áª  ¯ ¬ïâ¨
     .no_u1:
     ;else if(tex[i].td>ted_tim_ch) tex[i].td=0; // ¥á«¨ ã¤ «¥¨¥ á¨¬¢®«  ¡ë«® ®â¬¥¥®
 proc KeyConvertToASCII, table:dword
-  push ebx
+	push ebx
-  mov ebx,dword[table] ;convert scan to ascii
+	mov ebx,dword[table] ;convert scan to ascii
-  ror ax,8
+	ror ax,8
-  xor ah,ah
+	xor ah,ah
-  add bx,ax
+	add bx,ax ;? ebx,eax
-  mov ah,byte[ebx]
+	mov ah,byte[ebx]
-  pop ebx
+	pop ebx
-  ret
+	ret
 endp
     .no_msg:
     m2m ted_tim_ls,ted_tim_ch
   @@:
   pop ecx ;§ ¯¨áë¢ ¥¬ ãª § â¥«ì   ¢ë¤¥«¥ãî ¯ ¬ïâì
-  call mem_Free
+  stdcall mem_Free,ecx
   .no_save:
   popad
   ret
 endp
+}

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/t_edit.mac – Rev 1459 → 1464