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

 ;-----------------------------------------------------------------------------
 ; project name:      TINYPAD
 ; compiler:          flat assembler 1.67.15
 ; memory to compile: 2.0/7.0 MBytes (without/with size optimizations)
 ; version:           4.0.4 pre
-; last update:       2007-01-03 (Jan 3, 2007)
+; last update:       2007-01-07 (Jan 7, 2007)
 ; minimal kernel:    revision #138 (svn://kolibrios.org/kernel)
 ;-----------------------------------------------------------------------------
 ; originally by:     Ville Michael Turjanmaa >> villemt@aton.co.jyu.fi
 ; maintained by:     Mike Semenyako          >> mike.dld@gmail.com
 ;                    Ivan Poddubny           >> ivan-yar@bk.ru
 ; TODO (FOR 4.1.0):
 ;   - optimize drawing (reduce flickering)
 ;   - add vertical selection, undo, goto position, overwrite mode
 ;   - improve window drawing with small dimensions
 ;   - other bug-fixes and speed/size optimizations
+;   - save settings to ini file, not to executable
+;
 ; TODO (FOR 4.0.4, PLANNED FOR 2007-01-21):
-;   - finish tabbed interface [critical]
+;   - finish tabbed interface (some bug with tab switching) [critical]
 ;   - add memory reallocation to keys handler [critical]
 ;   - rework save_file (memory manager) [critical]
+;   - fix scrollbars dragging coordinates calculation [critical]
-;   - reduce flickering (changes checker) [average]
+;   - fix parameters parsing (incl. DOCPAK) [average]
-;   - incorrect saved/modified lines flags on copy/paste [normal]
+;   - reduce flickering (introduce changes checker) [normal]
-;   - case-insensitive file extensions comparison (.asm/.inc) [normal]
+;   - fix incorrect saved/modified lines flags on copy/paste [normal]
-;   - prompt to save file before closing/opening [low]
+;   - add prompt to save file before closing/opening [low]
+;
 ; HISTORY:
 ; 4.0.4 pre (mike.dld)
 ;   bug-fixes:
 ;     - statusbar contained hint after dialog operation cancelled
 ;     - small drawing fix for gutter and line saved/modified markers
 ;   changes:
+;     - editor and other modifications to ease parts placement changing
 ;     - modified/saved colors now match those in MSVS
 ;     - function 70 for *all* file operations (including diamond's fixes)
 ;     - use memory manager instead of statically allocated region
+;     - case-insensitive filenames input, to be able to open/save files with
+;       non-latin chars in name (russian etc.)
+;     - overall code cleanup
 ;   new features:
 ;     - recode tables between CP866, CP1251 and KOI8-R (suggested by Victor)
 ;     - tabbed interface, ability to open several files in one app instance
+;       (thanks IRC guys for ideas and testing)
 ; 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 main 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 (fixed by diamond)
+;     - compare file extension case-insensitively (fixed 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
-LCHGW	  = 3		  ; changed/saved marker width
+LCHGW = 3	      ; changed/saved marker width
-STATH	  = 16		  ; status bar height
+STATH = 16	      ; status bar height
-TBARH	  = 18		  ; tab bar height
-MEV_LDOWN = 1
-MEV_LUP   = 2
-MEV_RDOWN = 3
-MEV_RUP   = 4
-MEV_MOVE  = 5
+TBARH = 18	      ; tab bar height
 ;-----------------------------------------------------------------------------
 section @OPTIONS ;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ;-----------------------------------------------------------------------------
 label color_tbl dword
   RGB(	0,  0,	0) ; RGB(  0,  0,  0) ; RGB(  0,  0,  0) ; text
-  RGB(	0,144,	0) ; RGB(  0,144,  0) ; RGB(  0,160,  0) ; numbers
+  RGB(	0,144,	0) ; RGB(  0,160,  0) ; RGB(  0,144,  0) ; numbers
-  RGB(176,  0,	0) ; RGB(160,  0,  0) ; RGB(  0,128,255) ; strings
+  RGB(176,  0,	0) ; RGB(  0,128,255) ; RGB(160,  0,  0) ; strings
-  RGB(128,128,128) ; RGB(144,144,144) ; RGB(160,160,160) ; comments
+  RGB(128,128,128) ; RGB(160,160,160) ; RGB(144,144,144) ; comments
-  RGB( 48, 48,240) ; RGB( 48, 48,240) ; RGB(255,  0,  0) ; symbols
+  RGB( 48, 48,240) ; RGB(255,  0,  0) ; RGB( 48, 48,240) ; symbols
-  RGB(255,255,255) ; RGB(224,224,224) ; RGB(255,255,255) ; background
+  RGB(255,255,255) ; RGB(255,255,255) ; RGB(224,224,224) ; 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( 10, 36,106) ; RGB(  0, 64,128) ; RGB(  0,  0,128) ; selection background
   RGB(255,238, 98) ; modified line marker
   RGB(108,226,108) ; saved line marker
 ins_mode db 1
 options  db OPTS_AUTOINDENT+OPTS_OPTIMSAVE+OPTS_SMARTTAB
 	call	mem.Alloc
 	mov	[temp_buf],eax
 	mov	eax,65536
 	call	mem.Alloc
-	mov	[cur_tab.Editor.Data],eax
+	mov	[cur_editor.Lines],eax
 	inc	[do_not_draw]
 ;-----------------------------------------------------------------------------
 func start_fasm ;/////////////////////////////////////////////////////////////
 ;-----------------------------------------------------------------------------
 ; BL = run after compile
 ;-----------------------------------------------------------------------------
-	cmp	[cur_tab.Editor.AsmMode],0 ;! [asm_mode],0
+	cmp	[cur_editor.AsmMode],0 ;! [asm_mode],0
 	jne	@f
 	ret
     @@: mov	esi,f_info.path ; s_fname
 	mov	edi,fasm_parameters
 x28,0x29,0x00,0x2B,0x2C,0x2D,0x2E,0x2F,\
 x30,0x31,0x32,0x33,0x34,0x35,0x00,0x00,\
 x00,0x39,0x00,0x00,0x00,0x00,0x00,0x00
   times 12*16 db 0x00
-accel_table dd			    \
+accel_table_main dd		    \
 x0000000E,key.bkspace	   ,\ ; BackSpace
 x0000000F,key.tab		   ,\ ; Tab
 x0000001C,key.return 	   ,\ ; Return
 x0000003D,key.f3		   ,\ ; F3
 \;0x00020026,key.ctrl_l            ,\ ; Ctrl+L
 x0002002D,key.ctrl_x 	   ,\ ; Ctrl+X
 x0002002E,key.ctrl_c 	   ,\ ; Ctrl+C
 x0002002F,key.ctrl_v 	   ,\ ; Ctrl+V
 x00020031,key.ctrl_n 	   ,\ ; Ctrl+N
+x0002003E,key.ctrl_f4	   ,\ ; Ctrl+F4
 x00020043,key.ctrl_f9	   ,\ ; Ctrl+F9
 x00020147,key.ctrl_home	   ,\ ; Ctrl+Home
 \;0x00020148,key.ctrl_up           ,\ ; Ctrl+Up
 x00020149,key.ctrl_pgup	   ,\ ; Ctrl+PageUp
 x0002014B,key.ctrl_left	   ,\ ; Ctrl+Left
 x00010153,key.tb.del 	   ,\ ; Shift+Del
 accel_table2 dd 	   \
 ,btn.close_main_window ,\
-  'UP',btn.scroll_up	  ,\
+  'VSL',btn.vscroll_up	 ,\
-  'DN',btn.scroll_down	  ,\
+  'VSG',btn.vscroll_down ,\
+  'HSL',btn.hscroll_up	 ,\
-  'LT',btn.scroll_left	  ,\
+  'HSG',btn.hscroll_down ,\
+  'TBL',btn.tabctl_right ,\
-  'RT',btn.scroll_right   ,\
+  'TBG',btn.tabctl_left  ,\
 accel_table2_botdlg dd	   \
 file_info FILEINFO
 tab_bar      TABCTL
 virtual at tab_bar.Current
+  cur_tab      TABITEM
+end virtual
-  cur_tab      TABITEM
+virtual at tab_bar.Current.Editor
-  ;cur_tab_addr dd ?
+  cur_editor   EDITOR
 end virtual
 lines.scr     dd ?    ; number of lines on the screen

Subversion Repositories Kolibri OS

(root)/programs/develop/tinypad/trunk/tinypad.asm – Rev 259 → 267