Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 30992) +++ trunk/src/extobj_helper.h (revision 30993) @@ -173,7 +173,7 @@ #define pcb_exto_dlg_coord(dlg, subc, vis_name, attr_name, help) \ do { \ - pcb_hid_dad_spin_t *spin; \ + rnd_hid_dad_spin_t *spin; \ double d; \ rnd_coord_t currval = 0; \ const rnd_unit_t *unit_out = NULL; \ @@ -193,11 +193,11 @@ spin = dlg[wid].wdata; \ spin->unit = unit_out; \ spin->no_unit_chg = 1; \ - pcb_dad_spin_update_internal(spin); \ + rnd_dad_spin_update_internal(spin); \ } while(0) /* hv.crd = currval; \*/ -/* pcb_dad_spin_set_value(spin->cmp.wend, NULL, wid, &hv); \*/ +/* rnd_dad_spin_set_value(spin->cmp.wend, NULL, wid, &hv); \*/ RND_INLINE void pcb_exto_dlg_str_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30992) +++ trunk/src/librnd/core/hid_dad.h (revision 30993) @@ -282,19 +282,19 @@ #define RND_DAD_INTEGER(table, label) \ do { \ - PCB_DAD_SPIN_INT(table); \ + RND_DAD_SPIN_INT(table); \ RND_DAD_SET_ATTR_FIELD(table, name, label); \ } while(0) #define RND_DAD_REAL(table, label) \ do { \ - PCB_DAD_SPIN_DOUBLE(table); \ + RND_DAD_SPIN_DOUBLE(table); \ RND_DAD_SET_ATTR_FIELD(table, name, label); \ } while(0) #define RND_DAD_COORD(table, label) \ do { \ - PCB_DAD_SPIN_COORD(table); \ + RND_DAD_SPIN_COORD(table); \ RND_DAD_SET_ATTR_FIELD(table, name, label); \ } while(0) Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 30992) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 30993) @@ -38,9 +38,9 @@ #include #include -gdl_list_t pcb_dad_coord_spins; +gdl_list_t rnd_dad_coord_spins; -const char *pcb_hid_dad_spin_up[] = { +const char *rnd_hid_dad_spin_up[] = { "5 3 2 1", " c None", "+ c #000000", @@ -49,7 +49,7 @@ "+++++", }; -const char *pcb_hid_dad_spin_down[] = { +const char *rnd_hid_dad_spin_down[] = { "5 3 2 1", " c None", "+ c #000000", @@ -58,7 +58,7 @@ " + ", }; -const char *pcb_hid_dad_spin_unit[] = { +const char *rnd_hid_dad_spin_unit[] = { "4 4 2 1", " c None", "+ c #000000", @@ -68,7 +68,7 @@ " ++ ", }; -const char *pcb_hid_dad_spin_warn[] = { +const char *rnd_hid_dad_spin_warn[] = { "9 9 3 1", " c None", "+ c #000000", @@ -84,7 +84,7 @@ " ******* ", }; -static void spin_changed(void *hid_ctx, void *caller_data, pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *end) +static void spin_changed(void *hid_ctx, void *caller_data, rnd_hid_dad_spin_t *spin, rnd_hid_attribute_t *end) { const char *s; rnd_hid_attribute_t *str = end - spin->cmp.wend + spin->wstr; @@ -101,7 +101,7 @@ end->change_cb(hid_ctx, caller_data, end); } -static void spin_warn(void *hid_ctx, pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, const char *msg) +static void spin_warn(void *hid_ctx, rnd_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, const char *msg) { rnd_gui->attr_dlg_widget_hide(hid_ctx, spin->wwarn, (msg == NULL)); if (rnd_gui->attr_dlg_set_help != NULL) @@ -108,7 +108,7 @@ rnd_gui->attr_dlg_set_help(hid_ctx, spin->wwarn, msg); } -static char *gen_str_coord(pcb_hid_dad_spin_t *spin, rnd_coord_t c, char *buf, int buflen) +static char *gen_str_coord(rnd_hid_dad_spin_t *spin, rnd_coord_t c, char *buf, int buflen) { const rnd_unit_t *unit; if (spin->unit != NULL) @@ -163,7 +163,7 @@ su->valid = 1; } -static void spin_unit_dialog(void *spin_hid_ctx, pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, rnd_hid_attribute_t *str) +static void spin_unit_dialog(void *spin_hid_ctx, rnd_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, rnd_hid_attribute_t *str) { rnd_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; spin_unit_t ctx; @@ -251,7 +251,7 @@ RND_DAD_FREE(ctx.dlg); } -static double get_step(pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, rnd_hid_attribute_t *str) +static double get_step(rnd_hid_dad_spin_t *spin, rnd_hid_attribute_t *end, rnd_hid_attribute_t *str) { double v, step; const rnd_unit_t *unit; @@ -260,16 +260,16 @@ return spin->step; switch(spin->type) { - case PCB_DAD_SPIN_INT: + case RND_DAD_SPIN_INT: step = pow(10, floor(log10(fabs((double)end->val.lng)) - 1.0)); if (step < 1) step = 1; break; - case PCB_DAD_SPIN_DOUBLE: - case PCB_DAD_SPIN_FREQ: + case RND_DAD_SPIN_DOUBLE: + case RND_DAD_SPIN_FREQ: step = pow(10, floor(log10(fabs((double)end->val.dbl)) - 1.0)); break; - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: if (spin->unit == NULL) { rnd_bool succ = 0; if (str->val.str != NULL) @@ -303,7 +303,7 @@ } \ } while(0) -static void do_step(void *hid_ctx, pcb_hid_dad_spin_t *spin, rnd_hid_attribute_t *str, rnd_hid_attribute_t *end, double step) +static void do_step(void *hid_ctx, rnd_hid_dad_spin_t *spin, rnd_hid_attribute_t *str, rnd_hid_attribute_t *end, double step) { rnd_hid_attr_val_t hv; const char *warn = NULL; @@ -310,18 +310,18 @@ char buf[128]; switch(spin->type) { - case PCB_DAD_SPIN_INT: + case RND_DAD_SPIN_INT: end->val.lng += step; SPIN_CLAMP(end->val.lng); sprintf(buf, "%ld", end->val.lng); break; - case PCB_DAD_SPIN_DOUBLE: - case PCB_DAD_SPIN_FREQ: + case RND_DAD_SPIN_DOUBLE: + case RND_DAD_SPIN_FREQ: end->val.dbl += step; SPIN_CLAMP(end->val.dbl); sprintf(buf, "%f", end->val.dbl); break; - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: end->val.crd += step; SPIN_CLAMP(end->val.crd); spin->last_good_crd = end->val.crd; @@ -336,35 +336,35 @@ spin->set_writeback_lock--; } -void pcb_dad_spin_up_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_up_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *str = attr - spin->wup + spin->wstr; rnd_hid_attribute_t *end = attr - spin->wup + spin->cmp.wend; - pcb_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, str); /* fix up missing unit */ + rnd_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, str); /* fix up missing unit */ do_step(hid_ctx, spin, str, end, get_step(spin, end, str)); spin_changed(hid_ctx, caller_data, spin, end); - pcb_dad_spin_txt_enter_call_users(hid_ctx, end); + rnd_dad_spin_txt_enter_call_users(hid_ctx, end); } -void pcb_dad_spin_down_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_down_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *str = attr - spin->wdown + spin->wstr; rnd_hid_attribute_t *end = attr - spin->wdown + spin->cmp.wend; - pcb_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, str); /* fix up missing unit */ + rnd_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, str); /* fix up missing unit */ do_step(hid_ctx, spin, str, end, -get_step(spin, end, str)); spin_changed(hid_ctx, caller_data, spin, end); - pcb_dad_spin_txt_enter_call_users(hid_ctx, end); + rnd_dad_spin_txt_enter_call_users(hid_ctx, end); } -void pcb_dad_spin_txt_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_txt_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *str = attr; rnd_hid_attribute_t *end = attr - spin->wstr + spin->cmp.wend; char *ends, *warn = NULL; @@ -377,7 +377,7 @@ return; switch(spin->type) { - case PCB_DAD_SPIN_INT: + case RND_DAD_SPIN_INT: l = strtol(str->val.str, &ends, 10); SPIN_CLAMP(l); if (*ends != '\0') @@ -384,7 +384,7 @@ warn = "Invalid integer - result is truncated"; end->val.lng = l; break; - case PCB_DAD_SPIN_DOUBLE: + case RND_DAD_SPIN_DOUBLE: d = strtod(str->val.str, &ends); SPIN_CLAMP(d); if (*ends != '\0') @@ -391,7 +391,7 @@ warn = "Invalid numeric - result is truncated"; end->val.dbl = d; break; - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: succ = pcb_get_value_unit(str->val.str, &absolute, 0, &d, &unit); if (succ) { SPIN_CLAMP(d); @@ -412,9 +412,9 @@ spin_changed(hid_ctx, caller_data, spin, end); } -void pcb_dad_spin_txt_enter_cb_dry(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_txt_enter_cb_dry(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *str = attr; rnd_hid_attribute_t *end = attr - spin->wstr + spin->cmp.wend; const char *inval; @@ -428,7 +428,7 @@ return; switch(spin->type) { - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: inval = str->val.str; while(isspace(*inval)) inval++; if (*inval == '\0') @@ -466,7 +466,7 @@ } } -void pcb_dad_spin_txt_enter_call_users(void *hid_ctx, rnd_hid_attribute_t *end) +void rnd_dad_spin_txt_enter_call_users(void *hid_ctx, rnd_hid_attribute_t *end) { struct { void *caller_data; @@ -476,41 +476,41 @@ end->enter_cb(hid_ctx, hc->caller_data, end); } -void pcb_dad_spin_txt_enter_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_txt_enter_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *end = attr - spin->wstr + spin->cmp.wend; - pcb_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, attr); - pcb_dad_spin_txt_enter_call_users(hid_ctx, end); + rnd_dad_spin_txt_enter_cb_dry(hid_ctx, caller_data, attr); + rnd_dad_spin_txt_enter_call_users(hid_ctx, end); } -void pcb_dad_spin_unit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) +void rnd_dad_spin_unit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - pcb_hid_dad_spin_t *spin = (pcb_hid_dad_spin_t *)attr->user_data; + rnd_hid_dad_spin_t *spin = (rnd_hid_dad_spin_t *)attr->user_data; rnd_hid_attribute_t *str = attr - spin->wunit + spin->wstr; rnd_hid_attribute_t *end = attr - spin->wunit + spin->cmp.wend; spin_unit_dialog(hid_ctx, spin, end, str); } -void pcb_dad_spin_set_num(rnd_hid_attribute_t *attr, long l, double d, rnd_coord_t c) +void rnd_dad_spin_set_num(rnd_hid_attribute_t *attr, long l, double d, rnd_coord_t c) { - pcb_hid_dad_spin_t *spin = attr->wdata; + rnd_hid_dad_spin_t *spin = attr->wdata; rnd_hid_attribute_t *str = attr - spin->cmp.wend + spin->wstr; switch(spin->type) { - case PCB_DAD_SPIN_INT: + case RND_DAD_SPIN_INT: attr->val.lng = l; free((char *)str->val.str); str->val.str = pcb_strdup_printf("%ld", l); break; - case PCB_DAD_SPIN_DOUBLE: + case RND_DAD_SPIN_DOUBLE: attr->val.dbl = d; free((char *)str->val.str); str->val.str = pcb_strdup_printf("%f", d); break; - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: attr->val.crd = c; spin->last_good_crd = c; spin->unit = NULL; @@ -521,47 +521,47 @@ } } -void pcb_dad_spin_free(rnd_hid_attribute_t *attr) +void rnd_dad_spin_free(rnd_hid_attribute_t *attr) { if (attr->type == RND_HATT_END) { - pcb_hid_dad_spin_t *spin = attr->wdata; - if (spin->type == PCB_DAD_SPIN_COORD) - gdl_remove(&pcb_dad_coord_spins, spin, link); + rnd_hid_dad_spin_t *spin = attr->wdata; + if (spin->type == RND_DAD_SPIN_COORD) + gdl_remove(&rnd_dad_coord_spins, spin, link); free(spin); } } -int pcb_dad_spin_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled) +int rnd_dad_spin_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled) { - pcb_hid_dad_spin_t *spin = end->wdata; + rnd_hid_dad_spin_t *spin = end->wdata; return rnd_gui->attr_dlg_widget_state(hid_ctx, spin->wall, enabled); } -int pcb_dad_spin_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide) +int rnd_dad_spin_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide) { - pcb_hid_dad_spin_t *spin = end->wdata; + rnd_hid_dad_spin_t *spin = end->wdata; return rnd_gui->attr_dlg_widget_hide(hid_ctx, spin->wall, hide); } -int pcb_dad_spin_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val) +int rnd_dad_spin_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val) { - pcb_hid_dad_spin_t *spin = end->wdata; + rnd_hid_dad_spin_t *spin = end->wdata; rnd_hid_attribute_t *str = end - spin->cmp.wend + spin->wstr; /* do not modify the text field if the value is the same */ switch(spin->type) { - case PCB_DAD_SPIN_INT: + case RND_DAD_SPIN_INT: if (val->lng == end->val.lng) return 0; end->val.lng = val->lng; break; - case PCB_DAD_SPIN_DOUBLE: - case PCB_DAD_SPIN_FREQ: + case RND_DAD_SPIN_DOUBLE: + case RND_DAD_SPIN_FREQ: if (val->dbl == end->val.dbl) return 0; end->val.dbl = val->dbl; break; - case PCB_DAD_SPIN_COORD: + case RND_DAD_SPIN_COORD: if (val->crd == end->val.crd) return 0; end->val.crd = val->crd; @@ -572,9 +572,9 @@ return 0; } -void pcb_dad_spin_set_help(rnd_hid_attribute_t *end, const char *help) +void rnd_dad_spin_set_help(rnd_hid_attribute_t *end, const char *help) { - pcb_hid_dad_spin_t *spin = end->wdata; + rnd_hid_dad_spin_t *spin = end->wdata; rnd_hid_attribute_t *str = end - spin->cmp.wend + spin->wstr; if ((spin->hid_ctx == NULL) || (*spin->hid_ctx == NULL)) /* while building */ @@ -585,10 +585,10 @@ void pcb_dad_spin_update_global_coords(void) { - pcb_hid_dad_spin_t *spin; + rnd_hid_dad_spin_t *spin; - for(spin = gdl_first(&pcb_dad_coord_spins); spin != NULL; spin = gdl_next(&pcb_dad_coord_spins, spin)) { + for(spin = gdl_first(&rnd_dad_coord_spins); spin != NULL; spin = gdl_next(&rnd_dad_coord_spins, spin)) { rnd_hid_attribute_t *dlg; void *hid_ctx; @@ -601,7 +601,7 @@ } } -void pcb_dad_spin_update_internal(pcb_hid_dad_spin_t *spin) +void rnd_dad_spin_update_internal(rnd_hid_dad_spin_t *spin) { rnd_hid_attribute_t *dlg = *spin->attrs, *end = dlg+spin->cmp.wend; rnd_hid_attribute_t *str = dlg + spin->wstr; @@ -614,9 +614,9 @@ do_step(hid_ctx, spin, &dlg[spin->wstr], &dlg[spin->cmp.wend], 0); /* cheap conversion*/ } -void pcb_dad_spin_set_geo(rnd_hid_attribute_t *end, rnd_hatt_compflags_t flg, int geo) +void rnd_dad_spin_set_geo(rnd_hid_attribute_t *end, rnd_hatt_compflags_t flg, int geo) { - pcb_hid_dad_spin_t *spin = end->wdata; + rnd_hid_dad_spin_t *spin = end->wdata; rnd_hid_attribute_t *str = end - spin->cmp.wend + spin->wstr; if (flg == RND_HATF_HEIGHT_CHR) { Index: trunk/src/librnd/core/hid_dad_spin.h =================================================================== --- trunk/src/librnd/core/hid_dad_spin.h (revision 30992) +++ trunk/src/librnd/core/hid_dad_spin.h (revision 30993) @@ -26,8 +26,8 @@ /* Compound DAD widget for numeric value entry, creating a spinbox */ -#ifndef PCB_HID_DAD_SPIN_H -#define PCB_HID_DAD_SPIN_H +#ifndef RND_HID_DAD_SPIN_H +#define RND_HID_DAD_SPIN_H #include @@ -39,7 +39,7 @@ unsigned vmax_valid:1; unsigned no_unit_chg:1; int wall, wstr, wup, wdown, wunit, wwarn; - const rnd_unit_t *unit; /* for PCB_DAD_SPIN_COORD and PCB_DAD_SPIN_FREQ only: current unit */ + const rnd_unit_t *unit; /* for RND_DAD_SPIN_COORD and RND_DAD_SPIN_FREQ only: current unit */ pcb_family_t unit_family; rnd_hid_attribute_t **attrs; void **hid_ctx; @@ -46,30 +46,30 @@ int set_writeback_lock; rnd_coord_t last_good_crd; enum { - PCB_DAD_SPIN_INT, - PCB_DAD_SPIN_DOUBLE, - PCB_DAD_SPIN_COORD, - PCB_DAD_SPIN_FREQ + RND_DAD_SPIN_INT, + RND_DAD_SPIN_DOUBLE, + RND_DAD_SPIN_COORD, + RND_DAD_SPIN_FREQ } type; rnd_hid_attr_type_t wtype; gdl_elem_t link; -} pcb_hid_dad_spin_t; +} rnd_hid_dad_spin_t; -#define PCB_DAD_SPIN_INT(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_INT, RND_HATT_INTEGER, 0, 0) -#define PCB_DAD_SPIN_DOUBLE(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_DOUBLE, RND_HATT_REAL, 0, 0) -#define PCB_DAD_SPIN_COORD(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_COORD, RND_HATT_COORD, 1, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL) -#define PCB_DAD_SPIN_FREQ(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_FREQ, RND_HATT_REAL, 1, PCB_UNIT_FREQ) +#define RND_DAD_SPIN_INT(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_INT, RND_HATT_INTEGER, 0, 0) +#define RND_DAD_SPIN_DOUBLE(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_DOUBLE, RND_HATT_REAL, 0, 0) +#define RND_DAD_SPIN_COORD(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_COORD, RND_HATT_COORD, 1, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL) +#define RND_DAD_SPIN_FREQ(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_FREQ, RND_HATT_REAL, 1, PCB_UNIT_FREQ) /* Return the widget-type (PCB_DAD_HATT) of a spinbox at the RND_HATT_END widget; useful for dispatching what value set to use */ -#define PCB_DAD_SPIN_GET_TYPE(attr) \ - ((((attr)->type == RND_HATT_END) && (((pcb_hid_dad_spin_t *)((attr)->wdata))->cmp.free == pcb_dad_spin_free)) ? ((pcb_hid_dad_spin_t *)((attr)->wdata))->wtype : RND_HATT_END) +#define RND_DAD_SPIN_GET_TYPE(attr) \ + ((((attr)->type == RND_HATT_END) && (((rnd_hid_dad_spin_t *)((attr)->wdata))->cmp.free == rnd_dad_spin_free)) ? ((rnd_hid_dad_spin_t *)((attr)->wdata))->wtype : RND_HATT_END) /*** implementation ***/ -#define PCB_DAD_SPIN_ANY(table, typ, wtyp, has_unit, unit_family_) \ +#define RND_DAD_SPIN_ANY(table, typ, wtyp, has_unit, unit_family_) \ do { \ - pcb_hid_dad_spin_t *spin = calloc(sizeof(pcb_hid_dad_spin_t), 1); \ + rnd_hid_dad_spin_t *spin = calloc(sizeof(rnd_hid_dad_spin_t), 1); \ RND_DAD_BEGIN(table, RND_HATT_BEGIN_COMPOUND); \ spin->cmp.wbegin = RND_DAD_CURRENT(table); \ RND_DAD_SET_ATTR_FIELD(table, wdata, spin); \ @@ -78,18 +78,18 @@ RND_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ RND_DAD_STRING(table); \ RND_DAD_DEFAULT_PTR(table, rnd_strdup("")); \ - RND_DAD_ENTER_CB(table, pcb_dad_spin_txt_enter_cb); \ - RND_DAD_CHANGE_CB(table, pcb_dad_spin_txt_change_cb); \ + RND_DAD_ENTER_CB(table, rnd_dad_spin_txt_enter_cb); \ + RND_DAD_CHANGE_CB(table, rnd_dad_spin_txt_change_cb); \ RND_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wstr = RND_DAD_CURRENT(table); \ RND_DAD_BEGIN_VBOX(table); \ RND_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ - RND_DAD_PICBUTTON(table, pcb_hid_dad_spin_up); \ - RND_DAD_CHANGE_CB(table, pcb_dad_spin_up_cb); \ + RND_DAD_PICBUTTON(table, rnd_hid_dad_spin_up); \ + RND_DAD_CHANGE_CB(table, rnd_dad_spin_up_cb); \ RND_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wup = RND_DAD_CURRENT(table); \ - RND_DAD_PICBUTTON(table, pcb_hid_dad_spin_down); \ - RND_DAD_CHANGE_CB(table, pcb_dad_spin_down_cb); \ + RND_DAD_PICBUTTON(table, rnd_hid_dad_spin_down); \ + RND_DAD_CHANGE_CB(table, rnd_dad_spin_down_cb); \ RND_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wdown = RND_DAD_CURRENT(table); \ RND_DAD_END(table); \ @@ -96,12 +96,12 @@ RND_DAD_BEGIN_VBOX(table); \ RND_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ if (has_unit) { \ - RND_DAD_PICBUTTON(table, pcb_hid_dad_spin_unit); \ - RND_DAD_CHANGE_CB(table, pcb_dad_spin_unit_cb); \ + RND_DAD_PICBUTTON(table, rnd_hid_dad_spin_unit); \ + RND_DAD_CHANGE_CB(table, rnd_dad_spin_unit_cb); \ RND_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wunit = RND_DAD_CURRENT(table); \ } \ - RND_DAD_PICTURE(table, pcb_hid_dad_spin_warn); \ + RND_DAD_PICTURE(table, rnd_hid_dad_spin_warn); \ RND_DAD_COMPFLAG(table, RND_HATF_HIDE); \ RND_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wwarn = RND_DAD_CURRENT(table); \ @@ -111,13 +111,13 @@ RND_DAD_SET_ATTR_FIELD(table, wdata, spin); \ spin->cmp.wend = RND_DAD_CURRENT(table); \ \ - spin->cmp.free = pcb_dad_spin_free; \ - spin->cmp.set_val_num = pcb_dad_spin_set_num; \ - spin->cmp.widget_state = pcb_dad_spin_widget_state; \ - spin->cmp.widget_hide = pcb_dad_spin_widget_hide; \ - spin->cmp.set_value = pcb_dad_spin_set_value; \ - spin->cmp.set_help = pcb_dad_spin_set_help; \ - spin->cmp.set_geo = pcb_dad_spin_set_geo; \ + spin->cmp.free = rnd_dad_spin_free; \ + spin->cmp.set_val_num = rnd_dad_spin_set_num; \ + spin->cmp.widget_state = rnd_dad_spin_widget_state; \ + spin->cmp.widget_hide = rnd_dad_spin_widget_hide; \ + spin->cmp.set_value = rnd_dad_spin_set_value; \ + spin->cmp.set_help = rnd_dad_spin_set_help; \ + spin->cmp.set_geo = rnd_dad_spin_set_geo; \ spin->type = typ; \ spin->wtype = wtyp; \ spin->attrs = &table; \ @@ -124,34 +124,34 @@ spin->hid_ctx = &table ## _hid_ctx; \ spin->unit_family = unit_family_; \ \ - if (typ == PCB_DAD_SPIN_COORD) \ - gdl_append(&pcb_dad_coord_spins, spin, link); \ + if (typ == RND_DAD_SPIN_COORD) \ + gdl_append(&rnd_dad_coord_spins, spin, link); \ } while(0) -extern const char *pcb_hid_dad_spin_up[]; -extern const char *pcb_hid_dad_spin_down[]; -extern const char *pcb_hid_dad_spin_unit[]; -extern const char *pcb_hid_dad_spin_unit[]; -extern const char *pcb_hid_dad_spin_warn[]; +extern const char *rnd_hid_dad_spin_up[]; +extern const char *rnd_hid_dad_spin_down[]; +extern const char *rnd_hid_dad_spin_unit[]; +extern const char *rnd_hid_dad_spin_unit[]; +extern const char *rnd_hid_dad_spin_warn[]; -void pcb_dad_spin_up_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_down_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_txt_enter_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_txt_enter_cb_dry(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_txt_enter_call_users(void *hid_ctx, rnd_hid_attribute_t *end); /* call the user's enter_cb on end */ -void pcb_dad_spin_txt_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_unit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_up_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_down_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_txt_enter_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_txt_enter_cb_dry(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_txt_enter_call_users(void *hid_ctx, rnd_hid_attribute_t *end); /* call the user's enter_cb on end */ +void rnd_dad_spin_txt_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); +void rnd_dad_spin_unit_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -void pcb_dad_spin_free(rnd_hid_attribute_t *attrib); -void pcb_dad_spin_set_num(rnd_hid_attribute_t *attr, long l, double d, rnd_coord_t c); -int pcb_dad_spin_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled); -int pcb_dad_spin_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide); -int pcb_dad_spin_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val); -void pcb_dad_spin_set_help(rnd_hid_attribute_t *end, const char *help); -void pcb_dad_spin_set_geo(rnd_hid_attribute_t *end, rnd_hatt_compflags_t flg, int geo); +void rnd_dad_spin_free(rnd_hid_attribute_t *attrib); +void rnd_dad_spin_set_num(rnd_hid_attribute_t *attr, long l, double d, rnd_coord_t c); +int rnd_dad_spin_widget_state(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled); +int rnd_dad_spin_widget_hide(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool hide); +int rnd_dad_spin_set_value(rnd_hid_attribute_t *end, void *hid_ctx, int idx, const rnd_hid_attr_val_t *val); +void rnd_dad_spin_set_help(rnd_hid_attribute_t *end, const char *help); +void rnd_dad_spin_set_geo(rnd_hid_attribute_t *end, rnd_hatt_compflags_t flg, int geo); -void pcb_dad_spin_update_internal(pcb_hid_dad_spin_t *spin); /* update the widget from spin, before or after the dialog is realized */ +void rnd_dad_spin_update_internal(rnd_hid_dad_spin_t *spin); /* update the widget from spin, before or after the dialog is realized */ -extern gdl_list_t pcb_dad_coord_spins; /* list of all active coord spinboxes */ +extern gdl_list_t rnd_dad_coord_spins; /* list of all active coord spinboxes */ #endif Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30992) +++ trunk/src/librnd/pcb_compat.h (revision 30993) @@ -823,3 +823,31 @@ #define pcb_hid_iterate rnd_hid_iterate #define pcb_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s #define pcb_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t +#define PCB_DAD_SPIN_INT RND_DAD_SPIN_INT +#define PCB_DAD_SPIN_DOUBLE RND_DAD_SPIN_DOUBLE +#define PCB_DAD_SPIN_COORD RND_DAD_SPIN_COORD +#define PCB_DAD_SPIN_FREQ RND_DAD_SPIN_FREQ +#define pcb_hid_dad_spin_t rnd_hid_dad_spin_t +#define PCB_DAD_SPIN_GET_TYPE RND_DAD_SPIN_GET_TYPE +#define PCB_DAD_SPIN_ANY RND_DAD_SPIN_ANY +#define rnd_hid_dad_spin_up rnd_hid_dad_spin_up +#define rnd_hid_dad_spin_down rnd_hid_dad_spin_down +#define rnd_hid_dad_spin_unit rnd_hid_dad_spin_unit +#define rnd_hid_dad_spin_unit rnd_hid_dad_spin_unit +#define pcb_hid_dad_spin_warn rnd_hid_dad_spin_warn +#define pcb_dad_spin_up_cb rnd_dad_spin_up_cb +#define pcb_dad_spin_down_cb rnd_dad_spin_down_cb +#define pcb_dad_spin_txt_enter_cb rnd_dad_spin_txt_enter_cb +#define pcb_dad_spin_txt_enter_cb_dry rnd_dad_spin_txt_enter_cb_dry +#define pcb_dad_spin_txt_enter_call_users rnd_dad_spin_txt_enter_call_users +#define pcb_dad_spin_txt_change_cb rnd_dad_spin_txt_change_cb +#define pcb_dad_spin_unit_cb rnd_dad_spin_unit_cb +#define pcb_dad_spin_free rnd_dad_spin_free +#define pcb_dad_spin_set_num rnd_dad_spin_set_num +#define pcb_dad_spin_widget_state rnd_dad_spin_widget_state +#define pcb_dad_spin_widget_hide rnd_dad_spin_widget_hide +#define pcb_dad_spin_set_value rnd_dad_spin_set_value +#define pcb_dad_spin_set_help rnd_dad_spin_set_help +#define pcb_dad_spin_set_geo rnd_dad_spin_set_geo +#define pcb_dad_spin_update_internal rnd_dad_spin_update_internal +#define pcb_dad_coord_spins rnd_dad_coord_spins Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30992) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30993) @@ -125,7 +125,7 @@ RND_DAD_BEGIN_HBOX(ctx.dlg); RND_DAD_LABEL(ctx.dlg, "INT:"); - PCB_DAD_SPIN_INT(ctx.dlg); + RND_DAD_SPIN_INT(ctx.dlg); ctx.wspin_int = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, 42); RND_DAD_CHANGE_CB(ctx.dlg, pcb_act_spin_upd); @@ -136,7 +136,7 @@ RND_DAD_BEGIN_HBOX(ctx.dlg); RND_DAD_LABEL(ctx.dlg, "DBL:"); - PCB_DAD_SPIN_DOUBLE(ctx.dlg); + RND_DAD_SPIN_DOUBLE(ctx.dlg); ctx.wspin_double = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, 42); RND_DAD_CHANGE_CB(ctx.dlg, pcb_act_spin_upd); @@ -147,7 +147,7 @@ RND_DAD_BEGIN_HBOX(ctx.dlg); RND_DAD_LABEL(ctx.dlg, "CRD:"); - PCB_DAD_SPIN_COORD(ctx.dlg); + RND_DAD_SPIN_COORD(ctx.dlg); ctx.wspin_coord = RND_DAD_CURRENT(ctx.dlg); RND_DAD_DEFAULT_NUM(ctx.dlg, PCB_MM_TO_COORD(42)); RND_DAD_CHANGE_CB(ctx.dlg, pcb_act_spin_upd); Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30992) +++ trunk/src_plugins/export_openems/excitation.c (revision 30993) @@ -165,7 +165,7 @@ { RND_DAD_BEGIN_TABLE(exc_ctx.dlg, 2); RND_DAD_LABEL(exc_ctx.dlg, "fc"); - PCB_DAD_SPIN_FREQ(exc_ctx.dlg); + RND_DAD_SPIN_FREQ(exc_ctx.dlg); RND_DAD_MINMAX(exc_ctx.dlg, 0, FREQ_MAX); RND_DAD_HELP(exc_ctx.dlg, "20db Cutoff Frequency\nbandwidth is 2*fc"); RND_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30992) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30993) @@ -457,7 +457,7 @@ wtype = dad->dlg[wid].type; if (dad->dlg[wid].type == RND_HATT_END) /* composite widget's end or real end - the spin macro handles both */ - wtype = PCB_DAD_SPIN_GET_TYPE(&dad->dlg[wid]); + wtype = RND_DAD_SPIN_GET_TYPE(&dad->dlg[wid]); switch(wtype) { case RND_HATT_COORD: @@ -499,7 +499,7 @@ wtype = dad->dlg[wid].type; if (dad->dlg[wid].type == RND_HATT_END) /* composite widget's end or real end - the spin macro handles both */ - wtype = PCB_DAD_SPIN_GET_TYPE(&dad->dlg[wid]); + wtype = RND_DAD_SPIN_GET_TYPE(&dad->dlg[wid]); switch(wtype) { case RND_HATT_COORD: