WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/trunk/tree_list.mac

 ; ìàêðîñ äëÿ ñèñòåìíîé áèáëèîòåêè box_lib.obj
 ; ýëåìåíò TreeList äëÿ Kolibri OS
-; ôàéë ïîñëåäíèé ðàç èçìåíÿëñÿ 20.11.2009 IgorA
+; ôàéë ïîñëåäíèé ðàç èçìåíÿëñÿ 23.11.2009 IgorA
 ; íà êîä ïðèìåíåíà GPL2 ëèöåíçèÿ
+sizeof.TreeList equ 20
+;struct TreeList
+;  type dw ? ;+ 0 òèï ýëåìåíòà, èëè èíäåêñ èêîíêè äëÿ óçëà
+;  lev db ?  ;+ 2 óðîâåíü ýëåìåíòà
+;  clo db ?  ;+ 3 ôëàã çàêðûòèÿ, èëè îòêðûòèÿ (èìååò ñìûñë äëÿ ðîäèòåëüñêîãî óçëà)
+;  perv dd ? ;+ 4 èíäåêñ ïðåäûäóùåãî ýëåìåíòà
+;  next dd ? ;+ 8 èíäåêñ ïîñëåäóþùåãî ýëåìåíòà
+;  tc dd ?   ;+12 âðåì. ñîçäàíèÿ
+;  td dd ?   ;+16 âðåì. óäàëåíèÿ
 ;ends
-sizeof.TreeList equ 20
+tl_info_size  equ  word[edi +4] ;ðàçìåð äàííûõ âûäåëÿåìûõ äëÿ êàæäîãî óçëà (ïîëüçîâàòåëüñüêèå äàííûå + òåêñò äëÿ ïîäïèñè)
 tl_style      equ dword[edi+10] ;ñòèëè ýëåìåíòà
-tl_style      equ dword[edi+10] ;ñòèëè ýëåìåíòà
+tl_data_nodes equ dword[edi+14] ;óêàçàòåëü íà ñòðóêòóðû óçëîâ
 tl_img_cx     equ  word[edi+22] ;øèðèíà èêîíîê
 tl_img_cy     equ  word[edi+24] ;âûñîòà èêîíîê
 tl_box_left   equ dword[edi+58]
 tl_box_top    equ dword[edi+62]
 tl_box_width  equ dword[edi+66]
 tl_box_height equ dword[edi+70]
 tl_capt_cy    equ  word[edi+74] ;âûñîòà ïîäïèñè
-tl_info_capt_offs equ dword[edi+76]
+tl_info_capt_offs equ dword[edi+76] ;ñäâèã äëÿ íà÷àëà òåêñòà (ïîäïèñè óçëà)
 tl_el_focus   equ dword[edi+80] ;óêàçàòåëü íà ñòðóêòóðó ýëåìåíòà â ôîêóñå
 tl_p_scrol    equ dword[edi+84] ;óêàçàòåëü íà ñòðóêòóðó ñêðîëëèíãà
 tl_sb_draw    equ dword[edi+88] ;óêàçàòåëü íà ôóíêöèþ ïåðåðèñîâûâàþùóþ ñêðîëëèíã
 tl_on_press   equ dword[edi+96] ;óêàçàòåëü íà ôóíêöèþ, êîòîðàÿ âûçûâàåòñÿ ïðè íàæàòèè Enter
 ;êîíñòàíòû ñòèëÿ
 tl_key_no_edit   equ   1b ;ýëåìåíò íåëüçÿ ðåäàêòèðîâàòü íà êëàâèàòóðå (èçìåíÿòü óðîâíè, óäàëÿòü)
 tl_draw_par_line equ  10b ;ðèñîâàòü ëèíèè ê ðîäèòåëüñêîìó óçëó
-tl_list_box_mode equ 100b ;ñòèëü íå îòîáðàæàåò óðîâíè (êàê â ListBox âñå îäíîãî óðîâíÿ)
-macro use_tree_list_structs
-{
+tl_list_box_mode equ 100b ;ñòèëü íå îòîáðàæàåò óðîâíè (êàê â ListBox âñå îäíîãî óðîâíÿ)
-struct TreeInfo
-  data_info	 dd ? ;+ 0 óêàçàòåëü íà îñíîâíûå äàíûå
-  info_size	 dw ? ;+ 4 ðàçìåð èíôîðìàöèîííîé ñòðóêòóðû (ïîëüçîâàòåëüñüêèå äàííûå + òåêñò äëÿ ïîäïèñè)
-  info_max_count dd ? ;+ 6 ìàêñèìàëüíîå êîëëè÷åñòâî ñòðóêòóð
-  style 	 dd ? ;+10 ñòèëè ýëåìåíòà
+;data_info	 dd ? ;+ 0 óêàçàòåëü íà îñíîâíûå äàíûå
-  data_nodes	 dd ? ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
-  data_img	 dd ? ;+18 óêàçàòåëü íà èçîáðàæåíèÿ
-  img_cx	 dw ? ;+22 øèðèíà èêîíîê
-  img_cy	 dw ? ;+24 âûñîòà èêîíîê
-  data_img_sys dd ? ;+26 óêàçàòåëü íà ñèñòåìíûå èçîáðàæåíèÿ (ñòðåëêè, ïëþñèêè)
+;info_max_count dd ? ;+ 6 ìàêñèìàëüíîå êîëëè÷åñòâî ñòðóêòóð
-  ch_tim		dd ? ;+30 êîëè÷åñòâî èçìåíåíèé â ôàéëå
-  ls_tim		dd ? ;+34 âðåìÿ ïîñëåäíåãî ñîõðàíåíèÿ
-  tim_undo	 dd ? ;+38 êîëè÷åñòâî îòìåíåííûõ äåéñòâèé
-  cur_pos	 dd ? ;+42 ïîçèöèÿ êóðñîðà
-  col_bkg	 dd ? ;+46 öâåò ôîíà
-  col_zag	 dd ? ;+50 öâåò çàãîëîâêà
-  col_txt	 dd ? ;+54 öâåò òåêñòà
-  wndMain	BOX ? ;+58 ðàçìåð îêíà äëÿ âûâîäà
-  capt_cy	 dw ? ;+74 âûñîòà ïîäïèñè
-  info_capt_offs dd ? ;+76 ñäâèã äëÿ íà÷àëà òåêñòà (ïîäïèñè óçëà)
-  el_focus dd ? ;+80 óêàçàòåëü íà ñòðóêòóðó ýëåìåíòà â ôîêóñå
-  p_scrol dd ?  ;+84 óêàçàòåëü íà ñòðóêòóðó ñêðîëëèíãà
+;data_img	 dd ? ;+18 óêàçàòåëü íà èçîáðàæåíèÿ
-  sb_draw dd ?  ;+88 óêàçàòåëü íà ôóíêöèþ ïåðåðèñîâûâàþùóþ ñêðîëëèíã
-  on_activate dd ? ;+92 óêàçàòåëü íà ôóíêöèþ ïðè àêòèâèðîâàíèè óçëà
-  on_press dd ? ;+96 óêàçàòåëü íà ôóíêöèþ ïðè íàæàòèè Enter
-ends
-struct TreeList
-  type dw ? ;+ 0 òèï ýëåìåíòà, èëè èíäåêñ èêîíêè äëÿ óçëà
-  lev db ?  ;+ 2 óðîâåíü ýëåìåíòà
-  clo db ?  ;+ 3 ôëàã çàêðûòèÿ, èëè îòêðûòèÿ (èìååò ñìûñë äëÿ ðîäèòåëüñêîãî óçëà)
-  perv dd ? ;+ 4 èíäåêñ ïðåäûäóùåãî ýëåìåíòà
-  next dd ? ;+ 8 èíäåêñ ïîñëåäóþùåãî ýëåìåíòà
-  tc dd ?   ;+12 âðåì. ñîçäàíèÿ
-  td dd ?   ;+16 âðåì. óäàëåíèÿ
-ends
+;ls_tim		dd ? ;+34 âðåìÿ ïîñëåäíåãî ñîõðàíåíèÿ
 ;on_activate dd ? ;+92 óêàçàòåëü íà ôóíêöèþ ïðè àêòèâèðîâàíèè óçëà
 struc tree_list info_size,info_max_count,style, img_cx,img_cy,\
     col_bkg,col_zag,col_txt, box_l,box_t,box_w,box_h, capt_cy,info_capt_offs,\
-    el_focus, p_scrol,p_sb_draw,fun_enter {
+    el_focus, p_scrol,p_sb_draw,on_press {
   .data_info	dd 0
   .info_size	dw info_size
   .info_capt_offs dd info_capt_offs
   .el_focus dd el_focus
   .p_scrol  dd p_scrol
   .p_sb_draw dd p_sb_draw
   .on_activate dd 0
-  .on_press dd fun_enter
+  .on_press dd on_press
+}
 ;-----------------------------------------------------------------------------
 ;ôóíêöèÿ äëÿ âûäåëåíèÿ ïàìÿòè
   mov ebp,esp
   push eax ecx edi
     mov edi,dword[ebp+8]
     xor ecx,ecx
-    mov cx,word[edi+4]
+    mov cx,tl_info_size
     imul ecx,dword[edi+6]
     call mem_Alloc
     mov dword[edi],eax ;êîïèðóåì óêàçàòåëü íà ïîëó÷åíóþ ïàìÿòü â ñòðóêòóðó
     mov dword[edi+18],0 ;îáíóëÿåì óêàçàòåëü 'data_img'
     mov tl_data_img_sys,0 ;îáíóëÿåì óêàçàòåëü 'data_img_sys'
     mov ecx,sizeof.TreeList
     imul ecx,dword[edi+6]
     call mem_Alloc
-    mov dword[edi+14],eax ;êîïèðóåì óêàçàòåëü íà ïîëó÷åíóþ ïàìÿòü â ñòðóêòóðó
+    mov tl_data_nodes,eax ;êîïèðóåì óêàçàòåëü íà ïîëó÷åíóþ ïàìÿòü â ñòðóêòóðó
       call mem_Free ;÷èñòêà ñèñòåìíûõ èêîíîê
     @@:
     mov ecx,dword[edi]
     call mem_Free
-    mov ecx,dword[edi+14]
+    mov ecx,tl_data_nodes
     call mem_Free
     pop edi ecx
   pop ebp
     mov tl_tim_undo,0
     mov tl_cur_pos,0
     ;xor ecx,ecx
     mov ecx,sizeof.TreeList
     imul ecx,dword[edi+6]
-    mov eax,dword[edi+14]
+    mov eax,tl_data_nodes
     @@:
       mov byte[eax],0 ;÷èñòèì óçëû 0-ìè
       inc eax
       loop @b
-    mov eax,dword[edi+14] ;óêàçàòåëü íà 1-é óçåë
+    mov eax,tl_data_nodes ;óêàçàòåëü íà 0-é óçåë
-    mov dword[eax+8],1 ;óêàçàòåëü next â 1-ì óçëå ïðèðàâíèâàåì ê 1
+    mov dword[eax+8],1 ;óêàçàòåëü next â 0-ì óçëå ïðèðàâíèâàåì ê 1
     call tb_scrol_resize ;îáðàáîòêà ñêðîëëèíãà
     pop edi ecx eax
   pop ebp
   ret 4
     int 0x40
     bt eax,0 ;left mouse button press
-    jae .no_draw
-    mov ebx,tl_el_focus
-    mov dword[ebx],edi ;set focus
+    jae .no_draw
     mov eax,37
     mov ebx,1
     sub ebx,tl_box_height
     add bx,tl_capt_cy
     cmp ax,bx ;âåðõíÿÿ ãðàíèöà îêíà + âûñîòà ïîäïèñè
     jl .no_in_wnd
+    mov esi,tl_el_focus
+    mov dword[esi],edi ;set focus
     ; if '+' or '-' press
     mov esi,eax
     shr esi,16
     cmp eax,ecx
     jl @f
       mov eax,ecx ;åñëè êóðñîð íå âûøåë çà ïðåäåëû óçëîâ, âîññòàíàâëèâàåì ñòàðîå çíà÷åíèå eax
     @@:
     mov ebx,0x80000000 ;ñòàâèì ôëàã äëÿ âûõîäà áåç îáíîâëåíèÿ
     cmp eax,tl_cur_pos ;åñëè íîâîå çíà÷åíèå êóðñîðà ñîâïàëî ñ ïðåäûäóùèì
+    je @f ;òî íå ñòèðàåì êóðñîð
-    je @f	       ;òî ìîæåì âûéòè áåç îáíîâëåíèÿ îêíà
+    push esi
+      mov esi,tl_box_top
+      add esi,tl_box_height ;esi = coord bottom border
+      call tl_draw_null_cursor ;ñòèðàåì êóðñîð
-      xor ebx,ebx
+    pop esi
     @@:
     mov tl_cur_pos,eax
     ; if '+' or '-' press
     call tl_get_cur_node_index ;eax = node index
     cmp eax,2
     jl .no_open_close ;êóðñîð ñòîèò íà ïóñòîì ìåñòå, áåç óçëîâ
     imul eax,sizeof.TreeList
-    add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    add eax,tl_data_nodes
     xor bx,bx
       push dword edi
       call tl_node_close_open
     .no_open_close:
-    bt ebx,31
-    jc .no_draw
+      mov esi,tl_box_top
-      push dword edi
+      add esi,tl_box_height ;esi = coord bottom border
-      call tl_draw
+      call tl_draw_cursor ;ïåðåðèñîâêà êóðñîðà
       jmp .no_draw
+    .no_in_wnd: ;íå ïîïàëè â îêíî - ïîòåðÿ ôîêóñà (ïðè óñëîâèè ÷òî ôîêóñ áûë íà äàííîì ýåëåìåíòå)
+      mov ebx,tl_el_focus
-    .no_in_wnd: ;íå ïîïàëè â îêíî - ïîòåðÿ ôîêóñà
+      cmp dword[ebx],edi
-      mov ebx,tl_el_focus
+      jne .no_draw ;ýëåìåíò íå â ôîêóñå
-      mov dword[ebx],0 ;reset focus
+        mov dword[ebx],0 ;reset focus
     .no_draw:
 ;  mov [dragk],0 ;çàêàí÷èâàåì âûäåëåíèå îò êëàâèàòóðû
   cmp tl_tim_undo,1
   jl .no_work
   push eax ebx ecx edx
-  mov edx,dword[edi+14]
+  mov edx,tl_data_nodes
   mov ecx,edx
   add ecx,sizeof.TreeList
-  call tl_move_next ;long i=tex[0].next;
+  call tl_move_next ;long i=node[0].next;
   mov eax,tl_tim_undo
   sub tl_ch_tim,eax ;ch_tim-=tim_undo;
   mov eax,tl_ch_tim
   cmp [edi+34],eax ;if(ls_tim>ch_tim)
   jle @f
     mov dword[edi+34],0 ;ls_tim=0
   @@:
     cmp edx,ecx
     jle @f
-    ;if(tex[i].tc>ch_tim){ // åñëè ñîçäàíèå ñèìâîëà áûëî îòìåíåíî
+    ;if(node[i].tc>ch_tim){ // åñëè ñîçäàíèå ñèìâîëà áûëî îòìåíåíî
     cmp dword[edx+12],eax
     jle .no_u1
       mov dword[edx+12],0
       mov dword[edx+16],0
       mov ebx, dword[edx+4]
       imul ebx,sizeof.TreeList
-      add ebx, dword[edi+14] ;.next
+      add ebx, tl_data_nodes ;.next
-      push dword[edx+8] ;tex[tex[i].perv].next=tex[i].next;
+      push dword[edx+8] ;node[node[i].perv].next=node[i].next;
       pop dword[ebx+8]
       mov ebx, dword[edx+8]
       imul ebx,sizeof.TreeList
-      add ebx, dword[edi+14] ;.perv
+      add ebx, tl_data_nodes ;.perv
-      push dword[edx+4] ;tex[tex[i].next].perv=tex[i].perv;
+      push dword[edx+4] ;node[node[i].next].perv=node[i].perv;
       pop dword[ebx+4]
     .no_u1:
 ;@@:
 ;---debug---
     ;cycle to nodes
     xor eax,eax
-    mov edx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    mov edx,tl_data_nodes
     mov ecx,edx
     add ecx,sizeof.TreeList
 ; edx = pointer to next node struct
 align 4
 tl_move_next:
   mov edx,dword[edx+8]
   imul edx,sizeof.TreeList
-  add edx,dword[edi+14]
+  add edx,tl_data_nodes
   ret
 ;input:
 ; edx = pointer to some node struct
 ; edx = pointer to perv node struct
 align 4
 tl_move_perv:
   mov edx,dword[edx+4]
   imul edx,sizeof.TreeList
-  add edx,dword[edi+14]
+  add edx,tl_data_nodes
   ret
 ;input:
 ; edx = pointer to symbol struct
 ; edi = pointer to 'TreeList' struct
 ;output:
 ; al = 1 if sumbol not visible
-; (tex[i].td+tim_Undo<=ch_tim && tex[i].td) || (tex[i].tc>ch_tim-tim_Undo)
+; (node[i].td+tim_Undo<=ch_tim && node[i].td) || (node[i].tc>ch_tim-tim_Undo)
 align 4
 tl_node_not_vis:
   cmp dword[edx+16],0
   je @f
-  mov eax,dword[edx+16] ;eax=tex[i].td
+  mov eax,dword[edx+16] ;eax=node[i].td
   add eax,tl_tim_undo
   cmp eax,tl_ch_tim
   jg @f
     mov al,1
       int 0x40 ;draw node icon '-'
     pop esi edx ebx
     @@:
     mov al,byte[edx+2] ;draw minus '-'
-    mov ecx,dword[edi+14]
+    mov ecx,tl_data_nodes
     add ecx,sizeof.TreeList
     mov ah,10 ;get icon index '+' or '-' ?
 align 4
 tl_draw_node_caption:
     push ebx ecx edx esi
     xor esi,esi
-    mov si,word[edi+4];info_size
+    mov si,tl_info_size
     cmp esi,tl_info_capt_offs
     jle @f ;if caption size <= 0
     call tl_info_set_undo
     mov ebx,sizeof.TreeList
     imul ebx,dword[edi+6] ;+6 ìàêñ. êîëè÷åñòâî óçëîâ
-    add ebx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    add ebx,tl_data_nodes
 ;--
     call tl_get_cur_node_index ;eax=po_t
     imul eax,sizeof.TreeList
-    add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    add eax,tl_data_nodes
     mov edx,eax
     call tl_move_perv
     call tl_get_node_index ;eax = index of pointer [edx]
 ;--
     mov edx,sizeof.TreeList
     shl edx,1
-    add edx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    add edx,tl_data_nodes
     @@: ;for(i=2;i
       cmp dword [edx+12],0
       jne .u0
       cmp dword [edx+16],0
       jne .u0
 	inc  tl_ch_tim
+	push  word[ebp+14] ;get type
+	pop   word[edx]
+	mov   byte[edx+2], 0 ;node[i].lev=0
+  bt tl_style,2 ;tl_list_box_mode
+  jc .l_box_m
-	push  word[ebp+14] ;get type
+    mov cl,byte[ebp+12]
-	pop   word[edx]
+    mov byte[edx+2],cl  ;node[i].lev
-	mov   byte[edx+2], 0 ;node[i].lev=0
+  .l_box_m:
 	push tl_ch_tim       ;node[i].tc=ch_tim;
 	pop  dword[edx+12]
 	mov  dword[edx+4], eax ;node[i].perv=po_t;
 	;*** copy node data ***
 	push esi
 	xor ecx,ecx
-	mov cx,word[edi+4];info_size
+	mov cx,tl_info_size
 	mov esi,ecx
 	rep movsb
 	mov esi,edi
 	mov edi,dword[ebp+16] ;restore edi
 	mov ecx,tl_info_capt_offs
-	cmp cx,word[edi+4] ;+4 info_size
+	cmp cx,tl_info_size
 	jge .no_text_data
 	  dec esi
 	  mov byte[esi],0
 	.no_text_data:
 	pop esi ;restore esi
 	mov ecx,eax
 	imul ecx,sizeof.TreeList
-	add ecx,dword[edi+14] ; *** ecx = tex[po_t] ***
+	add ecx,tl_data_nodes ; *** ecx = node[po_t] ***
-	add ecx,8   ; *** ecx = tex[po_t].next ***
+	add ecx,8   ; *** ecx = node[po_t].next ***
-	push dword [ecx] ;tex[i].next=tex[po_t].next;
+	push dword [ecx] ;node[i].next=node[po_t].next;
 	pop dword [edx+8]
 	call tl_get_node_index ;*** eax = i ***
 	cmp eax,dword[edi+6] ;info_max_count
 	jge .u0
-	mov [ecx],eax ;tex[po_t].next=i; // ññûëêè ïåðåíàïðàâëÿåì
+	mov [ecx],eax ;node[po_t].next=i; // ññûëêè ïåðåíàïðàâëÿåì
-	mov ecx,[edx+8] ; *** ecx = tex[i].next ***
+	mov ecx,[edx+8] ; *** ecx = node[i].next ***
 	imul ecx,sizeof.TreeList
-	add ecx,dword[edi+14] ; *** ecx = tex[tex[i].next] ***
+	add ecx,tl_data_nodes ; *** ecx = node[node[i].next] ***
-	mov [ecx+4],eax ;tex[tex[i].next].perv=i;
+	mov [ecx+4],eax ;node[node[i].next].perv=i;
     mov edi,dword[ebp+12]
     call tl_get_cur_node_index ;eax=po_t
     cmp eax,2
     jl @f
       xor ecx,ecx
-      mov cx,word[edi+4];info_size
+      mov cx,tl_info_size
       imul eax,ecx
       add eax,dword[edi]
       mov edi,eax
       mov esi,dword[ebp+8] ;pointer to node data
       rep movsb
       mov esi,edi
       mov edi,dword[ebp+12] ;restore edi
       mov ecx,tl_info_capt_offs
-      cmp cx,word[edi+4] ;+4 info_size
+      cmp cx,tl_info_size
       jge .no_text_data
 	dec esi
 	mov byte[esi],0
     call tl_get_cur_node_index ;eax=po_t
     mov dword[ebp+8],0 ;if return 0 pointer
     cmp eax,2
     jl @f
       xor ecx,ecx
-      mov cx,word[edi+4];info_size
+      mov cx,tl_info_size
       imul eax,ecx
       add eax,dword[edi]
       mov dword[ebp+8],eax ;return node data pointer
     @@:
   pop edi ecx eax
   push eax ecx edx edi
     mov edi,dword[ebp+12]
     mov eax,dword[ebp+8]
     ;cycle to nodes
-    mov edx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    mov edx,tl_data_nodes
     mov ecx,edx
     add ecx,sizeof.TreeList
     @@:
       call tl_iterat_next_all
   mov ebp,esp
   push ecx edx edi
     mov edi,dword[ebp+12]
     mov edx,dword[ebp+8]
-    mov ecx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    mov ecx,tl_data_nodes
     add ecx,sizeof.TreeList
     call tl_iterat_next_all
     mov dword[ebp+12],0
     call tl_get_node_index ;eax = node index
     cmp eax,2
     jl @f
       xor ecx,ecx
-      mov cx,word[edi+4];info_size
+      mov cx,tl_info_size
       imul eax,ecx
       add eax,dword[edi]
       mov dword[ebp+12],eax ;return node data pointer
     @@:
   pop edi ecx eax
 align 4
 tl_get_cur_node_index: ;áåðåò ïîçèöèþ ïîä êóðñîðîì
   push ecx edx
     ;cycle to nodes
     xor eax,eax
-    mov edx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    mov edx,tl_data_nodes
     mov ecx,edx
     add ecx,sizeof.TreeList
     @@:
       call tl_iterat_next
       cmp edx,ecx
       je @f
       inc eax
       jmp @b
     @@:
   mov eax,edx
-  sub eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+  sub eax,tl_data_nodes
   xor edx,edx
   mov ecx,sizeof.TreeList
   div ecx
   pop edx ecx
   ret
 ; eax = struct index of current node
 align 4
 tl_get_node_index: ;áåðåò ïîçèöèþ óêàçàííîãî ñèìâîëà
   push ecx edx
   mov eax,edx
-  sub eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+  sub eax,tl_data_nodes
   xor edx,edx
   mov ecx,sizeof.TreeList
   div ecx
   pop edx ecx
   ret
     mov edi,dword[ebp+8]
     call tl_get_cur_node_index ;eax=po_t
     cmp eax,2
     jl @f
       imul eax,sizeof.TreeList
-      add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+      add eax,tl_data_nodes
       mov edx,eax
       inc tl_ch_tim
       mov eax,tl_ch_tim
       mov dword[edx+16],eax
       call tb_scrol_resize ;îáðàáîòêà ñêðîëëèíãà
 align 4
 tl_get_node_count: ;áåðåò ÷èñëî âñåõ âèäèìûõ óçëîâ (íå ñ÷èòàÿ çàêðûòûõ äî÷åðíèõ)
   push ecx edx
     ;cycle to nodes
     xor eax,eax
-    mov edx,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+    mov edx,tl_data_nodes
     mov ecx,edx
     add ecx,sizeof.TreeList
     @@:
       call tl_iterat_next
       cmp edx,ecx
     mov edi,dword[ebp+8]
     call tl_get_cur_node_index ;eax = ïîçèöèÿ óçëà íà êîòîðîì ñòîèò êóðñîð
     cmp eax,2 ;êóðñîð ñòîèò íà óçëå ?
     jl @f
       imul eax,sizeof.TreeList
-      add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+      add eax,tl_data_nodes
       ;eax = óêàçàòåëü íà ñòðóêòóðó óçëà âûáðàííîãî êóðñîðîì
       push dword edi
       push dword eax
       call tl_node_poi_get_next_info
       pop dword edx ;edx = óêàçàòåëü íà ñòðóêòóðó óçëà êîòîðûé èäåò ïîñëå óçëà eax
     jc @f
     call tl_get_cur_node_index ;eax=po_t
     cmp eax,2
     jl @f
       imul eax,sizeof.TreeList
-      add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+      add eax,tl_data_nodes
       mov edx,eax
       inc word[edx+2]
     @@:
   pop edi edx eax
   pop ebp
     mov edi,dword[ebp+8]
     call tl_get_cur_node_index ;eax=po_t
     cmp eax,2
     jl @f
       imul eax,sizeof.TreeList
-      add eax,dword[edi+14] ;+14 óêàçàòåëü íà ñòðóêòóðû óçëîâ
+      add eax,tl_data_nodes
       mov edx,eax
       cmp word[edx+2],0
       je @f
       dec word[edx+2]
     @@:

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/tree_list.mac – Rev 1277 → 1283