Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30953) +++ trunk/src/brave.c (revision 30954) @@ -42,7 +42,7 @@ pcb_brave_t pcb_brave = 0; static const char brave_cookie[] = "brave"; -static conf_hid_id_t brave_conf_id; +static rnd_conf_hid_id_t brave_conf_id; typedef struct { pcb_brave_t bit; @@ -288,17 +288,17 @@ void pcb_brave_init(void) { rnd_conf_native_t *n = rnd_conf_get_field("rc/brave"); - brave_conf_id = pcb_conf_hid_reg(brave_cookie, NULL); + brave_conf_id = rnd_conf_hid_reg(brave_cookie, NULL); if (n != NULL) { - static conf_hid_callbacks_t cbs; - memset(&cbs, 0, sizeof(conf_hid_callbacks_t)); + static rnd_conf_hid_callbacks_t cbs; + memset(&cbs, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs.val_change_post = brave_conf_chg; - pcb_conf_hid_set_cb(n, brave_conf_id, &cbs); + rnd_conf_hid_set_cb(n, brave_conf_id, &cbs); } } void pcb_brave_uninit(void) { - pcb_conf_hid_unreg(brave_cookie); + rnd_conf_hid_unreg(brave_cookie); } Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 30953) +++ trunk/src/conf_core.c (revision 30954) @@ -97,12 +97,12 @@ lock--; } -static conf_hid_callbacks_t cbs; +static rnd_conf_hid_callbacks_t cbs; void conf_core_uninit_pre(void) { - pcb_conf_hid_unreg(conf_core_cookie); + rnd_conf_hid_unreg(conf_core_cookie); } void conf_core_uninit(void) @@ -123,7 +123,7 @@ conf_core_postproc(); cbs.val_change_post = conf_legacy_chg; - pcb_conf_hid_reg(conf_core_cookie, &cbs); + rnd_conf_hid_reg(conf_core_cookie, &cbs); /* these old drc settings from editor/ are copied over to editor/drc because various core and tool code depend on the values being at the Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 30953) +++ trunk/src/layer_vis.c (revision 30954) @@ -208,7 +208,7 @@ SavedStack.cnt--; } -static conf_hid_id_t layer_vis_conf_id; +static rnd_conf_hid_id_t layer_vis_conf_id; void layer_vis_chg_mask(rnd_conf_native_t *cfg, int arr_idx) { @@ -351,14 +351,14 @@ void pcb_layer_vis_init(void) { rnd_conf_native_t *n_mask = rnd_conf_get_field("editor/show_mask"); - static conf_hid_callbacks_t cbs_mask; + static rnd_conf_hid_callbacks_t cbs_mask; - layer_vis_conf_id = pcb_conf_hid_reg(layer_vis_cookie, NULL); + layer_vis_conf_id = rnd_conf_hid_reg(layer_vis_cookie, NULL); if (n_mask != NULL) { - memset(&cbs_mask, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs_mask, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs_mask.val_change_post = layer_vis_chg_mask; - pcb_conf_hid_set_cb(n_mask, layer_vis_conf_id, &cbs_mask); + rnd_conf_hid_set_cb(n_mask, layer_vis_conf_id, &cbs_mask); } pcb_event_bind(PCB_EVENT_BOARD_CHANGED, layer_vis_grp_defaults, NULL, layer_vis_cookie); @@ -368,5 +368,5 @@ void pcb_layer_vis_uninit(void) { pcb_event_unbind_allcookie(layer_vis_cookie); - pcb_conf_hid_unreg(layer_vis_cookie); + rnd_conf_hid_unreg(layer_vis_cookie); } Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30953) +++ trunk/src/librnd/core/conf.c (revision 30954) @@ -723,7 +723,7 @@ rnd_conflist_insert(dest->val.list, i); dest->used |= 1; if ((dest->type == RND_CFN_HLIST) || (s->user_data == NULL)) { - conf_hid_global_cb_ptr(dest, i, new_hlist_item_post); + rnd_conf_hid_global_cb_ptr(dest, i, new_hlist_item_post); s->user_data = pcb_cast_f2d((pcb_fptr_t)pcb_conf_merge_patch_list); } } @@ -762,7 +762,7 @@ i->val.any = NULL; dest->used |= 1; if ((dest->type == RND_CFN_HLIST) && (s->user_data == NULL)) { - conf_hid_global_cb_ptr(dest, i, new_hlist_item_post); + rnd_conf_hid_global_cb_ptr(dest, i, new_hlist_item_post); s->user_data = pcb_cast_f2d((pcb_fptr_t)pcb_conf_merge_patch_list); } } @@ -1070,8 +1070,8 @@ if (path == NULL) { htsp_entry_t *e; rnd_conf_fields_foreach(e) { - conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); - conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); + rnd_conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); + rnd_conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); conf_field_clear(e->value); } } @@ -1097,8 +1097,8 @@ return; } conf_field_clear(n); - conf_hid_global_cb(n, arr_idx, val_change_pre); - conf_hid_local_cb(n, arr_idx, val_change_pre); + rnd_conf_hid_global_cb(n, arr_idx, val_change_pre); + rnd_conf_hid_local_cb(n, arr_idx, val_change_pre); } /* merge all memory-lht data to memory-bin */ @@ -1110,13 +1110,13 @@ if (path == NULL) { htsp_entry_t *e; rnd_conf_fields_foreach(e) { - conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_post); - conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_post); + rnd_conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_post); + rnd_conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_post); } } else { - conf_hid_local_cb(n, arr_idx, val_change_post); - conf_hid_global_cb(n, arr_idx, val_change_post); + rnd_conf_hid_local_cb(n, arr_idx, val_change_post); + rnd_conf_hid_global_cb(n, arr_idx, val_change_post); } rnd_conf_rev++; } @@ -1318,7 +1318,7 @@ vtp0_init(&(node->hid_callbacks)); htsp_set(rnd_conf_fields, (char *)path, node); - conf_hid_global_cb(node, -1, new_item_post); + rnd_conf_hid_global_cb(node, -1, new_item_post); return node; } @@ -2204,7 +2204,7 @@ fprintf(stderr, "pcb-rnd conf ERROR: conf node '%s' is not unregistered\n", e->key); } - pcb_conf_pcb_hid_uninit(); + rnd_conf_pcb_hid_uninit(); for(n = 0; n < RND_CFR_max_alloc; n++) { if (pcb_conf_main_root[n] != NULL) Index: trunk/src/librnd/core/conf_hid.c =================================================================== --- trunk/src/librnd/core/conf_hid.c (revision 30953) +++ trunk/src/librnd/core/conf_hid.c (revision 30954) @@ -6,11 +6,11 @@ #include typedef struct { - const conf_hid_callbacks_t *cb; - conf_hid_id_t id; + const rnd_conf_hid_callbacks_t *cb; + rnd_conf_hid_id_t id; } conf_hid_t; -void *pcb_conf_hid_set_data(rnd_conf_native_t *cfg, conf_hid_id_t id, void *data) +void *rnd_conf_hid_set_data(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id, void *data) { void **old = vtp0_get(&cfg->hid_data, id, 0); vtp0_set(&cfg->hid_data, id, data); @@ -17,19 +17,19 @@ return old == NULL ? NULL : *old; } -void *pcb_conf_hid_get_data(rnd_conf_native_t *cfg, conf_hid_id_t id) +void *rnd_conf_hid_get_data(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id) { void **old = vtp0_get(&cfg->hid_data, id, 0); return old == NULL ? NULL : *old; } -const conf_hid_callbacks_t *pcb_conf_hid_set_cb(rnd_conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs) +const rnd_conf_hid_callbacks_t *rnd_conf_hid_set_cb(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id, const rnd_conf_hid_callbacks_t *cbs) { void **old; assert(id >= 0); old = vtp0_get(&cfg->hid_callbacks, id, 0); vtp0_set(&cfg->hid_callbacks, id, (void *)cbs); - return (const conf_hid_callbacks_t *)(old == NULL ? NULL : *old); + return (const rnd_conf_hid_callbacks_t *)(old == NULL ? NULL : *old); } @@ -42,7 +42,7 @@ conf_hid_ids = htpp_alloc(ptrhash, ptrkeyeq); } -void pcb_conf_pcb_hid_uninit(void) +void rnd_conf_pcb_hid_uninit(void) { #ifndef NDEBUG if (conf_hid_ids != NULL) { @@ -58,7 +58,7 @@ } } -conf_hid_id_t pcb_conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb) +rnd_conf_hid_id_t rnd_conf_hid_reg(const char *cookie, const rnd_conf_hid_callbacks_t *cb) { conf_hid_t *h; @@ -76,7 +76,7 @@ return h->id; } -void pcb_conf_hid_unreg(const char *cookie) +void rnd_conf_hid_unreg(const char *cookie) { htsp_entry_t *e; conf_hid_t *h = htpp_pop(conf_hid_ids, (void *)cookie); @@ -90,7 +90,7 @@ rnd_conf_native_t *cfg = e->value; len = vtp0_len(&cfg->hid_callbacks); - conf_hid_local_cb(cfg, -1, unreg_item); + rnd_conf_hid_local_cb(cfg, -1, unreg_item); /* truncate the list if there are empty items at the end */ if (len > h->id) { @@ -115,7 +115,7 @@ } typedef void (*cbi_t)(rnd_conf_native_t *cfg, int arr_idx); -void pcb_conf_hid_global_cb_int(rnd_conf_native_t *item, int arr_idx, int offs) +void rnd_conf_hid_global_cb_int_(rnd_conf_native_t *item, int arr_idx, int offs) { htpp_entry_t *e; if (conf_hid_ids == NULL) @@ -122,7 +122,7 @@ return; for (e = htpp_first(conf_hid_ids); e; e = htpp_next(conf_hid_ids, e)) { conf_hid_t *h = e->value; - const conf_hid_callbacks_t *cbs = h->cb; + const rnd_conf_hid_callbacks_t *cbs = h->cb; if (cbs != NULL) { char *s = (char *)&cbs->val_change_pre; cbi_t *cb = (cbi_t *)(s + offs); @@ -133,7 +133,7 @@ } typedef void (*cbp_t)(rnd_conf_native_t *cfg, void *ptr); -void pcb_conf_hid_global_cb_ptr(rnd_conf_native_t *item, void *ptr, int offs) +void rnd_conf_hid_global_cb_ptr_(rnd_conf_native_t *item, void *ptr, int offs) { htpp_entry_t *e; if (conf_hid_ids == NULL) @@ -140,7 +140,7 @@ return; for (e = htpp_first(conf_hid_ids); e; e = htpp_next(conf_hid_ids, e)) { conf_hid_t *h = e->value; - const conf_hid_callbacks_t *cbs = h->cb; + const rnd_conf_hid_callbacks_t *cbs = h->cb; if (cbs != NULL) { char *s = (char *)&cbs->val_change_pre; cbp_t *cb = (cbp_t *)(s + offs); @@ -151,7 +151,7 @@ } -void pcb_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup) +void rnd_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup) { *tag = NULL; *popup = 0; Index: trunk/src/librnd/core/conf_hid.h =================================================================== --- trunk/src/librnd/core/conf_hid.h (revision 30953) +++ trunk/src/librnd/core/conf_hid.h (revision 30954) @@ -1,10 +1,10 @@ -#ifndef PCB_CONF_HID_H -#define PCB_CONF_HID_H +#ifndef RND_CONF_HID_H +#define RND_CONF_HID_H #include #include -typedef struct conf_hid_callbacks_s { +typedef struct rnd_conf_hid_callbacks_s { /* Called before/after a value of a config item is updated - this doesn't necessarily mean the value actually changes */ void (*val_change_pre)(rnd_conf_native_t *cfg, int arr_idx); void (*val_change_post)(rnd_conf_native_t *cfg, int arr_idx); @@ -13,20 +13,20 @@ void (*new_item_post)(rnd_conf_native_t *cfg, int arr_idx); void (*new_hlist_item_post)(rnd_conf_native_t *cfg, rnd_conf_listitem_t *i); - /* Called during pcb_conf_hid_unreg to get hid-data cleaned up */ + /* Called during rnd_conf_hid_unreg to get hid-data cleaned up */ void (*unreg_item)(rnd_conf_native_t *cfg, int arr_idx); -} conf_hid_callbacks_t; +} rnd_conf_hid_callbacks_t; -typedef int conf_hid_id_t; +typedef int rnd_conf_hid_id_t; /* Set local hid data in a native item; returns the previous value set or NULL */ -void *pcb_conf_hid_set_data(rnd_conf_native_t *cfg, conf_hid_id_t id, void *data); +void *rnd_conf_hid_set_data(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id, void *data); /* Returns local hid data in a native item */ -void *pcb_conf_hid_get_data(rnd_conf_native_t *cfg, conf_hid_id_t id); +void *rnd_conf_hid_get_data(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id); /* Set local callbacks in a native item; returns the previous callbacks set or NULL */ -const conf_hid_callbacks_t *pcb_conf_hid_set_cb(rnd_conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs); +const rnd_conf_hid_callbacks_t *rnd_conf_hid_set_cb(rnd_conf_native_t *cfg, rnd_conf_hid_id_t id, const rnd_conf_hid_callbacks_t *cbs); /* register a hid with a cookie; this is necessary only if: @@ -37,20 +37,20 @@ cb holds the global notification callbacks - called when anything changed; it can be NULL. Returns a new HID id that can be used to access hid data, or -1 on error. */ -conf_hid_id_t pcb_conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb); +rnd_conf_hid_id_t rnd_conf_hid_reg(const char *cookie, const rnd_conf_hid_callbacks_t *cb); /* Unregister a hid; if unreg_item cb is specified, call it on each config item */ -void pcb_conf_hid_unreg(const char *cookie); +void rnd_conf_hid_unreg(const char *cookie); -void pcb_conf_pcb_hid_uninit(void); +void rnd_conf_pcb_hid_uninit(void); /* Call the local callback of a native item */ -#define conf_hid_local_cb(native, arr_idx, cb) \ +#define rnd_conf_hid_local_cb(native, arr_idx, cb) \ do { \ unsigned int __n__; \ for(__n__ = 0; __n__ < vtp0_len(&((native)->hid_callbacks)); __n__++) { \ - const conf_hid_callbacks_t *cbs = (native)->hid_callbacks.array[__n__]; \ + const rnd_conf_hid_callbacks_t *cbs = (native)->hid_callbacks.array[__n__]; \ if ((cbs != NULL) && (cbs->cb != NULL)) \ cbs->cb(native, arr_idx); \ } \ @@ -57,27 +57,27 @@ } while(0) /* Call the global callback of a native item */ -#define conf_hid_global_cb(native, arr_idx, cb) \ +#define rnd_conf_hid_global_cb(native, arr_idx, cb) \ do { \ - conf_hid_callbacks_t __cbs__; \ + rnd_conf_hid_callbacks_t __cbs__; \ int __offs__ = ((char *)&(__cbs__.cb)) - ((char *)&(__cbs__)); \ - pcb_conf_hid_global_cb_int(native, arr_idx, __offs__); \ + rnd_conf_hid_global_cb_int_(native, arr_idx, __offs__); \ } while(0) -#define conf_hid_global_cb_ptr(native, ptr, cb) \ +#define rnd_conf_hid_global_cb_ptr(native, ptr, cb) \ do { \ - conf_hid_callbacks_t __cbs__; \ + rnd_conf_hid_callbacks_t __cbs__; \ int __offs__ = ((char *)&(__cbs__.cb)) - ((char *)&(__cbs__)); \ - pcb_conf_hid_global_cb_ptr(native, ptr, __offs__); \ + rnd_conf_hid_global_cb_ptr_(native, ptr, __offs__); \ } while(0) /****** Utility/helper functions ******/ /* Looking at the log level, return a log format tag and whether the window should pop up. */ -void pcb_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup); +void rnd_conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup); /****** Internal ******/ -void pcb_conf_hid_global_cb_int(rnd_conf_native_t *item, int arr_idx, int offs); -void pcb_conf_hid_global_cb_ptr(rnd_conf_native_t *item, void *ptr, int offs); +void rnd_conf_hid_global_cb_int_(rnd_conf_native_t *item, int arr_idx, int offs); +void rnd_conf_hid_global_cb_ptr_(rnd_conf_native_t *item, void *ptr, int offs); #endif Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30953) +++ trunk/src/librnd/pcb_compat.h (revision 30954) @@ -354,3 +354,18 @@ #define pcb_conflist_nth rnd_conflist_nth #define pcb_conflist_insert rnd_conflist_insert #define pcb_conflist_remove rnd_conflist_remove +#define conf_hid_callbacks_s rnd_conf_hid_callbacks_s +#define conf_hid_callbacks_t rnd_conf_hid_callbacks_t +#define conf_hid_id_t rnd_conf_hid_id_t +#define pcb_conf_hid_set_data rnd_conf_hid_set_data +#define pcb_conf_hid_get_data rnd_conf_hid_get_data +#define pcb_conf_hid_set_cb rnd_conf_hid_set_cb +#define pcb_conf_hid_reg rnd_conf_hid_reg +#define pcb_conf_hid_unreg rnd_conf_hid_unreg +#define pcb_conf_pcb_hid_uninit rnd_conf_pcb_hid_uninit +#define conf_hid_local_cb rnd_conf_hid_local_cb +#define conf_hid_global_cb rnd_conf_hid_global_cb +#define conf_hid_global_cb_ptr rnd_conf_hid_global_cb_ptr +#define pcb_conf_loglevel_props rnd_conf_loglevel_props +#define pcb_conf_hid_global_cb_int rnd_conf_hid_global_cb_int +#define pcb_conf_hid_global_cb_ptr rnd_conf_hid_global_cb_ptr Index: trunk/src/tool_logic.c =================================================================== --- trunk/src/tool_logic.c (revision 30953) +++ trunk/src/tool_logic.c (revision 30954) @@ -68,15 +68,15 @@ void pcb_tool_logic_init(void) { - static conf_hid_callbacks_t cbs_mode; - static conf_hid_id_t tool_conf_id; + static rnd_conf_hid_callbacks_t cbs_mode; + static rnd_conf_hid_id_t tool_conf_id; rnd_conf_native_t *n_mode = rnd_conf_get_field("editor/mode"); - tool_conf_id = pcb_conf_hid_reg(tool_logic_cookie, NULL); + tool_conf_id = rnd_conf_hid_reg(tool_logic_cookie, NULL); if (n_mode != NULL) { - memset(&cbs_mode, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs_mode, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs_mode.val_change_post = tool_logic_chg_mode; - pcb_conf_hid_set_cb(n_mode, tool_conf_id, &cbs_mode); + rnd_conf_hid_set_cb(n_mode, tool_conf_id, &cbs_mode); } pcb_event_bind(PCB_EVENT_TOOL_SELECT_PRE, tool_logic_chg_tool, NULL, tool_logic_cookie); @@ -88,7 +88,7 @@ void pcb_tool_logic_uninit(void) { pcb_event_unbind_allcookie(tool_logic_cookie); - pcb_conf_hid_unreg(tool_logic_cookie); + rnd_conf_hid_unreg(tool_logic_cookie); } /*** pcb-rnd-specific parts ***/ Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 30953) +++ trunk/src_plugins/ddraft/ddraft.c (revision 30954) @@ -538,19 +538,19 @@ void pplg_uninit_ddraft(void) { - pcb_conf_hid_unreg(ddraft_cookie); + rnd_conf_hid_unreg(ddraft_cookie); pcb_event_unbind_allcookie(ddraft_cookie); rnd_remove_actions_by_cookie(ddraft_cookie); pcb_tool_unreg_by_cookie(ddraft_cookie); } -static const conf_hid_callbacks_t conf_cbs_adl = { NULL, cons_gui_confchg, NULL, NULL }; -static const conf_hid_callbacks_t conf_cbs_mode = { NULL, mode_confchg, NULL, NULL }; +static const rnd_conf_hid_callbacks_t conf_cbs_adl = { NULL, cons_gui_confchg, NULL, NULL }; +static const rnd_conf_hid_callbacks_t conf_cbs_mode = { NULL, mode_confchg, NULL, NULL }; int pplg_init_ddraft(void) { rnd_conf_native_t *cn; - conf_hid_id_t confid; + rnd_conf_hid_id_t confid; PCB_API_CHK_VER; @@ -559,10 +559,10 @@ pcb_ddraft_tool = pcb_tool_reg(&tool_ddraft, ddraft_cookie); - confid = pcb_conf_hid_reg(ddraft_cookie, NULL); + confid = rnd_conf_hid_reg(ddraft_cookie, NULL); cn = rnd_conf_get_field("editor/all_direction_lines"); - pcb_conf_hid_set_cb(cn, confid, &conf_cbs_adl); + rnd_conf_hid_set_cb(cn, confid, &conf_cbs_adl); cn = rnd_conf_get_field("editor/mode"); - pcb_conf_hid_set_cb(cn, confid, &conf_cbs_mode); + rnd_conf_hid_set_cb(cn, confid, &conf_cbs_mode); return 0; } Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30953) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30954) @@ -53,7 +53,7 @@ pref_ctx_t pref_ctx; static const char *pref_cookie = "preferences dialog"; -conf_hid_id_t pref_hid; +rnd_conf_hid_id_t pref_hid; static const char *role_names[] = { "user", "project", "design", "cli", NULL }; static const rnd_conf_role_t roles[] = { RND_CFR_USER, RND_CFR_PROJECT, RND_CFR_DESIGN, RND_CFR_CLI, 0 }; @@ -183,8 +183,8 @@ return; } - item->cnext = pcb_conf_hid_get_data(cn, pref_hid); - pcb_conf_hid_set_data(cn, pref_hid, item); + item->cnext = rnd_conf_hid_get_data(cn, pref_hid); + rnd_conf_hid_set_data(cn, pref_hid, item); } void pcb_pref_create_conftable(pref_ctx_t *ctx, pref_confitem_t *list, void (*change_cb)(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)) @@ -201,7 +201,7 @@ rnd_conf_native_t *cn = rnd_conf_get_field(c->confpath); c->cnext = NULL; if (cn != NULL) - pcb_conf_hid_set_data(cn, pref_hid, NULL); + rnd_conf_hid_set_data(cn, pref_hid, NULL); } } @@ -363,7 +363,7 @@ { pref_confitem_t *i; - for(i = pcb_conf_hid_get_data(cfg, pref_hid); i != NULL; i = i->cnext) + for(i = rnd_conf_hid_get_data(cfg, pref_hid); i != NULL; i = i->cnext) if (i != pref_ctx.pcb_conf_lock) pcb_pref_conf2dlg_item(cfg, i); @@ -370,13 +370,13 @@ pcb_pref_dlg_conf_changed_cb(&pref_ctx, cfg, arr_idx); } -static conf_hid_callbacks_t pref_conf_cb; +static rnd_conf_hid_callbacks_t pref_conf_cb; void pcb_dlg_pref_init(void) { pref_conf_cb.val_change_post = pref_conf_changed; pcb_event_bind(PCB_EVENT_BOARD_CHANGED, pref_ev_board_changed, &pref_ctx, pref_cookie); pcb_event_bind(PCB_EVENT_BOARD_META_CHANGED, pref_ev_board_meta_changed, &pref_ctx, pref_cookie); - pref_hid = pcb_conf_hid_reg(pref_cookie, &pref_conf_cb); + pref_hid = rnd_conf_hid_reg(pref_cookie, &pref_conf_cb); pcb_dlg_pref_sizes_init(&pref_ctx); pcb_dlg_pref_lib_init(&pref_ctx); } @@ -384,7 +384,7 @@ void pcb_dlg_pref_uninit(void) { pcb_event_unbind_allcookie(pref_cookie); - pcb_conf_hid_unreg(pref_cookie); + rnd_conf_hid_unreg(pref_cookie); } const char pcb_acts_Preferences[] = "Preferences([tabname])\n"; Index: trunk/src_plugins/dialogs/dlg_pref.h =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.h (revision 30953) +++ trunk/src_plugins/dialogs/dlg_pref.h (revision 30954) @@ -56,7 +56,7 @@ (i.e. on dialog box close) */ void pcb_pref_conflist_remove(pref_ctx_t *ctx, pref_confitem_t *list); -conf_hid_id_t pref_hid; +rnd_conf_hid_id_t pref_hid; /*** pulbic API for the caller ***/ void pcb_dlg_pref_init(void); Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30953) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30954) @@ -483,13 +483,13 @@ void pcb_dlg_pref_lib_init(pref_ctx_t *ctx) { - static conf_hid_callbacks_t cbs_spth; + static rnd_conf_hid_callbacks_t cbs_spth; rnd_conf_native_t *cn = rnd_conf_get_field("rc/library_search_paths"); if (cn != NULL) { - memset(&cbs_spth, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs_spth, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs_spth.val_change_pre = pref_lib_conf2dlg_pre; cbs_spth.val_change_post = pref_lib_conf2dlg_post; - pcb_conf_hid_set_cb(cn, pref_hid, &cbs_spth); + rnd_conf_hid_set_cb(cn, pref_hid, &cbs_spth); } } Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30953) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30954) @@ -158,12 +158,12 @@ void pcb_dlg_pref_sizes_init(pref_ctx_t *ctx) { - static conf_hid_callbacks_t cbs_isle; + static rnd_conf_hid_callbacks_t cbs_isle; rnd_conf_native_t *cn = rnd_conf_get_field("design/poly_isle_area"); if (cn != NULL) { - memset(&cbs_isle, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs_isle, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs_isle.val_change_post = pref_isle_brd2dlg; - pcb_conf_hid_set_cb(cn, pref_hid, &cbs_isle); + rnd_conf_hid_set_cb(cn, pref_hid, &cbs_isle); } } Index: trunk/src_plugins/drc_query/drc_query.c =================================================================== --- trunk/src_plugins/drc_query/drc_query.c (revision 30953) +++ trunk/src_plugins/drc_query/drc_query.c (revision 30954) @@ -364,7 +364,7 @@ pcb_event_unbind_allcookie(drc_query_cookie); rnd_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN); - pcb_conf_hid_unreg(drc_query_cookie); + rnd_conf_hid_unreg(drc_query_cookie); for(n = 0; n < free_drc_conf_nodes.used; n++) rnd_conf_unreg_field(free_drc_conf_nodes.array[n]); @@ -374,7 +374,7 @@ pcb_drcq_stat_uninit(); } -static conf_hid_callbacks_t cbs; +static rnd_conf_hid_callbacks_t cbs; int pplg_init_drc_query(void) { @@ -386,7 +386,7 @@ vtp0_init(&free_drc_conf_nodes); cbs.new_hlist_item_post = drc_query_newconf; - pcb_conf_hid_reg(drc_query_cookie, &cbs); + rnd_conf_hid_reg(drc_query_cookie, &cbs); rnd_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 30953) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 30954) @@ -29,7 +29,7 @@ void pplg_uninit_hid_gtk2_gl(void) { pcb_event_unbind_allcookie(ghid_gl_cookie); - pcb_conf_hid_unreg(ghid_gl_cookie); + rnd_conf_hid_unreg(ghid_gl_cookie); drawgl_uninit(); } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30953) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30954) @@ -2782,23 +2782,23 @@ } } -static conf_hid_id_t lesstif_conf_id = -1; +static rnd_conf_hid_id_t lesstif_conf_id = -1; TODO("decide if we'll ever need this") #if 0 -static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) +static void init_conf_watch(rnd_conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) { rnd_conf_native_t *n = rnd_conf_get_field(path); if (n != NULL) { - memset(cbs, 0, sizeof(conf_hid_callbacks_t)); + memset(cbs, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs->val_change_post = func; - pcb_conf_hid_set_cb(n, lesstif_conf_id, cbs); + rnd_conf_hid_set_cb(n, lesstif_conf_id, cbs); } } static void lesstif_conf_regs(const char *cookie) { - static conf_hid_callbacks_t cbs_grid_unit; + static rnd_conf_hid_callbacks_t cbs_grid_unit; } #endif @@ -2934,12 +2934,12 @@ { pcb_export_remove_opts_by_cookie(lesstif_cookie); pcb_event_unbind_allcookie(lesstif_cookie); - pcb_conf_hid_unreg(lesstif_cookie); + rnd_conf_hid_unreg(lesstif_cookie); } int pplg_init_hid_lesstif(void) { - static conf_hid_callbacks_t ccb; + static rnd_conf_hid_callbacks_t ccb; PCB_API_CHK_VER; @@ -3050,7 +3050,7 @@ pcb_hid_register_hid(&lesstif_hid); if (lesstif_conf_id < 0) - lesstif_conf_id = pcb_conf_hid_reg(lesstif_cookie, &ccb); + lesstif_conf_id = rnd_conf_hid_reg(lesstif_cookie, &ccb); /* lesstif_conf_regs(lesstif_cookie);*/ return 0; Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 30953) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 30954) @@ -34,7 +34,7 @@ Widget lesstif_menubar; pcb_hid_cfg_t *lesstif_cfg; -conf_hid_id_t lesstif_menuconf_id = -1; +rnd_conf_hid_id_t lesstif_menuconf_id = -1; htsp_t ltf_popups; /* popup_name -> Widget */ #ifndef R_OK @@ -497,17 +497,17 @@ if (uo == NULL) uo = pcb_hid_cfg_menu_field_str(node, PCB_MF_CHECKED); if (uo != NULL) { - static conf_hid_callbacks_t cbs; + static rnd_conf_hid_callbacks_t cbs; static int cbs_inited = 0; rnd_conf_native_t *nat = rnd_conf_get_field(uo); if (nat != NULL) { if (!cbs_inited) { - memset(&cbs, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs.val_change_post = lesstif_confchg_checkbox; cbs_inited = 1; } - pcb_conf_hid_set_cb(nat, lesstif_menuconf_id, &cbs); + rnd_conf_hid_set_cb(nat, lesstif_menuconf_id, &cbs); } else { if (*uo != '\0') @@ -675,12 +675,12 @@ void lesstif_init_menu(void) { if (lesstif_menuconf_id < 0) - lesstif_menuconf_id = pcb_conf_hid_reg(lesstif_menu_cookie, NULL); + lesstif_menuconf_id = rnd_conf_hid_reg(lesstif_menu_cookie, NULL); } void lesstif_uninit_menu(void) { - pcb_conf_hid_unreg(lesstif_menu_cookie); + rnd_conf_hid_unreg(lesstif_menu_cookie); XtDestroyWidget(lesstif_menubar); lesstif_menuconf_id = -1; } Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30953) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30954) @@ -365,21 +365,21 @@ isch_pcb2dlg(); } -static conf_hid_id_t cfgid; +static rnd_conf_hid_id_t cfgid; static void isch_dlg_uninit(void) { - pcb_conf_hid_unreg(import_sch_cookie); + rnd_conf_hid_unreg(import_sch_cookie); } static void isch_dlg_init(void) { - static conf_hid_callbacks_t cbs; - cfgid = pcb_conf_hid_reg(import_sch_cookie, NULL); + static rnd_conf_hid_callbacks_t cbs; + cfgid = rnd_conf_hid_reg(import_sch_cookie, NULL); cbs.val_change_post = isch_cfg_chg; - pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); - pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); - pcb_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); + rnd_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/args"), cfgid, &cbs); + rnd_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/import_fmt"), cfgid, &cbs); + rnd_conf_hid_set_cb(rnd_conf_get_field("plugins/import_sch/verbose"), cfgid, &cbs); } Index: trunk/src_plugins/lib_gtk_common/bu_menu.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30953) +++ trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 30954) @@ -172,14 +172,14 @@ nat = rnd_conf_get_field(checked); if (nat != NULL) { - static conf_hid_callbacks_t cbs; + static rnd_conf_hid_callbacks_t cbs; static int cbs_inited = 0; if (!cbs_inited) { - memset(&cbs, 0, sizeof(conf_hid_callbacks_t)); + memset(&cbs, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs.val_change_post = ctx->confchg_checkbox; cbs_inited = 1; } - pcb_conf_hid_set_cb(nat, ctx->ghid_menuconf_id, &cbs); + rnd_conf_hid_set_cb(nat, ctx->ghid_menuconf_id, &cbs); } else { if ((update_on == NULL) || (*update_on != '\0')) Index: trunk/src_plugins/lib_gtk_common/bu_menu.h =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.h (revision 30953) +++ trunk/src_plugins/lib_gtk_common/bu_menu.h (revision 30954) @@ -19,7 +19,7 @@ typedef struct pcb_gtk_menu_ctx_s { GtkWidget *menu_bar; - conf_hid_id_t ghid_menuconf_id; + rnd_conf_hid_id_t ghid_menuconf_id; void (*confchg_checkbox)(rnd_conf_native_t *cfg, int arr_idx); rnd_hidlib_t *hidlib; } pcb_gtk_menu_ctx_t; Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30953) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 30954) @@ -105,21 +105,21 @@ -static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) +static void init_conf_watch(rnd_conf_hid_callbacks_t *cbs, const char *path, void (*func)(rnd_conf_native_t *, int)) { rnd_conf_native_t *n = rnd_conf_get_field(path); if (n != NULL) { - memset(cbs, 0, sizeof(conf_hid_callbacks_t)); + memset(cbs, 0, sizeof(rnd_conf_hid_callbacks_t)); cbs->val_change_post = func; - pcb_conf_hid_set_cb(n, ghidgui->conf_id, cbs); + rnd_conf_hid_set_cb(n, ghidgui->conf_id, cbs); } } static void ghid_conf_regs(const char *cookie) { - static conf_hid_callbacks_t cbs_fullscreen, cbs_cli[2], cbs_color[3]; + static rnd_conf_hid_callbacks_t cbs_fullscreen, cbs_cli[2], cbs_color[3]; - ghidgui->conf_id = pcb_conf_hid_reg(cookie, NULL); + ghidgui->conf_id = rnd_conf_hid_reg(cookie, NULL); init_conf_watch(&cbs_fullscreen, "editor/fullscreen", ghid_confchg_fullscreen); @@ -130,7 +130,7 @@ init_conf_watch(&cbs_color[1], "appearance/color/off_limit", ghid_confchg_spec_color); init_conf_watch(&cbs_color[2], "appearance/color/grid", ghid_confchg_spec_color); - ghidgui->topwin.menu.ghid_menuconf_id = pcb_conf_hid_reg(cookie_menu, NULL); + ghidgui->topwin.menu.ghid_menuconf_id = rnd_conf_hid_reg(cookie_menu, NULL); ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox; } @@ -339,8 +339,8 @@ void ghid_glue_common_uninit(const char *cookie) { pcb_event_unbind_allcookie(cookie); - pcb_conf_hid_unreg(cookie); - pcb_conf_hid_unreg(cookie_menu); + rnd_conf_hid_unreg(cookie); + rnd_conf_hid_unreg(cookie_menu); } void ghid_glue_common_init(const char *cookie) Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30953) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30954) @@ -36,12 +36,12 @@ static const char *lib_gtk_config_cookie = "lib_gtk_config"; -conf_hid_id_t ghid_conf_id = -1; +rnd_conf_hid_id_t ghid_conf_id = -1; conf_hid_gtk_t pcb_conf_hid_gtk; void pcb_gtk_conf_uninit(void) { - pcb_conf_hid_unreg(lib_gtk_config_cookie); + rnd_conf_hid_unreg(lib_gtk_config_cookie); rnd_conf_unreg_fields("plugins/hid_gtk/"); } @@ -97,7 +97,7 @@ int dirty[RND_CFR_max_real] = {0}; rnd_conf_role_t r; - ghid_conf_id = pcb_conf_hid_reg(lib_gtk_config_cookie, NULL); + ghid_conf_id = rnd_conf_hid_reg(lib_gtk_config_cookie, NULL); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(pcb_conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags); Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.h =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (revision 30953) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (revision 30954) @@ -2,7 +2,7 @@ #include #include -extern conf_hid_id_t ghid_conf_id; +extern rnd_conf_hid_id_t ghid_conf_id; void pcb_gtk_conf_init(void); void pcb_gtk_conf_uninit(void); Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h =================================================================== --- trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30953) +++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30954) @@ -176,7 +176,7 @@ GtkActionGroup *main_actions; pcb_gtk_topwin_t topwin; - conf_hid_id_t conf_id; + rnd_conf_hid_id_t conf_id; pcb_gtk_pixmap_t bg_pixmap; Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30953) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30954) @@ -59,7 +59,7 @@ const char *prefix = NULL; int popup; - pcb_conf_loglevel_props(line->level, &prefix, &popup); + rnd_conf_loglevel_props(line->level, &prefix, &popup); if (pcb_gui->supports_dad_text_markup) { if (prefix != NULL) { @@ -207,7 +207,7 @@ const char *prefix; int popup; - pcb_conf_loglevel_props(line->level, &prefix, &popup); + rnd_conf_loglevel_props(line->level, &prefix, &popup); if (popup) log_window_create(hidlib); } @@ -235,7 +235,7 @@ const char *prefix; int popup; - pcb_conf_loglevel_props(n->level, &prefix, &popup); + rnd_conf_loglevel_props(n->level, &prefix, &popup); if (popup) { log_window_create(hidlib); return; Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30953) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30954) @@ -89,7 +89,7 @@ int pplg_check_ver_lib_hid_common(int ver_needed) { return 0; } -static conf_hid_id_t conf_id; +static rnd_conf_hid_id_t conf_id; void pplg_uninit_lib_hid_common(void) { @@ -99,7 +99,7 @@ pcb_event_unbind_allcookie(grid_cookie); pcb_event_unbind_allcookie(lead_cookie); pcb_event_unbind_allcookie(wplc_cookie); - pcb_conf_hid_unreg(grid_cookie); + rnd_conf_hid_unreg(grid_cookie); pcb_dialog_place_uninit(); rnd_remove_actions_by_cookie(hid_common_cookie); pcb_act_dad_uninit(); @@ -109,7 +109,7 @@ int pplg_init_lib_hid_common(void) { - static conf_hid_callbacks_t ccb, ccbu; + static rnd_conf_hid_callbacks_t ccb, ccbu; rnd_conf_native_t *nat; PCB_API_CHK_VER; @@ -132,19 +132,19 @@ pcb_event_bind(PCB_EVENT_DAD_NEW_DIALOG, pcb_dialog_place, NULL, wplc_cookie); pcb_event_bind(PCB_EVENT_DAD_NEW_GEO, pcb_dialog_resize, NULL, wplc_cookie); - conf_id = pcb_conf_hid_reg(grid_cookie, NULL); + conf_id = rnd_conf_hid_reg(grid_cookie, NULL); memset(&ccb, 0, sizeof(ccb)); ccb.val_change_post = pcb_grid_update_conf; nat = rnd_conf_get_field("editor/grids"); if (nat != NULL) - pcb_conf_hid_set_cb(nat, conf_id, &ccb); + rnd_conf_hid_set_cb(nat, conf_id, &ccb); memset(&ccbu, 0, sizeof(ccbu)); ccbu.val_change_post = grid_unit_chg_ev; nat = rnd_conf_get_field("editor/grid_unit"); if (nat != NULL) - pcb_conf_hid_set_cb(nat, conf_id, &ccbu); + rnd_conf_hid_set_cb(nat, conf_id, &ccbu); return 0; } Index: trunk/src_plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_common/toolbar.c (revision 30953) +++ trunk/src_plugins/lib_hid_common/toolbar.c (revision 30954) @@ -210,20 +210,20 @@ static const char *toolbar_cookie = "lib_hid_pcbui/toolbar"; -static conf_hid_id_t install_events(const char *cookie, const char *paths[], conf_hid_callbacks_t cb[], void (*update_cb)(rnd_conf_native_t*,int)) +static rnd_conf_hid_id_t install_events(const char *cookie, const char *paths[], rnd_conf_hid_callbacks_t cb[], void (*update_cb)(rnd_conf_native_t*,int)) { const char **rp; rnd_conf_native_t *nat; int n; - conf_hid_id_t conf_id; + rnd_conf_hid_id_t conf_id; - conf_id = pcb_conf_hid_reg(cookie, NULL); + conf_id = rnd_conf_hid_reg(cookie, NULL); for(rp = paths, n = 0; *rp != NULL; rp++, n++) { memset(&cb[n], 0, sizeof(cb[0])); cb[n].val_change_post = update_cb; nat = rnd_conf_get_field(*rp); if (nat != NULL) - pcb_conf_hid_set_cb(nat, conf_id, &cb[n]); + rnd_conf_hid_set_cb(nat, conf_id, &cb[n]); } return conf_id; @@ -232,13 +232,13 @@ void rnd_toolbar_uninit(void) { pcb_event_unbind_allcookie(toolbar_cookie); - pcb_conf_hid_unreg(toolbar_cookie); + rnd_conf_hid_unreg(toolbar_cookie); } void rnd_toolbar_init(void) { const char *tpaths[] = {"editor/mode", NULL}; - static conf_hid_callbacks_t tcb[sizeof(tpaths)/sizeof(tpaths[0])]; + static rnd_conf_hid_callbacks_t tcb[sizeof(tpaths)/sizeof(tpaths[0])]; pcb_event_bind(PCB_EVENT_GUI_INIT, pcb_toolbar_gui_init_ev, NULL, toolbar_cookie); pcb_event_bind(PCB_EVENT_TOOL_REG, pcb_toolbar_reg_ev, NULL, toolbar_cookie); Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30953) +++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30954) @@ -86,27 +86,27 @@ pcb_event_unbind_allcookie(infobar_cookie); pcb_event_unbind_allcookie(title_cookie); pcb_event_unbind_allcookie(layersel_cookie); - pcb_conf_hid_unreg(rst_cookie); - pcb_conf_hid_unreg(status_cookie); - pcb_conf_hid_unreg(status_rd_cookie); - pcb_conf_hid_unreg(infobar_cookie); + rnd_conf_hid_unreg(rst_cookie); + rnd_conf_hid_unreg(status_cookie); + rnd_conf_hid_unreg(status_rd_cookie); + rnd_conf_hid_unreg(infobar_cookie); rnd_toolbar_uninit(); } -static conf_hid_id_t install_events(const char *cookie, const char *paths[], conf_hid_callbacks_t cb[], void (*update_cb)(rnd_conf_native_t*,int)) +static rnd_conf_hid_id_t install_events(const char *cookie, const char *paths[], rnd_conf_hid_callbacks_t cb[], void (*update_cb)(rnd_conf_native_t*,int)) { const char **rp; rnd_conf_native_t *nat; int n; - conf_hid_id_t conf_id; + rnd_conf_hid_id_t conf_id; - conf_id = pcb_conf_hid_reg(cookie, NULL); + conf_id = rnd_conf_hid_reg(cookie, NULL); for(rp = paths, n = 0; *rp != NULL; rp++, n++) { memset(&cb[n], 0, sizeof(cb[0])); cb[n].val_change_post = update_cb; nat = rnd_conf_get_field(*rp); if (nat != NULL) - pcb_conf_hid_set_cb(nat, conf_id, &cb[n]); + rnd_conf_hid_set_cb(nat, conf_id, &cb[n]); } return conf_id; @@ -119,10 +119,10 @@ const char *stpaths[] = { "editor/show_solder_side", "design/line_thickness", "editor/all_direction_lines", "editor/line_refraction", "editor/rubber_band_mode", "design/via_thickness", "design/via_drilling_hole", "design/clearance", "design/text_scale", "design/text_thickness", "editor/buffer_number", "editor/grid_unit", "editor/grid", "appearance/compact", NULL }; const char *rdpaths[] = { "editor/grid_unit", "appearance/compact", NULL }; const char *ibpaths[] = { "rc/file_changed_interval", NULL }; - static conf_hid_callbacks_t rcb[sizeof(rpaths)/sizeof(rpaths[0])]; - static conf_hid_callbacks_t stcb[sizeof(stpaths)/sizeof(stpaths[0])]; - static conf_hid_callbacks_t rdcb[sizeof(rdpaths)/sizeof(rdpaths[0])]; - static conf_hid_callbacks_t ibcb[sizeof(rdpaths)/sizeof(ibpaths[0])]; + static rnd_conf_hid_callbacks_t rcb[sizeof(rpaths)/sizeof(rpaths[0])]; + static rnd_conf_hid_callbacks_t stcb[sizeof(stpaths)/sizeof(stpaths[0])]; + static rnd_conf_hid_callbacks_t rdcb[sizeof(rdpaths)/sizeof(rdpaths[0])]; + static rnd_conf_hid_callbacks_t ibcb[sizeof(rdpaths)/sizeof(ibpaths[0])]; PCB_API_CHK_VER; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30953) +++ trunk/src_plugins/propedit/propdlg.c (revision 30954) @@ -688,21 +688,21 @@ } } -static conf_hid_id_t propdlg_conf_id; +static rnd_conf_hid_id_t propdlg_conf_id; static const char *propdlg_cookie = "propdlg"; void pcb_propdlg_init(void) { - static conf_hid_callbacks_t cbs; + static rnd_conf_hid_callbacks_t cbs; rnd_conf_native_t *n = rnd_conf_get_field("editor/grid_unit"); - propdlg_conf_id = pcb_conf_hid_reg(propdlg_cookie, NULL); + propdlg_conf_id = rnd_conf_hid_reg(propdlg_cookie, NULL); if (n != NULL) { cbs.val_change_post = propdlg_unit_change; - pcb_conf_hid_set_cb(n, propdlg_conf_id, &cbs); + rnd_conf_hid_set_cb(n, propdlg_conf_id, &cbs); } } void pcb_propdlg_uninit(void) { - pcb_conf_hid_unreg(propdlg_cookie); + rnd_conf_hid_unreg(propdlg_cookie); } Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30953) +++ trunk/tests/conf/conftest.c (revision 30954) @@ -12,7 +12,7 @@ int lineno = 0; int global_notify = 0; -conf_hid_id_t hid_id; +rnd_conf_hid_id_t hid_id; const char *hid_cookie = "conftest cookie"; pcb_hid_t *pcb_gui = NULL; const char *pcb_hidlib_default_embedded_menu = ""; @@ -72,8 +72,8 @@ printf("notify_post: '%s' new value\n", cfg->hash_path); } -conf_hid_callbacks_t watch_cbs = {watch_pre, watch_post, NULL, NULL}; -conf_hid_callbacks_t global_cbs = {notify_pre, notify_post, NULL, NULL}; +rnd_conf_hid_callbacks_t watch_cbs = {watch_pre, watch_post, NULL, NULL}; +rnd_conf_hid_callbacks_t global_cbs = {notify_pre, notify_post, NULL, NULL}; extern lht_doc_t *pcb_conf_main_root[]; @@ -263,7 +263,7 @@ rnd_message(PCB_MSG_ERROR, "unknown path"); return; } - pcb_conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL)); + rnd_conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL)); } void cmd_notify(char *arg) @@ -348,7 +348,7 @@ int main() { - hid_id = pcb_conf_hid_reg(hid_cookie, &global_cbs); + hid_id = rnd_conf_hid_reg(hid_cookie, &global_cbs); rnd_conf_init(); conf_core_init(); @@ -403,7 +403,7 @@ } conf_core_uninit_pre(); - pcb_conf_hid_unreg(hid_cookie); + rnd_conf_hid_unreg(hid_cookie); rnd_conf_uninit(); return 0; }