WebSVN – Kolibri OS – Diff – /programs/other/t_edit/t_draw.inc

-mouse_wnd_main:
+proc mouse_wnd_main, edit:dword
-  push eax ebx ecx
+  push eax ebx ecx edi
   mcall 37,2 ;get mouse buttons
+  mov edi,dword[edit]
   cmp al,1
   jne @f
     mcall 37,1 ;get mouse coords
-    mov ebx,[wndMain.top]
+    mov ebx,ted_wnd_t
-    add ebx,[recMain.top]
+    add ebx,ted_rec_t
     cmp ax,bx
     jl @f ;y_mouse
-    sub ebx,[recMain.top]
+    sub ebx,ted_rec_t
-    add ebx,[wndMain.height]
+    add ebx,ted_wnd_h
     cmp bx,ax
     jl @f ;y_mouse>y_wnd
-    mov ebx,[wndMain.left]
+    mov ebx,ted_wnd_l
-    add ebx,[recMain.left]
+    add ebx,ted_rec_l
     mov ecx,eax
     shr ecx,16
     cmp cx,bx
     jl @f ;x_mouse
-    sub ebx,[recMain.left]
+    sub ebx,ted_rec_l
-    add ebx,[wndMain.width]
+    add ebx,ted_wnd_w
-    cmp bx,cx
-    jl @f ;x_mouse>x_wnd
+    cmp bx,cx
     jl @f ;x_mouse>x_wnd
     call draw_cursor_sumb
-    call wnd_main_click
+    stdcall draw_cursor_sumb, tedit0
-    ;call draw_main_cursor ;???
+    call wnd_main_click
     jmp .no_in_wnd
   @@:
     call wnd_main_mouse_scroll
-    cmp [dragm],0
+    cmp ted_drag_m,0
     je .no_in_wnd
-      mov [dragm],0
+      mov ted_drag_m,0
+      call draw_but_toolbar
-      call draw_but_toolbar
+      stdcall draw_main_win, tedit0
-      call draw_main_win
+  .no_in_wnd:
+  pop edi ecx ebx eax
+  ret
+endp
   .no_in_wnd:
-  pop ecx ebx eax
+;input:
-  ret
+; eax -> (x,y)
 ; edi -> óêàçàòåëü íà ñòðóêòóðó tedit
-; input:
+;description:
-;  eax->(x,y)
+; ôóíêöèÿ âûçûâåòñÿ ïðè íàæàòèè êíîïêîé ìûøè è ïîïàäåíèè êóðñîðîì â îêíî ðåäàêòîðà
 wnd_main_click:
   push ecx edx
   push eax
     shr eax,16
     and eax,0xffff
-    sub eax,[wndMain.left]
+    sub eax,ted_wnd_l
-    sub eax,[recMain.left]
+    sub eax,ted_rec_l
     mov [cur_x],eax
   pop eax
   push eax
     and eax,0xffff
-    sub eax,[wndMain.top]
+    sub eax,ted_wnd_t
-    sub eax,[recMain.top]
+    sub eax,ted_rec_t
     xor edx,edx
-    mov ecx,[recMain.height]
+    mov ecx,ted_rec_h
     div cx
     inc eax
     cmp eax,[wScr.cur_area]
     jle @f
       mov eax,[wScr.cur_area]
     @@:
     dec eax
     mov [cur_y],eax
   pop eax
-  cmp [dragm],0
+  cmp ted_drag_m,0
   je @f
     call SelMove
     jmp .sel_move
   @@:
-    mov [dragm],1
+    mov ted_drag_m,1
     call SelStart
     cmp eax,[wScr.max_area]
     jb @f
       mov dword[wScr.position],ebx ;if scroll position out of range
       jmp .no_scroll
     @@:
-    call draw_main_win
+    stdcall draw_main_win, tedit0
   .no_scroll:
   pop ebx eax
   ret
   inc cx
   mov edx,85*65536+25
   call draw_but_icon
-call IsSel
+stdcall IsSel, tedit0
 cmp al,0
 jne @f
 and ecx,0xffff
   call draw_but_icon
   pop edx ecx ebx
-  ret
   ret
+;input:
-;input:
+;  clear_o - åñëè =1 î÷èñòèòü îäíó ñòðîêó, =0 î÷èñòèòü âñå ñòðîêè îêíà äî íèçó
-; ebx = x*2^16+y coords to left up point clear line
+proc clear_line_before_draw, edit:dword, coords:dword, clear_o:dword, numb_lin:dword
-; esi = 0 clear all rows
+  pushad
-; edi - number text line
+    mov edi,dword[edit]
+    mov ebx,dword[coords]   ;ebx = x*2^16+y coords to left up point clear line
-clear_line_before_draw:
+    mov esi,dword[numb_lin] ;esi - number text line
-  push eax ebx ecx edx
     sub ebx,0x10001 ;îòíèìàåì îòñòóïû äëÿ âûðàâíèâàíèÿ áóêâû ïî öåíòðó
-    cmp esi,0
+    cmp dword[clear_o],0
     jne @f
-      add bx,word[recMain.height]
+      add ebx,ted_rec_h
+      inc esi
-      inc edi ; ???
+      ror ebx,16
-      ror ebx,16
+	  xor bx,bx
-      mov bx,word[wndMain.left]
+      add ebx,ted_wnd_l
-      add bx,word[recMain.left]
+      add ebx,ted_rec_l ;bx = ted_wnd_l+ted_rec_l
       ror ebx,16
     @@:
-    mov ax,word[wndMain.height]
+    mov eax,ted_wnd_h
-    add ax,word[wndMain.top]
+    add eax,ted_wnd_t
     cmp ax,bx
     jl .no_clear
+    sub ax,bx
-    sub ax,bx
+    mov cx,bx
+    shl ecx,16
-    mov cx,bx
-    shl ecx,16
+    xor bx,bx
+    add ebx,ted_wnd_w
-    mov bx,word[wndMain.width]
+    sub ebx,ted_rec_l
-    sub bx,word[recMain.left]
+	xor cx,cx
-    mov cx,word[recMain.height]
+    add ecx,ted_rec_h
     mov edx,[WND_WORK_COLOR]
-    cmp esi,0
+    cmp dword[clear_o],0
     je .pusto
     cmp ax,cx
     jge @f
       .pusto:
       mov cx,ax
     @@:
-    call IsSel
+    stdcall IsSel,edi
     cmp al,0
     je @f
-    cmp [seln.y0],edi
+    cmp [seln.y0],esi
     jg @f
-    cmp [seln.y1],edi
+    cmp [seln.y1],esi
     jl @f
       mov edx,[SELECT_COLOR] ;draw selected line
+    @@:
-    @@:
+    mov eax,13 ;rect
-    mov eax,13 ;rect
+    int 0x40
     int 0x40
     stdcall IsSel,edi
-    call IsSel
+    cmp al,0
-    cmp al,0
+    je .no_clear
     je .no_clear
+    mov al,13 ;rect
-    mov al,13 ;rect
+	xor cx,cx
-    mov cx,word[recMain.height]
+    add ecx,ted_rec_h
-    cmp [seln.y0],edi
+    cmp [seln.y0],esi
     jne @f
       push bx
       mov edx,[seln.x0] ; âåðõíÿÿ ïîëîñà (çàòèðàåò ñëåâà)
       cmp edx,[hScr.position]
       jle .in_wnd
 	sub edx,[hScr.position]
-	imul edx,[recMain.width]
+	imul edx,ted_rec_w
 	mov bx,dx
 	jmp .no_wnd
       .in_wnd:
 	mov bx,0
       .no_wnd:
       mov edx,[WND_WORK_COLOR]
       int 0x40
       pop bx
     @@:
-    cmp [seln.y1],edi
+    cmp [seln.y1],esi
     jne @f
       mov edx,[seln.x1] ; íèæíÿÿ ïîëîñà (çàòèðàåò ñïðàâà)
       cmp edx,[hScr.position]
       jle .in_wnd2
 	sub edx,[hScr.position]
-	imul edx,[recMain.width]
+	imul edx,ted_rec_w
+	sub bx,dx
-	sub bx,dx
+	shl edx,16
-	shl edx,16
+	add ebx,edx
-	add ebx,edx
-      .in_wnd2:
+      .in_wnd2:
-      mov edx,[WND_WORK_COLOR]
-      int 0x40
-    @@:
-  .no_clear:
+      mov edx,[WND_WORK_COLOR]
-  pop edx ecx ebx eax
+      int 0x40
-  ret
-;include 't_debug.inc'
+    @@:
 draw_main_win:
-  push eax ebx ecx edx edi esi
-;---debug---
+  .no_clear:
-;mov ecx,0
+  popad
-;@@:
+  ret
-;call DebugSymb
+endp
-;inc ecx
-;cmp ecx,10
 ;jge @f
-;jmp @b
+proc draw_main_win, edit:dword
-;@@:
+  locals
-;ret
+    line_num dd ?
-;---debug---
+  endl
+  pushad
+  mov edi,dword[edit]
-  mov eax,4 ;draw text
-  mov esi,1
+  mov eax,4 ;draw text
   mov ecx,[tex_colors]
   push dword[ecx]
+  pop ecx
   pop ecx
   mov ebx,ted_wnd_l
-  mov ebx,[wndMain.left]
+  add ebx,ted_rec_l
-  add ebx,[recMain.left]
+  shl ebx,16
-  inc ebx
-  shl ebx,16
-  add ebx,[wndMain.top]
-  add ebx,[recMain.top]
-  inc ebx
   add ebx,ted_wnd_t
-  call SelNormalize ;need before draw select
+  add ebx,ted_rec_t
-  mov edi,[wScr.position]
+  add ebx,0x10001 ;äîáàâëÿåì îòñòóïû äëÿ âûðàâíèâàíèÿ áóêâû ïî öåíòðó
-  call clear_line_before_draw
+  call SelNormalize ;need before draw select
 	push edx
 	mov edx,symbol_new_line
 	int 0x40
 	pop edx
       .no_invis:
-      add bx,word [recMain.height]
+      add ebx,ted_rec_h
       ;optimized output \/
-      mov ax,word [wndMain.height]
+      mov eax,ted_wnd_h
-      add ax,word [wndMain.top]
+      add eax,ted_wnd_t
       cmp bx,ax
       jg .no_draw_text
-      mov ax,4
+      mov eax,4
       ;optimized output /\
+	  and ebx,0xffff
       ror ebx,16
-      mov bx,word [wndMain.left]
+      add ebx,ted_wnd_l
-      add bx,word [recMain.left]
+      add ebx,ted_rec_l
       inc ebx
       ror ebx,16
-      inc edi ;increment line number
+      inc dword[line_num] ;increment line number
-      call clear_line_before_draw
+      stdcall clear_line_before_draw, tedit0,ebx,1,dword[line_num]
       call OptDrawLineLeft
       jmp @b
     .no_13:
     int 0x40
     ror ebx,16
-    add bx,word [recMain.width]
+    add ebx,ted_rec_w
-    mov si,word [wndMain.left]
+    mov esi,ted_wnd_l
-    add si,word [wndMain.width]
+    add esi,ted_wnd_w
     cmp bx,si
     jl .no_opt
       call OptDrawLineRight
     .no_opt:
-    mov si,1
+	mov si,1
     ror ebx,16
     jmp @b
-  .no_draw_text:
-  xor esi,esi
-  call clear_line_before_draw
-  mov eax,13
-  ;top panel with caption
-  mov ebx,[wndMain.left]
-;  add ebx,[recMain.left]
-  shl ebx,16
-  add ebx,[wndMain.width]
-;  sub ebx,[recMain.left]
+  .no_draw_text:
-  mov edx,[WND_WORK_COLOR]
-  mov ecx,[wndMain.top] ;draw caption
-  shl ecx,16
-  add ecx,[recMain.top]
-  mov edx,[WND_CAPT_COLOR]
-  int 0x40
-  ;left panel with numbers
-;  mov ebx,[wndMain.left]
-;  shl ebx,16
-;  add ebx,[recMain.left]
-  ;mov cx,word[wndMain.height]
-;  mov cx,word[recMain.top]
-;  int 0x40
+  stdcall clear_line_before_draw, tedit0,ebx,0,dword[line_num]
-  call draw_line_numbers
+  stdcall draw_line_numbers, tedit0
-  call draw_main_cursor
+  stdcall draw_main_cursor, tedit0
 ;---------------------------------------------
 	inc	eax
 	mov	[wScr.all_redraw],eax
 	mov	[hScr.all_redraw],eax
-; draw for Vertical ScrollBar
-	push	 dword wScr
+; draw for Vertical ScrollBar
-	call	 [scrollbar_ver_draw]
-	push	 dword hScr
+	stdcall [scrollbar_ver_draw], dword wScr
-	call	 [scrollbar_hor_draw]
+	stdcall [scrollbar_hor_draw], dword hScr
 ; reset all_redraw flag
 	xor	eax,eax
 	mov	[wScr.all_redraw],eax
 	mov	[hScr.all_redraw],eax
 ;---------------------------------------------
   mov eax,13
   ;left-bottom square
-  mov bx,word[wndMain.left]
+  mov ebx,ted_wnd_l
   shl ebx,16
-  mov bx,word[recMain.left]
+  add ebx,ted_rec_l
-  mov ecx,[wndMain.top]
+  mov ecx,ted_wnd_t
-  add ecx,[wndMain.height]
+  add ecx,ted_wnd_h
   shl ecx,16
   mov cx,word[hScr.size_y]
   inc cx
   mov edx,[sc.work]
   int 0x40
   ;right-bottom square
-  mov ebx,[wndMain.left]
+  mov ebx,ted_wnd_l
-  add ebx,[wndMain.width]
+  add ebx,ted_wnd_w
   shl ebx,16
-  mov bx,word[wScr.size_x]
-  inc bx
+  mov bx,word[wScr.size_x]
-  int 0x40
+  inc bx
+  int 0x40
+  stdcall draw_panel_find, edi
-  pop esi edi edx ecx ebx eax
+  stdcall draw_panel_syntax, edi
-  call draw_panel_find
+  popad
-  call draw_panel_syntax
+  ret
-  ret
+endp
+;txtBUp db 24
+;txtBDn db 25
+;txtBRi db 26
-;txtBUp db 24
+;txtBLe db 27
-;txtBDn db 25
+proc draw_panel_find, edit:dword
-;txtBRi db 26
+  push edi
-;txtBLe db 27
+  mov edi,dword[edit]
 draw_panel_find:
   cmp byte[panel_id],TE_PANEL_FIND ;if not panel
   jne @f
   push eax ebx ecx edx
   mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
   mov ebx,TE_PANEL_WIDTH
-  mov cx,word[wndMain.top]
+  mov ecx,ted_wnd_t
   shl ecx,16
   mov cx,20
   mov edx,[sc.work]
   int 0x40
   mov eax,4 ;ðèñîâàíèå òåêñòà
   mov ebx,30*65536+5
-  add bx,word[wndMain.top]
+  add ebx,ted_wnd_t
   mov ecx,[sc.work_text]
   or ecx,0x80000000
   mov edx,txtFindCapt
   int 0x40
   push dword edit2
   call [edit_box_draw]
   mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
   mov ebx,TE_PANEL_WIDTH
-  mov cx,word[wndMain.top]
+  mov ecx,ted_wnd_t
   add cx,20+15 ; 15 - height text box
   shl ecx,16
-  mov cx,word[wndMain.height]
+  add ecx,ted_wnd_h
   add cx,word[hScr.size_y]
   sub cx,20+15-1 ; 15 - height text box
   mov edx,[sc.work]
   int 0x40
   mov eax,8 ;êíîïêà
   mov ebx,5*65536+85
-  mov cx,word[wndMain.top]
+  mov ecx,ted_wnd_t
   add cx,20+15+5
   shl ecx,16
   mov cx,20
   mov edx,201 ;button id
   mov esi,[sc.work_button]
   int 0x40
   mov eax,4 ;ðèñîâàíèå òåêñòà
   mov ebx,15*65536+(20+15+10)
-  add bx,word[wndMain.top]
+  add ebx,ted_wnd_t
   mov ecx,[sc.work_text]
   or ecx,0x80000000
+  mov edx,txtFindNext
+  int 0x40
   mov edx,txtFindNext
+  pop edx ecx ebx eax
+  jmp .end_f
+  @@:
+  push eax edx
+    mov eax,8
-  int 0x40
     mov edx,201
-  pop edx ecx ebx eax
+    or edx,0x80000000
-  ret
+    int 0x40
-  @@:
+  pop edx eax
-  push eax edx
+  .end_f:
-    mov eax,8
+  pop edi
-    mov edx,201
+  ret
-    or edx,0x80000000
+endp
     int 0x40
-  pop edx eax
+proc draw_panel_syntax, edit:dword
-  ret
+  push edi
-draw_panel_syntax:
-  cmp byte[panel_id],TE_PANEL_SYNTAX ;if not panel
+  mov edi,dword[edit]
-  jne @f
-  push eax ebx ecx edx
   cmp byte[panel_id],TE_PANEL_SYNTAX ;if not panel
-  mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
+  jne @f
-  mov ebx,TE_PANEL_WIDTH
+  push eax ebx ecx edx
-  mov cx,word[wndMain.top]
+  mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
-  shl ecx,16
+  mov ebx,TE_PANEL_WIDTH
-  mov cx,20
+  mov ecx,ted_wnd_t
-  mov edx,[sc.work]
+  shl ecx,16
-  int 0x40
+  mov cx,20
   mov edx,[sc.work]
-  push dword tree1
+  int 0x40 ;ðèñîâàíèå âåðõíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
   call dword[tl_draw]
   stdcall dword[tl_draw], dword tree1
-  mov	[ws_dir_lbox.all_redraw],1
+  mov [ws_dir_lbox.all_redraw],1 ;äëÿ ïîëíîé ïåðåðèñîâêè äî÷åðíåãî ñêðîëëèíãà
-  push dword ws_dir_lbox
+  stdcall dword[scrollbar_ver_draw], dword ws_dir_lbox
   call dword[scrollbar_ver_draw]
   ror ecx,16
-  ror ecx,16
+  add ecx,dword[tree1.box_height]
-  add ecx,dword[tree1.box_height]
+  add ecx,20
-  add ecx,20
+  and ecx,0xffff
   ror ecx,16
-  mov cx,word[wndMain.height]
+  add ecx,ted_wnd_h
   add cx,word[hScr.size_y]
   sub cx,20
   sub ecx,dword[tree1.box_height]
   inc cx
-  int 0x40
+  int 0x40 ;ðèñîâàíèå íèæíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
   mov eax,8 ;êíîïêà
   mov ebx,5*65536+65
-  mov cx,word[wndMain.top]
+  mov ecx,ted_wnd_t
-  add cx,25
+  add ecx,25
   add ecx,dword[tree1.box_height]
   shl ecx,16
   mov cx,20
   mov edx,200 ;button id
   mov esi,[sc.work_button]
   int 0x40
   mov eax,4 ;ðèñîâàíèå òåêñòà
   mov ebx,30*65536+5
-  add bx,word[wndMain.top]
+  add ebx,ted_wnd_t
+  mov ecx,[sc.work_text]
+  or ecx,0x80000000
-  mov ecx,[sc.work_text]
+  mov edx,txtFormatCapt
+  int 0x40
-  or ecx,0x80000000
+  mov ebx,10*65536+30
-  mov edx,txtFormatCapt
+  add ebx,dword[tree1.box_height]
-  int 0x40
-  mov ebx,10*65536+30
+  add ebx,ted_wnd_t
-  add ebx,dword[tree1.box_height]
+  mov edx,txtFormatApply
-  add bx,word[wndMain.top]
-  mov edx,txtFormatApply
+  int 0x40
-  int 0x40
+  pop edx ecx ebx eax
-  pop edx ecx ebx eax
+  jmp .end_f
-  ret
+  @@:
-  @@:
+    push eax edx
+      mov eax,8
-  push eax edx
-    mov eax,8
-    mov edx,200
+      mov edx,200
+      or edx,0x80000000
+      int 0x40 ;åñëè íåò ïàíåëè òî óäàëÿåì êíîïêó
-    or edx,0x80000000
+    pop edx eax
-    int 0x40
+  .end_f:
-  pop edx eax
-  ret
+  pop edi
   ret
-draw_cur_line:
+endp
   push eax ebx ecx edx esi edi
       jmp .no_draw_text
     .no_13:
     int 0x40
     ror ebx,16
-    add bx,word[recMain.width]
-;    cmp bx,word[wndMain.width]
+    add ebx,ted_rec_w
-    mov ax,word[wndMain.width]
+    mov eax,ted_wnd_w
-    add ax,word[wndMain.left] ;ax = îòñòóï ïî îñè x
+    add eax,ted_wnd_l ;ax = îòñòóï ïî îñè x
     cmp bx,ax
     jge .no_draw_text ;Opt
     ror ebx,16
     call IteratNext
     jmp @b
-  .no_draw_text:
+  .no_draw_text:
-  pop edi esi edx ecx ebx eax
+  stdcall draw_main_cursor, tedit0
+  popad
-  call draw_main_cursor
+  ret
-  ret
+endp
 MIN_M_WND_H equ 100
 MIN_W_SCRL_ARE equ 3
 MIN_H_SCRL_ARE equ 3
+proc EvSize, edit:dword
+  push eax ecx edx edi
-EvSize:
+  mov edi,dword[edit]
-  push eax ecx edx edi
-  m2m [wndMain.width],[procinfo.client_box.width]
+  m2m ted_wnd_w,[procinfo.client_box.width] ;ñòàâèì øèðèíó îêíà ðåäàêòîðà ðàâíîé øèðèíå âñåãî îêíà
-  mov ax,word[wndMain.left]
+  mov eax,ted_wnd_l
+  sub ted_wnd_w,eax ;îòíèìàåì îòñòóï ñëåâà
-  sub word[wndMain.width],ax
+  mov eax,[wScr]    ;+0 size_x
-  mov eax,[wScr] ;+0 size_x
+  and eax,0xffff
-  sub word[wndMain.width],ax
+  sub ted_wnd_w,eax ;îòíèìàåì øèðèíó âåðò. ñêðîëëèíãà
-  m2m [wndMain.height],[procinfo.client_box.height]
+  m2m ted_wnd_h,[procinfo.client_box.height] ;ñòàâèì âûñîòó îêíà ðåäàêòîðà ðàâíîé âûñîòå âñåãî îêíà
-  cmp [wndMain.height],MIN_M_WND_H
+  cmp ted_wnd_h,MIN_M_WND_H
   jg @f
+    mov ted_wnd_h,MIN_M_WND_H
-    mov [wndMain.height],MIN_M_WND_H
+  @@:
-  @@:
+  mov ax,word[hScr.size_y]
-  mov ax,word[hScr.size_y]
+  and eax,0xffff
-  sub word[wndMain.height],ax
+  sub ted_wnd_h,eax	      ;îòíèìàåì âûñîòó ãîðèç. ñêðîëëèíãà
-    mov eax,[wndMain.height] ;.height = .top+.height
+    mov eax,ted_wnd_h	      ;eax = âûñîòà îêíà - âûñîòà ãîðèç. ñêðîëëèíãà
-    mov word[hScr.start_y],ax
+    mov word[hScr.start_y],ax ;ïåðåäâèãàåì ãîðèç. ñêðîëëèíã
-  mov eax,[wndMain.top]
+  mov eax,ted_wnd_t
+  sub ted_wnd_h,eax	      ;îòíèìàåì îòñòóï ñâåðõó
-  sub word[wndMain.height],ax
+  mov eax,ted_wnd_w
+  mov ecx,ted_wnd_l
-  m2m word[wScr.start_x],word[wndMain.width]
+  add eax,ecx
-  mov ax,word[wndMain.left]
+  mov word[wScr.start_x],ax   ;ïåðåäâèãàåì âåðò. ñêðîëëèíã
-  add [wScr.start_x],ax
+  mov eax,ted_wnd_h
-  m2m word[wScr.size_y],word[wndMain.height]
+  mov word[wScr.size_y],ax    ;çàäàåì âûñîòó âåðò. ñêðîëëèíãà
-  m2m word[hScr.start_x],word[recMain.left]
+  add ecx,ted_rec_l	;ecx=ted_wnd_l+ted_rec_l
-  add [hScr.start_x],ax ;ax=[wndMain.left]
+  mov [hScr.start_x],cx ;ñäâèãàåì ãîðèç. ñêðîëëèíã ïî ðàçìåðó ëåâîãî îòñòóïà äëÿ öèôð
-  mov eax,[wndMain.width]
+  mov eax,ted_wnd_w
-  sub ax,word[recMain.left]
+  sub eax,ted_rec_l
-  mov word[hScr.size_x],ax
+  mov word[hScr.size_x],ax ;çàäàåì øèðèíó ãîðèç. ñêðîëëèíãà
-  mov eax,[wndMain.height] ;calculate lines in page
+  mov eax,ted_wnd_h ;calculate lines in page
-  sub eax,[recMain.top]
+  sub eax,ted_rec_t
   xor edx,edx
-  mov ecx,[recMain.height]
+  mov ecx,ted_rec_h
   div ecx
   cmp eax,MIN_W_SCRL_ARE
   jg @f
     mov eax,MIN_W_SCRL_ARE
   @@:
   mov [wScr.cur_area],eax
-  mov eax,[wndMain.width] ;calculate cols in page
+  mov eax,ted_wnd_w ;calculate cols in page
-  sub eax,[recMain.left]
+  sub eax,ted_rec_l
   xor edx,edx
-  mov ecx,[recMain.width]
+  mov ecx,ted_rec_w
+  div ecx
-  div ecx
+  cmp eax,MIN_H_SCRL_ARE
-  cmp eax,MIN_H_SCRL_ARE
+  jg @f
-  jg @f
+    mov eax,MIN_H_SCRL_ARE
-    mov eax,MIN_H_SCRL_ARE
+  @@:
-  @@:
+  dec eax ; ???
-  dec eax ; ???
+  mov [hScr.cur_area],eax
   mov [hScr.cur_area],eax
   mov eax,ted_wnd_t
+  mov edi,dword tree1
-  mov edi,dword tree1
+  mov tl_box_top,eax ;=ted_wnd_t
-  m2m tl_box_top,dword[wndMain.top]
+  add tl_box_top,20
   add tl_box_top,20
   mov dword[edit2.top],eax ;=ted_wnd_t
   mov edx,eax ;perv sumbol
   pop eax
   call GetSymbColor
   ret
+proc draw_main_cursor, edit:dword
-draw_main_cursor:
+  pushad
-  push eax ebx ecx edx edi esi
+  mov edi,dword[edit]
   mov eax,13 ;draw cursor
-  mov ecx,[wndMain.top] ;calc rect -> y0,y1
+  mov ecx,ted_wnd_t ;calc rect -> y0,y1
-  add ecx,[recMain.top]
+  add ecx,ted_rec_t
   mov edx,[cur_y]
-  imul edx,[recMain.height]
+  imul edx,ted_rec_h
   add ecx,edx
-  cmp [curMod],1
+  cmp [curMod],1 ;ïðîâåðêà ðåæèìà ðàáîòû êóðñîðà (îáû÷íûé èëè âñòàâêà)
   jne @f
-    mov edx,[recMain.height]
+    mov edx,ted_rec_h
-    inc edx ; 1->1, 3->2, 5->3, ...
+    inc edx   ;1->1, 3->2, 5->3, ...
-    shr edx,1
+    shr edx,1 ;edx = âûñîòà ñòðîêè äåëåííàÿ íà 2 (êîãäà êóðñîð íå ïîëíûé)
     add ecx,edx
   @@:
   shl ecx,16
-  add ecx,[recMain.height]
+  add ecx,ted_rec_h
   cmp [curMod],1
   jne @f
-    shr cx,1
+    shr cx,1 ;äåëèì âûñîòó êóðñîðà íà 2
   @@:
-  mov ebx,[wndMain.left] ;calc rect -> x0,x1
+  mov ebx,ted_wnd_l ;calc rect -> x0,x1
-  add ebx,[recMain.left]
+  add ebx,ted_rec_l
   mov edx,[cur_x]
-  imul edx,[recMain.width]
+  imul edx,ted_rec_w
   add ebx,edx
   shl ebx,16
-  add ebx,[recMain.width]
+  add ebx,ted_rec_w
   mov edx,[CURSOR_COLOR]
     ror ecx,16
     mov bx,cx
     add ebx,0x10001
     cmp [curMod],1
     jne .no_up_tetx
-      mov cx,word[recMain.height]
+      mov ecx,ted_rec_h
       inc cx ; 1->1, 3->2, 5->3, ...
       shr cx,1
       sub bx,cx
     .no_up_tetx:
     mov ecx,[CUR_TEXT_COLOR]
     call ConvertInvisSymb
     int 0x40
   @@:
   mov eax,4
-  mov ebx,[wndMain.left]
+  mov ebx,ted_wnd_l
-  add ebx,[recMain.left]
+  add ebx,ted_rec_l
   shl ebx,16
-  add ebx,[wndMain.top]
+  add ebx,ted_wnd_t
   add ebx,3
   mov ecx,[WND_BORD_COLOR]
   or  ecx,0x80000000
   mov edx,txtRow
-  int 0x40
+  int 0x40 ;âûâîä ïîäïèñè 'Ñòðîêà'
   add ebx,0x500000
   mov edx,txtCol
-  int 0x40
+  int 0x40 ;âûâîä ïîäïèñè 'Çíàê'
   cmp [tim_Undo],0
   je @f
     add ebx,0x500000
     mov edx,txtOtm
     int 0x40
     sub ebx,0x500000
   @@:
-  call draw_bufer
+  stdcall draw_bufer, edi
-  call draw_help_f1
   stdcall draw_help_f1, edi
   mov eax,47 ;draw cursor coords
-  mov esi,[WND_BORD_COLOR]
+  mov eax,47 ;draw cursor coords
-  or  esi,0x40000000
+  mov esi,[WND_BORD_COLOR]
-  mov edi,[WND_WORK_COLOR]
+  or  esi,0x40000000
   mov edx,ebx
   ror edx,16
   sub edx,35
+  ror edx,16
+  ;add edx,3
-  ror edx,16
+  mov ebx,0x40000 ;Row=...
-  ;add edx,3
+  mov ecx,[cur_y]
-  mov ebx,0x40000 ;Row=...
+  inc ecx
-  mov ecx,[cur_y]
+  add ecx,[wScr.position]
     mov ecx,[tim_Undo]
     add edx,0x500000
     int 0x40
   @@:
-  pop esi edi edx ecx ebx eax
+  popad
+  ret
+endp
+proc draw_bufer, edit:dword
-  ret
   pushad
-draw_bufer:
+  mov edi,dword[edit]
-  push eax ebx ecx edx esi edi
   cmp byte[buf],0
   je @f
-    mov ebx,[wndMain.left]
+    mov ebx,ted_wnd_l
-    add ebx,[recMain.left]
+    add ebx,ted_rec_l
   add bx,250
     shl ebx,16
-    add ebx,[wndMain.top]
+    add ebx,ted_wnd_t
     add ebx,3
     add esi,eax
     mov eax,4
     int 0x40
   @@:
-  pop edi esi edx ecx ebx eax
+  popad
+  ret
+endp
+proc draw_help_f1, edit:dword
+  pushad
-  ret
-draw_help_f1:
+  mov edi,dword[edit]
-  push eax ebx ecx edx edi
   mov eax,13 ;clear place before draw help
-  mov ebx,[wndMain.left]
+  mov ebx,ted_wnd_l
-  add ebx,[recMain.left]
+  add ebx,ted_rec_l
   shl ebx,16
-  add ebx,[wndMain.width]
+  add ebx,ted_wnd_w
-  sub ebx,[recMain.left]
+  sub ebx,ted_rec_l
-  mov ecx,[wndMain.top]
+  mov ecx,ted_wnd_t
   add ecx,13
   shl ecx,16
-  add ecx,[recMain.height]
+  add ecx,ted_rec_h
   mov edx,[WND_CAPT_COLOR]
   int 0x40
   cmp [help_id],-1
-  je @f;.no_help
+  je @f
     mov eax,[help_id]
     ColToIndexOffset eax,edx
     ;SetCoordinates
-    mov ebx,[wndMain.left]
+    mov ebx,ted_wnd_l
-    add ebx,[recMain.left]
+    add ebx,ted_rec_l
     shl ebx,16
-    add ebx,[wndMain.top]
+    add ebx,ted_wnd_t
     add ecx,eax
     push dword[ecx]
     pop ecx
     or	ecx,0xc0000000 ;SetTextStyles
     mov edi,[WND_WORK_COLOR]
+; edi <> edit -----------------------------------------------------------------
     mov eax,4
     int 0x40
     ;*** draw help string ***
       add edi,dword[tex_help_f1]
       mov edx,edi
       add ebx,0x500000
       int 0x40
-    @@:
+  @@:
-  ;.no_help:
+  popad
-  pop edi edx ecx ebx eax
   ret
+endp
+proc draw_line_numbers, edit:dword
+  pushad
+  mov edi,dword[edit]
+  ;top panel with caption
+  mov ebx,ted_wnd_l
+;  add ebx,ted_rec_l
+  shl ebx,16
+  add ebx,ted_wnd_w
+;  sub ebx,ted_rec_l
+  mov edx,[WND_WORK_COLOR]
+  mov ecx,ted_wnd_t
+  shl ecx,16
+  add ecx,ted_rec_t
+  mov eax,13
+  mov edx,[WND_CAPT_COLOR]
+  int 0x40
-draw_line_numbers:
   push eax ebx ecx edx esi ;edi
-  ;line numbers
-  mov eax,47
-  mov esi,[WND_BORD_COLOR]
-  ;or esi,0x40000000
-  ;mov edi,[WND_WORK_COLOR]
+  ;line numbers
-  mov ebx,0x40000 ;format
   mov ebx,0x40000 ;format
   mov ecx,[wScr.position]
   inc ecx
-  mov dx,3
+  mov edx,3
-  add dx,word[wndMain.left]
+  add edx,ted_wnd_l
-  shl edx,16
+  rol edx,16
-  mov dx,word[wndMain.top]
+  add edx,ted_wnd_t
-  add dx,word[recMain.top]
+  add edx,ted_rec_t
   @@:
 push eax ebx ecx edx
-  mov eax,13
+push ebx ecx edx
   ;left panel with numbers
-  mov ebx,[wndMain.left]
+  mov ebx,ted_wnd_l
+  shl ebx,16
+  add ebx,ted_rec_l
-  shl ebx,16
+  mov ecx,ted_rec_h
-  add ebx,[recMain.left]
-  mov cx,dx
-;  mov ecx,[wndMain.top] ;draw caption
+  rol ecx,16
-;  add ecx,[recMain.top]
+  mov cx,dx
-  shl ecx,16
+  rol ecx,16
-  mov cx,word [recMain.height]
+  mov eax,13
   mov edx,[WND_CAPT_COLOR]
-  int 0x40
+  int 0x40 ;ðèñóåì ïðÿìîóãîëüíèê ïîä íîìåðîì ñòðîêè
+pop edx ecx ebx
-pop edx ecx ebx eax
+    mov eax,47
+    mov esi,[WND_BORD_COLOR]
-    int 0x40
+    int 0x40 ;ðèñóåì íîìåð ñòðîêè
+    inc ecx
+    add edx,ted_rec_h
-    inc ecx
+    sub edx,ted_wnd_t
-    add dx,word[recMain.height]
+	mov esi,edx
-    sub dx,word[wndMain.top]
+	and esi,0xffff
-    cmp dx,word[wndMain.height]
+    cmp esi,ted_wnd_h
     jge @f
-    add dx,word[wndMain.top]
+    add edx,ted_wnd_t
     jmp @b
+  @@:
+  popad
+  ret
+endp
-  @@:
   pop esi edx ecx ebx eax
-  ret
+;this function need to optimize output
+proc draw_cursor_sumb, edit:dword
   push eax ecx edx edi
-draw_cursor_sumb: ;this function need to optimize output
+  mov edi,dword[edit]
   push eax ecx edx
   mov eax,13 ;rect
-  mov ebx,[wndMain.left]
+  mov ebx,ted_wnd_l
-  add ebx,[recMain.left]
+  add ebx,ted_rec_l
   mov edx,[cur_x]
-  imul edx,[recMain.width]
+  imul edx,ted_rec_w
   add ebx,edx
   shl ebx,16
-  add ebx,[recMain.width]
+  add ebx,ted_rec_w
-  mov ecx,[wndMain.top] ;calc rect -> y0,y1
+  mov ecx,ted_wnd_t ;calc rect -> y0,y1
-  add ecx,[recMain.top]
+  add ecx,ted_rec_t
   mov edx,[cur_y]
     call ConvertInvisSymb
     int 0x40
     pop esi
   @@:
-  pop edx ecx eax
+  pop edi edx ecx eax
   ret
 endp

Subversion Repositories Kolibri OS

(root)/programs/other/t_edit/t_draw.inc – Rev 1343 → 1449