WebSVN – Kolibri OS – Diff – /programs/develop/tinypad/trunk/tinypad.asm

 ;-----------------------------------------------------------------------------
 ; project name:      TINYPAD
-; compiler:          flat assembler 1.64
+; compiler:          flat assembler 1.67.1
-; memory to compile: 3.0/11.5 MBytes (without/with size optimizations)
+; memory to compile: 2.0/7.0 MBytes (without/with size optimizations)
-; version:           4.0
+; version:           4.0.3
-; last update:       2006-04-13 (Apr 13, 2006)
+; last update:       2006-08-28 (Aug 28, 2006)
+; minimal kernel:    revision #138 (svn://kolibrios.org/kernel)
 ;-----------------------------------------------------------------------------
 ; originally by:     Ville Michael Turjanmaa >> villemt@aton.co.jyu.fi
 ; maintained by:     Ivan Poddubny           >> ivan-yar@bk.ru
 ;                    Mike Semenyako          >> mike.dld@gmail.com
 ;-----------------------------------------------------------------------------
 ; TODO:
-;   optimize drawing (reduce flickering);
+;   - optimize drawing (reduce flickering)
-;   optimize memory usage (allocate only needed amount, not static 3 Mbytes);
+;   - optimize memory usage (allocate only needed amount, not static 3 Mbytes)
-;   add block selection ability, undo action;
+;   - add block selection ability, undo action, goto position
-;   working with multiple files (add tabs);
+;   - working with multiple files (add tabs)
+;   - improve window drawing with small dimensions
-;   other bugfixes and speed/size optimizations
+;   - other bugfixes and speed/size optimizations
+;
 ; HISTORY:
+; 4.0.3 (mike.dld)
+;   bug-fixes:
+;     - 1-char selection if pressing  out of real line length
+;     - fault in `writepos`, added call to function 9
+;     - main menu items weren't highlighted if popup opened and cursor
+;       isn't in menu item's area
+;     - statusbar and textboxes drawing fixes (wrong colors)
+;     - perform no redraw while pressing Shift, Ctrl, Alt keys
+;     - data length from DOCPAK in string representation (fix by diamond)
+;   changes:
+;     - function 70 instead of 58 for files loading/saving
+;     - clientarea-relative drawing (less code)
+;     - every line's dword is now splitted into 2 words;
+;       low word - line block length, so max line length is 65535 now
+;       high word - various flags. for now, only 2 of 16 bits are used:
+;         if bit #0 is set, line was modified since file open
+;         if bit #1 is set, line was saved after last modification
+;       high word could also be further used for code collapsing and different
+;         line marking features (breakpoints, errors, bookmarks, etc.)
+;   new features:
+;     - line markers for modified and saved lines
+;     - status messages for various actions
 ; 4.0.2 (mike.dld)
 ;   bug-fixes:
 ;     - program terminates if started with parameters (fine for DOCPAK)
 ; 4.0.1 (mike.dld)
 ;   bug-fixes:
 ;   all line feed formats are supported: WIN(CRLF),*NIX(LF),MAC(CR);
 ;   etc.
 ; 3.77 (mike.dld)
 ;   changed save_string to collapse SPACEs into TABs;
 ;   rewrote drawfile from scratch (speed++)
-;     through some drawing improvements still needed
+;     through some drawing improvements  needed
 ;     (some checkups to reduce flickering);
 ;   writepos (size--);
 ;   fixed drawing window while height < 100px, and for non-asm files;
 ;   several small fixes; speed/size optimizations
 ; 3.76 (mike.dld)
 ;   load position    0x010000 +
 ;   edit area        0x080000 +
 ;   copy/paste area  0x2f0000 +
 ;-----------------------------------------------------------------------------
 include 'lang.inc'
+include 'macros.inc' ; useful stuff
-include 'macros.inc' ; useful stuff
+;include 'proc32.inc'
 include 'tinypad.inc'
-purge mov,add,sub            ;  SPEED
+;purge mov,add,sub            ;  SPEED
 SCRLW     = 16            ; scrollbar widht/height (pixels)
 ATABW     = 8             ; tab width (chars)
 LINEH     = 10            ; line height (pixels)
 PATHL     = 255           ; maximum path length (chars) !!! don't change !!!
 AMINS     = 8             ; minimal scroll thumb size (pixels)
+LCHGW     = 2             ; changed/saved marker width
 STATH     = 14            ; status bar height
   RGB(128,128,128) ; RGB(144,144,144) ; RGB(160,160,160) ; comments
   RGB( 48, 48,240) ; RGB( 48, 48,240) ; RGB(255,  0,  0) ; symbols
   RGB(255,255,255) ; RGB(224,224,224) ; RGB(255,255,255) ; background
   RGB(255,255,255) ; RGB(255,255,255) ; RGB(255,255,255) ; selection text
   RGB( 10, 36,106) ; RGB(  0,  0,128) ; RGB(  0, 64,128) ; selection background
+  RGB(  0,255,  0) ; modified line marker
+  RGB(255,255,  0) ; saved line marker
 ins_mode db 1
 section @CODE ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ;-----------------------------------------------------------------------------
+;       fninit
+;        stdcall ini.get_int,finfo_ini,ini_sec_window,ini_window_left,50
+;        mov     [mainwnd_pos.x],eax
+;        stdcall ini.get_int,finfo_ini,ini_sec_window,ini_window_top,50
+;        mov     [mainwnd_pos.y],eax
+;        stdcall ini.get_int,finfo_ini,ini_sec_window,ini_window_right,350
+;        sub     eax,[mainwnd_pos.x]
+;        mov     [mainwnd_pos.w],eax
+;        stdcall ini.get_int,finfo_ini,ini_sec_window,ini_window_bottom,450
+;        sub     eax,[mainwnd_pos.y]
-;       fninit
+;        mov     [mainwnd_pos.h],eax
         cld
         mov     edi,@UDATA
         mov     ecx,@PARAMS-@UDATA
+        mov     al,0
+        rep     stosb
         mov     al,0
-        rep     stosb
+	inc	[do_not_draw]
         mov     [left_ofs],40+1
-        mov     [f_info+4],0
-        mov     [f_info+12],AREA_TEMP
-        mov     [f_info+16],AREA_EDIT-AREA_TEMP
-;        mov     esi,s_example
-;        mov     edi,s_fname
+        mov     [f_info+4],0
-;        mov     ecx,s_example.size
+        mov     [f_info+12],AREA_TEMP
-;        mov     [s_fname.size],ecx
+        mov     [f_info+16],AREA_EDIT-AREA_TEMP
 ;        rep     movsb
         mov     esi,s_example
 ;// Willow's code to support DOCPAK [
+        cmp     byte[@PARAMS],'*'
-        cmp     byte[@PARAMS],'*'
+        jne     .noipc
-        jne     .noipc
+;// diamond [ (convert size from decimal representation to dword)
-; convert size from decimal representation to dword
+;--     mov     edx,dword[@PARAMS+1]
-        mov     esi, @PARAMS+1
+        mov     esi,@PARAMS+1
-        xor     edx, edx
-        xor     eax, eax
+        xor     edx,edx
-@@:
+        xor     eax,eax
-        lodsb
+    @@: lodsb
-        test    al, al
+        test    al,al
         jz      @f
-        lea     edx, [edx*4+edx]
+        lea     edx,[edx*4+edx]
-        lea     edx, [edx*2+eax]
+        lea     edx,[edx*2+eax-'0']
+        jmp     @b
+    @@:
-        jmp     @b
+;// diamond ]
 @@:
         add     edx,20
         mcall   60,1,AREA_TEMP-16 ; 0x10000-16
         mov     dword[AREA_TEMP-16+4],8 ; [0x10000-16+4],8
         mov     byte[esi],1
         mov     eax,[esi+12]
         inc     eax
         call    load_file.file_found
         jmp     @f
-;       call    file_found  ; çàãðóçêà ôàéëà
-;       jmp     do_load_file.restorecursor ; îòîáðàæåíèå
   .noipc:
 ;// Willow's code to support DOCPAK ]
         call    btn.load_file;do_load_file
         jnc     @f
         call    new_file
     @@:
-        call    drawwindow
+	dec	[do_not_draw]
         mcall   66,1,1
+        mcall   40,00100111b
+red:
+	call    drawwindow
-        mcall   40,00100111b
+	call	check_inv_all.skip_check
 ;-----------------------------------------------------------------------------
         jz      mouse
         jmp     still.skip_write
-;-----------------------------------------------------------------------------
-func red ;///// window redraw ////////////////////////////////////////////////
-;-----------------------------------------------------------------------------
-        call    drawwindow
-        call    check_inv_all.skip_check
-        jmp     still
-endf
 ;-----------------------------------------------------------------------------
 func start_fasm ;/////////////////////////////////////////////////////////////
 ;-----------------------------------------------------------------------------
 ; BL = run after compile
  .run:
         cmp     bl,0 ; run outfile ?
         je      @f
         mov     dword[edi-1],',run'
         mov     byte[edi+3],0
+    @@:
-    @@: mcall   19,fasm_filename,fasm_parameters
+        mov     ebx, fasm_start
+start_ret:
+        mov     eax, 70
+        int     0x40
         ret
 endf
 ;-----------------------------------------------------------------------------
 func open_debug_board ;///////////////////////////////////////////////////////
 ;-----------------------------------------------------------------------------
-        mcall   19,debug_filename,0
+        mov     ebx, board_start
-        ret
+        jmp     start_ret
 endf
 ;-----------------------------------------------------------------------------
 func open_sysfuncs_txt ;//////////////////////////////////////////////////////
+;-----------------------------------------------------------------------------
-;-----------------------------------------------------------------------------
+        mov     ebx, docpak_start
-        mcall   19,docpak_filename,sysfuncs_param
+        call    start_ret
+        cmp     eax,0xfffffff0
-        cmp     eax,0xfffffff0
+        jb      @f
+        mov     ebx, tinypad_start
-        jb      @f
+        mov     dword [ebx+8], sysfuncs_filename
-        mcall   19,tinypad_filename,sysfuncs_filename
+        call    start_ret
     @@: ret
 endf
 ;-----------------------------------------------------------------------------
-func layout  ;///// change keyboard layout ///////////////////////////////////
+;func layout  ;///// change keyboard layout ///////////////////////////////////
 ;-----------------------------------------------------------------------------
-        mcall   19,setup,param_setup
+;        mcall   19,setup,param_setup
+;        mcall   5,eax
+;;       call    activate_me
+;;       ret
+;;endf
+;;func activate_me
+;        mcall   9,p_info,-1
+;        inc     eax
+;        inc     eax
+;        mov     ecx,eax
+;        mov     edi,[p_info.PID]
+;        mov     ebx,p_info
+;    @@: dec     ecx
+;        jz      @f    ; counter=0 => not found? => return
+;        mcall   9
+;        cmp     edi,[p_info.PID]
+;        jne     @b
-        mcall   5,eax
+;        mcall   18,3
-;       call    activate_me
-;       ret
-;endf
-;func activate_me
-        mcall   9,p_info,-1
-        inc     eax
-        inc     eax
-        mov     ecx,eax
-        mov     edi,[p_info.PID]
-        mov     ebx,p_info
-    @@: dec     ecx
-        jz      @f    ; counter=0 => not found? => return
-        mcall   9
-        cmp     edi,[p_info.PID]
-        jne     @b
-        mcall   18,3
-        mcall   5,eax
+;        mcall   5,eax
-    @@: ret
+;    @@: ret
-endf
+;endf
 func set_opt
 ;-----------------------------------------------------------------------------
-include 'tp-draw.asm'
-include 'tp-key.asm'
+include 'tp-draw.asm'
-;include 'tp-key2.asm'
+include 'tp-key.asm'
 include 'tp-butto.asm'
 include 'tp-mouse.asm'
 include 'tp-files.asm'
-include 'tp-commo.asm'
-include 'tp-dialo.asm'
+include 'tp-commo.asm'
-;include 'tp-find.asm'
+include 'tp-dialo.asm'
+include 'tp-popup.asm'
+include 'tp-tbox.asm'
 include 'tp-popup.asm'
-include 'tp-tbox.asm'
+;include 'lib-ini.asm'
 ;-----------------------------------------------------------------------------
   times $04 db -$00,-$01
   times $08 db -$00
+;error_beep      db 0xA0,0x30,0
-;error_beep      db 0xA0,0x30,0
+s_status dd 0
 sz s_example,'EXAMPLE.ASM'
+sz s_still  ,'still'
+;sz param_setup,'LANG',0 ; parameter for SETUP
-sz s_still  ,'still'
+fasm_start:
+        dd      7
+        dd      0
+        dd      fasm_parameters
+        dd      0
+        dd      0
+        db      '/RD/1/FASM',0
+board_start:
+        dd      7
+        dd      0
+        dd      0
+        dd      0
+        dd      0
+        db      '/RD/1/BOARD',0
+tinypad_start:
+        dd      7
-;sz param_setup,'LANG',0 ; parameter for SETUP
+        dd      0
+        dd      ?
+        dd      0
+        dd      0
+        db      '/RD/1/TINYPAD',0
+docpak_start:
+        dd      7
+        dd      0
+        dd      sysfuncs_param
-sz fasm_filename   ,'FASM       '
+        dd      0
-sz debug_filename  ,'BOARD      '
+        dd      0
-sz tinypad_filename,'TINYPAD    '
+        db      '/RD/1/DOCPAK',0
 sz docpak_filename ,'DOCPAK     '
 ;sz setup           ,'SETUP      ' ; to change keyboard layout
 sz sysfuncs_param,'g',0
 lsz sysfuncs_filename,\
   ru,<'SYSFUNCR.TXT',0>,\
 popup_res popup_file,\
-  ru,'®¢ë©'           ,'Ctrl+N',key.ctrl_n      ,\
+  ru,'®¢ë©'           ,'Ctrl+N'      ,key.ctrl_n      ,\
-  ru,'âªàëâì...'      ,'Ctrl+O',key.ctrl_o      ,\
+  ru,'âªàëâì...'      ,'Ctrl+O'      ,key.ctrl_o      ,\
-  ru,'®åà ¨âì'       ,'Ctrl+S',key.ctrl_s      ,\
+  ru,'®åà ¨âì'       ,'Ctrl+S'      ,key.ctrl_s      ,\
-  ru,'®åà ¨âì ª ª...',''      ,key.shift_ctrl_s,\
+  ru,'®åà ¨âì ª ª...','Ctrl+Shift+S',key.shift_ctrl_s,\
-  ru,'-'               ,''      ,0               ,\
+  ru,'-'               ,''            ,0               ,\
-  ru,'ëå®¤'           ,'Alt+X' ,key.alt_x       ,\
+  ru,'ëå®¤'           ,'Alt+X'       ,key.alt_x       ,\
+\
-  en,'New'       ,'Ctrl+N',key.ctrl_n      ,\
+  en,'New'       ,'Ctrl+N'      ,key.ctrl_n      ,\
-  en,'Open...'   ,'Ctrl+O',key.ctrl_o      ,\
+  en,'Open...'   ,'Ctrl+O'      ,key.ctrl_o      ,\
-  en,'Save'      ,'Ctrl+S',key.ctrl_s      ,\
+  en,'Save'      ,'Ctrl+S'      ,key.ctrl_s      ,\
-  en,'Save as...',''      ,key.shift_ctrl_s,\
+  en,'Save as...','Ctrl+Shift+S',key.shift_ctrl_s,\
-  en,'-'         ,''      ,0               ,\
+  en,'-'         ,''            ,0               ,\
-  en,'Exit'      ,'Alt+X' ,key.alt_x
+  en,'Exit'      ,'Alt+X'       ,key.alt_x
 popup_res popup_edit,\
   ru,'ëà¥§ âì'    ,'Ctrl+X',key.ctrl_x,\
   ru,'®¯¨à®¢ âì'  ,'Ctrl+C',key.ctrl_c,\
   ru,'áâ ¢¨âì'    ,'Ctrl+V',key.ctrl_v,\
   ru,'¤ «¨âì'     ,''      ,key.del   ,\
+  ru,'-'           ,''      ,0         ,\
+  ru,'ë¤¥«¨âì ¢áñ','Ctrl+A',key.ctrl_a,\
-  ru,'-'           ,''      ,0         ,\
+\;  ru,'-'           ,''      ,0         ,\
-  ru,'ë¤¥«¨âì ¢áñ','Ctrl+A',key.ctrl_a,\
+\;  ru,'¥àâ¨ª «ì®¥ ¢ë¤¥«¥¨¥','Alt+Ins',0         ,\
+\
   en,'Cut'       ,'Ctrl+X',key.ctrl_x,\
   en,'Copy'      ,'Ctrl+C',key.ctrl_c,\
   en,'Paste'     ,'Ctrl+V',key.ctrl_v,\
   en,'Delete'    ,''      ,key.del   ,\
+  en,'-'         ,''      ,0         ,\
+  en,'Select all','Ctrl+A',key.ctrl_a;,\
-  en,'-'         ,''      ,0         ,\
+;  en,'-'         ,''      ,0         ,\
-  en,'Select all','Ctrl+A',key.ctrl_a
+;  en,'Vertical selection','Alt+Ins',0
 popup_res popup_search,\
 db ':'
 lsz s_2cancel,\
   ru,'â¬¥ ',\
   en,'Cancel'
+lsz s_enter_filename,\
+  ru,<'¢¥¤¨â¥ ¨¬ï ä ©« ',0>,\
+  en,<'Enter filename',0>
+lsz s_enter_text_to_find,\
+  ru,<'¢¥¤¨â¥ â¥ªáâ ¤«ï ¯®¨áª ',0>,\
+  en,<'Enter text to find',0>
+lsz s_enter_text_to_replace,\
+  ru,<'¢¥¤¨â¥ â¥ªáâ ¤«ï § ¬¥ë',0>,\
+  en,<'Enter text to replace',0>
+lsz s_text_not_found,\
+  ru,<'®áâ¨£ãâ ª®¥æ ä ©« , â¥ªáâ ¥  ©¤¥',0>,\
+  en,<'Reached end of file, text not found',0>
+lszc s_fs_error,b,\
+  ru,<'¯¥à æ¨ï § ¢¥àè¥  ãá¯¥è® (0)',0>,\
+  ru,<'',0>,\
+  ru,<'ãªæ¨ï ¥ ¯®¤¤¥à¦¨¢ ¥âáï ¤«ï ¤ ®© ä ©«®¢®© á¨áâ¥¬ë (2)',0>,\
+  ru,<'¥¨§¢¥áâ ï ä ©«®¢ ï á¨áâ¥¬  (3)',0>,\
+  ru,<'',0>,\
+  ru,<'¥¢®§¬®¦® ®âªàëâì ä ©« (5)',0>,\
+  ru,<'¯¥à æ¨ï § ¢¥àè¥  ãá¯¥è® (6)',0>,\
+  ru,<'¤à¥á  å®¤¨âáï §  £à ¨æ ¬¨ ¯ ¬ïâ¨ ¯à®£à ¬¬ë (7)',0>,\
+  ru,<'  ¤¨áª¥ ¥â á¢®¡®¤®£® ¬¥áâ  (8)',0>,\
+  ru,<' ¡«¨æ  FAT ã¨çâ®¦¥  (9)',0>,\
+  ru,<'®áâã¯ § ¯à¥éñ (10)',0>,\
+  ru,<'è¨¡ª  ãáâà®©áâ¢  (11)',0>,\
+\
+  en,<'Operation executed successfully (0)',0>,\
+  en,<'',0>,\
+  en,<'Function is not supported for the given filesystem (2)',0>,\
+  en,<'Unknown filesystem (3)',0>,\
+  en,<'',0>,\
+  en,<'Unable to open file (5)',0>,\
+  en,<'Operation executed successfully (6)',0>,\
+  en,<'Pointer lies outside of application memory (7)',0>,\
+  en,<'Disk is full (8)',0>,\
+  en,<'FAT table is destroyed (9)',0>,\
+  en,<'Access denied (10)',0>,\
+  en,<'Device error (11)',0>
 sz symbols_ex,';?.%"',"'"
+sz symbols   ,'#&*\:/<>|{}()[]=+-, '
+ini_sec_window    db 'Window',0
+ini_window_top    db 'Top',0
+ini_window_left   db 'Left',0
+ini_window_right  db 'Right',0
+ini_window_bottom db 'Bottom',0
+finfo_ini dd ?,?,?,AREA_TEMP,AREA_EDIT-AREA_TEMP
-sz symbols   ,'#&*\:/<>|{}()[]=+-, '
+          db '/rd/1/tinypad.ini',0
 TINYPAD_END:     ; end of file
 self_path rb PATHL
+;-----------------------------------------------------------------------------
 section @UDATA ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ;-----------------------------------------------------------------------------
 section @UDATA ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-;-----------------------------------------------------------------------------
+f_info70 rd 7
 left_col      dd ?    ; leftmost visible char on line
 vscrl_top     dd ?
 vscrl_size    dd ?
 hscrl_top     dd ?
 hscrl_size    dd ?
-skinh         dd ?    ; skin height
+;skinh         dd ?    ; skin height
 __rc          dd ?,?,?,?
 ;filelen       dd ?    ; file size (on save) ???
 filesize      dd ?    ; file size (on load) ???
 ya            dd ?    ; for read_string
 ;copy_start    dd ?    ; first line for copying (Ctrl+S)

Subversion Repositories Kolibri OS

(root)/programs/develop/tinypad/trunk/tinypad.asm – Rev 122 → 178