Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 30993) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 30994) @@ -61,30 +61,30 @@ free(tree); } -void pcb_dad_tree_hide_all(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int val) +void rnd_dad_tree_hide_all(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int val) { rnd_hid_row_t *r; for(r = gdl_first(rowlist); r != NULL; r = gdl_next(rowlist, r)) { r->hide = val; - pcb_dad_tree_hide_all(tree, &r->children, val); + rnd_dad_tree_hide_all(tree, &r->children, val); } } -void pcb_dad_tree_unhide_filter(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text) +void rnd_dad_tree_unhide_filter(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text) { rnd_hid_row_t *r, *pr; for(r = gdl_first(rowlist); r != NULL; r = gdl_next(rowlist, r)) { if (strstr(r->cell[col], text) != NULL) { - pcb_dad_tree_hide_all(tree, &r->children, 0); /* if this is a node with children, show all children */ - for(pr = r; pr != NULL; pr = pcb_dad_tree_parent_row(tree, pr)) /* also show all parents so it is visible */ + rnd_dad_tree_hide_all(tree, &r->children, 0); /* if this is a node with children, show all children */ + for(pr = r; pr != NULL; pr = rnd_dad_tree_parent_row(tree, pr)) /* also show all parents so it is visible */ pr->hide = 0; } - pcb_dad_tree_unhide_filter(tree, &r->children, col, text); + rnd_dad_tree_unhide_filter(tree, &r->children, col, text); } } -rnd_hid_row_t *pcb_dad_tree_mkdirp(rnd_hid_tree_t *tree, char *path, char **cells) +rnd_hid_row_t *rnd_dad_tree_mkdirp(rnd_hid_tree_t *tree, char *path, char **cells) { char *cell[2] = {NULL}; rnd_hid_row_t *parent; @@ -108,7 +108,7 @@ /* non-root-dir: get or create parent */ *last = '\0'; last++; - parent = pcb_dad_tree_mkdirp(tree, path, NULL); + parent = rnd_dad_tree_mkdirp(tree, path, NULL); if (cells == NULL) { cell[0] = rnd_strdup(last); Index: trunk/src/librnd/core/hid_dad_tree.h =================================================================== --- trunk/src/librnd/core/hid_dad_tree.h (revision 30993) +++ trunk/src/librnd/core/hid_dad_tree.h (revision 30994) @@ -26,8 +26,8 @@ /* Inline helpers called by the DAD macros for the tree-table widget */ -#ifndef PCB_HID_DAD_TREE_H -#define PCB_HID_DAD_TREE_H +#ifndef RND_HID_DAD_TREE_H +#define RND_HID_DAD_TREE_H #include #include @@ -37,18 +37,18 @@ #include /* recursively sets the hide flag on all nodes to val */ -void pcb_dad_tree_hide_all(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int val); +void rnd_dad_tree_hide_all(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int val); /* recursively unhide items that match text in the given column; parents are unhidden too */ -void pcb_dad_tree_unhide_filter(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text); +void rnd_dad_tree_unhide_filter(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text); /* Recursively create the node and all parents in a tree. If cells is not NULL, the target path row is created with these cells, else only the first col is filled in. Temporarily modifies path (but changes it back) */ -rnd_hid_row_t *pcb_dad_tree_mkdirp(rnd_hid_tree_t *tree, char *path, char **cells); +rnd_hid_row_t *rnd_dad_tree_mkdirp(rnd_hid_tree_t *tree, char *path, char **cells); /* Internal: Allocate a new row and load the cells (but do not insert it anywhere) */ -RND_INLINE rnd_hid_row_t *pcb_dad_tree_new_row(char **cols) +RND_INLINE rnd_hid_row_t *rnd_dad_tree_new_row(char **cols) { int num_cols; rnd_hid_row_t *nrow; @@ -63,7 +63,7 @@ return nrow; } -RND_INLINE void pcb_dad_tree_free_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) +RND_INLINE void rnd_dad_tree_free_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) { int do_free_path = 0; /* do this before the user callback just in case row->path == row->cell[0] @@ -83,7 +83,7 @@ } -RND_INLINE rnd_hid_row_t *pcb_dad_tree_parent_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) +RND_INLINE rnd_hid_row_t *rnd_dad_tree_parent_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) { char *ptr = (char *)row->link.parent; if ((ptr == NULL) || ((gdl_list_t *)ptr == &tree->rows)) @@ -94,22 +94,22 @@ return (rnd_hid_row_t *)ptr; } -RND_INLINE rnd_hid_row_t *pcb_dad_tree_prev_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) +RND_INLINE rnd_hid_row_t *rnd_dad_tree_prev_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) { return row->link.prev; } -RND_INLINE rnd_hid_row_t *pcb_dad_tree_next_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) +RND_INLINE rnd_hid_row_t *rnd_dad_tree_next_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) { return row->link.next; } /* recursively build a full path of a tree node in path */ -RND_INLINE void pcb_dad_tree_build_path(rnd_hid_tree_t *tree, gds_t *path, rnd_hid_row_t *row) +RND_INLINE void rnd_dad_tree_build_path(rnd_hid_tree_t *tree, gds_t *path, rnd_hid_row_t *row) { - rnd_hid_row_t *par = pcb_dad_tree_parent_row(tree, row); + rnd_hid_row_t *par = rnd_dad_tree_parent_row(tree, row); if (par != NULL) - pcb_dad_tree_build_path(tree, path, par); + rnd_dad_tree_build_path(tree, path, par); if (path->used > 0) gds_append(path, '/'); gds_append_str(path, row->cell[0]); @@ -116,13 +116,13 @@ } /* calculate path of a row and insert it in the tree hash */ -RND_INLINE void pcb_dad_tree_set_hash(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) +RND_INLINE void rnd_dad_tree_set_hash(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { rnd_hid_tree_t *tree = attr->wdata; if (attr->rnd_hatt_flags & RND_HATF_TREE_COL) { gds_t path; gds_init(&path); - pcb_dad_tree_build_path(tree, &path, row); + rnd_dad_tree_build_path(tree, &path, row); row->path = path.array; } else @@ -135,7 +135,7 @@ RND_INLINE rnd_hid_row_t *rnd_dad_tree_append(rnd_hid_attribute_t *attr, rnd_hid_row_t *aft, char **cols) { rnd_hid_tree_t *tree = attr->wdata; - rnd_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_row_t *nrow = rnd_dad_tree_new_row(cols); gdl_list_t *par; /* the list that is the common parent of aft and the new row */ assert(attr == tree->attrib); @@ -148,7 +148,7 @@ par = aft->link.parent; gdl_insert_after(par, aft, nrow, link); - pcb_dad_tree_set_hash(attr, nrow); + rnd_dad_tree_set_hash(attr, nrow); if (tree->hid_insert_cb != NULL) tree->hid_insert_cb(tree->attrib, tree->hid_wdata, nrow); return nrow; @@ -159,7 +159,7 @@ RND_INLINE rnd_hid_row_t *rnd_dad_tree_insert(rnd_hid_attribute_t *attr, rnd_hid_row_t *bfr, char **cols) { rnd_hid_tree_t *tree = attr->wdata; - rnd_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_row_t *nrow = rnd_dad_tree_new_row(cols); gdl_list_t *par; /* the list that is the common parent of bfr and the new row */ assert(attr == tree->attrib); @@ -172,7 +172,7 @@ par = bfr->link.parent; gdl_insert_before(par, bfr, nrow, link); - pcb_dad_tree_set_hash(attr, nrow); + rnd_dad_tree_set_hash(attr, nrow); if (tree->hid_insert_cb != NULL) tree->hid_insert_cb(tree->attrib, tree->hid_wdata, nrow); return nrow; @@ -183,7 +183,7 @@ RND_INLINE rnd_hid_row_t *rnd_dad_tree_append_under(rnd_hid_attribute_t *attr, rnd_hid_row_t *prn, char **cols) { rnd_hid_tree_t *tree = attr->wdata; - rnd_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_row_t *nrow = rnd_dad_tree_new_row(cols); gdl_list_t *par; /* the list that is the common parent of aft and the new row */ assert(attr == tree->attrib); @@ -194,16 +194,16 @@ par = &prn->children; gdl_append(par, nrow, link); - pcb_dad_tree_set_hash(attr, nrow); + rnd_dad_tree_set_hash(attr, nrow); if (tree->hid_insert_cb != NULL) tree->hid_insert_cb(tree->attrib, tree->hid_wdata, nrow); return nrow; } -RND_INLINE int pcb_dad_tree_remove(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) +RND_INLINE int rnd_dad_tree_remove(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { rnd_hid_tree_t *tree = attr->wdata; - rnd_hid_row_t *r, *rn, *par = pcb_dad_tree_parent_row(tree, row); + rnd_hid_row_t *r, *rn, *par = rnd_dad_tree_parent_row(tree, row); gdl_list_t *lst = (par == NULL) ? &tree->rows : &par->children; int res = 0; @@ -212,7 +212,7 @@ /* recursively remove all children */ for(r = gdl_first(&row->children); r != NULL; r = rn) { rn = gdl_next(&row->children, r); - res |= pcb_dad_tree_remove(attr, r); + res |= rnd_dad_tree_remove(attr, r); } /* remove from gui */ @@ -223,18 +223,18 @@ /* remove from dad */ gdl_remove(lst, row, link); - pcb_dad_tree_free_row(tree, row); + rnd_dad_tree_free_row(tree, row); return res; } -RND_INLINE void pcb_dad_tree_clear(rnd_hid_tree_t *tree) +RND_INLINE void rnd_dad_tree_clear(rnd_hid_tree_t *tree) { rnd_hid_row_t *r; for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) - pcb_dad_tree_remove(tree->attrib, r); + rnd_dad_tree_remove(tree->attrib, r); } -RND_INLINE rnd_hid_row_t *pcb_dad_tree_get_selected(rnd_hid_attribute_t *attr) +RND_INLINE rnd_hid_row_t *rnd_dad_tree_get_selected(rnd_hid_attribute_t *attr) { rnd_hid_tree_t *tree = attr->wdata; @@ -246,7 +246,7 @@ return tree->hid_get_selected_cb(tree->attrib, tree->hid_wdata); } -RND_INLINE void pcb_dad_tree_update_hide(rnd_hid_attribute_t *attr) +RND_INLINE void rnd_dad_tree_update_hide(rnd_hid_attribute_t *attr) { rnd_hid_tree_t *tree = attr->wdata; @@ -256,7 +256,7 @@ tree->hid_update_hide_cb(tree->attrib, tree->hid_wdata); } -RND_INLINE int pcb_dad_tree_modify_cell(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, int col, char *new_val) +RND_INLINE int rnd_dad_tree_modify_cell(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, int col, char *new_val) { rnd_hid_tree_t *tree = attr->wdata; @@ -274,7 +274,7 @@ row->cell[col] = new_val; if (col == 0) - pcb_dad_tree_set_hash(attr, row); + rnd_dad_tree_set_hash(attr, row); if (tree->hid_modify_cb != NULL) tree->hid_modify_cb(tree->attrib, tree->hid_wdata, row, col); @@ -282,7 +282,7 @@ return 0; } -RND_INLINE void pcb_dad_tree_jumpto(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) +RND_INLINE void rnd_dad_tree_jumpto(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { rnd_hid_tree_t *tree = attr->wdata; @@ -292,18 +292,18 @@ tree->hid_jumpto_cb(tree->attrib, tree->hid_wdata, row); } -RND_INLINE void pcb_dad_tree_expcoll_(rnd_hid_tree_t *tree, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void rnd_dad_tree_expcoll_(rnd_hid_tree_t *tree, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { if (recursive) { rnd_hid_row_t *r; for(r = gdl_first(&row->children); r != NULL; r = gdl_next(&row->children, r)) - pcb_dad_tree_expcoll_(tree, r, expanded, recursive); + rnd_dad_tree_expcoll_(tree, r, expanded, recursive); } if (gdl_first(&row->children) != NULL) tree->hid_expcoll_cb(tree->attrib, tree->hid_wdata, row, expanded); } -RND_INLINE void pcb_dad_tree_expcoll(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void rnd_dad_tree_expcoll(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { rnd_hid_tree_t *tree = attr->wdata; @@ -312,10 +312,10 @@ if (tree->hid_expcoll_cb != NULL) { if (row == NULL) { for(row = gdl_first(&tree->rows); row != NULL; row = gdl_next(&tree->rows, row)) - pcb_dad_tree_expcoll_(tree, row, expanded, recursive); + rnd_dad_tree_expcoll_(tree, row, expanded, recursive); } else - pcb_dad_tree_expcoll_(tree, row, expanded, recursive); + rnd_dad_tree_expcoll_(tree, row, expanded, recursive); } } Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30993) +++ trunk/src/librnd/pcb_compat.h (revision 30994) @@ -851,3 +851,21 @@ #define pcb_dad_spin_set_geo rnd_dad_spin_set_geo #define pcb_dad_spin_update_internal rnd_dad_spin_update_internal #define pcb_dad_coord_spins rnd_dad_coord_spins +#define pcb_dad_tree_hide_all rnd_dad_tree_hide_all +#define pcb_dad_tree_unhide_filter rnd_dad_tree_unhide_filter +#define pcb_dad_tree_mkdirp rnd_dad_tree_mkdirp +#define pcb_dad_tree_new_row rnd_dad_tree_new_row +#define pcb_dad_tree_free_row rnd_dad_tree_free_row +#define pcb_dad_tree_parent_row rnd_dad_tree_parent_row +#define pcb_dad_tree_prev_row rnd_dad_tree_prev_row +#define pcb_dad_tree_next_row rnd_dad_tree_next_row +#define pcb_dad_tree_build_path rnd_dad_tree_build_path +#define pcb_dad_tree_set_hash rnd_dad_tree_set_hash +#define pcb_dad_tree_remove rnd_dad_tree_remove +#define pcb_dad_tree_clear rnd_dad_tree_clear +#define pcb_dad_tree_get_selected rnd_dad_tree_get_selected +#define pcb_dad_tree_update_hide rnd_dad_tree_update_hide +#define pcb_dad_tree_modify_cell rnd_dad_tree_modify_cell +#define pcb_dad_tree_jumpto rnd_dad_tree_jumpto +#define pcb_dad_tree_expcoll_ rnd_dad_tree_expcoll_ +#define pcb_dad_tree_expcoll rnd_dad_tree_expcoll Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30993) +++ trunk/src_plugins/asm/asm.c (revision 30994) @@ -415,12 +415,12 @@ goto last; /* skipping from the last part of the last group -> unselect all */ nr = gdl_first(&nr->children); } - pcb_dad_tree_jumpto(&asm_ctx.dlg[asm_ctx.wtbl], nr); + rnd_dad_tree_jumpto(&asm_ctx.dlg[asm_ctx.wtbl], nr); return; last:; /* what happens after the last */ - pcb_dad_tree_jumpto(&asm_ctx.dlg[asm_ctx.wtbl], NULL); + rnd_dad_tree_jumpto(&asm_ctx.dlg[asm_ctx.wtbl], NULL); return; } @@ -436,7 +436,7 @@ } tmp = pcb_strdup_printf("%d/%d", done, total); - pcb_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], grp->row, 5, tmp); + rnd_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], grp->row, 5, tmp); } static void done(void *hid_ctx, part_t *part, int done) @@ -443,15 +443,15 @@ { part->done = done; if (done) - pcb_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], part->row, 5, "yes"); + rnd_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], part->row, 5, "yes"); else - pcb_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], part->row, 5, "-"); + rnd_dad_tree_modify_cell(&asm_ctx.dlg[asm_ctx.wtbl], part->row, 5, "-"); group_progress_update(hid_ctx, part->parent); } static void asm_done_part(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); if (*(int *)row->user_data) return; done(hid_ctx, row->user_data, 1); @@ -460,7 +460,7 @@ static void asm_undo_part(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); if (*(int *)row->user_data) return; done(hid_ctx, row->user_data, 0); @@ -469,7 +469,7 @@ static void asm_skip_part(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); if (*(int *)row->user_data) return; skip(hid_ctx, 0, row); @@ -479,7 +479,7 @@ { long n; group_t *g; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); if (!*(int *)row->user_data) { part_t *p = row->user_data; @@ -506,7 +506,7 @@ static void asm_skip_group(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); skip(hid_ctx, 1, row); } @@ -619,7 +619,7 @@ /* expand all groups by default */ for(g = (group_t **)asm_ctx.grps.array, n = 0; n < asm_ctx.grps.used; g++,n++) - pcb_dad_tree_expcoll(&asm_ctx.dlg[asm_ctx.wtbl], (*g)->row, 1, 0); + rnd_dad_tree_expcoll(&asm_ctx.dlg[asm_ctx.wtbl], (*g)->row, 1, 0); RND_ACT_IRES(0); return 0; Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30993) +++ trunk/src_plugins/cam/cam_gui.c (revision 30994) @@ -51,12 +51,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all new items */ cn = rnd_conf_get_field("plugins/cam/jobs"); @@ -91,7 +91,7 @@ tree = attr->wdata; /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all new items */ for(n = 0, c = ctx->cam.code.array; n < ctx->cam.code.used; n++,c++) { @@ -145,12 +145,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all new items */ for(e = htsp_first(vars); e != NULL; e = htsp_next(vars, e)) { @@ -185,9 +185,9 @@ tree = attr->wdata; text = attr_inp->val.str; - pcb_dad_tree_hide_all(tree, &tree->rows, 1); - pcb_dad_tree_unhide_filter(tree, &tree->rows, 0, text); - pcb_dad_tree_update_hide(attr); + rnd_dad_tree_hide_all(tree, &tree->rows, 1); + rnd_dad_tree_unhide_filter(tree, &tree->rows, 0, text); + rnd_dad_tree_update_hide(attr); } static void cam_gui_export_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_btn) @@ -194,7 +194,7 @@ { cam_dlg_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wjobs]; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(attr); if (row != NULL) { const char *outfile = ctx->dlg[ctx->woutfile].val.str; Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30994) @@ -98,12 +98,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all items */ cell[3] = NULL; @@ -288,7 +288,7 @@ r->hide = (strstr(r->cell[1], text) == NULL); } - pcb_dad_tree_update_hide(attr); + rnd_dad_tree_update_hide(attr); } @@ -320,7 +320,7 @@ { pstk_lib_ctx_t *ctx = caller_data; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); if ((row == NULL) || (data == NULL)) return; @@ -341,7 +341,7 @@ return; if (dup) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); if (row == NULL) return; proto = pcb_pstk_get_proto_(data, strtol(row->cell[0], NULL, 10)); @@ -388,7 +388,7 @@ return; attr = &ctx->dlg[ctx->wlist]; - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r == NULL) return; @@ -421,7 +421,7 @@ return; attr = &ctx->dlg[ctx->wlist]; - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r == NULL) return; Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30994) @@ -223,7 +223,7 @@ { const char *otext = ctx->dlg[ctx->wfilt].val.str; int param_entered = 0, param_selected = 0; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); if (row != NULL) { pcb_fplibrary_t *l = row->user_data; @@ -282,12 +282,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all items recursively */ create_lib_tree_model_recurse(attr, &pcb_library, NULL); @@ -421,8 +421,8 @@ for(r = gdl_first(rowlist); r != NULL; r = gdl_next(rowlist, r)) { if (((preg == NULL) || (re_sei_exec(preg, r->cell[0]))) && tag_match(r->user_data, taglist)) { - pcb_dad_tree_hide_all(tree, &r->children, 0); /* if this is a node with children, show all children */ - for(pr = r; pr != NULL; pr = pcb_dad_tree_parent_row(tree, pr)) /* also show all parents so it is visible */ + rnd_dad_tree_hide_all(tree, &r->children, 0); /* if this is a node with children, show all children */ + for(pr = r; pr != NULL; pr = rnd_dad_tree_parent_row(tree, pr)) /* also show all parents so it is visible */ pr->hide = 0; } library_tree_unhide(tree, &r->children, preg, taglist); @@ -463,13 +463,13 @@ if (have_filter_text) { /* need to unhide for expand to work */ - pcb_dad_tree_hide_all(tree, &tree->rows, 0); - pcb_dad_tree_update_hide(attr); - pcb_dad_tree_expcoll(attr, NULL, 1, 1); - pcb_dad_tree_hide_all(tree, &tree->rows, 1); + rnd_dad_tree_hide_all(tree, &tree->rows, 0); + rnd_dad_tree_update_hide(attr); + rnd_dad_tree_expcoll(attr, NULL, 1, 1); + rnd_dad_tree_hide_all(tree, &tree->rows, 1); } else - pcb_dad_tree_hide_all(tree, &tree->rows, 0); + rnd_dad_tree_hide_all(tree, &tree->rows, 0); if (have_filter_text) { /* unhide hits and all their parents */ char *tag, *next, *tags = NULL; @@ -514,7 +514,7 @@ free(tags); } - pcb_dad_tree_update_hide(attr); + rnd_dad_tree_update_hide(attr); skip_filter:; @@ -564,7 +564,7 @@ int namelen; attr = &ctx->dlg[ctx->wtree]; - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (!ctx->last_clicked && (otext != NULL)) { name = rnd_strdup(otext); @@ -597,7 +597,7 @@ if (rnew != NULL) { if (r != rnew) - pcb_dad_tree_jumpto(attr, rnew); + rnd_dad_tree_jumpto(attr, rnew); library_param_dialog(ctx, rnew->user_data); } else @@ -609,7 +609,7 @@ static void library_refresh_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp) { library_ctx_t *ctx = caller_data; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); pcb_fplibrary_t *l; char *oname; Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30994) @@ -62,12 +62,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); nets = pcb_netlist_sort(&ctx->pcb->netlist[1]); if (nets != NULL) { @@ -102,13 +102,13 @@ /* remember cursor */ if (net != NULL) { - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); } /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); if (net == NULL) return; @@ -196,7 +196,7 @@ const char *name; atree = &ctx->dlg[ctx->wnetlist]; - r = pcb_dad_tree_get_selected(atree); + r = rnd_dad_tree_get_selected(atree); if (r == NULL) return; name = rnd_strdup(r->cell[0]); @@ -266,7 +266,7 @@ pcb_net_t *net = NULL; attr = &ctx->dlg[ctx->wnetlist]; - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) net = pcb_net_get(ctx->pcb, &ctx->pcb->netlist[PCB_NETLIST_EDITED], r->cell[0], 0); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30994) @@ -85,7 +85,7 @@ *basename = '\0'; basename++; - parent = pcb_dad_tree_mkdirp(tree, path, NULL); + parent = rnd_dad_tree_mkdirp(tree, path, NULL); if (parent == NULL) { rnd_message(RND_MSG_WARNING, "Warning: can't create config item for %s: invalid path\n", e->key); continue; @@ -95,7 +95,7 @@ if (nat->array_size > 1) { int i; *bnsep = '/'; - parent = pcb_dad_tree_mkdirp(tree, path, NULL); + parent = rnd_dad_tree_mkdirp(tree, path, NULL); for(i = 0; i < nat->array_size; i++) { cell[0] = pcb_strdup_printf("[%d]", i); rnd_dad_tree_append_under(attr, parent, cell); @@ -143,7 +143,7 @@ rnd_hid_tree_t *tree = attr->wdata; rnd_hid_row_t *r; - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); for(n = 0; n < RND_CFR_max_real; n++) { char *cell[5]= {NULL}; @@ -237,7 +237,7 @@ rnd_conf_listitem_t *n; char *cell[4]; - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); for (n = rnd_conflist_first(&nat->val.list[idx]); n != NULL; n = rnd_conflist_next(n)) { const char *strval; rolename = rnd_conf_role_name(rnd_conf_lookup_role(n->prop.src)); @@ -332,12 +332,12 @@ have_filter_text = (*text != '\0'); /* hide or unhide everything */ - pcb_dad_tree_hide_all(tree, &tree->rows, have_filter_text); + rnd_dad_tree_hide_all(tree, &tree->rows, have_filter_text); if (have_filter_text) /* unhide hits and all their parents */ - pcb_dad_tree_unhide_filter(tree, &tree->rows, 0, text); + rnd_dad_tree_unhide_filter(tree, &tree->rows, 0, text); - pcb_dad_tree_update_hide(attr); + rnd_dad_tree_update_hide(attr); } @@ -490,7 +490,7 @@ hv.str = rnd_strdup(tabarg); rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wfilter, &hv); pcb_pref_dlg_conf_filter_cb(ctx->dlg_hid_ctx, ctx, &ctx->dlg[ctx->conf.wfilter]); - pcb_dad_tree_expcoll(&ctx->dlg[ctx->conf.wtree], NULL, 1, 1); + rnd_dad_tree_expcoll(&ctx->dlg[ctx->conf.wtree], NULL, 1, 1); } } Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30994) @@ -102,7 +102,7 @@ rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; rnd_hid_tree_t *tree = attr->wdata; - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); if (nd->type != LHT_LIST) return; for(nl = nd->data.list.first; nl != NULL; nl = nl->next) { @@ -198,10 +198,10 @@ { confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); if (r != NULL) { - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); pref_conf_editval_cb(hid_ctx, caller_data, trigger_attr); } } @@ -212,7 +212,7 @@ if (nv == NULL) return; - if (pcb_dad_tree_modify_cell(attr, r, 0, rnd_strdup(nv)) == 0) + if (rnd_dad_tree_modify_cell(attr, r, 0, rnd_strdup(nv)) == 0) pref_conf_editval_cb(hid_ctx, ctx, attr); } @@ -220,7 +220,7 @@ { confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); if (r != NULL) pref_conf_editval_edit(hid_ctx, ctx, attr, r); @@ -230,7 +230,7 @@ { confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); char *cols[] = {NULL, NULL}; cols[0] = rnd_strdup(""); @@ -265,7 +265,7 @@ return; } - r = pcb_dad_tree_get_selected(&pctx->dlg[pctx->conf.wintree]); + r = rnd_dad_tree_get_selected(&pctx->dlg[pctx->conf.wintree]); if (r == NULL) { rnd_message(RND_MSG_ERROR, "You need to select a role (upper right list)\n"); return; @@ -417,7 +417,7 @@ return; } - r = pcb_dad_tree_get_selected(&pctx->dlg[pctx->conf.wintree]); + r = rnd_dad_tree_get_selected(&pctx->dlg[pctx->conf.wintree]); if (r == NULL) { rnd_message(RND_MSG_ERROR, "You need to select a role (upper right list)\n"); return; Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30994) @@ -39,7 +39,7 @@ static void pref_lib_update_buttons(void) { rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); int en = (r != NULL); rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wedit, en); @@ -75,7 +75,7 @@ attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; tree = attr->wdata; - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) { free(pref_ctx.lib.cursor_path); pref_ctx.lib.cursor_path = rnd_strdup(r->cell[0]); @@ -83,7 +83,7 @@ /* remove all existing entries */ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) { - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); } } @@ -172,7 +172,7 @@ nd->data.text.value = rnd_strdup(r->cell[0]); nd->doc = m->doc; lht_dom_list_append(lst, nd); - pcb_dad_tree_modify_cell(attr, r, 2, rnd_strdup(pref_node_src(nd))); + rnd_dad_tree_modify_cell(attr, r, 2, rnd_strdup(pref_node_src(nd))); } rnd_conf_update("rc/library_search_paths", -1); @@ -186,12 +186,12 @@ static void lib_btn_remove(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr) { rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); if (r == NULL) return; - if (pcb_dad_tree_remove(attr, r) == 0) { + if (rnd_dad_tree_remove(attr, r) == 0) { pref_lib_dlg2conf(hid_ctx, caller_data, attr); pref_lib_update_buttons(); } @@ -200,7 +200,7 @@ static void lib_btn_up(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr) { rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - rnd_hid_row_t *prev, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *prev, *r = rnd_dad_tree_get_selected(attr); rnd_hid_tree_t *tree = attr->wdata; char *cell[4]; @@ -215,7 +215,7 @@ cell[1] = r->cell[1]; r->cell[1] = NULL; cell[2] = r->cell[2]; r->cell[2] = NULL; cell[3] = NULL; - if (pcb_dad_tree_remove(attr, r) == 0) { + if (rnd_dad_tree_remove(attr, r) == 0) { rnd_hid_attr_val_t hv; rnd_dad_tree_insert(attr, prev, cell); pref_lib_dlg2conf(hid_ctx, caller_data, attr); @@ -227,7 +227,7 @@ static void lib_btn_down(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr) { rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - rnd_hid_row_t *next, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *next, *r = rnd_dad_tree_get_selected(attr); rnd_hid_tree_t *tree = attr->wdata; char *cell[4]; @@ -242,7 +242,7 @@ cell[1] = r->cell[1]; r->cell[1] = NULL; cell[2] = r->cell[2]; r->cell[2] = NULL; cell[3] = NULL; - if (pcb_dad_tree_remove(attr, r) == 0) { + if (rnd_dad_tree_remove(attr, r) == 0) { rnd_hid_attr_val_t hv; rnd_dad_tree_append(attr, next, cell); pref_lib_dlg2conf(hid_ctx, caller_data, attr); @@ -314,7 +314,7 @@ { pref_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); char *cell[4]; if (r == NULL) { @@ -361,9 +361,9 @@ rnd_dad_tree_append(attr, r, cell); break; case 0: /* replace */ - pcb_dad_tree_modify_cell(attr, r, 0, cell[0]); - pcb_dad_tree_modify_cell(attr, r, 1, cell[1]); - pcb_dad_tree_modify_cell(attr, r, 2, cell[2]); + rnd_dad_tree_modify_cell(attr, r, 0, cell[0]); + rnd_dad_tree_modify_cell(attr, r, 1, cell[1]); + rnd_dad_tree_modify_cell(attr, r, 2, cell[2]); break; } pref_lib_dlg2conf(hid_ctx, caller_data, attr); Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30994) @@ -83,13 +83,13 @@ /* remember cursor */ if (click) { - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); } /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all items */ cell[1] = NULL; @@ -109,7 +109,7 @@ free(cursor_path); } if (cur != NULL) - pcb_dad_tree_jumpto(attr, cur); + rnd_dad_tree_jumpto(attr, cur); ctx->last_op = op; } @@ -124,7 +124,7 @@ tree = attr->wdata; /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all items */ cell[1] = NULL; @@ -246,7 +246,7 @@ } if (cur != NULL) { - pcb_dad_tree_jumpto(attr, cur); + rnd_dad_tree_jumpto(attr, cur); /* clear all cache fields so a second window open won't inhibit refreshes */ ctx->last_op = NULL; Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30994) @@ -350,7 +350,7 @@ test_t *ctx = caller_data; rnd_hid_attribute_t *treea = &ctx->dlg[ctx->tt]; char *rowdata[] = {NULL, "ins", "dummy", NULL}; - rnd_hid_row_t *new_row, *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *new_row, *row = rnd_dad_tree_get_selected(treea); rnd_hid_attr_val_t val; rowdata[0] = pcb_strdup_printf("dyn_%d", ctx->ttctr++); @@ -366,7 +366,7 @@ test_t *ctx = caller_data; rnd_hid_attribute_t *treea = &ctx->dlg[ctx->tt]; char *rowdata[] = {NULL, "app", "dummy", NULL}; - rnd_hid_row_t *new_row, *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *new_row, *row = rnd_dad_tree_get_selected(treea); rnd_hid_attr_val_t val; rowdata[0] = pcb_strdup_printf("dyn_%d", ctx->ttctr++); @@ -403,13 +403,13 @@ rnd_hid_tree_t *tree = treea->wdata; ttbl_filt(&tree->rows, attr->val.lng); - pcb_dad_tree_update_hide(treea); + rnd_dad_tree_update_hide(treea); } /* table level selection */ static void cb_ttbl_select(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hid_row_t *row = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(attr); if (attr->val.str != NULL) rnd_trace("tt tbl selected: path=%s row=%p '%s'\n", attr->val.str, row, row->cell[0]); else Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30994) @@ -77,12 +77,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); mark[1] = '\0'; cell[3] = NULL; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30993) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30994) @@ -95,12 +95,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); /* add all items */ cell[2] = NULL; @@ -118,7 +118,7 @@ cell[1] = rnd_strdup(v->title); r = rnd_dad_tree_append_under(attr, rt, cell); r->user_data2.lng = v->uid; - pcb_dad_tree_expcoll(attr, rt, 1, 0); + rnd_dad_tree_expcoll(attr, rt, 1, 0); } /* restore cursor */ @@ -318,7 +318,7 @@ } else { /* full dialog, go by the list */ rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - rnd_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = rnd_dad_tree_get_selected(attr); if (r == NULL) return; @@ -327,16 +327,16 @@ /* remove a whole category - assume a single level */ for(rc = gdl_first(&r->children); rc != NULL; rc = gdl_next(&r->children, rc)) { v = pcb_view_by_uid(ctx->lst, rc->user_data2.lng); - pcb_dad_tree_remove(attr, rc); + rnd_dad_tree_remove(attr, rc); if (v != NULL) pcb_view_free(v); } - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); } else { /* remove a single item */ v = pcb_view_by_uid(ctx->lst, r->user_data2.lng); - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); if (v != NULL) pcb_view_free(v); } @@ -349,7 +349,7 @@ pcb_view_t *v; gds_t tmp; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - rnd_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = rnd_dad_tree_get_selected(attr); int btn_idx = attr_btn - ctx->dlg; int cut = (ctx->wbtn_cut == btn_idx); @@ -396,7 +396,7 @@ size_t clen; pcb_view_t *v, *vt = NULL; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(attr); if (r != NULL) { /* if cursor is a category */ @@ -528,7 +528,7 @@ { view_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - rnd_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = rnd_dad_tree_get_selected(attr); if (r == NULL) return; Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30993) +++ trunk/src_plugins/drc_query/dlg.c (revision 30994) @@ -379,12 +379,12 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); cell[4] = NULL; @@ -419,7 +419,7 @@ rnd_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlist, &hv); free(cursor_path); - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); rlist_select(&ctx->dlg[ctx->wlist], ctx->dlg_hid_ctx, r); } } @@ -427,7 +427,7 @@ static void rlist_btn_toggle_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp) { drc_rlist_ctx_t *ctx = caller_data; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); int *dis; if (row == NULL) { @@ -472,7 +472,7 @@ static void rlist_btn_edit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp) { drc_rlist_ctx_t *ctx = caller_data; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); rnd_conf_role_t role; rlist_fetch(); @@ -483,7 +483,7 @@ static void rlist_btn_run_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp) { drc_rlist_ctx_t *ctx = caller_data; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); lht_node_t *nd; const char *script; rnd_conf_role_t role; Index: trunk/src_plugins/hid_lesstif/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30993) +++ trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30994) @@ -37,7 +37,7 @@ e = tt_entry_alloc(new_row->cols); - parent = pcb_dad_tree_parent_row(lt->ht, new_row); + parent = rnd_dad_tree_parent_row(lt->ht, new_row); if (parent != NULL) { parlist = &parent->children; at = parent->hid_data; @@ -297,7 +297,7 @@ /* make sure the path is visible: expand all parent, but not all children of those parents */ - for(r = pcb_dad_tree_parent_row(lt->ht, row); r != NULL; r = pcb_dad_tree_parent_row(lt->ht, r)) { + for(r = rnd_dad_tree_parent_row(lt->ht, row); r != NULL; r = rnd_dad_tree_parent_row(lt->ht, r)) { e = r->hid_data; e->flags.is_thidden = 0; e->flags.is_uhidden = 0; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30993) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30994) @@ -96,7 +96,7 @@ static void ghid_tree_table_insert_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *new_row) { attr_dlg_t *ctx = hid_ctx; - rnd_hid_row_t *sibling, *par = pcb_dad_tree_parent_row(attrib->wdata, new_row); + rnd_hid_row_t *sibling, *par = rnd_dad_tree_parent_row(attrib->wdata, new_row); GtkTreeModel *model = ghid_tree_table_get_model(ctx, attrib, 0); GtkTreeIter *sibiter, *pariter; int prepnd; Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30993) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30994) @@ -94,7 +94,7 @@ hv.crd = rst->Diameter; rnd_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wviaring, &hv); - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); for(a = rst->attr.List, n = 0; n < rst->attr.Number; a++,n++) { char *cell[3]= {NULL}; @@ -212,7 +212,7 @@ { pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0); rnd_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr]; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(treea); char *key, *val; if (row == NULL) @@ -232,7 +232,7 @@ { pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, rstdlg_ctx.curr, 0); rnd_hid_attribute_t *treea = &rstdlg_ctx.dlg[rstdlg_ctx.wattr]; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(treea); if (row == NULL) return; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30993) +++ trunk/src_plugins/propedit/propdlg.c (revision 30994) @@ -76,12 +76,12 @@ have_filter_text = (text != NULL) && (*text != '\0'); /* hide or unhide everything */ - pcb_dad_tree_hide_all(tree, &tree->rows, have_filter_text); + rnd_dad_tree_hide_all(tree, &tree->rows, have_filter_text); if (have_filter_text) /* unhide hits and all their parents */ - pcb_dad_tree_unhide_filter(tree, &tree->rows, 0, text); + rnd_dad_tree_unhide_filter(tree, &tree->rows, 0, text); - pcb_dad_tree_update_hide(attr); + rnd_dad_tree_update_hide(attr); } static void prop_pcb2dlg(propdlg_t *ctx) @@ -93,11 +93,11 @@ char *cursor_path = NULL; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->path); - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); pcb_props_clear(&ctx->pe); pcb_propsel_map_core(&ctx->pe); @@ -120,13 +120,13 @@ cell[0] = rnd_strdup(e->key); cell[1] = pcb_propsel_printval(p->type, &com); - r = pcb_dad_tree_mkdirp(tree, cell[0], cell); + r = rnd_dad_tree_mkdirp(tree, cell[0], cell); r->user_data = e->key; } free(sorted); prop_filter_cb(ctx->dlg_hid_ctx, ctx, NULL); - pcb_dad_tree_expcoll(attr, NULL, 1, 1); + rnd_dad_tree_expcoll(attr, NULL, 1, 1); /* restore cursor */ if (cursor_path != NULL) { @@ -271,7 +271,7 @@ char *cell[3] = {NULL, NULL, NULL}; int n; - pcb_dad_tree_clear(tree); + rnd_dad_tree_clear(tree); if (p == NULL) { /* deselect or not found */ hv.lng = 0; @@ -319,7 +319,7 @@ static void prop_data_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr, int force_update) { propdlg_t *ctx = caller_data; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); pcb_props_t *p = NULL; pcb_propset_ctx_t sctx; @@ -419,7 +419,7 @@ static void prop_del_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { propdlg_t *ctx = caller_data; - rnd_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + rnd_hid_row_t *r = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); if (r == NULL) { rnd_message(RND_MSG_ERROR, "can not delete: no attribute selected\n"); return; @@ -438,8 +438,8 @@ static void prop_preset_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { propdlg_t *ctx = caller_data; - rnd_hid_row_t *rv = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wvals]); - rnd_hid_row_t *rp = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + rnd_hid_row_t *rv = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wvals]); + rnd_hid_row_t *rp = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); pcb_props_t *p; if ((rv == NULL) || (rv->user_data == NULL) || (rp == NULL)) @@ -461,7 +461,7 @@ { rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wtree]; prop_pcb2dlg(ctx); - prop_select_node_cb(attr, ctx->dlg_hid_ctx, pcb_dad_tree_get_selected(attr)); + prop_select_node_cb(attr, ctx->dlg_hid_ctx, rnd_dad_tree_get_selected(attr)); } Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30993) +++ trunk/src_plugins/script/script_act.c (revision 30994) @@ -85,9 +85,9 @@ /* remove existing items */ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); - r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); + r = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); if (r == NULL) return; @@ -116,13 +116,13 @@ tree = attr->wdata; /* remember cursor */ - r = pcb_dad_tree_get_selected(attr); + r = rnd_dad_tree_get_selected(attr); if (r != NULL) cursor_path = rnd_strdup(r->cell[0]); /* remove existing items */ for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) - pcb_dad_tree_remove(attr, r); + rnd_dad_tree_remove(attr, r); /* add all items */ cell[3] = NULL; @@ -160,7 +160,7 @@ static void btn_unload_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { script_dlg_t *ctx = caller_data; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); if (row == NULL) return; @@ -171,7 +171,7 @@ static void btn_reload_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { script_dlg_t *ctx = caller_data; - rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); + rnd_hid_row_t *row = rnd_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); if (row == NULL) return;