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

 include '..\..\..\macros.inc'
 purge add,sub	 ; macros.inc does incorrect substitution
 include 'fasm.inc'
+include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac'
+include '..\..\..\develop\libraries\box_lib\trunk\checkbox.mac'
-include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac'
+;include '..\..\..\develop\libraries\box_lib\asm\trunk\editbox_ex.mac'
 include '..\..\..\develop\libraries\box_lib\load_lib.mac'
     call make_fullpaths
     mcall 70,file_info_debug
     jmp  still
-   norundebug:
-    mov  ecx,5
-    mov  [ya],ecx
-    cmp  ah,14
-    je	 f4
+   norundebug:
-    jmp  still
-f4:
-	xor	[bGenerateDebugInfo], 1
 	mcall	8,,,0x8000000E
-	call	draw_checkbox
+    jmp  still
 	jmp	still
 mouse:
   push dword edit1
   call [edit_box_mouse]
+  push dword edit2
+  call [edit_box_mouse]
-  push dword edit2
+  push dword edit3
   call [edit_box_mouse]
-  push dword edit3
+  push dword ch1_dbg
     mov  edi,title	       ; Draw Window Label Text
     mcall
+    mcall 9,PROCESSINFO,-1
+    cmp dword[pinfo.box.width],230 ; ïðîâåðÿåì øèðèíó îêíà
+    jge @f
+      mov dword[pinfo.box.width],230 ; åñëè îêíî î÷åíü óçêîå, óâåëè÷èâàåì øèðèíó äëÿ èçáåæàíèÿ ãëþêîâ
-    mcall 9,PROCESSINFO,-1
+    @@:
     mpack ecx,1,1
     mov   ebx,[pinfo.box.width]
     sub   ebx,10
-mov eax,8
-mov edx,0x4000000B
-    madd  ecx, 14,0
-;    mcall  ,,,0x4000000C       ; Button: Enter Outfile
     madd  ecx, 14,0
-;    mcall  ,,,0x4000000D       ; Button: Enter Path
+    mov eax,8
     mov edx,0x4000000B
     mpack ebx,[pinfo.box.width],MAGIC1
     msub  ebx,MAGIC1+10+1,0
     cmp   al,MAX_PATH
     jbe   @f
     mov   al,MAX_PATH
 @@: movzx esi,al
     call draw_checkbox
     call draw_messages
-    mov eax,dword[pinfo.box.width]
-    cmp eax,250
-    jge @f
       mov eax,250
-    @@:
+    mov eax,dword[pinfo.box.width]
     sub eax,127
-    mov dword[edit1.width],eax
+    mov dword[edit1.width],eax ; óñòàíàâëèâàåì øèðèíó òåêñòîâûõ ïîëåé
     mov dword[edit2.width],eax
     mov dword[edit3.width],eax
     push dword edit1
     call [edit_box_draw]
     push dword edit2
+    call [edit_box_draw]
+    push dword edit3
     call [edit_box_draw]
-    push dword edit3
+    push dword ch1_dbg
-    call [edit_box_draw]
+    call [check_box_draw]
-    mcall  12,2 ; End of Draw
-    popa
-    ret
-bottom_right dd ?
-draw_checkbox:
-	mcall	8,<5,10>,<14*3+5,10>,14,[sc.work_button]
-	cmp	[bGenerateDebugInfo], 0
-	jz	@f
-	mov	edx, [sc.work_button_text]
-	mcall	38,<7,13>,<14*3+7,14*3+13>
-	mcall	38,,<14*3+13,14*3+7>
+    mcall  12,2 ; End of Draw
 @@:
-	mov	ecx, [sc.work_text]
+    popa
-	or	ecx, 0x80000000
+    ret
 	mcall	4,<20,14*3+7>,,s_dbgdescr
   s_compile db '®¬¯¨«.'
   s_run     db ' ãáª  '
   s_debug   db 'â« ¤ª '
+  s_dbgdescr db '®§¤ ¢ âì ®â« ¤®çãî ¨ä®à¬ æ¨î',0
-  s_dbgdescr	  db	  '®§¤ ¢ âì ®â« ¤®çãî ¨ä®à¬ æ¨î',0
+  s_dbgdescr_end:
   err_message_import db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ box_lib.obj',0
   err_message_found_lib db 'è¨¡ª  ¯à¨ ¯®¨áª¥ box_lib.obj',0 ;áâà®ª , ª®â®à ï ¡ã¤¥â ¢ áä®à¬¨à®¢ ®¬ ®ª¥, ¥á«¨ ¡¨¡«¨®â¥ª  ¥ ¡ã¤¥â  ©¤¥
   s_compile db 'COMPILE'
   s_run     db '  RUN  '
   s_debug   db ' DEBUG '
+  s_dbgdescr db 'Generate debug information',0
-  s_dbgdescr	  db	  'Generate debug information',0
+  s_dbgdescr_end:
   err_message_import db 'Error on load import library box_lib.obj',0
   err_message_found_lib db 'Sorry I cannot found library box_lib.obj',0 ;áâà®ª , ª®â®à ï ¡ã¤¥â ¢ áä®à¬¨à®¢ ®¬ ®ª¥, ¥á«¨ ¡¨¡«¨®â¥ª  ¥ ¡ã¤¥â  ©¤¥
   edit_box_draw  dd aEdit_box_draw
   edit_box_key	 dd aEdit_box_key
   edit_box_mouse dd aEdit_box_mouse
   ;version_ed     dd aVersion_ed
-  ;check_box_draw  dd aCheck_box_draw
+  check_box_draw  dd aCheck_box_draw
-  ;check_box_mouse dd aCheck_box_mouse
+  check_box_mouse dd aCheck_box_mouse
   ;version_ch      dd aVersion_ch
   dd 0,0
   aEdit_box_draw  db 'edit_box',0
   aEdit_box_key   db 'edit_box_key',0
   aEdit_box_mouse db 'edit_box_mouse',0
   ;aVersion_ed     db 'version_ed',0
-  ;aCheck_box_draw  db 'check_box_draw',0
+  aCheck_box_draw  db 'check_box_draw',0
-  ;aCheck_box_mouse db 'check_box_mouse',0
+  aCheck_box_mouse db 'check_box_mouse',0
+  ;aVersion_ch      db 'version_ch',0
+edit1 edit_box 153, 56, 1, 0xffffff, 0xff, 0x80ff, 0, 0x8000, (outfile-infile-1), infile, mouse_dd, 0, 11,11
+edit2 edit_box 153, 56, 17, 0xffffff, 0xff, 0x80ff, 0, 0x8000,(path-outfile-1), outfile, mouse_dd, 0, 7,7
+edit3 edit_box 153, 56, 33, 0xffffff, 0xff, 0x80ff, 0, 0x8000,(path_end-path-1), path, mouse_dd, 0, 6,6
+;ch1_dbg check_box 5, 49, 6, 12, 0xffffff, 0x80ff, 0, s_dbgdescr,(s_dbgdescr_end-s_dbgdescr)
+ch1_dbg:
+  .left:	   dw  5
+  .top: 	   dw 49
+  .ch_text_margin: dd 6
+  .ch_size:	   dd 12
+  .color:	   dd 0xffffff
-  ;aVersion_ch      db 'version_ch',0
+  .border_color:   dd 0x80ff
   .text_color:	   dd 0
-edit1 edit_box 153, 56, 1, 0xffffff, 0xff, 0x80ff, 0, 0xa000, (outfile-infile-1), infile, mouse_dd, 0, 11,11
+  .text:	   dd s_dbgdescr
-edit2 edit_box 153, 56, 17, 0xffffff, 0xff, 0x80ff, 0, 0xa000,(path-outfile-1), outfile, mouse_dd, 0, 7,7
+  .ch_text_length: dd (s_dbgdescr_end-s_dbgdescr)
-edit3 edit_box 153, 56, 33, 0xffffff, 0xff, 0x80ff, 0, 0xa000,(path_end-path-1), path, mouse_dd, 0, 6,6
+  .flags:	   dd 0
 mouse_dd dd 0 ;íóæíî äëÿ Shift-à â editbox
 infile	  db 'example.asm'
-  times MAX_PATH+$-infile  db 0
-outfile db 'example'
-  times MAX_PATH+$-outfile db 0
-path	db '/rd/1/'
+  times MAX_PATH-$+infile  db 0
-  times MAX_PATH+$-path    db 0
+outfile db 'example'
-path_end:
+  times MAX_PATH-$+outfile db 0
-lf db 13,10,0
+path	db '/rd/1/'
     mov    [start_time],eax
     call   preprocessor
     call   parser
     call   assembler
-    cmp    [bGenerateDebugInfo], 0
+    bt	   dword[ch1_dbg.flags],1 ;cmp [bGenerateDebugInfo], 0
-    jz	   @f
+    jae    @f			  ;jz @f
     call   symbol_dump
 @@:
     call   formatter
 _counter db 4,'0000'
 _mode	       dd NORMAL_MODE
 _run_outfile  dd 0
-bGenerateDebugInfo db 0
+;bGenerateDebugInfo db 0
 sub_table:

Subversion Repositories Kolibri OS

(root)/programs/develop/fasm/trunk/fasm.asm @ 1372 – Rev 1367 → 1371