WebSVN – Kolibri OS – Diff – /contrib/C_Layer/INCLUDE/kolibri_treelist.h

 #ifndef KOLIBRI_TREELIST_H
 #define KOLIBRI_TREELIST_H
 /// êîíñòàíòû ñòèëÿ
 enum tl_style {
     TL_KEY_NO_EDIT  = 1,    // ýëåìåíò íåëüçÿ ðåäàêòèðîâàòü íà êëàâèàòóðå (èçìåíÿòü óðîâíè, óäàëÿòü)
     TL_DRAW_PAR_LINE = 2,   // ðèñîâàòü ëèíèè ê ðîäèòåëüñêîìó óçëó
     TL_LISTBOX_MODE  = 4    //ñòèëü íå îòîáðàæàåò óðîâíè (êàê â ListBox âñå îäíîãî óðîâíÿ)
 };
 /// êîíñòàíòû äëÿ ôóíêöèé
 enum tl_err {
     TL_ERR_LOAD_CAPTION     = 1, //â ïàìÿòè íåò çàãîëîâêà 'tree'
     TL_ERR_SAVE_MEMOTY_SIZE = 2, //íå õâàòàåò ïàìÿòè äëÿ ñîõðàíåíèÿ ýëåìåíòà
     TL_ERR_LOAD_INFO_SIZE   = 4, //íå ñîâïàäàåò ðàçìåð èíôîðìàöèîííîé ñòðóêòóðû ïðè îòêðûòèè
 };
 typedef struct __attribute__ ((__packed__)) {
     uint16_t    type;   //òèï ýëåìåíòà, èëè èíäåêñ èêîíêè äëÿ óçëà
     uint8_t     lev;    //óðîâåíü ýëåìåíòà
     uint8_t     clo;    //ôëàã çàêðûòèÿ, èëè îòêðûòèÿ (èìååò ñìûñë äëÿ ðîäèòåëüñêîãî óçëà)
     uint32_t    prev;   //èíäåêñ ïðåäûäóùåãî ýëåìåíòà
     uint32_t    next;   //èíäåêñ ïîñëåäóþùåãî ýëåìåíòà
     uint32_t    tcreat; //âðåì. ñîçäàíèÿ
     uint32_t    tdel;   //âðåì. óäàëåíèÿ
 } treelist_node;
 typedef struct __attribute__ ((__packed__)) {
     uint32_t    left;
     uint32_t    top;
     uint32_t    width;
     uint32_t    height;
     void       *data_info;  // óêàçàòåëü íà îñíîâíûå äàíûå
     uint16_t    info_size;  // ðàçìåð äàííûõ âûäåëÿåìûõ äëÿ êàæäîãî óçëà (ïîëüçîâàòåëüñüêèå äàííûå + òåêñò äëÿ ïîäïèñè)
     uint32_t    info_max_count; // ìàêñèìàëüíîå êîëè÷åñòâî óçëîâ, êîòîðûå ìîæíî äîáàâèòü â ýëåìåíò
     uint32_t    style;      // ñòèëè ýëåìåíòà
     treelist_node *data_nodes; // óêàçàòåëü íà ñòðóêòóðû óçëîâ
     void       *data_img;   // óêàçàòåëü íà èçîáðàæåíèÿ ñ èêîíêàìè óçëîâ
     uint16_t    img_cx;     // øèðèíà èêîíîê
     uint16_t    img_cy;     // âûñîòà èêîíîê
     void       *data_img_sys;//óêàçàòåëü íà ñèñòåìíûå èçîáðàæåíèÿ (ñòðåëêè, ïëþñèêè)
     uint32_t    ch_tim;     // êîëè÷åñòâî èçìåíåíèé â ôàéëå
     uint32_t    tim_undo;   // êîëè÷åñòâî îòìåíåííûõ äåéñòâèé
     uint32_t    cur_pos;    // ïîçèöèÿ êóðñîðà
     color_t     col_bkg;    // öâåò ôîíà
     color_t     col_zag; // öâåò çàãîëîâêà
     color_t     col_txt; // öâåò òåêñòà
     uint16_t    capt_cy;    // âûñîòà ïîäïèñè
     uint16_t    info_capt_offs;//ñäâèã äëÿ íà÷àëà òåêñòà (ïîäïèñè óçëà)
     uint16_t    info_capt_len;//äëèíà òåêñòà ïîäïèñè óçëà (åñëè = 0 òî äî êîíöà ñòðóêòóðû)
     void       *el_focus;   // óêàçàòåëü íà ñòðóêòóðó ýëåìåíòà â ôîêóñå
     scrollbar  *p_scroll;   // óêàçàòåëü íà ñòðóêòóðó ñêðîëëèíãà
     void       *on_press;   // +84 óêàçàòåëü íà ôóíêöèþ, êîòîðàÿ âûçûâàåòñÿ ïðè íàæàòèè Enter
 } treelist;
 static inline treelist* kolibri_new_treelist( uint32_t x_w, uint32_t y_h, uint16_t capt_cy, uint32_t icon_size_xy, uint16_t info_size, uint32_t info_max_count,
                                              uint16_t info_capt_len, uint16_t info_capt_offs, enum tl_style style, void *el_focus, color_t back, color_t title, color_t txt)
+{
     treelist *tl = (treelist *)calloc(1, sizeof(treelist));
     tl->left= x_w >> 16;
     tl->width = x_w & 0xFFFF;
     tl->top = y_h >> 16;
     tl->height = y_h & 0xFFFF;
     tl->info_size = info_size;
     tl->info_max_count = info_max_count;
     tl->style = style;
     tl->img_cx = icon_size_xy >> 16;
     tl->img_cy = icon_size_xy & 0xFFFF;
     tl->col_bkg = back;
     tl->col_zag = title;
     tl->col_txt = txt;
     tl->info_capt_len = info_capt_len;
     tl->info_capt_offs = info_capt_offs;
     tl->el_focus = el_focus;
     tl->p_scroll = kolibri_new_scrollbar_def(X_Y(0, 16), X_Y(0, 0), 100, 30, 0);
     return tl;
+}
 static inline void gui_add_treelist(kolibri_window *wnd, treelist* tl)
+{
     kolibri_window_add_element(wnd, KOLIBRI_TREELIST, tl);
+}
 ///ðåàêöèÿ íà ìûøü
 extern void (*tl_mouse)(treelist *) __attribute__((__stdcall__));
 ///âûâîä ñïèñêà íà ýêðàí
 extern void (*tl_draw)(treelist *) __attribute__((__stdcall__));
 __attribute__((__stdcall__)) static inline void treelist_draw(treelist *tl)
+{
     tl->p_scroll->all_redraw = 1;
     (*tl_draw)(tl);
+}
 ///ïåðåìåùàåì óçåë ââåðõ
 extern void (*tl_node_move_up)(treelist *) __attribute__((__stdcall__));
 ///ïåðåìåùàåì óçåë âíèç
 extern void (*tl_node_move_down)(treelist *) __attribute__((__stdcall__));
 extern void (*tl_data_init_asm)(treelist *) __attribute__((__stdcall__));
 ///âûäåëåíèå ïàìÿòè äëÿ ñòðóêòóð ñïèñêà è îñíîâíîé èíôîðìàöèè (êîíñòðóêòîð)
-static inline void treelist_data_init(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_data_init_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
 extern void (*tl_data_init)(treelist *) __attribute__((__stdcall__));
-extern void (*tl_data_clear_asm)(treelist *) __attribute__((__stdcall__));
+///î÷èñòêà ïàìÿòè ýëåìåíòà (äåñòðóêòîð)
-///î÷èñòêà ïàìÿòè ýëåìåíòà (äåñòðóêòîð)
-static inline void treelist_data_clear(treelist *tl)
-{
-    __asm__ __volatile__ (
+extern void (*tl_data_clear)(treelist *) __attribute__((__stdcall__));
-             "push %%edi \n\t":::);
-    (*tl_data_clear_asm)(tl);
 static inline void treelist_data_clear(treelist *tl)
     __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
+    (*tl_data_clear)(tl);
     free(tl->p_scroll);
+}
 extern void (*tl_info_clear_asm)(treelist *) __attribute__((__stdcall__));
 ///î÷èñòêà ñïèñêà (èíôîðìàöèè)
-static inline void treelist_info_clear(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_info_clear_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
 extern void (*tl_info_clear)(treelist *) __attribute__((__stdcall__));
 extern void (*tl_key_asm)(treelist *) __attribute__((__stdcall__));
 ///ðåàêöèÿ íà êëàâèàòóðó
 __attribute__((__stdcall__)) static inline void treelist_key(treelist *tl, oskey_t code)
+{
     __asm__ __volatile__ (
              "push %2\n\t"
              "call *%1 \n\t"::"a"(code.val), "m"(tl_key_asm), "m"(tl):);  // indirect call with asterisk *
 //    (*tl_key_asm)(tl);
+}
 extern void (*tl_info_undo_asm)(treelist *) __attribute__((__stdcall__));
 ///îòìåíà äåéñòâèÿ
-static inline void treelist_undo(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_info_undo_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
-}
 extern void (*tl_info_undo)(treelist *) __attribute__((__stdcall__));
-extern void (*tl_info_redo_asm)(treelist *) __attribute__((__stdcall__));
-///ïîâòîð äåéñòâèÿ
-static inline void treelist_redo(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_info_redo_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
+///ïîâòîð äåéñòâèÿ
 extern void (*tl_info_redo)(treelist *) __attribute__((__stdcall__));
-extern void (*tl_node_add_asm)(treelist *, uint32_t n_opt, void *n_info) __attribute__((__stdcall__));
+extern void (*tl_node_add)(treelist *, uint32_t n_opt, void *n_info) __attribute__((__stdcall__));
 ///äîáàâèòü óçåë
 ///input:
 /// tlist - óêàçàòåëü íà ñòðóêòóðó ëèñòà
 /// n_opt - îïöèè äîáàâëåíèÿ
 /// n_info - óêàçàòåëü íà äîáàâëÿåìûå äàííûå
 static inline void treelist_node_add(treelist *tl, void *n_info, uint16_t type, uint8_t clos, uint8_t lev)
+{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%edi \n\t":::);
     uint32_t    n_opt = (type << 16) | (clos << 8) | lev;
-    (*tl_node_add_asm)(tl, n_opt, n_info);
+    (*tl_node_add)(tl, n_opt, n_info);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%ebx \n\t":::);
+}
 extern void (*tl_node_set_data_asm)(treelist *, void *n_info) __attribute__((__stdcall__));
 ///çàïèñàòü â òåêóùèé óçåë
 ///input:
 /// tlist - óêàçàòåëü íà ñòðóêòóðó ëèñòà
 /// n_info - óêàçàòåëü íà äàííûå
-static inline void treelist_node_setdata(treelist *tl, void *n_info)
+extern void (*tl_node_set_data)(treelist *, void *n_info) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%esi \n\t"
-             "push %%edi \n\t":::);
-    (*tl_node_set_data_asm)(tl, n_info);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%esi \n\t":::);
-}
 extern void* (*tl_node_get_data_asm)(treelist *) __attribute__((__stdcall__));
 ///âçÿòü óêàçàòåëü íà äàííûå óçëà ïîä êóðñîðîì
-static inline void* treelist_getdata(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    void *res =
-    (*tl_node_get_data_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
-    return res;
-}
 extern void* (*tl_node_get_data)(treelist *) __attribute__((__stdcall__));
-extern void (*tl_node_delete_asm)(treelist *) __attribute__((__stdcall__));
-///óäàëèòü óçåë ïîä êóðñîðîì
-static inline void treelist_node_delete(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_node_delete_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
 ///óäàëèòü óçåë ïîä êóðñîðîì
+extern void (*tl_node_delete)(treelist *) __attribute__((__stdcall__));
-extern void (*tl_cur_beg_asm)(treelist *) __attribute__((__stdcall__));
-///ïîñòàâèòü êóðñîð íà ïåðâûé óçåë
-static inline void treelist_cursor_begin(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    (*tl_cur_beg_asm)(tl);
-    __asm__ __volatile__ (
              "pop %%edi \n\t":::);
-}
+///ïîñòàâèòü êóðñîð íà ïåðâûé óçåë
-extern void (*tl_cur_next_asm)(treelist *) __attribute__((__stdcall__));
-///ïåðåíåñòè êóðñîð íà 1 ïîçèöèþ íèæå
-static inline void treelist_cursor_next(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%esi \n\t"
-             "push %%edi \n\t":::);
-    (*tl_cur_next_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%esi \n\t"
+extern void (*tl_cur_beg)(treelist *) __attribute__((__stdcall__));
-             "pop %%ebx \n\t":::);
-}
-extern void (*tl_cur_perv_asm)(treelist *) __attribute__((__stdcall__));
-///ïåðåíåñòè êóðñîð íà 1 ïîçèöèþ âûøå
-static inline void treelist_cursor_prev(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%esi \n\t"
-             "push %%edi \n\t":::);
-    (*tl_cur_perv_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
+///ïåðåíåñòè êóðñîð íà 1 ïîçèöèþ íèæå
-             "pop %%esi \n\t"
+extern void (*tl_cur_next)(treelist *) __attribute__((__stdcall__));
-             "pop %%ebx \n\t":::);
-}
-extern void (*tl_node_close_open_asm)(treelist *) __attribute__((__stdcall__));
-///îòêðûòü/çàêðûòü óçåë (ðàáîòàåò ñ óçëàìè êîòîðûå èìåþò äî÷åðíèå óçëû)
-static inline void treelist_close_open(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
     (*tl_node_close_open_asm)(tl);
+///ïåðåíåñòè êóðñîð íà 1 ïîçèöèþ âûøå
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
-}
-extern void (*tl_node_lev_inc_asm)(treelist *) __attribute__((__stdcall__));
-///óâåëè÷èòü óðîâåíü
-static inline void treelist_level_inc(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
 extern void (*tl_cur_perv)(treelist *) __attribute__((__stdcall__));
-    (*tl_node_lev_inc_asm)(tl);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
-}
-extern void (*tl_node_lev_dec_asm)(treelist *) __attribute__((__stdcall__));
-///óìåíüøèòü óðîâåíü
-static inline void treelist_level_dec(treelist *tl)
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
+///îòêðûòü/çàêðûòü óçåë (ðàáîòàåò ñ óçëàìè êîòîðûå èìåþò äî÷åðíèå óçëû)
 extern void (*tl_node_close_open)(treelist *) __attribute__((__stdcall__));
     (*tl_node_lev_dec_asm)(tl);
 ///óâåëè÷èòü óðîâåíü
-    __asm__ __volatile__ (
+extern void (*tl_node_lev_inc)(treelist *) __attribute__((__stdcall__));
              "pop %%edi \n\t":::);
 ///óìåíüøèòü óðîâåíü
 extern void (*tl_node_lev_dec)(treelist *) __attribute__((__stdcall__));
 extern treelist_node* (*tl_node_poi_get_info_asm)(treelist *, int node_ind) __attribute__((__stdcall__));
 ///âçÿòü óêàçàòåëü íà ñòðóêòóðó óçëà â óêàçàííîé ïîçèöèè
 ///input:
 /// tlist - pointer to 'TreeList' struct
 /// node_ind - node index
 ///output - pointer to node info or NULL
-static inline treelist_node* treelist_getnode(treelist *tl, int node_ind)
+extern treelist_node* (*tl_node_poi_get_info)(treelist *, int node_ind) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%edi \n\t":::);
-    treelist_node *ret =
-    (*tl_node_poi_get_info_asm)(tl, node_ind);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%ebx \n\t":::);
-    return ret;
-}
 extern treelist_node* (*tl_node_poi_get_next_info_asm)(treelist *, treelist_node*) __attribute__((__stdcall__));
 ///âçÿòü óêàçàòåëü íà ñëåäóùóþ ñòðóêòóðó óçëà
 ///input:
 /// tlist - pointer to 'TreeList' struct
 /// node_p - node param struct
 ///output - pointer to next node struct or NULL
-static inline treelist_node* treelist_getnode_next(treelist *tl, treelist_node* node)
+extern treelist_node* (*tl_node_poi_get_next_info)(treelist *, treelist_node*) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%edi \n\t":::);
-    treelist_node *ret =
-    (*tl_node_poi_get_next_info_asm)(tl, node);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%ebx \n\t":::);
-    return ret;
-}
 extern void* (*_tl_node_poi_get_data_asm)(treelist *, treelist_node*) __attribute__((__stdcall__));
 ///;âçÿòü óêàçàòåëü íà äàííûå óçëà
 ///input:
 /// tlist - pointer to 'TreeList' struct
 /// node_p - node param struct
 ///output - pointer
-static inline void* treelist_getnode_data(treelist *tl, treelist_node *node)
+extern void* (*_tl_node_poi_get_data)(treelist *, treelist_node*) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%edi \n\t":::);
-    void *ret =
-    (*_tl_node_poi_get_data_asm)(tl, node);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t":::);
-    return ret;
-}
 extern int (*tl_save_mem_asm)(treelist *, int opt, void *h_mem, int mem_size) __attribute__((__stdcall__));
 /// tlist - pointer to 'TreeList' struct
 /// opt - options: 0 - first element, 1 - add next element
 /// h_mem - pointer to memory
 /// mem_size - memory size
 ///output - error code
-static inline int treelist_save2mem(treelist *tl, int opt, void *h_mem, int mem_size)
+extern int (*tl_save_mem)(treelist *, int opt, void *h_mem, int mem_size) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%esi \n\t"
-             "push %%edi \n\t":::);
-    int ret =
-    (*tl_save_mem_asm)(tl, opt, h_mem, mem_size);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%esi \n\t"
-             "pop %%ebx \n\t":::);
-    return ret;
-}
 extern int (*_tl_load_mem_asm)(treelist *, int opt, void *h_mem, int mem_size) __attribute__((__stdcall__));
 /**input:
 ; tlist - pointer to 'TreeList' struct
 ; opt   - options: element index + (2*(add mode)+(init mode)) shl 16, tl_load_mode_add        equ 0x20000 ;îïöèÿ ñ÷èòûâàíèÿ â ðåæèìå äîáàâëåíèÿ èíôîðìàöèè
 ; h_mem - pointer to memory
 ; mem_size - memory size
 ;   ðàçìåð ïàìÿòè, ïîêà íå èñïîëüçóåòñÿ (íàçíà÷àëñÿ äëÿ êîíòðîëÿ)
 ;   äëÿ åãî èñïîëüçîâàíèÿ íóæíî äîðàáîòàòü ôóíêöèþ
 ;output:
 ; eax - error code
 ;memory header format:
 ;  +0 - (4) 'tree'
 ;  +4 - (2) info size
 ;  +6 - (4) count nodes
 ; +10 - (4) tlist style
 ; +14 - (4) cursor pos
 ; +18 - (2) info capt offs
 ; +20 - (2) info capt len
 ; +22 - (4) scroll pos
 ;memory data format:
 ; +26 - (info size + 8) * count nodes */
-static inline int treelist_load4mem(treelist *tl, int opt, void *h_mem, int mem_size)
+extern int (*_tl_load_mem)(treelist *, int opt, void *h_mem, int mem_size) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%esi \n\t"
-             "push %%edi \n\t":::);
-    int ret =
-    (*_tl_load_mem_asm)(tl, opt, h_mem, mem_size);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%esi \n\t"
-             "pop %%ebx \n\t":::);
-    return ret;
-}
 extern int (*tl_get_mem_size_asm)(treelist *, void *h_mem) __attribute__((__stdcall__));
 /// ;áåðåò ðàçìåð ïàìÿòè çàíÿòîé ôóíêöèåé tl_save_mem ïðè ñîõðàíåíèè ýëåìåíòîâ
 /// tlist - pointer to 'TreeList' struct
 /// h_mem - pointer to saved memory
-static inline int treelist_get_memsize(treelist *tl, void *h_mem)
+extern int (*tl_get_mem_size)(treelist *, void *h_mem) __attribute__((__stdcall__));
-{
-    __asm__ __volatile__ (
-             "push %%ebx \n\t"
-             "push %%edi \n\t":::);
-    int ret =
-    (*tl_get_mem_size_asm)(tl, h_mem);
-    __asm__ __volatile__ (
-             "pop %%edi \n\t"
-             "pop %%ebx \n\t":::);
-    return ret;
-}
 #endif //KOLIBRI_TREELIST_H

Subversion Repositories Kolibri OS

(root)/contrib/C_Layer/INCLUDE/kolibri_treelist.h – Rev 6612 → 6615