WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 2102 and /programs/ Rev 2101

Regard whitespace Rev 2102 → Rev 2101

 /programs/develop/libraries/box_lib/trunk/box_lib.asm
 ,7 → 227,7
 dd      sz_ted_but_reverse,             ted_but_reverse
 dd      sz_ted_but_find_next,           ted_but_find_next
 dd      sz_ted_text_colored,            ted_text_colored
-dd      sz_ted_version,                 0x00000003
+dd      sz_ted_version,                 0x00000002
 dd      0,0

 /programs/develop/libraries/box_lib/trunk/t_edit.mac
 ,6 → 1,6
 ; ¬ ªà®á ¤«ï á¨áâ¥¬®© ¡¨¡«¨®â¥ª¨ box_lib.obj
 ; í«¥¬¥â TextEditor ¤«ï Kolibri OS
-; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 22.08.2011 IgorA
+; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 09.06.2010 IgorA
 ;   ª®¤ ¯à¨¬¥¥  GPL2 «¨æ¥§¨ï
 ;input:
 ,10 → 39,9
 struct TexColViv
         Text  rb MAX_COLOR_WORD_LEN ; á«®¢® ¤«ï ¯®¤á¢¥âª¨
         f1    dd 0 ; á¯à ¢ª  ¯® á«®¢ã
-        flags db ? ; f1+4 ä« £¨ ¨á¯®«ì§ã¥¬ë¥ ¯à¨ ¢ë¤¥«¥¨¨
-        endc  db ? ; f1+5 á¨¬¢®« ª®æ  ¢ë¤¥«¥¨ï (¨á¯®«ì§ã¥âáï ¯à¨ flags&4)
-        escc  db ? ; f1+6 íªà ¨àãîé¨© á¨¬¢®« (¨á¯®«ì§ã¥âáï ¯à¨ flags&4)
-        color db ? ; f1+7 ®¬¥à æ¢¥â
+  wwo db ? ; whole words only
+  endc db ? ; á¨¬¢®« ª®æ  ¢ë¤¥«¥¨ï (wwo&4)
+  color db ? ; ®¬¥à æ¢¥â
 ends
 struct symbol
 ,10 → 807,10
         loop @b
         ;init: ted_help_text_f1
-        mov ecx,ted_key_words_count ;ª®«¨ç¥áâ¢® ª«îç¥¢ëå á«®¢
-        imul ecx,sizeof.TexColViv   ;à §¬¥à áâàãªâãàë á 1-¬ ª«. á«.
-        add ecx,ted_key_words_data  ; ç «® ä ©«  á ª«. á«.
-        mov ted_help_text_f1,ecx    ;¬¥âª  ¢ ¯ ¬ïâ¨, £¤¥  ç¨¥âáï â¥ªáâ á® á¯à ¢ª®©
+        mov ecx,ted_key_words_count
+        imul ecx,sizeof.TexColViv
+        add ecx,ted_key_words_data
+        mov ted_help_text_f1,ecx
         stdcall ted_init_scroll_bars,edi,1 ;¬¥ï¥¬ æ¢¥â  áªà®««¨£®¢
         .no_colors:
 ,7 → 972,6
 ;input:
 ; bl = symbol end of select
-; bh = íªà ¨àãîé¨© á¨¬¢®« (= 0 ¥á«¨ ¥â ¯à®¢¥àª¨   ¨å)
 ; edx = pointer to symbol struct
 ; edi = pointer to tedit struct
 ;description:
 ,23 → 978,15
 ;  ©â¨ á«¥¤ãîéãî ¯®§¨æ¨î ãª § ®£® á¨¬¢®«
 align 4
 ted_iterat_next_pos_char:
-        push ax
-        mov al,1 ;¯à¥¤ë¤ãé¨© á¨¬¢®«, á«ã¦¨â ¤«ï áà ¢¥¨ï á á¨¬¢®«®¬ bh
         @@:
                 cmp bl,byte[edx]
-                je .found
-                .no_found:
+                je @f
                 cmp edx,ted_tex_1
                 jle @f
-                        mov al,byte[edx]
                         call ted_iterat_next
                         jmp @b
-        .found:
-                cmp bh,al
-                je .no_found
         @@:
         call ted_iterat_next
-        pop ax
         ret
 ;input:
 ,7 → 2121,7
       jne .if_0 ;if(Col[word_n].Text[pos]==0){
         mov dword[endPos],edx ;eP=i;
         ColToIndexOffset eax,ebx
-        mov bl,byte[ebx+MAX_COLOR_WORD_LEN+7]
+        mov bl,byte[ebx+MAX_COLOR_WORD_LEN+6]
         mov byte[f_color],bl ;f_color=Col[word_n].color;
 mov byte[find],1
 ,7 → 2171,7
             btr bx,2 ;3-1
             jae .if_7e ;if(Col[word_n].wwo&4)
             ColToIndexOffset eax,ebx
-            mov bx,word[ebx+MAX_COLOR_WORD_LEN+5]
+            mov bl,byte[ebx+MAX_COLOR_WORD_LEN+5]
             call ted_iterat_next_pos_char
        cmp edx,ted_tex_1
        jle .if_7e
 ,7 → 3308,7
                 ;SetTextColor
                 xor eax,eax
-                mov al,byte[edx+MAX_COLOR_WORD_LEN+7]
+                mov al,byte[edx+MAX_COLOR_WORD_LEN+6]
                 shl ax,2
                 mov ecx,ted_text_colors
                 add ecx,eax
 ,7 → 3947,7
   stdcall ted_can_save,edi
   cmp al,0
-;  je .no_save
+  je .no_save
   mov ecx,ted_max_chars
   invoke mem.alloc,ecx

 /programs/other/t_edit/build_en.bat
 ,6 → 4,7
 if not exist bin\msgbox.obj    @copy msgbox.obj bin\msgbox.obj
 if not exist bin\te_icon.bmp   @copy te_icon.bmp bin\te_icon.bmp
 if not exist bin\info mkdir bin\info
+copy info\*.syn bin\info\*.syn
 if not exist bin\box_lib.obj @fasm.exe -m 16384 ..\..\develop\libraries\box_lib\trunk\box_lib.asm bin\box_lib.obj
 @kpack bin\box_lib.obj
 ,6 → 13,4
 @echo lang fix en >lang.inc
 @fasm.exe -m 16384 t_edit.asm bin\t_edit.kex
 @kpack bin\t_edit.kex
-info\build.bat info\ bin\info\
 pause

 /programs/other/t_edit/build_ru.bat
 ,6 → 4,7
 if not exist bin\msgbox.obj    @copy msgbox.obj bin\msgbox.obj
 if not exist bin\te_icon.bmp   @copy te_icon.bmp bin\te_icon.bmp
 if not exist bin\info mkdir bin\info
+copy info\*.syn bin\info\*.syn
 if not exist bin\box_lib.obj @fasm.exe -m 16384 ..\..\develop\libraries\box_lib\trunk\box_lib.asm bin\box_lib.obj
 @kpack bin\box_lib.obj
 ,6 → 13,4
 @echo lang fix ru >lang.inc
 @fasm.exe -m 16384 t_edit.asm bin\t_edit.kex
 @kpack bin\t_edit.kex
-info\build.bat info\ bin\info\
 pause

/programs/other/t_edit/info/ini_files_syn.asm
File deleted

/programs/other/t_edit/info/win_const_syn.asm
File deleted

/programs/other/t_edit/info/cpp_win_dar_syn.asm
File deleted

/programs/other/t_edit/info/default_syn.asm
File deleted

/programs/other/t_edit/info/asm_syn.asm
File deleted

/programs/other/t_edit/info/cpp_kol_dar_syn.asm
File deleted

/programs/other/t_edit/info/voc_eng_rus_syn.asm
File deleted

/programs/other/t_edit/info/cpp_kol_cla_syn.asm
File deleted

/programs/other/t_edit/info/cpp_kol_def_syn.asm
File deleted

/programs/other/t_edit/info/build.bat
File deleted
\ No newline at end of file

/programs/other/t_edit/info/html.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /programs/other/t_edit/info/html_syn.asm
 ,12 → 2,10
 @@: db txt
 rb @b+40-$
 dd lf1
-db p1
-dw p2+0
-db p3
+db p1,p2+0,p3
 }
 count_colors_text dd (text-color_wnd_text)/4
-count_key_words dd (f1-text)/48
+count_key_words dd (f1-text)/47
 color_cursor dd 0xffd000
 color_wnd_capt dd 0x008080
 color_wnd_work dd 0xffffff

/programs/other/t_edit/info/ini_files.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/asm.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/default.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/cpp_kol_cla.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/cpp_kol_dar.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/cpp_kol_def.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/cpp_win_dar.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/voc_eng_rus.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/other/t_edit/info/win_const.syn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /programs/other/t_edit/t_edit.asm
 ,7 → 53,7
 load_libraries l_libs_start,load_lib_end
-;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨«¨áì ¡¨¡«¨®â¥ª¨
+;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì  è  «¨¡
         mov     ebp,lib0
         cmp     dword [ebp+ll_struc_size-4],0
         jz      @f
 ,12 → 65,6
         mcall -1 ;exit not correct
 @@:
-        cmp dword[version_text_edit],3
-        jge @f
-                stdcall [mb_create],msgbox_10,thread
-                mcall -1
-        @@:
 ;---------------------------------------------------------------------
         stdcall [ted_init], tedit0
         stdcall dword[tl_data_init], tree1
 ,7 → 164,6
   .filter:
   add eax,304
   loop @b
-  stdcall dword[tl_cur_beg],tree1 ;áâ ¢¨¬ ªãàá®à    ç «® á¯¨áª
 .end_dir_init:
 ;--- load color option file ---

 /programs/other/t_edit/t_button.inc
 ,6 → 8,14
         FileName dd ?
 ends
+struct TexColViv
+  Text rb MAX_COLOR_WORD_LEN ; á«®¢® ¤«ï ¯®¤á¢¥âª¨
+  f1 dd 0 ; á¯à ¢ª  ¯® á«®¢ã
+  wwo db ? ; whole words only
+  endc db ? ; á¨¬¢®« ª®æ  ¢ë¤¥«¥¨ï (wwo&4)
+  color db ? ; ®¬¥à æ¢¥â
+ends
 struct symbol
   c db ?    ;  +0 á¨¬¢®«
   col db ?  ;  +1 æ¢¥â
 ,7 → 26,7
 ends
-hed db 'TextEditor 22.08.11',0 ;¯®¤¯¨áì ®ª
+hed db 'TextEditor 25.08.10',0 ;¯®¤¯¨áì ®ª
 sc system_colors
 fn_icon db 'te_icon.bmp',0
 ,7 → 82,7
   ret
 ;description:
-; äãªæ¨ï ®âªàëâ¨ï ä ©«  ¡¥§ ®ª  á®®¡é¥¨ï
+; äãªæ¨ï ®âªàëâ¨ï ä ©«  ¡¥§ ®ª®  á®®¡é¥¨ï
 align 4
 but_no_msg_OpenFile:
         push eax ebx
 ,8 → 132,6
         popad
         ret
-;description:
-; ª®¯¨à®¢ ¨¥ ¯ ¬ïâ¨
 align 4
 proc mem_copy, source:dword, destination:dword, len:dword
   push ecx esi edi
 ,8 → 144,6
   ret
 endp
-;description:
-; § ¯®«¥¨¥ ¯ ¬ïâ¨ ¯à®¡¥« ¬¨
 align 4
 proc mem_spac, mem:dword, len:dword
   push eax ecx edi
 ,8 → 196,6
         stdcall [mb_create],msgbox_6,thread ;message: Can-t save text file!
         ret
-;description:
-; äãªæ¨ï  ¦ â¨ï   ª®¯ªã [à¨¬¥¨âì] ¢ ¯ ¥«¨ á¨â ªá¨á
 align 4
 proc ted_but_open_syntax, edit:dword
   push ebx edi
 ,10 → 216,8
   ret
 endp
-;description:
-; ¢ë§®¢/áªàëâ¨¥ ¯ ¥«¨ ¯®¨áª
 align 4
-proc ted_but_find
+proc ted_but_find ;¢ë§®¢/áªàëâ¨¥ ¯ ¥«¨ ¯®¨áª
   push edi
   mov edi,tedit0
 ,22 → 241,14
         stdcall [mb_create],msgbox_7,thread ;message: Can not find text
         ret
-;description:
-; ª®¯ª  [ ¬¥¨âì]   ¯ ¥«¨
 align 4
 but_replace:
-        ; ¯®ª  ¥ á¤¥« ®
         ret
-;description:
-; äãªæ¨ï ¯®¨áª  ¨ä®à¬ æ¨¨ ¢ á¯¨áª¥ ª«îç¥¢ëå á«®¢
 align 4
 but_find_key_w:
-        ; ¯®ª  ¥ á¤¥« ®
         ret
-;description:
-; ¢ë¤¥«¥¨¥/áªàëâ¨¥ ¥¯¥ç â ¥¬ëå á¨¬¢®«®¢
 align 4
 proc but_sumb_invis, edit:dword
   push edi
 ,8 → 261,6
   ret
 endp
-;description:
-; ¢ë¤¥«¥¨¥/áªàëâ¨¥ ª«îç¥¢ëå á«®¢
 align 4
 proc but_k_words_show, edit:dword
   push edi
 ,8 → 277,6
   ret
 endp
-;description:
-; ¢ë§®¢/áªàëâ¨¥ ¯ ¥«¨ á ä ©« ¬¨ á¨â ªá¨á
 align 4
 proc but_synt_show, edit:dword
   push edi

 /programs/other/t_edit/t_data.inc
 ,7 → 89,7
         ted_but_reverse dd sz_ted_but_reverse
         ted_but_find_next dd sz_ted_but_find_next
         ted_text_colored dd sz_ted_text_colored
-        version_text_edit dd sz_ted_version
+        ;version_text_edit dd sz_ted_version
 dd 0,0
         alib_init2 db 'lib_init',0
 ,7 → 164,7
         sz_ted_but_reverse              db 'ted_but_reverse',0
         sz_ted_but_find_next    db 'ted_but_find_next',0
         sz_ted_text_colored             db 'ted_text_colored',0
-        sz_ted_version db 'version_text_edit',0
+        ;sz_ted_version db 'version_text_edit',0
 align 4
 proclib_import:
 ,14 → 570,6
   db 0
   db ' ªàëâì',0
   db 0
-msgbox_10:
-  db 1,0
-  db '¨¬ ¨¥',0
-  db 'ë ¨á¯®«ì§ã¥â¥ áâ àãî ¢¥àá¨î ¡¨¡«¨®â¥ª¨ ',39,'box_lib.obj',39,'.',13,\
-        '®¯à®¡ã©â¥  ©â¨ ¡¨¡«¨®â¥ªã ¢ ª®â®à®©',13,\
-        'í«¥¬¥â ',39,'t_edit',39,' ¨¬¥¥â ¢¥àá¨î 3.',0
-  db ' ªàëâì',0
-  db 0
 txtFile db ' ©«:',0
 txtFindCapt db '®¨áª',0
 ,14 → 678,6
   db 0
   db 'Close',0
   db 0
-msgbox_10:
-  db 1,0
-  db 'Warning',0
-  db 'You are using an older version of the library ',39,'box_lib.obj',39,'.',13,\
-        'Try to find a library in which the element',13,\
-,'t_edit',39,' has a version 3.',13,0
-  db 'Close',0
-  db 0
 txtFile db 'File:',0
 txtFindCapt db 'Search',0

 /programs/other/t_edit_synt/te_data.inc
 ,9 → 361,9
 buf db BUF_SIZE dup(0) ;¡ãä¥à ¤«ï ª®¯¨à®¢ ¨ï | ¢áâ ¢ª¨
 capt_header db 'macro wo txt,lf1,p1,p2,p3{',13
-        db '@@: db txt',13,'rb @b+40-$',13,'dd lf1',13,'db p1',13,'dw p2+0',13,'db p3',13,'}',13
+        db '@@: db txt',13,'rb @b+40-$',13,'dd lf1',13,'db p1,p2+0,p3',13,'}',13
         db 'count_colors_text dd (text-color_wnd_text)/4',13
-        db 'count_key_words dd (f1-text)/48',13,0
+        db 'count_key_words dd (f1-text)/47',13,0
 col_1 db 'color_cursor dd ',0   ;+ 98 æ¢¥â ªãàá®à
 col_2 db 'color_wnd_capt dd ',0 ;+102 æ¢¥â ¯®«¥© ¢®ªàã£ ®ª
 col_3 db 'color_wnd_work dd ',0 ;+106 æ¢¥â ä®  ®ª

 /programs/other/t_edit_synt/te_syntax.asm
 ,7 → 125,6
   .filter:
   add eax,304
   loop @b
-  stdcall dword[tl_cur_beg],tree1 ;áâ ¢¨¬ ªãàá®à    ç «® á¯¨áª
 .end_dir_init:
 ;--- load color option file ---
 ,7 → 312,7
         ;@@:
         ret
-hed db 'TextEditor syntax file converter 22.08.11',0 ;¯®¤¯¨áì ®ª
+hed db 'TextEditor syntax file converter 20.08.11',0 ;¯®¤¯¨áì ®ª
 txt122 db ' £à. ä ©«',0
 txt148 db '®åà. ä ©«',0

 /programs/other/t_edit_synt/te_work.inc
 ,12 → 9,11
 ends
 struct TexColViv
-        Text  rb MAX_COLOR_WORD_LEN ; ñëîâî äëÿ ïîäñâåòêè
-        f1    dd 0 ; ñïðàâêà ïî ñëîâó
-        flags db ? ; f1+4 ôëàãè èñïîëüçóåìûå ïðè âûäåëåíèè
-        endc  db ? ; f1+5 ñèìâîë êîíöà âûäåëåíèÿ (èñïîëüçóåòñÿ ïðè flags&4)
-        escc  db ? ; f1+6 ýêðàíèðóþùèé ñèìâîë (èñïîëüçóåòñÿ ïðè flags&4)
-        color db ? ; f1+7 íîìåð öâåòà
+  Text rb MAX_COLOR_WORD_LEN ; ñëîâî
+  f1 dd 0
+  wwo db ? ; whole words only
+  endc db ? ; ñèìâîë êîíöà âûäåëåíèÿ (wwo&4)
+  color db ? ; íîìåð öâåòà
 ends
 count_colors_text dd 1
 ,8 → 251,8
         inc edi
         xor eax,eax
-        mov ax,word[ecx+MAX_COLOR_WORD_LEN+4+1] ;(escc shl 8)+endc
-        cmp ax,0 ;ïðîâåðÿåì åñòü ëè çàâåðøàþùèé è ýêðàíèíóþùèé ñèìâîë
+        mov al,byte[ecx+MAX_COLOR_WORD_LEN+4+1] ;endc
+        cmp al,0
         je @f
                 stdcall str_cat_value,edi,eax
                 stdcall str_len,edi

 /programs/other/t_edit_synt/build.bat
 ,6 → 2,7
 if not exist bin\tl_sys_16.bmp @copy ..\..\develop\libraries\box_lib\trunk\tl_sys_16.bmp bin\tl_sys_16.bmp
 if not exist bin\tl_nod_16.bmp @copy ..\..\develop\libraries\box_lib\trunk\tl_nod_16.bmp bin\tl_nod_16.bmp
 if not exist bin\info mkdir bin\info
+copy ..\t_edit\info\* bin\info\*
 if not exist bin\box_lib.obj @fasm.exe -m 16384 ..\..\develop\libraries\box_lib\trunk\box_lib.asm bin\box_lib.obj
 @kpack bin\box_lib.obj
 ,6 → 9,4
 @fasm.exe -m 16384 te_syntax.asm bin\te_syntax.kex
 @kpack bin\te_syntax.kex
-..\t_edit\info\build.bat ..\t_edit\info\ bin\info\
 pause

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2102 → Rev 2101