Index: trunk/src/librnd/core/hid_attrib.h =================================================================== --- trunk/src/librnd/core/hid_attrib.h (revision 30990) +++ trunk/src/librnd/core/hid_attrib.h (revision 30991) @@ -53,7 +53,7 @@ RND_HATT_PICTURE, /* static picture from xpm - picture data in wdata */ RND_HATT_PICBUTTON, /* button with static picture from xpm - picture data in wdata */ RND_HATT_COLOR, /* color pick (user input: select a color) */ - RND_HATT_TEXT, /* plain text editor; data is in 'wdata' as pcb_hid_text_t */ + RND_HATT_TEXT, /* plain text editor; data is in 'wdata' as rnd_hid_text_t */ /* groups (e.g. boxes) */ RND_HATT_BEGIN_HBOX, /* NOTE: RND_HATT_IS_COMPOSITE() depends on it */ @@ -62,7 +62,7 @@ RND_HATT_BEGIN_VPANE, /* vertical split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ RND_HATT_BEGIN_TABLE, /* wdata_aux1 is the number of columns */ RND_HATT_BEGIN_TABBED, /* tabbed view (e.g. notebook); ->wdata stores the tab names and a NULL; default_val's integer value is the index of the current tab */ - RND_HATT_BEGIN_COMPOUND, /* subtree emulating a single widget; (pcb_hid_compound_t *) stored in END's wdata */ + RND_HATT_BEGIN_COMPOUND, /* subtree emulating a single widget; (rnd_hid_compound_t *) stored in END's wdata */ RND_HATT_END /* close one level of PCB_HATT_* */ } rnd_hid_attr_type_t; Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30990) +++ trunk/src/librnd/core/hid_dad.h (revision 30991) @@ -24,8 +24,8 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#ifndef PCB_HID_DAD_H -#define PCB_HID_DAD_H +#ifndef RND_HID_DAD_H +#define RND_HID_DAD_H #include #include @@ -37,13 +37,13 @@ #include typedef enum { - PCB_HID_TEXT_INSERT, /* insert at cursor or replace selection */ - PCB_HID_TEXT_REPLACE, /* replace the entire text */ - PCB_HID_TEXT_APPEND, /* append to the end of the text */ + RND_HID_TEXT_INSERT, /* insert at cursor or replace selection */ + RND_HID_TEXT_REPLACE, /* replace the entire text */ + RND_HID_TEXT_APPEND, /* append to the end of the text */ /* modifiers (bitfield) */ - PCB_HID_TEXT_MARKUP = 0x0010 /* interpret minimal html-like markup - some HIDs may ignore these */ -} pcb_hid_text_set_t; + RND_HID_TEXT_MARKUP = 0x0010 /* interpret minimal html-like markup - some HIDs may ignore these */ +} rnd_hid_text_set_t; typedef struct { /* cursor manipulation callbacks */ @@ -52,7 +52,7 @@ void (*hid_set_xy)(rnd_hid_attribute_t *attrib, void *hid_ctx, long x, long y); /* can be very slow */ void (*hid_set_offs)(rnd_hid_attribute_t *attrib, void *hid_ctx, long offs); void (*hid_scroll_to_bottom)(rnd_hid_attribute_t *attrib, void *hid_ctx); - void (*hid_set_text)(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_text_set_t how, const char *txt); + void (*hid_set_text)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_text_set_t how, const char *txt); char *(*hid_get_text)(rnd_hid_attribute_t *attrib, void *hid_ctx); /* caller needs to free the result */ void (*hid_set_readonly)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_bool readonly); /* by default text views are not read-only */ @@ -63,7 +63,7 @@ /* optional callbacks HIDs may set after widget creation */ void *hid_wdata; void (*hid_free_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata); -} pcb_hid_text_t; +} rnd_hid_text_t; typedef struct { @@ -82,35 +82,35 @@ double dbl; } user_data2; char *cell[1]; /* each cell is a char *; the true length of the array is the value of the len field; the array is allocated together with the struct */ -} pcb_hid_row_t; +} rnd_hid_row_t; typedef struct { gdl_list_t rows; /* ordered list of first level rows (tree root) */ - htsp_t paths; /* translate first column paths iinto (pcb_hid_row_t *) */ + htsp_t paths; /* translate first column paths iinto (rnd_hid_row_t *) */ rnd_hid_attribute_t *attrib; const char **hdr; /* optional column headers (NULL means disable header) */ /* optional callbacks the user set after widget creation */ void *user_ctx; - void (*user_free_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); - void (*user_selected_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); - int (*user_browse_activate_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); /* returns non-zero if the row should auto-activate while browsing (e.g. stepping with arrow keys) */ - const char *(*user_copy_to_clip_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); /* returns the string to copy to clipboard for the given row (if unset, first column text is used) */ + void (*user_free_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); + void (*user_selected_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); + int (*user_browse_activate_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); /* returns non-zero if the row should auto-activate while browsing (e.g. stepping with arrow keys) */ + const char *(*user_copy_to_clip_cb)(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); /* returns the string to copy to clipboard for the given row (if unset, first column text is used) */ /* optional callbacks HIDs may set after widget creation */ void *hid_wdata; - void (*hid_insert_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *new_row); - void (*hid_modify_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row, int col); /* if col is negative, all columns have changed */ - void (*hid_remove_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row); - void (*hid_free_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row); - pcb_hid_row_t *(*hid_get_selected_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata); - void (*hid_jumpto_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row); /* row = NULL means deselect all */ - void (*hid_expcoll_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row, int expanded); /* sets whether a row is expanded or collapsed */ + void (*hid_insert_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *new_row); + void (*hid_modify_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row, int col); /* if col is negative, all columns have changed */ + void (*hid_remove_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row); + void (*hid_free_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row); + rnd_hid_row_t *(*hid_get_selected_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata); + void (*hid_jumpto_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row); /* row = NULL means deselect all */ + void (*hid_expcoll_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row, int expanded); /* sets whether a row is expanded or collapsed */ void (*hid_update_hide_cb)(rnd_hid_attribute_t *attrib, void *hid_wdata); -} pcb_hid_tree_t; +} rnd_hid_tree_t; -typedef struct pcb_hid_preview_s pcb_hid_preview_t; -struct pcb_hid_preview_s { +typedef struct rnd_hid_preview_s rnd_hid_preview_t; +struct rnd_hid_preview_s { rnd_hid_attribute_t *attrib; rnd_rnd_box_t initial_view; @@ -121,8 +121,8 @@ /* optional callbacks the user set after widget creation */ void *user_ctx; void (*user_free_cb)(rnd_hid_attribute_t *attrib, void *user_ctx, void *hid_ctx); - void (*user_expose_cb)(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); - rnd_bool (*user_mouse_cb)(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); /* returns true if redraw is needed */ + void (*user_expose_cb)(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); + rnd_bool (*user_mouse_cb)(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); /* returns true if redraw is needed */ /* optional callbacks HIDs may set after widget creation */ void *hid_wdata; @@ -144,7 +144,7 @@ void (*set_field_ptr)(rnd_hid_attribute_t *attr, const char *fieldname, void *ptr); /* set value during creation; attr is the END */ void (*set_geo)(rnd_hid_attribute_t *attr, rnd_hatt_compflags_t flg, int geo); /* set geometry during creation; attr is the END */ void (*free)(rnd_hid_attribute_t *attrib); /* called by DAD on free'ing the RND_HATT_BEGIN_COMPOUND and PCB_HATT_END_COMPOUND widget */ -} pcb_hid_compound_t; +} rnd_hid_compound_t; #include @@ -303,7 +303,7 @@ #define PCB_DAD_TEXT(table, user_ctx_) \ do { \ - pcb_hid_text_t *txt = calloc(sizeof(pcb_hid_text_t), 1); \ + rnd_hid_text_t *txt = calloc(sizeof(rnd_hid_text_t), 1); \ txt->user_ctx = user_ctx_; \ PCB_DAD_ALLOC(table, RND_HATT_TEXT); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, txt); \ @@ -352,7 +352,7 @@ #define PCB_DAD_PREVIEW(table, expose_cb, mouse_cb, free_cb, initial_view_box, min_sizex_px_, min_sizey_px_, user_ctx_) \ do { \ - pcb_hid_preview_t *prv = calloc(sizeof(pcb_hid_preview_t), 1); \ + rnd_hid_preview_t *prv = calloc(sizeof(rnd_hid_preview_t), 1); \ prv->user_ctx = user_ctx_; \ prv->user_expose_cb = expose_cb; \ prv->user_mouse_cb = mouse_cb; \ @@ -373,7 +373,7 @@ #define pcb_dad_preview_zoomto(attr, view) \ do { \ - pcb_hid_preview_t *prv = ((attr)->wdata); \ + rnd_hid_preview_t *prv = ((attr)->wdata); \ if (prv->hid_zoomto_cb != NULL) \ prv->hid_zoomto_cb((attr), prv->hid_wdata, view); \ } while(0) @@ -411,7 +411,7 @@ #define PCB_DAD_TREE(table, cols, first_col_is_tree, opt_header) \ do { \ - pcb_hid_tree_t *tree = calloc(sizeof(pcb_hid_tree_t), 1); \ + rnd_hid_tree_t *tree = calloc(sizeof(rnd_hid_tree_t), 1); \ htsp_init(&tree->paths, strhash, strkeyeq); \ PCB_DAD_ALLOC(table, RND_HATT_TREE); \ tree->attrib = &table[table ## _len-1]; \ @@ -431,11 +431,11 @@ pcb_dad_tree_insert(&table[table ## _len-1], row_before, cells) /* set the named tree user callback to func_or_data; name is automatically - appended with user_, any field prefixed with user_ in pcb_hid_tree_t + appended with user_, any field prefixed with user_ in rnd_hid_tree_t can be set */ #define PCB_DAD_TREE_SET_CB(table, name, func_or_data) \ do { \ - pcb_hid_tree_t *__tree__ = table[table ## _len-1].wdata; \ + rnd_hid_tree_t *__tree__ = table[table ## _len-1].wdata; \ __tree__->user_ ## name = func_or_data; \ } while(0) @@ -474,7 +474,7 @@ switch(table[table ## _len - 1].type) { \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_help != NULL)) \ cmp->set_help(&table[table ## _len - 1], (val)); \ } \ @@ -490,7 +490,7 @@ case RND_HATT_BEGIN_COMPOUND: \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_val_ptr != NULL)) \ cmp->set_val_ptr(&table[table ## _len - 1], (void *)(val_)); \ else \ @@ -508,7 +508,7 @@ case RND_HATT_BEGIN_COMPOUND: \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_val_num != NULL)) \ cmp->set_val_num(&table[table ## _len - 1], (long)(val_), (double)(val_), (rnd_coord_t)(val_)); \ else \ @@ -534,8 +534,8 @@ /* Update widget internals after a potential attr pointer change */ #define PCB_DAD_UPDATE_INTERNAL(table, widx) \ do { \ - pcb_hid_preview_t *__prv__; \ - pcb_hid_tree_t *__tree__; \ + rnd_hid_preview_t *__prv__; \ + rnd_hid_tree_t *__tree__; \ switch(table[(widx)].type) { \ case RND_HATT_PREVIEW: \ __prv__ = table[(widx)].wdata; \ @@ -656,7 +656,7 @@ case RND_HATT_BEGIN_COMPOUND: \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_field_num != NULL)) \ cmp->set_field_num(&table[table ## _len - 1], #field, (long)(val_), (double)(val_), (rnd_coord_t)(val_)); \ else \ @@ -715,7 +715,7 @@ case RND_HATT_BEGIN_COMPOUND: \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_field_ptr != NULL)) \ cmp->set_field_ptr(&table[table ## _len - 1], #field, (void *)(val_)); \ else \ @@ -749,7 +749,7 @@ break; \ case RND_HATT_PREVIEW: \ { \ - pcb_hid_preview_t *prv = table[field].wdata; \ + rnd_hid_preview_t *prv = table[field].wdata; \ if (prv->user_free_cb != NULL) \ prv->user_free_cb(&table[field], prv->user_ctx, prv->hid_wdata); \ if (prv->hid_free_cb != NULL) \ @@ -759,7 +759,7 @@ break; \ case RND_HATT_TEXT: \ { \ - pcb_hid_text_t *txt = table[field].wdata; \ + rnd_hid_text_t *txt = table[field].wdata; \ if (txt->user_free_cb != NULL) \ txt->user_free_cb(&table[field], txt->user_ctx, txt->hid_wdata); \ if (txt->hid_free_cb != NULL) \ @@ -770,7 +770,7 @@ case RND_HATT_BEGIN_COMPOUND: \ case RND_HATT_END: \ { \ - pcb_hid_compound_t *cmp = table[field].wdata; \ + rnd_hid_compound_t *cmp = table[field].wdata; \ if ((cmp != NULL) && (cmp->free != NULL)) \ cmp->free(&table[field]); \ } \ @@ -787,7 +787,7 @@ #define PCB_DAD_WIDTH_CHR(table, width) \ do { \ if ((table[table ## _len - 1].type) == RND_HATT_END) { \ - pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ + rnd_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if (cmp->set_geo != NULL) \ cmp->set_geo(&table[table ## _len - 1], RND_HATF_HEIGHT_CHR, (width)); \ } \ Index: trunk/src/librnd/core/hid_dad_spin.h =================================================================== --- trunk/src/librnd/core/hid_dad_spin.h (revision 30990) +++ trunk/src/librnd/core/hid_dad_spin.h (revision 30991) @@ -32,7 +32,7 @@ #include typedef struct { - pcb_hid_compound_t cmp; + rnd_hid_compound_t cmp; double step; /* how much an up/down step modifies; 0 means automatic */ double vmin, vmax; unsigned vmin_valid:1; Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 30990) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 30991) @@ -32,8 +32,8 @@ /* recursively free a row list subtree */ static void pcb_dad_tree_free_rowlist(rnd_hid_attribute_t *attr, gdl_list_t *list) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; while((r = gdl_first(list)) != NULL) { gdl_remove(list, r, link); @@ -55,15 +55,15 @@ /* Internal: free all rows and caches and the tree itself */ void pcb_dad_tree_free(rnd_hid_attribute_t *attr) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; htsp_uninit(&tree->paths); pcb_dad_tree_free_rowlist(attr, &tree->rows); free(tree); } -void pcb_dad_tree_hide_all(pcb_hid_tree_t *tree, gdl_list_t *rowlist, int val) +void pcb_dad_tree_hide_all(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int val) { - pcb_hid_row_t *r; + 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); @@ -70,9 +70,9 @@ } } -void pcb_dad_tree_unhide_filter(pcb_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text) +void pcb_dad_tree_unhide_filter(rnd_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text) { - pcb_hid_row_t *r, *pr; + 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) { @@ -84,10 +84,10 @@ } } -pcb_hid_row_t *pcb_dad_tree_mkdirp(pcb_hid_tree_t *tree, char *path, char **cells) +rnd_hid_row_t *pcb_dad_tree_mkdirp(rnd_hid_tree_t *tree, char *path, char **cells) { char *cell[2] = {NULL}; - pcb_hid_row_t *parent; + rnd_hid_row_t *parent; char *last, *old; parent = htsp_get(&tree->paths, path); Index: trunk/src/librnd/core/hid_dad_tree.h =================================================================== --- trunk/src/librnd/core/hid_dad_tree.h (revision 30990) +++ trunk/src/librnd/core/hid_dad_tree.h (revision 30991) @@ -37,25 +37,25 @@ #include /* recursively sets the hide flag on all nodes to val */ -void pcb_dad_tree_hide_all(pcb_hid_tree_t *tree, gdl_list_t *rowlist, int val); +void pcb_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(pcb_hid_tree_t *tree, gdl_list_t *rowlist, int col, const char *text); +void pcb_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) */ -pcb_hid_row_t *pcb_dad_tree_mkdirp(pcb_hid_tree_t *tree, char *path, char **cells); +rnd_hid_row_t *pcb_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 pcb_hid_row_t *pcb_dad_tree_new_row(char **cols) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_new_row(char **cols) { int num_cols; - pcb_hid_row_t *nrow; + rnd_hid_row_t *nrow; char **s, **o; for(s = cols, num_cols = 0; *s != NULL; s++, num_cols++); - nrow = calloc(sizeof(pcb_hid_row_t) + sizeof(char *) * num_cols, 1); + nrow = calloc(sizeof(rnd_hid_row_t) + sizeof(char *) * num_cols, 1); nrow->cols = num_cols; for(s = cols, o = nrow->cell; *s != NULL; s++, o++) *o = *s; @@ -63,7 +63,7 @@ return nrow; } -RND_INLINE void pcb_dad_tree_free_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE void pcb_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 pcb_hid_row_t *pcb_dad_tree_parent_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE rnd_hid_row_t *pcb_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)) @@ -90,24 +90,24 @@ return NULL; ptr -= offsetof(gdl_elem_t, parent); - ptr -= offsetof(pcb_hid_row_t, children); - return (pcb_hid_row_t *)ptr; + ptr -= offsetof(rnd_hid_row_t, children); + return (rnd_hid_row_t *)ptr; } -RND_INLINE pcb_hid_row_t *pcb_dad_tree_prev_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_prev_row(rnd_hid_tree_t *tree, rnd_hid_row_t *row) { return row->link.prev; } -RND_INLINE pcb_hid_row_t *pcb_dad_tree_next_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE rnd_hid_row_t *pcb_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(pcb_hid_tree_t *tree, gds_t *path, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_build_path(rnd_hid_tree_t *tree, gds_t *path, rnd_hid_row_t *row) { - pcb_hid_row_t *par = pcb_dad_tree_parent_row(tree, row); + rnd_hid_row_t *par = pcb_dad_tree_parent_row(tree, row); if (par != NULL) pcb_dad_tree_build_path(tree, path, par); if (path->used > 0) @@ -116,9 +116,9 @@ } /* 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, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_set_hash(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; if (attr->rnd_hatt_flags & RND_HATF_TREE_COL) { gds_t path; gds_init(&path); @@ -132,10 +132,10 @@ /* allocate a new row and append it after aft; if aft is NULL, the new row is appended at the end of the list of entries in the root (== at the bottom of the list) */ -RND_INLINE pcb_hid_row_t *pcb_dad_tree_append(rnd_hid_attribute_t *attr, pcb_hid_row_t *aft, char **cols) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_append(rnd_hid_attribute_t *attr, rnd_hid_row_t *aft, char **cols) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *nrow = pcb_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); @@ -156,10 +156,10 @@ /* allocate a new row and inert it before bfr; if bfr is NULL, the new row is inserted at the beginning of the list of entries in the root (== at the top of the list) */ -RND_INLINE pcb_hid_row_t *pcb_dad_tree_insert(rnd_hid_attribute_t *attr, pcb_hid_row_t *bfr, char **cols) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_insert(rnd_hid_attribute_t *attr, rnd_hid_row_t *bfr, char **cols) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *nrow = pcb_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); @@ -180,10 +180,10 @@ /* allocate a new row and append it under prn; if aft is NULL, the new row is appended at the end of the list of entries in the root (== at the bottom of the list) */ -RND_INLINE pcb_hid_row_t *pcb_dad_tree_append_under(rnd_hid_attribute_t *attr, pcb_hid_row_t *prn, char **cols) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_append_under(rnd_hid_attribute_t *attr, rnd_hid_row_t *prn, char **cols) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *nrow = pcb_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); @@ -200,10 +200,10 @@ return nrow; } -RND_INLINE int pcb_dad_tree_remove(rnd_hid_attribute_t *attr, pcb_hid_row_t *row) +RND_INLINE int pcb_dad_tree_remove(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r, *rn, *par = pcb_dad_tree_parent_row(tree, row); + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r, *rn, *par = pcb_dad_tree_parent_row(tree, row); gdl_list_t *lst = (par == NULL) ? &tree->rows : &par->children; int res = 0; @@ -227,16 +227,16 @@ return res; } -RND_INLINE void pcb_dad_tree_clear(pcb_hid_tree_t *tree) +RND_INLINE void pcb_dad_tree_clear(rnd_hid_tree_t *tree) { - pcb_hid_row_t *r; + 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_INLINE pcb_hid_row_t *pcb_dad_tree_get_selected(rnd_hid_attribute_t *attr) +RND_INLINE rnd_hid_row_t *pcb_dad_tree_get_selected(rnd_hid_attribute_t *attr) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; assert(attr == tree->attrib); @@ -248,7 +248,7 @@ RND_INLINE void pcb_dad_tree_update_hide(rnd_hid_attribute_t *attr) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; assert(attr == tree->attrib); @@ -256,9 +256,9 @@ tree->hid_update_hide_cb(tree->attrib, tree->hid_wdata); } -RND_INLINE int pcb_dad_tree_modify_cell(rnd_hid_attribute_t *attr, pcb_hid_row_t *row, int col, char *new_val) +RND_INLINE int pcb_dad_tree_modify_cell(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, int col, char *new_val) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; assert(attr == tree->attrib); @@ -282,9 +282,9 @@ return 0; } -RND_INLINE void pcb_dad_tree_jumpto(rnd_hid_attribute_t *attr, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_jumpto(rnd_hid_attribute_t *attr, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; assert(attr == tree->attrib); @@ -292,10 +292,10 @@ tree->hid_jumpto_cb(tree->attrib, tree->hid_wdata, row); } -RND_INLINE void pcb_dad_tree_expcoll_(pcb_hid_tree_t *tree, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void pcb_dad_tree_expcoll_(rnd_hid_tree_t *tree, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { if (recursive) { - pcb_hid_row_t *r; + 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); } @@ -303,9 +303,9 @@ tree->hid_expcoll_cb(tree->attrib, tree->hid_wdata, row, expanded); } -RND_INLINE void pcb_dad_tree_expcoll(rnd_hid_attribute_t *attr, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void pcb_dad_tree_expcoll(rnd_hid_attribute_t *attr, rnd_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; assert(attr == tree->attrib); Index: trunk/src/librnd/core/hid_dad_unit.h =================================================================== --- trunk/src/librnd/core/hid_dad_unit.h (revision 30990) +++ trunk/src/librnd/core/hid_dad_unit.h (revision 30991) @@ -34,7 +34,7 @@ #include typedef struct { - pcb_hid_compound_t cmp; + rnd_hid_compound_t cmp; void **hid_ctx; pcb_family_t family; /* which families of units are allowed in this spinbox */ int wenum; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30990) +++ trunk/src/librnd/pcb_compat.h (revision 30991) @@ -737,3 +737,14 @@ #define pcb_hid_cfg_keys_t rnd_hid_cfg_keys_t #define hid_cfg_key_default_trans rnd_hid_cfg_key_default_trans #define pcb_hid_cfg_mod_t rnd_hid_cfg_mod_t +#define pcb_hid_text_set_t rnd_hid_text_set_t +#define PCB_HID_TEXT_INSERT RND_HID_TEXT_INSERT +#define PCB_HID_TEXT_REPLACE RND_HID_TEXT_REPLACE +#define PCB_HID_TEXT_APPEND RND_HID_TEXT_APPEND +#define PCB_HID_TEXT_MARKUP RND_HID_TEXT_MARKUP +#define pcb_hid_text_t rnd_hid_text_t +#define pcb_hid_row_t rnd_hid_row_t +#define pcb_hid_tree_t rnd_hid_tree_t +#define pcb_hid_preview_s rnd_hid_preview_s +#define pcb_hid_preview_t rnd_hid_preview_t +#define pcb_hid_compound_t rnd_hid_compound_t Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30990) +++ trunk/src_plugins/asm/asm.c (revision 30991) @@ -71,7 +71,7 @@ typedef struct { int is_grp; char *name; - pcb_hid_row_t *row; + rnd_hid_row_t *row; vtp0_t parts; } group_t; @@ -80,7 +80,7 @@ char *name; long int id; int done; - pcb_hid_row_t *row; + rnd_hid_row_t *row; group_t *parent; } part_t; @@ -350,7 +350,7 @@ rnd_gui->pan(rnd_gui, (sc->BoundingBox.X1+sc->BoundingBox.X2)/2, (sc->BoundingBox.Y1+sc->BoundingBox.Y2)/2, 0); } -static void asm_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void asm_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { long n; int isgrp = 0, ispart = 0; @@ -388,9 +388,9 @@ rnd_hid_redraw(PCB); /* for displaying the new selection */ } -static void skip(void *hid_ctx, int pick_grp, pcb_hid_row_t *row) +static void skip(void *hid_ctx, int pick_grp, rnd_hid_row_t *row) { - pcb_hid_row_t *nr = NULL; + rnd_hid_row_t *nr = NULL; int is_grp = *(int *)row->user_data; if (pick_grp && !is_grp) { @@ -451,7 +451,7 @@ static void asm_done_part(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = pcb_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) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = pcb_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) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = pcb_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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = pcb_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) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&asm_ctx.dlg[asm_ctx.wtbl]); skip(hid_ctx, 1, row); } @@ -540,7 +540,7 @@ asm_ctx.wtbl = PCB_DAD_CURRENT(asm_ctx.dlg); PCB_DAD_COMPFLAG(asm_ctx.dlg, RND_HATF_SCROLL); for(g = (group_t **)asm_ctx.grps.array, n = 0; n < asm_ctx.grps.used; g++,n++) { - pcb_hid_row_t *parent, *child; + rnd_hid_row_t *parent, *child; row[0] = (*g)->name; row[1] = ""; row[2] = ""; Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30990) +++ trunk/src_plugins/cam/cam_gui.c (revision 30991) @@ -42,8 +42,8 @@ static void cam_gui_jobs2dlg(cam_dlg_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[2], *cursor_path = NULL; rnd_conf_native_t *cn; @@ -82,7 +82,7 @@ static void cam_gui_digest2dlg(cam_dlg_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; pcb_cam_code_t *c, *plugin = NULL; char *cell[4], tmp[1024]; int n; @@ -133,8 +133,8 @@ htsp_entry_t *e; rnd_hid_attr_val_t hv; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[3], *cursor_path = NULL; cam_parse_opt_outfile(&ctx->cam, ctx->dlg[ctx->woutfile].val.str); @@ -178,7 +178,7 @@ { cam_dlg_t *ctx = caller_data; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; const char *text; attr = &ctx->dlg[ctx->wjobs]; @@ -194,7 +194,7 @@ { cam_dlg_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wjobs]; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(attr); if (row != NULL) { const char *outfile = ctx->dlg[ctx->woutfile].val.str; @@ -214,17 +214,17 @@ return res; } -static void cam_job_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void cam_job_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; cam_dlg_t *ctx = tree->user_ctx; if (row != NULL) { char *script = kill_tabs(cam_find_job(row->cell[0])); rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; - txt->hid_set_text(atxt, hid_ctx, PCB_HID_TEXT_REPLACE, script); + txt->hid_set_text(atxt, hid_ctx, RND_HID_TEXT_REPLACE, script); cam_free_code(&ctx->cam); if (script != NULL) @@ -349,7 +349,7 @@ { /* set right top text read-only */ rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; txt->hid_set_readonly(atxt, ctx->dlg_hid_ctx, 1); } Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30991) @@ -71,7 +71,7 @@ memset(ctx, 0, sizeof(fontsel_ctx_t)); } -void fontsel_expose_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +void fontsel_expose_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { fontsel_ctx_t *ctx = prv->user_ctx; @@ -88,7 +88,7 @@ } } -rnd_bool fontsel_mouse_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +rnd_bool fontsel_mouse_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { fontsel_ctx_t *ctx = prv->user_ctx; Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30991) @@ -86,8 +86,8 @@ pcb_pstk_proto_t *proto; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[4], *cursor_path = NULL; long id; @@ -149,7 +149,7 @@ ps->ID = -1; /* disable undo and clipping */ } -static void pstklib_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void pstklib_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { pstk_lib_ctx_t *ctx = prv->user_ctx; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); @@ -214,10 +214,10 @@ pcb_dad_preview_zoomto(&ctx->dlg[ctx->wprev], &ctx->drawbox); } -static void pstklib_select(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void pstklib_select(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { rnd_hid_attr_val_t hv; - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; pstk_lib_ctx_t *ctx = tree->user_ctx; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); pcb_pstk_t ps; @@ -268,8 +268,8 @@ pstk_lib_ctx_t *ctx = caller_data; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; const char *text; if (data == NULL) @@ -320,7 +320,7 @@ { pstk_lib_ctx_t *ctx = caller_data; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); if ((row == NULL) || (data == NULL)) return; @@ -341,7 +341,7 @@ return; if (dup) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wlist]); if (row == NULL) return; proto = pcb_pstk_get_proto_(data, strtol(row->cell[0], NULL, 10)); @@ -380,7 +380,7 @@ pstk_lib_ctx_t *ctx = caller_data; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); rnd_hid_attribute_t *attr; - pcb_hid_row_t *r; + rnd_hid_row_t *r; rnd_cardinal_t from_pid, to_pid; pcb_pstk_t *ps; @@ -411,7 +411,7 @@ pstk_lib_ctx_t *ctx = caller_data; pcb_data_t *data = get_data(ctx, ctx->subc_id, NULL); rnd_hid_attribute_t *attr; - pcb_hid_row_t *r; + rnd_hid_row_t *r; long pid; rnd_rnd_box_t box; int changed = 0; Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30991) @@ -223,7 +223,7 @@ { const char *otext = ctx->dlg[ctx->wfilt].val.str; int param_entered = 0, param_selected = 0; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); if (row != NULL) { pcb_fplibrary_t *l = row->user_data; @@ -252,7 +252,7 @@ memset(ctx, 0, sizeof(library_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */ } -static void create_lib_tree_model_recurse(rnd_hid_attribute_t *attr, pcb_fplibrary_t *parent_lib, pcb_hid_row_t *parent_row) +static void create_lib_tree_model_recurse(rnd_hid_attribute_t *attr, pcb_fplibrary_t *parent_lib, rnd_hid_row_t *parent_row) { char *cell[2]; pcb_fplibrary_t *l; @@ -260,7 +260,7 @@ cell[1] = NULL; for(l = parent_lib->data.dir.children.array, n = 0; n < parent_lib->data.dir.children.used; l++, n++) { - pcb_hid_row_t *row; + rnd_hid_row_t *row; cell[0] = rnd_strdup(l->name); row = pcb_dad_tree_append_under(attr, parent_row, cell); @@ -274,8 +274,8 @@ static void library_lib2dlg(library_ctx_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cursor_path = NULL; attr = &ctx->dlg[ctx->wtree]; @@ -329,10 +329,10 @@ pcb_pclose(f); } -static void library_select(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void library_select(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { rnd_hid_attr_val_t hv; - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; library_ctx_t *ctx = tree->user_ctx; int close_param = 1; static pcb_fplibrary_t *last = NULL; @@ -376,7 +376,7 @@ } -static void library_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void library_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { library_ctx_t *ctx = prv->user_ctx; int orig_po = pcb_draw_force_termlab; @@ -415,9 +415,9 @@ return 1; } -static void library_tree_unhide(pcb_hid_tree_t *tree, gdl_list_t *rowlist, re_sei_t *preg, vtp0_t *taglist) +static void library_tree_unhide(rnd_hid_tree_t *tree, gdl_list_t *rowlist, re_sei_t *preg, vtp0_t *taglist) { - pcb_hid_row_t *r, *pr; + rnd_hid_row_t *r, *pr; 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)) { @@ -433,7 +433,7 @@ { library_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; const char *otext; char *text, *sep, *para_start; int have_filter_text, is_para, is_para_closed = 0; @@ -527,9 +527,9 @@ free(text); } -static pcb_hid_row_t *find_fp_prefix_(pcb_hid_tree_t *tree, gdl_list_t *rowlist, const char *name, int namelen) +static rnd_hid_row_t *find_fp_prefix_(rnd_hid_tree_t *tree, gdl_list_t *rowlist, const char *name, int namelen) { - pcb_hid_row_t *r, *pr; + rnd_hid_row_t *r, *pr; for(r = gdl_first(rowlist); r != NULL; r = gdl_next(rowlist, r)) { pcb_fplibrary_t *l = r->user_data; @@ -542,10 +542,10 @@ return NULL; } -static pcb_hid_row_t *find_fp_prefix(library_ctx_t *ctx, const char *name, int namelen) +static rnd_hid_row_t *find_fp_prefix(library_ctx_t *ctx, const char *name, int namelen) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; attr = &ctx->dlg[ctx->wtree]; tree = attr->wdata; @@ -558,7 +558,7 @@ { library_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr; - pcb_hid_row_t *r, *rnew; + rnd_hid_row_t *r, *rnew; const char *otext = ctx->dlg[ctx->wfilt].val.str; char *name, *sep; int namelen; @@ -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; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); + rnd_hid_row_t *r = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wtree])); pcb_fplibrary_t *l; char *oname; @@ -633,7 +633,7 @@ } -static rnd_bool library_mouse(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool library_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { return pcb_false; } Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30991) @@ -53,8 +53,8 @@ static char *netlist_data2dlg_netlist(netlist_ctx_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[4], *cursor_path = NULL; pcb_net_t **n, **nets; @@ -92,8 +92,8 @@ static void netlist_data2dlg_connlist(netlist_ctx_t *ctx, pcb_net_t *net) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[2], *cursor_path = NULL; pcb_net_term_t *t; @@ -146,9 +146,9 @@ } -static void netlist_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void netlist_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; netlist_ctx_t *ctx= tree->user_ctx; const char *netname = NULL; pcb_net_t *net = NULL; @@ -162,9 +162,9 @@ netlist_force_redraw(ctx); } -static void termlist_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void termlist_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; netlist_ctx_t *ctx= tree->user_ctx; char *refdes, *term; pcb_any_obj_t *obj; @@ -192,7 +192,7 @@ netlist_ctx_t *ctx = caller_data; rnd_hid_attribute_t *atree; int w = attr - ctx->dlg; - pcb_hid_row_t *r; + rnd_hid_row_t *r; const char *name; atree = &ctx->dlg[ctx->wnetlist]; @@ -255,7 +255,7 @@ static vtp0_t netlist_color_save; -static void netlist_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void netlist_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { netlist_ctx_t *ctx = prv->user_ctx; rnd_xform_t xform; @@ -262,7 +262,7 @@ size_t n; void **p; rnd_hid_attribute_t *attr; - pcb_hid_row_t *r; + rnd_hid_row_t *r; pcb_net_t *net = NULL; attr = &ctx->dlg[ctx->wnetlist]; @@ -302,7 +302,7 @@ } } -static rnd_bool netlist_mouse(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool netlist_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { return pcb_false; } Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30991) @@ -56,7 +56,7 @@ } -static void pinout_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void pinout_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { pinout_ctx_t *ctx = prv->user_ctx; void *r1, *r2, *r3; @@ -105,7 +105,7 @@ return PCB_R_DIR_NOT_FOUND; } -static rnd_bool pinout_mouse(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool pinout_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { if (kind == RND_HID_MOUSE_RELEASE) { pinout_ctx_t *ctx = prv->user_ctx; Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30991) @@ -51,7 +51,7 @@ { char *cell[2] = {NULL}; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->conf.wtree]; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; htsp_entry_t *e; htsp_entry_t **sorted; int num_paths, n; @@ -67,7 +67,7 @@ for(n = 0; n < num_paths; n++) { char *basename, *bnsep; - pcb_hid_row_t *parent; + rnd_hid_row_t *parent; rnd_conf_native_t *nat; e = sorted[n]; @@ -140,8 +140,8 @@ { rnd_conf_role_t n; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->conf.wintree]; - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; pcb_dad_tree_clear(tree); @@ -233,7 +233,7 @@ if ((nat->type == RND_CFN_LIST) || (nat->type == RND_CFN_HLIST)) { /* non-default: lists are manually loaded */ rnd_hid_attribute_t *attr = &ctx->dlg[ctx->conf.wnatval[nat->type]]; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; rnd_conf_listitem_t *n; char *cell[4]; @@ -272,9 +272,9 @@ return; } -static void dlg_conf_select_node_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void dlg_conf_select_node_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; char *end, *end2; rnd_conf_native_t *nat; @@ -322,7 +322,7 @@ { pref_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; const char *text; int have_filter_text; Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30991) @@ -100,7 +100,7 @@ case RND_CFN_LIST: { rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; pcb_dad_tree_clear(tree); if (nd->type != LHT_LIST) @@ -150,8 +150,8 @@ case RND_CFN_LIST: { rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; lht_node_t *nd = rnd_conf_lht_get_at(ctx->role, ctx->nat->hash_path, 0); if (nd == NULL) { @@ -198,7 +198,7 @@ { confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); if (r != NULL) { pcb_dad_tree_remove(attr, r); @@ -206,7 +206,7 @@ } } -static void pref_conf_editval_edit(void *hid_ctx, confedit_ctx_t *ctx, rnd_hid_attribute_t *attr, pcb_hid_row_t *r) +static void pref_conf_editval_edit(void *hid_ctx, confedit_ctx_t *ctx, rnd_hid_attribute_t *attr, rnd_hid_row_t *r) { char *nv = rnd_hid_prompt_for(&PCB->hidlib, "list item value:", r->cell[0], "Edit config list item"); if (nv == NULL) @@ -220,7 +220,7 @@ { confedit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_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]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); char *cols[] = {NULL, NULL}; cols[0] = rnd_strdup(""); @@ -257,7 +257,7 @@ pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; pref_ctx_t *pctx = caller_data; confedit_ctx_t *ctx; - pcb_hid_row_t *r; + rnd_hid_row_t *r; int b[4] = {0}; if (pctx->conf.selected_nat == NULL) { @@ -410,7 +410,7 @@ static void pref_conf_del_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { pref_ctx_t *pctx = caller_data; - pcb_hid_row_t *r; + rnd_hid_row_t *r; if (pctx->conf.selected_nat == NULL) { rnd_message(RND_MSG_ERROR, "You need to select a conf leaf node to remove\nTry the tree on the left.\n"); Index: trunk/src_plugins/dialogs/dlg_pref_layer.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 30991) @@ -34,12 +34,12 @@ #define PCB_EMPTY(a) ((a) ? (a) : "") -void layersel_expose_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +void layersel_expose_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { pcb_stub_draw_csect(gc, e); } -rnd_bool layersel_mouse_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +rnd_bool layersel_mouse_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { return pcb_stub_draw_csect_mouse_ev(kind, x, y); } Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30991) @@ -39,7 +39,7 @@ static void pref_lib_update_buttons(void) { rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_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); @@ -48,12 +48,12 @@ rnd_gui->attr_dlg_widget_state(pref_ctx.dlg_hid_ctx, pref_ctx.lib.wmovedown, en); } -static void pref_lib_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void pref_lib_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { pref_lib_update_buttons(); } -static void pref_lib_row_free(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void pref_lib_row_free(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { free(row->cell[0]); free(row->cell[1]); @@ -66,8 +66,8 @@ static void pref_lib_conf2dlg_pre(rnd_conf_native_t *cfg, int arr_idx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; if ((pref_ctx.lib.lock) || (!pref_ctx.active)) return; @@ -151,9 +151,9 @@ static void pref_lib_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; lht_node_t *m, *lst, *nd; - pcb_hid_row_t *r; + rnd_hid_row_t *r; ctx->lib.lock++; @@ -186,7 +186,7 @@ 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]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); if (r == NULL) return; @@ -200,8 +200,8 @@ 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]; - pcb_hid_row_t *prev, *r = pcb_dad_tree_get_selected(attr); - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *prev, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_tree_t *tree = attr->wdata; char *cell[4]; if (r == NULL) @@ -227,8 +227,8 @@ 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]; - pcb_hid_row_t *next, *r = pcb_dad_tree_get_selected(attr); - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *next, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_tree_t *tree = attr->wdata; char *cell[4]; if (r == NULL) @@ -314,11 +314,11 @@ { pref_ctx_t *ctx = caller_data; rnd_hid_attribute_t *attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_dad_tree_get_selected(attr); char *cell[4]; if (r == NULL) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; switch(pos) { case 0: /* replace */ @@ -435,7 +435,7 @@ void pcb_dlg_pref_lib_create(pref_ctx_t *ctx) { static const char *hdr[] = {"configured path", "actual path on the filesystem", "config source", NULL}; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); /* get the parent vbox, which is the tab's page vbox, to expand and fill */ Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30991) @@ -69,9 +69,9 @@ static void srch_expr_set_ops(srchedit_ctx_t *ctx, const expr_wizard_op_t *op, int click) { - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; rnd_hid_attribute_t *attr; - pcb_hid_row_t *r, *cur = NULL; + rnd_hid_row_t *r, *cur = NULL; char *cell[2], *cursor_path = NULL; const char **o; @@ -115,7 +115,7 @@ static void srch_expr_fill_in_right_const(srchedit_ctx_t *ctx, const search_expr_t *s) { - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; rnd_hid_attribute_t *attr; char *cell[2]; const char **o; @@ -189,9 +189,9 @@ ctx->last_rtype = s->expr->rtype; } -static void srch_expr_left_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void srch_expr_left_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; srchedit_ctx_t *ctx = tree->user_ctx; const expr_wizard_t *e; @@ -207,9 +207,9 @@ srch_expr_fill_in_right(ctx, &ctx->se); } -static void srch_expr_op_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void srch_expr_op_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; srchedit_ctx_t *ctx = tree->user_ctx; if (row != NULL) @@ -224,7 +224,7 @@ { const expr_wizard_t *t; rnd_hid_attribute_t *attr; - pcb_hid_row_t *r, *parent = NULL, *cur = NULL; + rnd_hid_row_t *r, *parent = NULL, *cur = NULL; char *cell[2]; attr = &ctx->dlg[ctx->wleft]; @@ -266,9 +266,9 @@ set_right(ctx, attr); } -static void srch_expr_right_table_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void srch_expr_right_table_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; srchedit_ctx_t *ctx = tree->user_ctx; free(ctx->se.right); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30991) @@ -52,8 +52,8 @@ static void cb_ttbl_jump(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); static void cb_ttbl_filt(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); static void cb_ttbl_select(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -static void cb_ttbl_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); -static void cb_ttbl_free_row(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); +static void cb_ttbl_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); +static void cb_ttbl_free_row(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); static void cb_pane_set(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); static void cb_text_replace(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); static void cb_text_insert(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); @@ -63,8 +63,8 @@ static void cb_text_offs(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); static void cb_text_ro(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -static void prv_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); -static rnd_bool prv_mouse(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); +static void prv_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e); +static rnd_bool prv_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y); static const char * test_xpm[] = { "8 8 4 1", @@ -94,7 +94,7 @@ char *row3[] = {"three", "baz", "BAZ", NULL}; const char *hdr[] = {"num", "data1", "data2", NULL}; pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; - pcb_hid_row_t *row; + rnd_hid_row_t *row; int failed; test_t ctx; @@ -350,7 +350,7 @@ test_t *ctx = caller_data; rnd_hid_attribute_t *treea = &ctx->dlg[ctx->tt]; char *rowdata[] = {NULL, "ins", "dummy", NULL}; - pcb_hid_row_t *new_row, *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *new_row, *row = pcb_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}; - pcb_hid_row_t *new_row, *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *new_row, *row = pcb_dad_tree_get_selected(treea); rnd_hid_attr_val_t val; rowdata[0] = pcb_strdup_printf("dyn_%d", ctx->ttctr++); @@ -388,7 +388,7 @@ static void ttbl_filt(gdl_list_t *list, int hide) { - pcb_hid_row_t *r; + rnd_hid_row_t *r; for(r = gdl_first(list); r != NULL; r = gdl_next(list, r)) { if (r->user_data2.lng) r->hide = hide; @@ -400,7 +400,7 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *treea = &ctx->dlg[ctx->tt]; - pcb_hid_tree_t *tree = treea->wdata; + rnd_hid_tree_t *tree = treea->wdata; ttbl_filt(&tree->rows, attr->val.lng); pcb_dad_tree_update_hide(treea); @@ -409,7 +409,7 @@ /* table level selection */ static void cb_ttbl_select(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_row_t *row = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *row = pcb_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 @@ -417,7 +417,7 @@ } /* row level selection */ -static void cb_ttbl_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void cb_ttbl_row_selected(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { if (row != NULL) rnd_trace("tt row selected: row=%p '%s'\n", row, row->cell[0]); @@ -425,7 +425,7 @@ rnd_trace("tt row selected: \n"); } -static void cb_ttbl_free_row(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void cb_ttbl_free_row(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { if (row->user_data2.lng) free(row->cell[0]); @@ -445,8 +445,8 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; - txt->hid_set_text(atxt, hid_ctx, PCB_HID_TEXT_REPLACE, "Hello\nworld!\n"); + rnd_hid_text_t *txt = atxt->wdata; + txt->hid_set_text(atxt, hid_ctx, RND_HID_TEXT_REPLACE, "Hello\nworld!\n"); } static void cb_text_insert(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -453,8 +453,8 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; - txt->hid_set_text(atxt, hid_ctx, PCB_HID_TEXT_INSERT, "ins"); + rnd_hid_text_t *txt = atxt->wdata; + txt->hid_set_text(atxt, hid_ctx, RND_HID_TEXT_INSERT, "ins"); } static void cb_text_append(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -461,8 +461,8 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; - txt->hid_set_text(atxt, hid_ctx, PCB_HID_TEXT_APPEND | PCB_HID_TEXT_MARKUP, "appred\n"); + rnd_hid_text_t *txt = atxt->wdata; + txt->hid_set_text(atxt, hid_ctx, RND_HID_TEXT_APPEND | RND_HID_TEXT_MARKUP, "appred\n"); } static void cb_text_get(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) @@ -469,7 +469,7 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; char *s; s = txt->hid_get_text(atxt, hid_ctx); printf("text: '%s'\n", s); @@ -479,7 +479,7 @@ static void cb_text_edit(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { test_t *ctx = caller_data; - pcb_hid_text_t *txt = attr->wdata; + rnd_hid_text_t *txt = attr->wdata; long x, y, o; char buf[256]; rnd_hid_attr_val_t val; @@ -495,7 +495,7 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; txt->hid_set_offs(atxt, hid_ctx, txt->hid_get_offs(atxt, hid_ctx) / 2); } @@ -503,12 +503,12 @@ { test_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; ctx->txtro = !ctx->txtro; txt->hid_set_readonly(atxt, hid_ctx, ctx->txtro); } -static void prv_expose(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void prv_expose(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { rnd_render->set_color(gc, rnd_color_red); pcb_text_draw_string_simple(NULL, "foo", PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(20), 500, 10.0, 0, 0, 0, 0, 0); @@ -517,7 +517,7 @@ } -static rnd_bool prv_mouse(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool prv_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { pcb_printf("Mouse %d %mm %mm\n", kind, x, y); return (kind == RND_HID_MOUSE_PRESS) || (kind == RND_HID_MOUSE_RELEASE); Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30991) @@ -67,8 +67,8 @@ static void undo_data2dlg(undo_ctx_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[4], *cursor_path = NULL; uundo_item_t *i; char *payload, buff[8192], mark[2], ser[64]; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30990) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30991) @@ -87,8 +87,8 @@ { pcb_view_t *v; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[3], *cursor_path = NULL; attr = &ctx->dlg[ctx->wlist]; @@ -105,7 +105,7 @@ /* add all items */ cell[2] = NULL; for(v = pcb_view_list_first(ctx->lst); v != NULL; v = pcb_view_list_next(v)) { - pcb_hid_row_t *r, *rt; + rnd_hid_row_t *r, *rt; rt = htsp_get(&tree->paths, v->type); if (rt == NULL) { cell[0] = rnd_strdup(v->type); @@ -191,9 +191,9 @@ pcb_dad_preview_zoomto(&ctx->dlg[ctx->wprev], &v->bbox); } -static void view_select(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void view_select(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; view_ctx_t *ctx = tree->user_ctx; if (row != NULL) @@ -203,7 +203,7 @@ static vtp0_t view_color_save; -static void view_expose_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void view_expose_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { view_ctx_t *ctx = prv->user_ctx; rnd_xform_t xform; @@ -256,7 +256,7 @@ } -static rnd_bool view_mouse_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool view_mouse_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { return pcb_false; /* don't redraw */ } @@ -318,7 +318,7 @@ } else { /* full dialog, go by the list */ rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - pcb_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); if (r == NULL) return; @@ -349,7 +349,7 @@ pcb_view_t *v; gds_t tmp; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wlist]; - pcb_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = pcb_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]; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *r = pcb_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]; - pcb_hid_row_t *rc, *r = pcb_dad_tree_get_selected(attr); + rnd_hid_row_t *rc, *r = pcb_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 30990) +++ trunk/src_plugins/drc_query/dlg.c (revision 30991) @@ -37,7 +37,7 @@ #define PCB dont_use -static void rlist_select(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row); +static void rlist_select(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row); typedef struct{ PCB_DAD_DECL_NOINIT(dlg) @@ -81,7 +81,7 @@ lht_node_t *nd = rnd_conf_lht_get_at_mainplug(ctx->role, ctx->path, 1, 0); if (nd != NULL) { rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; int *dis, dis_ = 0; dis = drc_get_disable(ctx->rule); @@ -93,7 +93,7 @@ PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdisable, str, *dis ? "yes" : "no"); PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->wdesc, str, textval(nd, "desc")); - txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_REPLACE, textval(nd, "query")); + txt->hid_set_text(atxt, ctx->dlg_hid_ctx, RND_HID_TEXT_REPLACE, textval(nd, "query")); } else { rnd_message(RND_MSG_ERROR, "Rule %s disappeared from the config tree.\n", ctx->rule); @@ -115,7 +115,7 @@ { rule_edit_ctx_t *ctx = caller_data; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; char *script = txt->hid_get_text(atxt, hid_ctx); pcb_view_list_t *view = calloc(sizeof(pcb_view_list_t), 1); pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx); @@ -175,7 +175,7 @@ lht_node_t *nd; rnd_conf_role_t role; rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; if ((ri < 0) || (ri >= sizeof(save_rolee)/sizeof(save_rolee[0]))) { rnd_message(RND_MSG_ERROR, "Internal error: role out of range, rule is NOT saved\n"); @@ -365,8 +365,8 @@ { drc_rlist_ctx_t *ctx = &drc_rlist_ctx; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[5], *cursor_path = NULL; gdl_iterator_t it; rnd_conf_listitem_t *i; @@ -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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = pcb_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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = pcb_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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist])); lht_node_t *nd; const char *script; rnd_conf_role_t role; @@ -505,10 +505,10 @@ drc_rlist_pcb2dlg(); /* for the run time */ } -static void rlist_select(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void rlist_select(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { rnd_hid_attr_val_t hv; - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; drc_rlist_ctx_t *ctx = tree->user_ctx; lht_node_t *nd; gds_t tmp; Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30990) +++ trunk/src_plugins/export_openems/excitation.c (revision 30991) @@ -309,7 +309,7 @@ { int wscript; rnd_hid_attribute_t *attr; - pcb_hid_text_t *txt; + rnd_hid_text_t *txt; wscript = exc_ctx.exc_data[idx].w[I_SCRIPT]; attr = &exc_ctx.dlg[wscript]; Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30990) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30991) @@ -498,7 +498,7 @@ goto err; case RND_HATT_END: { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->set_value != NULL)) cmp->set_value(&ctx->attrs[idx], ctx, idx, val); else @@ -785,7 +785,7 @@ return -1; if (ctx->attrs[idx].type == RND_HATT_END) { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_state != NULL)) cmp->widget_state(&ctx->attrs[idx], ctx, idx, enabled); else @@ -806,7 +806,7 @@ if (ctx->attrs[idx].type == RND_HATT_BEGIN_COMPOUND) return -1; if (ctx->attrs[idx].type == RND_HATT_END) { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_hide != NULL)) cmp->widget_hide(&ctx->attrs[idx], ctx, idx, hide); else Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30990) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30991) @@ -78,7 +78,7 @@ { pcb_ltf_preview_t *pd = e->draw_data; rnd_hid_attribute_t *attr = pd->attr; - pcb_hid_preview_t *prv = attr->wdata; + rnd_hid_preview_t *prv = attr->wdata; prv->user_expose_cb(attr, prv, gc, e); } @@ -96,7 +96,7 @@ static void ltf_preview_zoomto(rnd_hid_attribute_t *attr, void *hid_ctx, const rnd_rnd_box_t *view) { - pcb_hid_preview_t *prv = attr->wdata; + rnd_hid_preview_t *prv = attr->wdata; pcb_ltf_preview_t *pd = prv->hid_wdata; pd->x1 = view->X1; @@ -112,7 +112,7 @@ { pcb_ltf_preview_t *pd = pd_; rnd_hid_attribute_t *attr = pd->attr; - pcb_hid_preview_t *prv = attr->wdata; + rnd_hid_preview_t *prv = attr->wdata; rnd_coord_t x, y; Window root, child; unsigned int keys_buttons; @@ -132,7 +132,7 @@ { pcb_ltf_preview_t *pd = pd_; rnd_hid_attribute_t *attr = pd->attr; - pcb_hid_preview_t *prv = attr->wdata; + rnd_hid_preview_t *prv = attr->wdata; rnd_coord_t x, y; rnd_hid_mouse_ev_t kind = -1; @@ -166,7 +166,7 @@ { Widget pw; pcb_ltf_preview_t *pd; - pcb_hid_preview_t *prv = attr->wdata; + rnd_hid_preview_t *prv = attr->wdata; pd = calloc(1, sizeof(pcb_ltf_preview_t)); prv->hid_wdata = pd; @@ -321,16 +321,16 @@ XmTextPosition pos; switch(how & 0x0F) { /* ignore flags - no markup support */ - case PCB_HID_TEXT_INSERT: + case RND_HID_TEXT_INSERT: stdarg_n = 0; stdarg(XmNcursorPosition, &pos); XtGetValues(wtxt, stdarg_args, stdarg_n); XmTextInsert(wtxt, pos, XmStrCast(txt)); break; - case PCB_HID_TEXT_REPLACE: + case RND_HID_TEXT_REPLACE: XmTextSetString(wtxt, XmStrCast(txt)); break; - case PCB_HID_TEXT_APPEND: + case RND_HID_TEXT_APPEND: pos = 1<<30; XmTextInsert(wtxt, pos, XmStrCast(txt)); break; @@ -337,13 +337,13 @@ } } -static void ltf_text_set_text(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_text_set_t how, const char *txt) +static void ltf_text_set_text(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_text_set_t how, const char *txt) { lesstif_attr_dlg_t *ctx = hid_ctx; int idx = attrib - ctx->attrs; Widget wtxt = ctx->wl[idx]; - if (how & PCB_HID_TEXT_MARKUP) { + if (how & RND_HID_TEXT_MARKUP) { char *orig, *tmp = rnd_strdup(txt); pcb_markup_state_t st = 0; char *seg; @@ -365,7 +365,7 @@ static void ltf_text_set(lesstif_attr_dlg_t *ctx, int idx, const char *val) { - ltf_text_set_text(&ctx->attrs[idx], ctx, PCB_HID_TEXT_REPLACE, val); + ltf_text_set_text(&ctx->attrs[idx], ctx, RND_HID_TEXT_REPLACE, val); } @@ -476,7 +476,7 @@ static Widget ltf_text_create(lesstif_attr_dlg_t *ctx, Widget parent, rnd_hid_attribute_t *attr) { Widget wtxt; - pcb_hid_text_t *txt = attr->wdata; + rnd_hid_text_t *txt = attr->wdata; stdarg(XmNresizePolicy, XmRESIZE_GROW); stdarg(XmNeditMode, XmMULTI_LINE_EDIT); Index: trunk/src_plugins/hid_lesstif/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30990) +++ trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30991) @@ -7,7 +7,7 @@ rnd_hid_attribute_t *attr; gdl_list_t model; Widget w; - pcb_hid_tree_t *ht; + rnd_hid_tree_t *ht; tt_entry_t *cursor; } ltf_tree_t; @@ -28,10 +28,10 @@ return NULL; } -static void ltf_tt_insert_row(ltf_tree_t *lt, pcb_hid_row_t *new_row) +static void ltf_tt_insert_row(ltf_tree_t *lt, rnd_hid_row_t *new_row) { tt_entry_t *e, *at; - pcb_hid_row_t *prev, *next, *parent; + rnd_hid_row_t *prev, *next, *parent; gdl_list_t *parlist; int n; @@ -94,9 +94,9 @@ extern void xm_extent_prediction(XmTreeTableWidget w); -static void ltf_tree_insert_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *new_row) +static void ltf_tree_insert_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *new_row) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; ltf_tt_insert_row(lt, new_row); @@ -104,9 +104,9 @@ REDRAW(); } -static void ltf_tree_modify_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row, int col) +static void ltf_tree_modify_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row, int col) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; /* the caller modifies data strings directly, no need to do anything just flush */ @@ -116,8 +116,8 @@ static void cursor_changed(ltf_tree_t *lt) { - pcb_hid_tree_t *ht = lt->ht; - pcb_hid_row_t *c_row = NULL; + rnd_hid_tree_t *ht = lt->ht; + rnd_hid_row_t *c_row = NULL; if (lt->cursor != NULL) c_row = lt->cursor->user_data; @@ -127,9 +127,9 @@ ht->user_selected_cb(lt->attr, lt->ctx, c_row); } -static void ltf_tree_remove_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row) +static void ltf_tree_remove_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; tt_entry_t *e = row->hid_data; int changed = 0; @@ -148,9 +148,9 @@ cursor_changed(lt); } -static void ltf_tree_free_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row) +static void ltf_tree_free_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; tt_entry_t *i; @@ -164,9 +164,9 @@ ht->hid_wdata = NULL; } -static pcb_hid_row_t *ltf_tree_get_selected_cb(rnd_hid_attribute_t *attrib, void *hid_wdata) +static rnd_hid_row_t *ltf_tree_get_selected_cb(rnd_hid_attribute_t *attrib, void *hid_wdata) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; if (lt->cursor == NULL) @@ -229,9 +229,9 @@ cursor_changed(lt); } -static void ltf_tree_jumpto_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row) +static void ltf_tree_jumpto_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; if (row != NULL) { tt_entry_t *e = row->hid_data; @@ -272,9 +272,9 @@ static void ltf_tree_set(lesstif_attr_dlg_t *ctx, int idx, const char *val) { rnd_hid_attribute_t *attr = &ctx->attrs[idx]; - pcb_hid_tree_t *ht = attr->wdata; + rnd_hid_tree_t *ht = attr->wdata; ltf_tree_t *lt = ht->hid_wdata; - pcb_hid_row_t *r, *row; + rnd_hid_row_t *r, *row; tt_entry_t *e; if (val == NULL) { @@ -307,9 +307,9 @@ ltf_tt_jumpto(lt, row->hid_data, 1); /* implies a REDRAW() */ } -static void ltf_tree_expcoll_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, pcb_hid_row_t *row, int expanded) +static void ltf_tree_expcoll_cb(rnd_hid_attribute_t *attrib, void *hid_wdata, rnd_hid_row_t *row, int expanded) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; ltf_tree_expcoll(lt, row->hid_data, expanded); REDRAW(); @@ -317,17 +317,17 @@ static void ltf_tree_update_hide_cb(rnd_hid_attribute_t *attrib, void *hid_wdata) { - pcb_hid_tree_t *ht = attrib->wdata; + rnd_hid_tree_t *ht = attrib->wdata; ltf_tree_t *lt = ht->hid_wdata; tt_entry_t *e; for(e = gdl_first(<->model); e != NULL; e = gdl_next(<->model, e)) { - pcb_hid_row_t *row = e->user_data; + rnd_hid_row_t *row = e->user_data; e->flags.is_uhidden = row->hide; } REDRAW(); } -static void ltf_tt_append_row(ltf_tree_t *lt, pcb_hid_row_t *new_row, int level) +static void ltf_tt_append_row(ltf_tree_t *lt, rnd_hid_row_t *new_row, int level) { tt_entry_t *e; int n; @@ -346,7 +346,7 @@ static void ltf_tt_import(ltf_tree_t *lt, gdl_list_t *lst, int level) { - pcb_hid_row_t *r; + rnd_hid_row_t *r; for(r = gdl_first(lst); r != NULL; r = gdl_next(lst, r)) { ltf_tt_append_row(lt, r, level); @@ -399,7 +399,7 @@ static Widget ltf_tree_create_(lesstif_attr_dlg_t *ctx, Widget parent, rnd_hid_attribute_t *attr) { - pcb_hid_tree_t *ht = attr->wdata; + rnd_hid_tree_t *ht = attr->wdata; ltf_tree_t *lt = calloc(sizeof(ltf_tree_t), 1); Widget table = xm_create_tree_table_widget_cb(parent, <->model, lt, ltf_tt_xevent_cb, NULL, NULL); Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 30990) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 30991) @@ -60,13 +60,13 @@ static void ghid_preview_expose(rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { - pcb_hid_preview_t *prv = e->draw_data; + rnd_hid_preview_t *prv = e->draw_data; prv->user_expose_cb(prv->attrib, prv, gc, e); } static rnd_bool ghid_preview_mouse(void *widget, void *draw_data, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { - pcb_hid_preview_t *prv = draw_data; + rnd_hid_preview_t *prv = draw_data; if (prv->user_mouse_cb != NULL) return prv->user_mouse_cb(prv->attrib, prv, kind, x, y); return pcb_false; @@ -92,7 +92,7 @@ void ghid_preview_config(pcb_gtk_preview_t *gp, GtkWidget *widget) { - pcb_hid_preview_t *prv = gp->expose_data.draw_data; + rnd_hid_preview_t *prv = gp->expose_data.draw_data; if (prv->initial_view_valid) { pcb_gtk_preview_zoomto(PCB_GTK_PREVIEW(widget), &prv->initial_view); gtk_widget_queue_draw(widget); @@ -104,7 +104,7 @@ { GtkWidget *bparent, *prv; pcb_gtk_preview_t *p; - pcb_hid_preview_t *hp = attr->wdata; + rnd_hid_preview_t *hp = attr->wdata; hp->hid_wdata = ctx; hp->hid_zoomto_cb = ghid_preview_zoomto; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30990) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30991) @@ -27,7 +27,7 @@ #include -static GtkTreeIter *ghid_tree_table_add(rnd_hid_attribute_t *attr, GtkTreeStore *tstore, GtkTreeIter *par, pcb_hid_row_t *r, int prepend, GtkTreeIter *sibling) +static GtkTreeIter *ghid_tree_table_add(rnd_hid_attribute_t *attr, GtkTreeStore *tstore, GtkTreeIter *par, rnd_hid_row_t *r, int prepend, GtkTreeIter *sibling) { int c; GtkTreeIter *curr = malloc(sizeof(GtkTreeIter)); @@ -70,7 +70,7 @@ /* insert a subtree of a tree-table widget in a gtk table store reursively */ static void ghid_tree_table_import(rnd_hid_attribute_t *attr, GtkTreeStore *tstore, gdl_list_t *lst, GtkTreeIter *par) { - pcb_hid_row_t *r; + rnd_hid_row_t *r; for(r = gdl_first(lst); r != NULL; r = gdl_next(lst, r)) { GtkTreeIter *curr = ghid_tree_table_add(attr, tstore, par, r, 0, NULL); @@ -93,10 +93,10 @@ return model; } -static void ghid_tree_table_insert_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *new_row) +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; - pcb_hid_row_t *sibling, *par = pcb_dad_tree_parent_row(attrib->wdata, new_row); + rnd_hid_row_t *sibling, *par = pcb_dad_tree_parent_row(attrib->wdata, new_row); GtkTreeModel *model = ghid_tree_table_get_model(ctx, attrib, 0); GtkTreeIter *sibiter, *pariter; int prepnd; @@ -114,7 +114,7 @@ ghid_tree_table_add(attrib, GTK_TREE_STORE(model), pariter, new_row, prepnd, sibiter); } -static void ghid_tree_table_remove_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void ghid_tree_table_remove_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { attr_dlg_t *ctx = hid_ctx; GtkTreeModel *model = ghid_tree_table_get_model(ctx, attrib, 0); @@ -122,7 +122,7 @@ row->hid_data = NULL; } -static void ghid_tree_table_modify_cb(rnd_hid_attribute_t *attr, void *hid_ctx, pcb_hid_row_t *row, int col) +static void ghid_tree_table_modify_cb(rnd_hid_attribute_t *attr, void *hid_ctx, rnd_hid_row_t *row, int col) { attr_dlg_t *ctx = hid_ctx; GtkTreeIter *iter = row->hid_data; @@ -143,7 +143,7 @@ } } -static void ghid_tree_table_free_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void ghid_tree_table_free_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { free(row->hid_data); } @@ -156,7 +156,7 @@ } -static pcb_hid_row_t *ghid_tree_table_get_selected(rnd_hid_attribute_t *attrib, void *hid_ctx) +static rnd_hid_row_t *ghid_tree_table_get_selected(rnd_hid_attribute_t *attrib, void *hid_ctx) { attr_dlg_t *ctx = hid_ctx; int idx = attrib - ctx->attrs; @@ -164,7 +164,7 @@ GtkTreeSelection *tsel; GtkTreeModel *tm; GtkTreeIter iter; - pcb_hid_row_t *r; + rnd_hid_row_t *r; tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tt)); if (tsel == NULL) @@ -181,8 +181,8 @@ static void ghid_tree_table_cursor(GtkWidget *widget, rnd_hid_attribute_t *attr) { attr_dlg_t *ctx = g_object_get_data(G_OBJECT(widget), PCB_OBJ_PROP); - pcb_hid_row_t *r = ghid_tree_table_get_selected(attr, ctx); - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r = ghid_tree_table_get_selected(attr, ctx); + rnd_hid_tree_t *tree = attr->wdata; attr->changed = 1; if (ctx->inhibit_valchg) @@ -199,7 +199,7 @@ static gboolean tree_table_filter_visible_func(GtkTreeModel *model, GtkTreeIter *iter, void *user_data) { rnd_hid_attribute_t *attr = user_data; - pcb_hid_row_t *r = NULL; + rnd_hid_row_t *r = NULL; gtk_tree_model_get(model, iter, attr->rnd_hatt_table_cols, &r, -1); @@ -249,8 +249,8 @@ /* Handle ctrl+c and ctrl+C: copy current name to clipboard */ if (((event->state & default_mod_mask) == GDK_CONTROL_MASK) && ((event->keyval == PCB_GTK_KEY(c)) || (event->keyval == PCB_GTK_KEY(C)))) { - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; const char *cliptext; selection = gtk_tree_view_get_selection(tree_view); @@ -296,11 +296,11 @@ display, but shouldn't open/close levels visited or pop up the parametric footprint dialog */ if (arrow_key) { - pcb_hid_row_t *r; + rnd_hid_row_t *r; gtk_tree_model_get(model, &iter, attr->rnd_hatt_table_cols, &r, -1); if (r != NULL) { - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; if (tree->user_browse_activate_cb != NULL) { /* let the user callbakc decide */ force_activate = tree->user_browse_activate_cb(attr, tree->hid_wdata, r); } @@ -368,8 +368,8 @@ rnd_hid_attribute_t *attr = &ctx->attrs[idx]; GtkTreeModel *model = ghid_tree_table_get_model(ctx, attr, 0); GtkTreePath *path; - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; const char *s = val->str; if ((s == NULL) || (*s == '\0')) { @@ -391,7 +391,7 @@ return 0; } -void ghid_tree_table_jumpto_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +void ghid_tree_table_jumpto_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { attr_dlg_t *ctx = hid_ctx; int idx = attrib - ctx->attrs; @@ -414,7 +414,7 @@ gtk_tree_view_set_cursor(GTK_TREE_VIEW(tt), path, NULL, FALSE); } -void ghid_tree_table_expcoll_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row, int expanded) +void ghid_tree_table_expcoll_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row, int expanded) { attr_dlg_t *ctx = hid_ctx; int idx = attrib - ctx->attrs; @@ -448,7 +448,7 @@ GType *types; GtkCellRenderer *renderer; GtkTreeSelection *selection; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; tree->hid_insert_cb = ghid_tree_table_insert_cb; tree->hid_remove_cb = ghid_tree_table_remove_cb; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c (revision 30990) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c (revision 30991) @@ -109,10 +109,10 @@ GtkTextIter it, it2; switch(how & 0x0F) { - case PCB_HID_TEXT_INSERT: + case RND_HID_TEXT_INSERT: gtk_text_buffer_insert_at_cursor(b, txt, len); break; - case PCB_HID_TEXT_REPLACE: + case RND_HID_TEXT_REPLACE: gtk_text_buffer_get_start_iter(b, &it); gtk_text_buffer_get_end_iter(b, &it2); gtk_text_buffer_delete(b, &it, &it2); @@ -119,7 +119,7 @@ gtk_text_buffer_get_start_iter(b, &it); gtk_text_buffer_insert(b, &it, txt, len); break; - case PCB_HID_TEXT_APPEND: + case RND_HID_TEXT_APPEND: gtk_text_buffer_get_end_iter(b, &it); gtk_text_buffer_insert(b, &it, txt, len); break; @@ -126,16 +126,16 @@ } } -static void txt_set_text(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_text_set_t how, const char *str) +static void txt_set_text(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_text_set_t how, const char *str) { attr_dlg_t *ctx = hid_ctx; - pcb_hid_text_t *txt = attrib->wdata; + rnd_hid_text_t *txt = attrib->wdata; dad_txt_t *tctx = txt->hid_wdata; int idx = attrib - ctx->attrs; GtkWidget *wtxt = ctx->wl[idx]; GtkTextBuffer *b = gtk_text_view_get_buffer(GTK_TEXT_VIEW(wtxt)); - if (how & PCB_HID_TEXT_MARKUP) { + if (how & RND_HID_TEXT_MARKUP) { pcb_markup_state_t st = 0; const char *seg; long seglen; @@ -178,7 +178,7 @@ static int ghid_text_set(attr_dlg_t *ctx, int idx, const rnd_hid_attr_val_t *val) { - txt_set_text(&ctx->attrs[idx], ctx, PCB_HID_TEXT_REPLACE, val->str); + txt_set_text(&ctx->attrs[idx], ctx, RND_HID_TEXT_REPLACE, val->str); return 0; } @@ -224,7 +224,7 @@ { GtkWidget *wtxt; GtkTextBuffer *buffer; - pcb_hid_text_t *txt = attr->wdata; + rnd_hid_text_t *txt = attr->wdata; dad_txt_t *tctx; Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30990) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30991) @@ -577,7 +577,7 @@ case RND_HATT_END: { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->set_value != NULL)) cmp->set_value(&ctx->attrs[idx], ctx, idx, val); else @@ -743,7 +743,7 @@ return -1; if (ctx->attrs[idx].type == RND_HATT_END) { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_hide != NULL)) return cmp->widget_hide(&ctx->attrs[idx], ctx, idx, hide); else @@ -935,7 +935,7 @@ return -1; if (ctx->attrs[idx].type == RND_HATT_END) { - pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; + rnd_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_state != NULL)) cmp->widget_state(&ctx->attrs[idx], ctx, idx, enabled); else Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30990) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30991) @@ -118,9 +118,9 @@ rnd_parse_command(dad->hidlib, *act, 1); } -static void dad_row_free_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void dad_row_free_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; dad_t *dad = tree->user_ctx; fgw_arg_t res; res.type = FGW_PTR | FGW_VOID; Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30990) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30991) @@ -55,7 +55,7 @@ static void log_append(log_ctx_t *ctx, rnd_hid_attribute_t *atxt, rnd_logline_t *line) { - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; const char *prefix = NULL; int popup; @@ -74,11 +74,11 @@ gds_append(&tmp, '/'); gds_append_str(&tmp, prefix+1); } - txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_APPEND | PCB_HID_TEXT_MARKUP, tmp.array); + txt->hid_set_text(atxt, ctx->dlg_hid_ctx, RND_HID_TEXT_APPEND | RND_HID_TEXT_MARKUP, tmp.array); gds_uninit(&tmp); } else - txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_APPEND, line->str); + txt->hid_set_text(atxt, ctx->dlg_hid_ctx, RND_HID_TEXT_APPEND, line->str); } else { if ((line->prev == NULL) || (line->prev->str[line->prev->len-1] == '\n')) { @@ -89,9 +89,9 @@ case RND_MSG_ERROR: prefix = "E: "; break; } if (prefix != NULL) - txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_APPEND | PCB_HID_TEXT_MARKUP, prefix); + txt->hid_set_text(atxt, ctx->dlg_hid_ctx, RND_HID_TEXT_APPEND | RND_HID_TEXT_MARKUP, prefix); } - txt->hid_set_text(atxt, ctx->dlg_hid_ctx, PCB_HID_TEXT_APPEND | PCB_HID_TEXT_MARKUP, line->str); + txt->hid_set_text(atxt, ctx->dlg_hid_ctx, RND_HID_TEXT_APPEND | RND_HID_TEXT_MARKUP, line->str); } if (popup && (rnd_gui->attr_dlg_raise != NULL)) rnd_gui->attr_dlg_raise(ctx->dlg_hid_ctx); @@ -124,7 +124,7 @@ static void maybe_scroll_to_bottom() { rnd_hid_attribute_t *atxt = &log_ctx.dlg[log_ctx.wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; if ((log_ctx.dlg[log_ctx.wscroll].val.lng) && (txt->hid_scroll_to_bottom != NULL)) txt->hid_scroll_to_bottom(atxt, log_ctx.dlg_hid_ctx); @@ -174,7 +174,7 @@ { rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; txt->hid_set_readonly(atxt, ctx->dlg_hid_ctx, 1); } hv.lng = 1; @@ -217,9 +217,9 @@ { if (log_ctx.active) { rnd_hid_attribute_t *atxt = &log_ctx.dlg[log_ctx.wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; - txt->hid_set_text(atxt, log_ctx.dlg_hid_ctx, PCB_HID_TEXT_REPLACE, ""); + txt->hid_set_text(atxt, log_ctx.dlg_hid_ctx, RND_HID_TEXT_REPLACE, ""); log_import(&log_ctx); } } Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30990) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30991) @@ -59,7 +59,7 @@ rnd_hid_attr_val_t hv; pcb_route_style_t *rst; rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; rnd_attribute_t *a; if (!rstdlg_ctx.active) @@ -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]; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *row = pcb_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]; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(treea); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(treea); if (row == NULL) return; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30990) +++ trunk/src_plugins/propedit/propdlg.c (revision 30991) @@ -65,7 +65,7 @@ { propdlg_t *ctx = caller_data; rnd_hid_attribute_t *attr, *attr_inp; - pcb_hid_tree_t *tree; + rnd_hid_tree_t *tree; const char *text; int have_filter_text; @@ -87,8 +87,8 @@ static void prop_pcb2dlg(propdlg_t *ctx) { rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wtree]; - pcb_hid_tree_t *tree = attr->wdata; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree = attr->wdata; + rnd_hid_row_t *r; htsp_entry_t *sorted, *e; char *cursor_path = NULL; @@ -210,13 +210,13 @@ } } -static void prop_prv_expose_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) +static void prop_prv_expose_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_gc_t gc, const rnd_hid_expose_ctx_t *e) { } -static rnd_bool prop_prv_mouse_cb(rnd_hid_attribute_t *attrib, pcb_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) +static rnd_bool prop_prv_mouse_cb(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) { return pcb_false; /* don't redraw */ } @@ -265,7 +265,7 @@ { rnd_hid_attr_val_t hv; rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wvals]; - pcb_hid_tree_t *tree = attr->wdata; + rnd_hid_tree_t *tree = attr->wdata; htprop_entry_t *e; pvsort_t *pvs; char *cell[3] = {NULL, NULL, NULL}; @@ -288,7 +288,7 @@ qsort(pvs, p->values.used, sizeof(pvsort_t), sort_pv); for(n = 0; n < p->values.used; n++) { - pcb_hid_row_t *r; + rnd_hid_row_t *r; cell[0] = pcb_strdup_printf("%ld", pvs[n].cnt); cell[1] = pcb_propsel_printval(p->type, pvs[n].val); r = pcb_dad_tree_append(attr, NULL, cell); @@ -303,9 +303,9 @@ free(pvs); } -static void prop_select_node_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) +static void prop_select_node_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row) { - pcb_hid_tree_t *tree = attrib->wdata; + rnd_hid_tree_t *tree = attrib->wdata; propdlg_t *ctx = tree->user_ctx; pcb_props_t *p = NULL; @@ -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; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + rnd_hid_row_t *r = pcb_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; - pcb_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + rnd_hid_row_t *r = pcb_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; - pcb_hid_row_t *rv = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wvals]); - pcb_hid_row_t *rp = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]); + 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]); pcb_props_t *p; if ((rv == NULL) || (rv->user_data == NULL) || (rp == NULL)) Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30990) +++ trunk/src_plugins/script/live_script.c (revision 30991) @@ -281,7 +281,7 @@ static int live_run(rnd_hidlib_t *hl, live_script_t *lvs) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; FILE *f; char *src, *fn, *lang; int res = 0; @@ -351,7 +351,7 @@ static int live_load(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; FILE *f; gds_t tmp; @@ -382,7 +382,7 @@ } } - txt->hid_set_text(atxt, lvs->dlg_hid_ctx, PCB_HID_TEXT_REPLACE, tmp.array); + txt->hid_set_text(atxt, lvs->dlg_hid_ctx, RND_HID_TEXT_REPLACE, tmp.array); gds_uninit(&tmp); fclose(f); @@ -392,7 +392,7 @@ static int live_save(rnd_hidlib_t *hl, live_script_t *lvs, const char *fn) { rnd_hid_attribute_t *atxt = &lvs->dlg[lvs->wtxt]; - pcb_hid_text_t *txt = atxt->wdata; + rnd_hid_text_t *txt = atxt->wdata; FILE *f; char *src; int res = 0; Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30990) +++ trunk/src_plugins/script/script_act.c (revision 30991) @@ -74,8 +74,8 @@ static void script_dlg_s2d_act(script_dlg_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[2]; htsp_entry_t *e; script_t *sc; @@ -107,8 +107,8 @@ static void script_dlg_s2d(script_dlg_t *ctx) { rnd_hid_attribute_t *attr; - pcb_hid_tree_t *tree; - pcb_hid_row_t *r; + rnd_hid_tree_t *tree; + rnd_hid_row_t *r; char *cell[4], *cursor_path = NULL; htsp_entry_t *e; @@ -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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); + rnd_hid_row_t *row = pcb_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; - pcb_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); + rnd_hid_row_t *row = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wslist]); if (row == NULL) return;