Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 26937) +++ trunk/src/brave.c (revision 26938) @@ -142,9 +142,9 @@ for(d = desc, len=0; d->name != NULL; d++,len++) { if (pcb_brave & d->bit) - PCB_DAD_SET_VALUE(hid_ctx, d->widget, int_value, 1); + PCB_DAD_SET_VALUE(hid_ctx, d->widget, lng, 1); else - PCB_DAD_SET_VALUE(hid_ctx, d->widget, int_value, 0); + PCB_DAD_SET_VALUE(hid_ctx, d->widget, lng, 0); } } @@ -153,7 +153,7 @@ { desc_t *d; for(d = desc; d->name != NULL; d++) - brave_set(d->bit, attrs[d->widget].val.int_value); + brave_set(d->bit, attrs[d->widget].val.lng); } /* If a checkbox changes, do the conversion forth and back to ensure sync */ Index: trunk/src/error.c =================================================================== --- trunk/src/error.c (revision 26937) +++ trunk/src/error.c (revision 26938) @@ -233,7 +233,7 @@ wfmt = PCB_DAD_CURRENT(fmtsub.dlg); fn = pcb_gui->fileselect(pcb_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", PCB_HID_FSD_MAY_NOT_EXIST, &fmtsub); if (fn != NULL) { - ret = pcb_log_export(NULL, fn, (fmtsub.dlg[wfmt].val.int_value == 1)); + ret = pcb_log_export(NULL, fn, (fmtsub.dlg[wfmt].val.lng == 1)); if (ret != 0) pcb_message(PCB_MSG_ERROR, "Failed to export log to '%s'\n", fn); free(fn); Index: trunk/src/hid_attrib.c =================================================================== --- trunk/src/hid_attrib.c (revision 26937) +++ trunk/src/hid_attrib.c (revision 26938) @@ -129,7 +129,7 @@ break; case PCB_HATT_INTEGER: if (a->value) - *(int *) a->value = a->default_val.int_value; + *(int *) a->value = a->default_val.lng; break; case PCB_HATT_COORD: if (a->value) @@ -137,7 +137,7 @@ break; case PCB_HATT_BOOL: if (a->value) - *(char *) a->value = a->default_val.int_value; + *(char *) a->value = a->default_val.lng; break; case PCB_HATT_REAL: if (a->value) @@ -149,11 +149,11 @@ break; case PCB_HATT_ENUM: if (a->value) - *(int *) a->value = a->default_val.int_value; + *(int *) a->value = a->default_val.lng; break; case PCB_HATT_UNIT: if (a->value) - *(int *) a->value = a->default_val.int_value; + *(int *) a->value = a->default_val.lng; break; default: pcb_message(PCB_MSG_ERROR, "Invalid attribute type %d for attribute %s\n", a->type, a->name); @@ -182,7 +182,7 @@ if (a->value) *(int *) a->value = strtol((*argv)[1], 0, 0); else - a->default_val.int_value = strtol((*argv)[1], 0, 0); + a->default_val.lng = strtol((*argv)[1], 0, 0); (*argc)--; (*argv)++; break; @@ -214,7 +214,7 @@ if (a->value) *(char *) a->value = bool_val; else - a->default_val.int_value = bool_val; + a->default_val.lng = bool_val; break; case PCB_HATT_ENUM: ep = (*argv)[1]; @@ -222,7 +222,7 @@ for (e = 0; a->enumerations[e]; e++) if (strcmp(a->enumerations[e], ep) == 0) { ok = 1; - a->default_val.int_value = e; + a->default_val.lng = e; a->default_val.str_value = ep; break; } @@ -239,7 +239,7 @@ fprintf(stderr, "ERROR: unit \"%s\" is unknown to pcb (option --%s)\n", (*argv)[1], a->name); exit(1); } - a->default_val.int_value = unit->index; + a->default_val.lng = unit->index; a->default_val.str_value = unit->suffix; (*argc)--; (*argv)++; Index: trunk/src/hid_attrib.h =================================================================== --- trunk/src/hid_attrib.h (revision 26937) +++ trunk/src/hid_attrib.h (revision 26938) @@ -6,11 +6,11 @@ #include "color.h" /* Used for HID attributes (exporting and printing, mostly). - HA_boolean uses int_value, HA_enum sets int_value to the index and + HA_boolean uses lng, HA_enum sets lng to the index and str_value to the enumeration string. PCB_HATT_LABEL just shows the default str_value. */ struct pcb_hid_attr_val_s { - int int_value; + int lng; const char *str_value; double real_value; pcb_coord_t coord_value; Index: trunk/src/hid_dad.h =================================================================== --- trunk/src/hid_dad.h (revision 26937) +++ trunk/src/hid_dad.h (revision 26938) @@ -217,7 +217,7 @@ do { \ PCB_DAD_ALLOC(table, PCB_HATT_BUTTON); \ table[table ## _len - 1].val.str_value = text; \ - table[table ## _len - 1].val.int_value = retval; \ + table[table ## _len - 1].val.lng = retval; \ table[table ## _len - 1].enumerations = (const char **)(&table ## _ret_override); \ PCB_DAD_CHANGE_CB(table, pcb_hid_dad_close_cb); \ } while(0) @@ -480,7 +480,7 @@ case PCB_HATT_ENUM: \ case PCB_HATT_UNIT: \ case PCB_HATT_BEGIN_TABBED: \ - table[table ## _len - 1].field.int_value = (int)val; \ + table[table ## _len - 1].field.lng = (int)val; \ break; \ case PCB_HATT_COORD: \ table[table ## _len - 1].field.coord_value = (pcb_coord_t)val; \ @@ -522,7 +522,7 @@ case PCB_HATT_BOOL: \ case PCB_HATT_ENUM: \ case PCB_HATT_BEGIN_TABBED: \ - table[table ## _len - 1].field.int_value = (int)val_; \ + table[table ## _len - 1].field.lng = (int)val_; \ break; \ case PCB_HATT_COORD: \ table[table ## _len - 1].field.coord_value = (pcb_coord_t)val_; \ @@ -584,7 +584,7 @@ if (val_ != NULL) { \ for(__n__ = 0; __n__ < __v__; __n__++) { \ if (&pcb_units[__n__] == (pcb_unit_t *)(val_)) { \ - table[table ## _len - 1].field.int_value = __n__; \ + table[table ## _len - 1].field.lng = __n__; \ break; \ } \ } \ Index: trunk/src/hid_dad_spin.c =================================================================== --- trunk/src/hid_dad_spin.c (revision 26937) +++ trunk/src/hid_dad_spin.c (revision 26938) @@ -134,9 +134,9 @@ pcb_hid_attr_val_t hv; spin_unit_t *su = (spin_unit_t *)caller_data; const pcb_unit_t *unit; - int unum = su->dlg[su->wunit].val.int_value; + int unum = su->dlg[su->wunit].val.lng; - if ((!su->dlg[su->wglob].val.int_value) && (unum >= 0) && (unum < pcb_get_n_units(0))) + if ((!su->dlg[su->wglob].val.lng) && (unum >= 0) && (unum < pcb_get_n_units(0))) unit = &pcb_units[unum]; else unit = pcbhl_conf.editor.grid_unit; @@ -144,7 +144,7 @@ pcb_snprintf(su->buf, sizeof(su->buf), "%$m*", unit->suffix, su->end->val.coord_value); hv.str_value = su->buf; pcb_gui->attr_dlg_set_value(hid_ctx, su->wout, &hv); - hv.int_value = 0; + hv.lng = 0; pcb_gui->attr_dlg_set_value(hid_ctx, su->wglob, &hv); su->valid = 1; } @@ -208,14 +208,14 @@ PCB_DAD_AUTORUN("unit", ctx.dlg, "spinbox coord unit change", &ctx, dlgfail); if ((dlgfail == 0) && (ctx.valid)) { pcb_hid_attr_val_t hv; - int unum = ctx.dlg[ctx.wunit].val.int_value; + int unum = ctx.dlg[ctx.wunit].val.lng; - if ((!ctx.dlg[ctx.wglob].val.int_value) && (unum >= 0) && (unum < pcb_get_n_units(0))) + if ((!ctx.dlg[ctx.wglob].val.lng) && (unum >= 0) && (unum < pcb_get_n_units(0))) spin->unit = &pcb_units[unum]; else spin->unit = NULL; - spin->no_unit_chg = ctx.dlg[ctx.wstick].val.int_value; + spin->no_unit_chg = ctx.dlg[ctx.wstick].val.lng; hv.str_value = pcb_strdup(ctx.buf); pcb_gui->attr_dlg_set_value(spin_hid_ctx, spin->wstr, &hv); } @@ -233,7 +233,7 @@ switch(spin->type) { case PCB_DAD_SPIN_INT: - step = pow(10, floor(log10(fabs((double)end->val.int_value)) - 1.0)); + step = pow(10, floor(log10(fabs((double)end->val.lng)) - 1.0)); if (step < 1) step = 1; break; @@ -282,9 +282,9 @@ switch(spin->type) { case PCB_DAD_SPIN_INT: - end->val.int_value += step; - SPIN_CLAMP(end->val.int_value); - sprintf(buf, "%d", end->val.int_value); + end->val.lng += step; + SPIN_CLAMP(end->val.lng); + sprintf(buf, "%d", end->val.lng); break; case PCB_DAD_SPIN_DOUBLE: end->val.real_value += step; @@ -351,7 +351,7 @@ SPIN_CLAMP(l); if (*ends != '\0') warn = "Invalid integer - result is truncated"; - end->val.int_value = l; + end->val.lng = l; break; case PCB_DAD_SPIN_DOUBLE: d = strtod(str->val.str_value, &ends); @@ -463,7 +463,7 @@ switch(spin->type) { case PCB_DAD_SPIN_INT: - attr->val.int_value = l; + attr->val.lng = l; free((char *)str->val.str_value); str->val.str_value = pcb_strdup_printf("%ld", l); break; @@ -512,9 +512,9 @@ /* do not modify the text field if the value is the same */ switch(spin->type) { case PCB_DAD_SPIN_INT: - if (val->int_value == end->val.int_value) + if (val->lng == end->val.lng) return 0; - end->val.int_value = val->int_value; + end->val.lng = val->lng; break; case PCB_DAD_SPIN_DOUBLE: if (val->real_value == end->val.real_value) Index: trunk/src/hid_dad_tree.c =================================================================== --- trunk/src/hid_dad_tree.c (revision 26937) +++ trunk/src/hid_dad_tree.c (revision 26938) @@ -97,7 +97,7 @@ void pcb_hid_dad_close_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pcb_dad_retovr_t **retovr = (pcb_dad_retovr_t **)attr->enumerations; - pcb_hid_dad_close(hid_ctx, *retovr, attr->val.int_value); + pcb_hid_dad_close(hid_ctx, *retovr, attr->val.lng); } int pcb_hid_dad_run(void *hid_ctx, pcb_dad_retovr_t *retovr) Index: trunk/src/hid_dad_unit.c =================================================================== --- trunk/src/hid_dad_unit.c (revision 26937) +++ trunk/src/hid_dad_unit.c (revision 26938) @@ -38,10 +38,10 @@ pcb_hid_dad_unit_t *unit = (pcb_hid_dad_unit_t *)attr->user_data; pcb_hid_attribute_t *enu = attr; pcb_hid_attribute_t *end = attr - unit->wenum + unit->cmp.wend; - const pcb_unit_t *u = get_unit_by_suffix(enu->enumerations[enu->val.int_value]); + const pcb_unit_t *u = get_unit_by_suffix(enu->enumerations[enu->val.lng]); int unit_id = u == NULL ? -1 : u - pcb_units; - end->val.int_value = unit_id; + end->val.lng = unit_id; end->changed = 1; if (end->change_cb != NULL) end->change_cb(hid_ctx, caller_data, end); @@ -56,8 +56,8 @@ for(l = 0; enu->enumerations[l] != NULL; l++) { if (strcmp(target, enu->enumerations[l]) == 0) { - enu->val.int_value = l; - attr->val.int_value = l; + enu->val.lng = l; + attr->val.lng = l; } } } @@ -93,7 +93,7 @@ pcb_hid_dad_unit_t *unit = (pcb_hid_dad_unit_t *)end->enumerations; if (pcb_gui->attr_dlg_set_value(hid_ctx, unit->wenum, val) != 0) return -1; - end->val.int_value = val->int_value; + end->val.lng = val->lng; return 0; } Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 26937) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 26938) @@ -178,7 +178,7 @@ return; cnstgui_ctx.inhibit_confchg++; - PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.alldir, int_value, conf_core.editor.all_direction_lines); + PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.alldir, lng, conf_core.editor.all_direction_lines); cnstgui_ctx.inhibit_confchg--; } @@ -189,7 +189,7 @@ return; cnstgui_ctx.inhibit_confchg++; - nv = (cnstgui_ctx.dlg[cnstgui_ctx.alldir].val.int_value) ? "1" : "0"; + nv = (cnstgui_ctx.dlg[cnstgui_ctx.alldir].val.lng) ? "1" : "0"; conf_set(CFR_DESIGN, "editor/all_direction_lines", -1, nv, POL_OVERWRITE); cnstgui_ctx.inhibit_confchg--; } Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 26938) @@ -205,7 +205,7 @@ case PCB_HATT_INTEGER: PCB_DAD_INTEGER(export_ctx.dlg, opts[i].name); PCB_DAD_MINMAX(export_ctx.dlg, opts[i].min_val, opts[i].max_val); - PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.int_value); + PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.lng); break; case PCB_HATT_REAL: PCB_DAD_REAL(export_ctx.dlg, opts[i].name); @@ -214,7 +214,7 @@ break; case PCB_HATT_UNIT: PCB_DAD_UNIT(export_ctx.dlg, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL); - PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.int_value); + PCB_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.lng); break; default: PCB_DAD_DUP_EXPOPT(export_ctx.dlg, &(opts[i])); Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 26938) @@ -58,9 +58,9 @@ for(n = 0; n < ctx->len; n++) { int wid = ctx->wid[n]; - if ((ctx->attrs[wid].val.int_value) && (!PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj))) + if ((ctx->attrs[wid].val.lng) && (!PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj))) set |= ctx->flag_bit[n]; - else if (!(ctx->attrs[wid].val.int_value) && PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj)) + else if (!(ctx->attrs[wid].val.lng) && PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj)) clr |= ctx->flag_bit[n]; } Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 26938) @@ -70,7 +70,7 @@ static void set_ly_type(void *hid_ctx, int wid, pcb_layer_type_t type) { - PCB_DAD_SET_VALUE(hid_ctx, wid, int_value, pcb_ly_type2enum(type)); + PCB_DAD_SET_VALUE(hid_ctx, wid, lng, pcb_ly_type2enum(type)); } void pcb_get_ly_type_(int combo_type, pcb_layer_type_t *type) @@ -148,7 +148,7 @@ PCB_DAD_SET_VALUE(hid_ctx, w->purpose, str_value, pcb_strdup(purp)); } - PCB_DAD_SET_VALUE(hid_ctx, w->comp, int_value, layer->comb); + PCB_DAD_SET_VALUE(hid_ctx, w->comp, lng, layer->comb); set_ly_type(hid_ctx, w->type, layer->meta.bound.type); @@ -155,7 +155,7 @@ /* disable side for non-sided */ if (PCB_LAYER_SIDED(layer->meta.bound.type)) { /* side & offset */ - PCB_DAD_SET_VALUE(hid_ctx, w->side, int_value, !!(layer->meta.bound.type & PCB_LYT_BOTTOM)); + PCB_DAD_SET_VALUE(hid_ctx, w->side, lng, !!(layer->meta.bound.type & PCB_LYT_BOTTOM)); pcb_gui->attr_dlg_widget_state(hid_ctx, w->side, 1); } else @@ -163,10 +163,10 @@ ofs = layer->meta.bound.stack_offs; if (ofs < 0) { - PCB_DAD_SET_VALUE(hid_ctx, w->side, int_value, 1); + PCB_DAD_SET_VALUE(hid_ctx, w->side, lng, 1); ofs = -layer->meta.bound.stack_offs; } - PCB_DAD_SET_VALUE(hid_ctx, w->offs, int_value, ofs); + PCB_DAD_SET_VALUE(hid_ctx, w->offs, lng, ofs); /* enable offset only for copper */ enable = (layer->meta.bound.type & PCB_LYT_COPPER); @@ -178,7 +178,7 @@ lid = pcb_layer_id(PCB->Data, layer->meta.bound.real); else lid = ctx->no_layer; - PCB_DAD_SET_VALUE(hid_ctx, w->layer, int_value, lid); + PCB_DAD_SET_VALUE(hid_ctx, w->layer, lng, lid); pcb_gui->attr_dlg_widget_state(hid_ctx, w->layer, 0); } } @@ -205,8 +205,8 @@ layer->meta.bound.purpose = pcb_strdup(purp); } - layer->comb = ctx->attrs[w->comp].val.int_value; - get_ly_type(ctx->attrs[w->type].val.int_value, ctx->attrs[w->side].val.int_value, ctx->attrs[w->offs].val.int_value, &layer->meta.bound.type, &layer->meta.bound.stack_offs); + layer->comb = ctx->attrs[w->comp].val.lng; + get_ly_type(ctx->attrs[w->type].val.lng, ctx->attrs[w->side].val.lng, ctx->attrs[w->offs].val.lng, &layer->meta.bound.type, &layer->meta.bound.stack_offs); /* enforce some sanity rules */ if (layer->meta.bound.type & PCB_LYT_BOUNDARY) { Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 26938) @@ -66,8 +66,8 @@ dlg[wname].val.str_value = pcb_strdup(ly->name); - dlg[wsub].val.int_value = ly->comb & PCB_LYC_SUB; - dlg[wauto].val.int_value = ly->comb & PCB_LYC_AUTO; + dlg[wsub].val.lng = ly->comb & PCB_LYC_SUB; + dlg[wauto].val.lng = ly->comb & PCB_LYC_AUTO; PCB_DAD_AUTORUN("layer_prop", dlg, "Properties of a logical layer", NULL, failed); @@ -77,8 +77,8 @@ ar |= pcb_layer_rename_(ly, (char *)dlg[wname].val.str_value); pcb_board_set_changed_flag(pcb_true); } - if (dlg[wsub].val.int_value) comb |= PCB_LYC_SUB; - if (dlg[wauto].val.int_value) comb |= PCB_LYC_AUTO; + if (dlg[wsub].val.lng) comb |= PCB_LYC_SUB; + if (dlg[wauto].val.lng) comb |= PCB_LYC_AUTO; if (ly->comb != comb) { ly->comb = comb; pcb_board_set_changed_flag(pcb_true); @@ -144,23 +144,23 @@ dlg[wname].val.str_value = pcb_strdup(g->name); - dlg[wtype].val.int_value = orig_type = pcb_ly_type2enum(g->ltype); + dlg[wtype].val.lng = orig_type = pcb_ly_type2enum(g->ltype); dlg[wpurp].val.str_value = pcb_strdup(g->purpose == NULL ? "" : g->purpose); if (!omit_loc) - dlg[wloc].val.int_value = def_loc; + dlg[wloc].val.lng = def_loc; if (!omit_loc) { pcb_layer_type_t loc = g->ltype & PCB_LYT_ANYWHERE; - dlg[wloc].val.int_value = 3; + dlg[wloc].val.lng = 3; if (loc != 0) { for(n = 0; ltypes[n] != NULL; n++) { if ((loc & ltype_bits[n]) == loc) { - dlg[wloc].val.int_value = n; + dlg[wloc].val.lng = n; break; } } } - orig_loc = dlg[wloc].val.int_value; + orig_loc = dlg[wloc].val.lng; } PCB_DAD_AUTORUN("layer_grp_prop", dlg, "Edit the properties of a layer group (physical layer)", NULL, failed); @@ -171,19 +171,19 @@ pcb_board_set_changed_flag(pcb_true); } - if (dlg[wtype].val.int_value != orig_type) { + if (dlg[wtype].val.lng != orig_type) { pcb_layer_type_t lyt = 0; - pcb_get_ly_type_(dlg[wtype].val.int_value, &lyt); + pcb_get_ly_type_(dlg[wtype].val.lng, &lyt); g->ltype &= ~PCB_LYT_ANYTHING; g->ltype |= lyt; changed = 1; } - if ((!omit_loc) && (dlg[wloc].val.int_value != orig_loc)) { + if ((!omit_loc) && (dlg[wloc].val.lng != orig_loc)) { if (PCB_LAYER_SIDED(g->ltype)) { g->ltype &= ~PCB_LYT_ANYWHERE; - if (dlg[wloc].val.int_value >= 0) - g->ltype |= ltype_bits[dlg[wloc].val.int_value]; + if (dlg[wloc].val.lng >= 0) + g->ltype |= ltype_bits[dlg[wloc].val.lng]; changed = 1; } else Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 26938) @@ -169,7 +169,7 @@ /* draw the shapes */ for(n = 0; n < pcb_proto_num_layers; n++) - layers[n] = !!ctx->dlg[ctx->wlayerv[n]].val.int_value + !!ctx->dlg[ctx->wlayerc[n]].val.int_value; + layers[n] = !!ctx->dlg[ctx->wlayerv[n]].val.lng + !!ctx->dlg[ctx->wlayerc[n]].val.lng; pcb_pstk_draw_preview(PCB, &ps, layers, 0, 0, &e->view); @@ -248,12 +248,12 @@ for(n = 0; n < pcb_proto_num_layers; n++) { if (ctx->wlayerc[n] == widx) { - hv.int_value = 1; + hv.lng = 1; idx = n; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerv[n], &hv); /* current must be visible as well */ } else - hv.int_value = 0; + hv.lng = 0; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wlayerc[n], &hv); } if (idx < 0) Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 26938) @@ -73,7 +73,7 @@ else len = strlen(*s); if ((len == vlen) && (strncmp(*s, val, len) == 0)) { - hv.int_value = n; + hv.lng = n; break; } } @@ -279,7 +279,7 @@ case PCB_HATT_BEGIN_TABLE: continue; case PCB_HATT_ENUM: - val = a->enumerations[a->val.int_value]; + val = a->enumerations[a->val.lng]; if (val != NULL) { desc = strstr((char *)val, " ("); if (desc != NULL) Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 26938) @@ -116,9 +116,9 @@ static void update_opts(save_t *save) { pcb_hid_attr_val_t hv; - int selection = save->fmtsub->dlg[save->wfmt].val.int_value; + int selection = save->fmtsub->dlg[save->wfmt].val.lng; - hv.int_value = save->opt_tab[selection]; + hv.lng = save->opt_tab[selection]; pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wopts, &hv); } @@ -129,7 +129,7 @@ char *bn, *fn, *s; const char *ext; pcb_event_arg_t res, argv[4]; - int selection = attr->val.int_value; + int selection = attr->val.lng; pcb_hid_attr_val_t hv; if ((save->avail == NULL) || save->fmt_chg_lock) @@ -139,7 +139,7 @@ return; /* turn off guessing becuase the user explicitly selected a format */ - hv.int_value = 0; + hv.lng = 0; pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wguess, &hv); fn = (char *)res.d.s; @@ -184,7 +184,7 @@ pcb_hid_dad_subdialog_t *fmtsub = caller_data; save_t *save = fmtsub->sub_ctx; - if (save->fmtsub->dlg[save->wguess].val.int_value) { + if (save->fmtsub->dlg[save->wguess].val.lng) { /* when guess is activated, make sure to recalculate the guess whatever the format or the last file name was - this closes out all corner cases with initial format mismatching the file name and multiple formats for @@ -207,7 +207,7 @@ if (strcmp(save->avail->extension[n], ext) == 0) { pcb_hid_attr_val_t hv; save->fmt_chg_lock = 1; - hv.int_value = n; + hv.lng = n; pcb_gui->attr_dlg_set_value(save->fmtsub->dlg_hid_ctx, save->wfmt, &hv); save->fmt_chg_lock = 0; update_opts(save); @@ -234,7 +234,7 @@ save->timer = pcb_gui->add_timer(pcb_gui, save_timer, 300, user_data); - if ((save->fmtsub->parent_poke != NULL) && (save->fmtsub->dlg_hid_ctx != NULL) && (save->fmtsub->dlg[save->wguess].val.int_value)) { + if ((save->fmtsub->parent_poke != NULL) && (save->fmtsub->dlg_hid_ctx != NULL) && (save->fmtsub->dlg[save->wguess].val.lng)) { pcb_event_arg_t res; char *end; @@ -252,7 +252,7 @@ save_t *save = sub->sub_ctx; int n, i; char *seen; - int tab_selection = save->opt_tab[save->fmtsub->dlg[save->wfmt].val.int_value]; + int tab_selection = save->opt_tab[save->fmtsub->dlg[save->wfmt].val.lng]; seen = calloc(1, save->tabs); for(n = 1; n < save->tabs; n++) { Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 26938) @@ -86,8 +86,8 @@ PCB_DAD_SET_VALUE(hid_ctx, pse->proto_id, str_value, tmp); PCB_DAD_SET_VALUE(hid_ctx, pse->clearance, coord_value, pse->ps->Clearance); PCB_DAD_SET_VALUE(hid_ctx, pse->rot, real_value, pse->ps->rot); - PCB_DAD_SET_VALUE(hid_ctx, pse->xmirror, int_value, pse->ps->xmirror); - PCB_DAD_SET_VALUE(hid_ctx, pse->smirror, int_value, pse->ps->smirror); + PCB_DAD_SET_VALUE(hid_ctx, pse->xmirror, lng, pse->ps->xmirror); + PCB_DAD_SET_VALUE(hid_ctx, pse->smirror, lng, pse->ps->smirror); /* proto - layers */ memset(shp_found, 0, sizeof(shp_found)); @@ -171,9 +171,9 @@ pse->attrs[pse->prname].val.str_value = NULL; PCB_DAD_SET_VALUE(hid_ctx, pse->prname, str_value, pcb_strdup(proto->name == NULL ? "" : proto->name)); PCB_DAD_SET_VALUE(hid_ctx, pse->hdia, coord_value, proto->hdia); - PCB_DAD_SET_VALUE(hid_ctx, pse->hplated, int_value, proto->hplated); - PCB_DAD_SET_VALUE(hid_ctx, pse->htop_val, int_value, proto->htop); - PCB_DAD_SET_VALUE(hid_ctx, pse->hbot_val, int_value, proto->hbottom); + PCB_DAD_SET_VALUE(hid_ctx, pse->hplated, lng, proto->hplated); + PCB_DAD_SET_VALUE(hid_ctx, pse->htop_val, lng, proto->htop); + PCB_DAD_SET_VALUE(hid_ctx, pse->hbot_val, lng, proto->hbottom); if (proto->htop == 0) strcpy(tmp, "top copper group"); @@ -260,8 +260,8 @@ NULL, &pse->attrs[pse->clearance].val.coord_value, &pse->attrs[pse->rot].val.real_value, - &pse->attrs[pse->xmirror].val.int_value, - &pse->attrs[pse->smirror].val.int_value); + &pse->attrs[pse->xmirror].val.lng, + &pse->attrs[pse->smirror].val.lng); lock++; pse_ps2dlg(hid_ctx, pse); /* to get calculated text fields updated */ @@ -311,10 +311,10 @@ if (proto != NULL) { pcb_pstk_proto_change_hole(proto, - &pse->attrs[pse->hplated].val.int_value, + &pse->attrs[pse->hplated].val.lng, &pse->attrs[pse->hdia].val.coord_value, - &pse->attrs[pse->htop_val].val.int_value, - &pse->attrs[pse->hbot_val].val.int_value); + &pse->attrs[pse->htop_val].val.lng, + &pse->attrs[pse->hbot_val].val.lng); } lock++; @@ -447,7 +447,7 @@ pse_t *pse = caller_data; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps); pcb_pstk_tshape_t *ts = &proto->tr.array[0]; - int from = pse->shape_chg[pse->copy_from].val.int_value; + int from = pse->shape_chg[pse->copy_from].val.lng; int dst_idx; int src_idx; @@ -481,7 +481,7 @@ pse_t *pse = caller_data; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps); pcb_pstk_tshape_t *ts = &proto->tr.array[0]; - int from = pse->shape_chg[pse->copy_from].val.int_value; + int from = pse->shape_chg[pse->copy_from].val.lng; int dst_idx; int src_idx; @@ -687,10 +687,10 @@ int err = 0; pse_t *pse = caller_data; pcb_pstk_proto_t proto; - int sides = pse->attrs[pse->gen_sides].val.int_value; - int shape = pse->attrs[pse->gen_shp].val.int_value; - int expose = pse->attrs[pse->gen_expose].val.int_value; - int paste = pse->attrs[pse->gen_paste].val.int_value; + int sides = pse->attrs[pse->gen_sides].val.lng; + int shape = pse->attrs[pse->gen_shp].val.lng; + int expose = pse->attrs[pse->gen_expose].val.lng; + int paste = pse->attrs[pse->gen_paste].val.lng; pcb_coord_t size = pse->attrs[pse->gen_size].val.coord_value; pcb_layer_type_t lyt = sides_lyt[sides]; pcb_pstk_tshape_t *ts; @@ -731,7 +731,7 @@ } pse_ps2dlg(hid_ctx, pse); - PCB_DAD_SET_VALUE(hid_ctx, pse->tab, int_value, 1); /* switch to the prototype view where the new attributes are visible */ + PCB_DAD_SET_VALUE(hid_ctx, pse->tab, lng, 1); /* switch to the prototype view where the new attributes are visible */ pse_changed(pse); pcb_gui->invalidate_all(pcb_gui); } @@ -963,7 +963,7 @@ pse->attrs = dlg; pse_ps2dlg(dlg_hid_ctx, pse); if (target_tab > 0) - PCB_DAD_SET_VALUE(dlg_hid_ctx, pse->tab, int_value, target_tab); + PCB_DAD_SET_VALUE(dlg_hid_ctx, pse->tab, lng, target_tab); PCB_DAD_RUN(dlg); free((char *)pse->attrs[pse->prname].val.str_value); Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 26938) @@ -66,7 +66,7 @@ break; case CFN_BOOLEAN: case CFN_INTEGER: - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, int_value, cn->val.integer[0]); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, lng, cn->val.integer[0]); break; case CFN_REAL: PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, item->wid, real_value, cn->val.real[0]); @@ -94,8 +94,8 @@ break; case CFN_BOOLEAN: case CFN_INTEGER: - if (cn->val.integer[0] != attr->val.int_value) - conf_setf(ctx->role, item->confpath, -1, "%d", attr->val.int_value); + if (cn->val.integer[0] != attr->val.lng) + conf_setf(ctx->role, item->confpath, -1, "%d", attr->val.lng); break; case CFN_REAL: if (cn->val.real[0] != attr->val.real_value) @@ -208,7 +208,7 @@ static void pref_role_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - ctx->role = roles[attr->val.int_value]; + ctx->role = roles[attr->val.lng]; } static void pref_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) @@ -260,7 +260,7 @@ if (pref_ctx.active) { if (target_tab >= 0) - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wtab, int_value, target_tab); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wtab, lng, target_tab); return; } @@ -319,7 +319,7 @@ PCB_DAD_NEW("preferences", pref_ctx.dlg, "pcb-rnd preferences", &pref_ctx, pcb_false, pref_close_cb); - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wrole, int_value, 2); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wrole, lng, 2); pref_ctx.role = CFR_DESIGN; pcb_dlg_pref_lib_open(&pref_ctx); @@ -327,7 +327,7 @@ pcb_dlg_pref_win_open(&pref_ctx); pcb_dlg_pref_conf_open(&pref_ctx, (target_tab == sizeof(tabs)/sizeof(tabs[0]) - 2) ? tabarg : NULL); if (target_tab >= 0) - PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wtab, int_value, target_tab); + PCB_DAD_SET_VALUE(pref_ctx.dlg_hid_ctx, pref_ctx.wtab, lng, target_tab); } static void pref_ev_board_changed(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 26938) @@ -207,7 +207,7 @@ pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wdesc, &hv); setup_intree(ctx, NULL, 0); - hv.int_value = CFN_max; + hv.lng = CFN_max; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); return; @@ -226,7 +226,7 @@ setup_intree(ctx, nat, idx); /* display native value */ - hv.int_value = nat->type; + hv.lng = nat->type; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->conf.wnattype, &hv); if (nat->type == CFN_LIST) { Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 26938) @@ -66,7 +66,7 @@ break; case CFN_BOOLEAN: case CFN_INTEGER: - hv.int_value = atoi(val); + hv.lng = atoi(val); pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); break; case CFN_REAL: @@ -81,9 +81,9 @@ { const pcb_unit_t *u = get_unit_struct(val); if (u != NULL) - hv.int_value = u - pcb_units; + hv.lng = u - pcb_units; else - hv.int_value = -1; + hv.lng = -1; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wnewval, &hv); } break; @@ -128,13 +128,13 @@ switch(ctx->nat->type) { case CFN_STRING: val = attr->val.str_value; break; case CFN_BOOLEAN: - case CFN_INTEGER: sprintf(buf, "%d", attr->val.int_value); break; + case CFN_INTEGER: sprintf(buf, "%d", attr->val.lng); break; case CFN_REAL: sprintf(buf, "%f", attr->val.real_value); break; case CFN_COORD: pcb_snprintf(buf, sizeof(buf), "%.08$mH", attr->val.coord_value); break; case CFN_UNIT: - if ((attr->val.int_value < 0) || (attr->val.int_value >= pcb_get_n_units(0))) + if ((attr->val.lng < 0) || (attr->val.lng >= pcb_get_n_units(0))) return; - val = pcb_units[attr->val.int_value].suffix; + val = pcb_units[attr->val.lng].suffix; break; case CFN_COLOR: val = attr->val.clr_value.str; break; case CFN_LIST: Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 26938) @@ -38,10 +38,10 @@ static void pref_win_brd2dlg(pref_ctx_t *ctx) { - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wmaster, int_value, pcbhl_conf.editor.auto_place); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wboard, int_value, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_design); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wproject, int_value, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_project); - PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wuser, int_value, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_user); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wmaster, lng, pcbhl_conf.editor.auto_place); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wboard, lng, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_design); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wproject, lng, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_project); + PCB_DAD_SET_VALUE(ctx->dlg_hid_ctx, ctx->win.wuser, lng, dialogs_conf.plugins.dialogs.auto_save_window_geometry.to_user); } void pcb_dlg_pref_win_open(pref_ctx_t *ctx) @@ -56,7 +56,7 @@ static void pref_win_master_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - conf_setf(ctx->role, "editor/auto_place", -1, "%d", attr->val.int_value); + conf_setf(ctx->role, "editor/auto_place", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -63,7 +63,7 @@ static void pref_win_board_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_design", -1, "%d", attr->val.int_value); + conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_design", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -70,7 +70,7 @@ static void pref_win_project_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_project", -1, "%d", attr->val.int_value); + conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_project", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -77,7 +77,7 @@ static void pref_win_user_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_user", -1, "%d", attr->val.int_value); + conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_user", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 26938) @@ -67,7 +67,7 @@ search_expr_t expr[MAX_ROW][MAX_COL]; } search_ctx_t; -#define WIZ(ctx) (ctx->dlg[ctx->wwizard].val.int_value) +#define WIZ(ctx) (ctx->dlg[ctx->wwizard].val.lng) #include "dlg_search_edit.c" @@ -298,7 +298,7 @@ { search_ctx_t *ctx = caller_data; if (ctx->dlg[ctx->wexpr_str].val.str_value != NULL) - pcb_actionl("query", search_acts[ctx->dlg[ctx->wact].val.int_value], ctx->dlg[ctx->wexpr_str].val.str_value, NULL); + pcb_actionl("query", search_acts[ctx->dlg[ctx->wact].val.lng], ctx->dlg[ctx->wexpr_str].val.str_value, NULL); } Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 26938) @@ -53,7 +53,7 @@ ctx->se.right = pcb_strdup(attr->val.str_value); break; case RIGHT_INT: - ctx->se.right = pcb_strdup_printf("%d", attr->val.int_value); + ctx->se.right = pcb_strdup_printf("%d", attr->val.lng); break; case RIGHT_DOUBLE: ctx->se.right = pcb_strdup_printf("%f", attr->val.real_value); @@ -164,7 +164,7 @@ pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); break; case RIGHT_INT: - hv.int_value = strtol(hv.str_value, NULL, 10); + hv.lng = strtol(hv.str_value, NULL, 10); pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wright[s->expr->rtype], &hv); if (empty) set_right(ctx, &ctx->dlg[ctx->wright[s->expr->rtype]]); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 26937) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 26938) @@ -292,7 +292,7 @@ printf("Chg\n"); st = !st; - val.int_value = (val.int_value + 1) % 3; + val.lng = (val.lng + 1) % 3; /* pcb_gui->attr_dlg_widget_state(hid_ctx, attr_idx, st);*/ pcb_gui->attr_dlg_set_value(hid_ctx, attr_idx, &val); @@ -303,7 +303,7 @@ test_t *ctx = caller_data; pcb_hid_attr_val_t hv; - hv.int_value = 42; + hv.lng = 42; hv.real_value = 42.0; hv.coord_value = PCB_MM_TO_COORD(42); @@ -320,7 +320,7 @@ hv.str_value = tmp; - sprintf(tmp, "%d", ctx->dlg[ctx->wspin_int].val.int_value); + sprintf(tmp, "%d", ctx->dlg[ctx->wspin_int].val.lng); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_int, &hv); sprintf(tmp, "%f", ctx->dlg[ctx->wspin_double].val.real_value); pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wspout_double, &hv); @@ -332,7 +332,7 @@ static void cb_tab_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { test_t *ctx = caller_data; - printf("Tab switch to %d!\n", ctx->dlg[ctx->wtab].val.int_value); + printf("Tab switch to %d!\n", ctx->dlg[ctx->wtab].val.lng); } static void cb_jump(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) @@ -341,7 +341,7 @@ test_t *ctx = caller_data; printf("Jumping tabs\n"); - val.int_value = 0; + val.lng = 0; pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wtab, &val); } @@ -402,7 +402,7 @@ pcb_hid_attribute_t *treea = &ctx->dlg[ctx->tt]; pcb_hid_tree_t *tree = (pcb_hid_tree_t *)treea->enumerations; - ttbl_filt(&tree->rows, attr->val.int_value); + ttbl_filt(&tree->rows, attr->val.lng); pcb_dad_tree_update_hide(treea); } Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 26937) +++ trunk/src_plugins/export_bboard/bboard.c (revision 26938) @@ -520,7 +520,7 @@ group_data[pcb_layer_get_group(PCB, i)].draw = 1; } - bboard_init_board_cairo(PCB->hidlib.size_x, PCB->hidlib.size_y, bboard_bgcolor, options[HA_antialias].int_value); + bboard_init_board_cairo(PCB->hidlib.size_x, PCB->hidlib.size_y, bboard_bgcolor, options[HA_antialias].lng); TODO("subc: rewrite") #if 0 @@ -556,7 +556,7 @@ else purpi = grp->purpi; - if (bboard_validate_layer(flg, purpi, gid, options[HA_skipsolder].int_value)) { + if (bboard_validate_layer(flg, purpi, gid, options[HA_skipsolder].lng)) { bboard_get_layer_color(&(PCB->Data->Layer[i]), &clr_r, &clr_g, &clr_b); bboard_set_color_cairo(clr_r, clr_g, clr_b); PCB_LINE_LOOP(&(PCB->Data->Layer[i])); Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 26937) +++ trunk/src_plugins/export_dxf/dxf.c (revision 26938) @@ -229,11 +229,11 @@ /* conf_force_set_bool(conf_core.editor.check_planes, 0);*/ conf_force_set_bool(conf_core.editor.show_solder_side, 0); - dxf_ctx.enable_force_thin = options[HA_thin].int_value; - dxf_ctx.poly_fill = options[HA_poly_fill].int_value; - dxf_ctx.poly_contour = options[HA_poly_contour].int_value; - dxf_ctx.drill_fill = options[HA_drill_fill].int_value; - dxf_ctx.drill_contour = options[HA_drill_contour].int_value; + dxf_ctx.enable_force_thin = options[HA_thin].lng; + dxf_ctx.poly_fill = options[HA_poly_fill].lng; + dxf_ctx.poly_contour = options[HA_poly_contour].lng; + dxf_ctx.drill_fill = options[HA_drill_fill].lng; + dxf_ctx.drill_contour = options[HA_drill_contour].lng; pcbhl_expose_main(&dxf_hid, &hectx, NULL); Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 26937) +++ trunk/src_plugins/export_excellon/excellon.c (revision 26938) @@ -254,7 +254,7 @@ if (excellon_cam.active) { fn = excellon_cam.fn; - pcb_drill_export_excellon(PCB, &pdrills, conf_excellon.plugins.export_excellon.plated_g85_slot, options[HA_excellonfile_coordfmt].int_value, fn); + pcb_drill_export_excellon(PCB, &pdrills, conf_excellon.plugins.export_excellon.plated_g85_slot, options[HA_excellonfile_coordfmt].lng, fn); } else { if (options[HA_excellonfile_plated].str_value == NULL) { @@ -263,7 +263,7 @@ } else fn = options[HA_excellonfile_plated].str_value; - pcb_drill_export_excellon(PCB, &pdrills, conf_excellon.plugins.export_excellon.plated_g85_slot, options[HA_excellonfile_coordfmt].int_value, fn); + pcb_drill_export_excellon(PCB, &pdrills, conf_excellon.plugins.export_excellon.plated_g85_slot, options[HA_excellonfile_coordfmt].lng, fn); if (options[HA_excellonfile_unplated].str_value == NULL) { strcpy(filesuff, ".unplated.cnc"); @@ -271,7 +271,7 @@ } else fn = options[HA_excellonfile_unplated].str_value; - pcb_drill_export_excellon(PCB, &udrills, conf_excellon.plugins.export_excellon.unplated_g85_slot, options[HA_excellonfile_coordfmt].int_value, fn); + pcb_drill_export_excellon(PCB, &udrills, conf_excellon.plugins.export_excellon.unplated_g85_slot, options[HA_excellonfile_coordfmt].lng, fn); } if (pcb_cam_end(&excellon_cam) == 0) Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 26937) +++ trunk/src_plugins/export_gcode/gcode.c (revision 26938) @@ -238,12 +238,12 @@ { static int last_unit_value = -1; - if (gcode_attribute_list[HA_unit].default_val.int_value == last_unit_value) { + if (gcode_attribute_list[HA_unit].default_val.lng == last_unit_value) { if (pcbhl_conf.editor.grid_unit) - gcode_attribute_list[HA_unit].default_val.int_value = pcbhl_conf.editor.grid_unit->index; + gcode_attribute_list[HA_unit].default_val.lng = pcbhl_conf.editor.grid_unit->index; else - gcode_attribute_list[HA_unit].default_val.int_value = get_unit_struct("mil")->index; - last_unit_value = gcode_attribute_list[HA_unit].default_val.int_value; + gcode_attribute_list[HA_unit].default_val.lng = get_unit_struct("mil")->index; + last_unit_value = gcode_attribute_list[HA_unit].default_val.lng; } if ((PCB != NULL) && (gcode_attribute_list[HA_basename].default_val.str_value == NULL)) @@ -392,12 +392,12 @@ if (!gcode_basename) { gcode_basename = "pcb-out"; } - gcode_dpi = options[HA_dpi].int_value; + gcode_dpi = options[HA_dpi].lng; if (gcode_dpi < 0) { fprintf(stderr, "ERROR: dpi may not be < 0\n"); return; } - unit = &(pcb_units[options[HA_unit].int_value]); + unit = &(pcb_units[options[HA_unit].lng]); metric = (unit->family == PCB_UNIT_METRIC); scale = metric ? 1.0 / pcb_coord_to_unit(unit, PCB_MM_TO_COORD(1.0)) : 1.0 / pcb_coord_to_unit(unit, PCB_INCH_TO_COORD(1.0)); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 26937) +++ trunk/src_plugins/export_gerber/gerber.c (revision 26938) @@ -537,7 +537,7 @@ } /* set up the coord format */ - i = options[HA_coord_format].int_value; + i = options[HA_coord_format].lng; if ((i < 0) || (i >= NUM_COORD_FORMATS)) { pcb_message(PCB_MSG_ERROR, "Invalid coordinate format (out of bounds)\n"); return; @@ -552,13 +552,13 @@ if (!fnbase) fnbase = "pcb-out"; - verbose = options[HA_verbose].int_value || pcbhl_conf.rc.verbose; - all_layers = options[HA_all_layers].int_value; + verbose = options[HA_verbose].lng || pcbhl_conf.rc.verbose; + all_layers = options[HA_all_layers].lng; - copy_outline_mode = options[HA_copy_outline].int_value; - name_style = options[HA_name_style].int_value; + copy_outline_mode = options[HA_copy_outline].lng; + name_style = options[HA_name_style].lng; - want_cross_sect = options[HA_cross_sect].int_value; + want_cross_sect = options[HA_cross_sect].lng; has_outline = pcb_has_explicit_outline(PCB); Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 26937) +++ trunk/src_plugins/export_openems/excitation.c (revision 26938) @@ -75,7 +75,7 @@ { if (save) { char tmp[128]; - sprintf(tmp, "%d", exc_ctx.dlg[widx].val.int_value); + sprintf(tmp, "%d", exc_ctx.dlg[widx].val.lng); ser_save(tmp, attrkey); } else { @@ -84,14 +84,14 @@ const char *orig = ser_load(attrkey); if (orig != NULL) { - hv.int_value = strtol(orig, &end, 10); + hv.lng = strtol(orig, &end, 10); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "Invalid integer value in board attribute '%s': '%s'\n", attrkey, orig); - hv.int_value = 0; + hv.lng = 0; } } else - hv.int_value = 0; + hv.lng = 0; pcb_gui->attr_dlg_set_value(exc_ctx.dlg_hid_ctx, widx, &hv); } @@ -344,7 +344,7 @@ static void select_update(int setattr) { pcb_hid_attr_val_t hv; - hv.int_value = exc_ctx.selected; + hv.lng = exc_ctx.selected; if ((exc_ctx.selected < 0) || (exc_ctx.selected >= sizeof(excitations)/sizeof(excitations[0]))) { pcb_message(PCB_MSG_ERROR, "Invalid excitation selected\n"); @@ -364,7 +364,7 @@ static void select_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - exc_ctx.selected = attr->val.int_value; + exc_ctx.selected = attr->val.lng; select_update(1); } Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 26937) +++ trunk/src_plugins/export_openems/export_openems.c (revision 26938) @@ -205,7 +205,7 @@ fprintf(ctx->f, "%%%% base_priority and offset: chassis for the board to sit in.\n"); fprintf(ctx->f, "%% base priority: if the board displaces the model of the chassis or the other way around.\n"); - fprintf(ctx->f, "base_priority=%d;\n", ctx->options[HA_base_prio].int_value); + fprintf(ctx->f, "base_priority=%d;\n", ctx->options[HA_base_prio].lng); fprintf(ctx->f, "\n"); fprintf(ctx->f, "%% offset on the whole layout to locate it relative to the simulation origin\n"); pcb_fprintf(ctx->f, "offset.x = %mm;\n", -ctx->ox); @@ -222,7 +222,7 @@ fprintf(ctx->f, "\n"); fprintf(ctx->f, "%% how many points should be used to describe the round end of traces.\n"); - fprintf(ctx->f, "kludge.segments = %d;\n", ctx->options[HA_segments].int_value); + fprintf(ctx->f, "kludge.segments = %d;\n", ctx->options[HA_segments].lng); fprintf(ctx->f, "\n"); fprintf(ctx->f, "\n"); Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 26937) +++ trunk/src_plugins/export_openems/mesh.c (revision 26938) @@ -56,22 +56,22 @@ static void mesh2dlg(void) { int n; - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.pml, int_value, mesh.pml); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.pml, lng, mesh.pml); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, coord_value, PCB_MM_TO_COORD(0.15)); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, coord_value, PCB_MM_TO_COORD(0.5)); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, coord_value, PCB_MM_TO_COORD(0.1)); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smooth, int_value, 1); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.noimpl, int_value, 0); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.hor, int_value, 1); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.ver, int_value, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smooth, lng, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.noimpl, lng, 0); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.hor, lng, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.ver, lng, 1); TODO("enum lookup"); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.subslines, int_value, 3); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.subslines, lng, 3); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_subs_thick, coord_value, PCB_MM_TO_COORD(1.5)); /* PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_copper_thick, coord_value, PCB_MM_TO_COORD(1.5));*/ - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_top, int_value, 1); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_bot, int_value, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_top, lng, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_bot, lng, 1); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, coord_value, PCB_MM_TO_COORD(0.7)); - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smoothz, int_value, 1); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smoothz, lng, 1); PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, coord_value, PCB_MM_TO_COORD(4)); for(n = 0; n < 6; n++) { const char **a; @@ -79,7 +79,7 @@ if (mesh.bnd[n] != NULL) for(i = 0, a = bnds; *a != NULL; a++,i++) if (strcmp(*a, mesh.bnd[n]) == 0) - PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.bnd[n], int_value, i); + PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.bnd[n], lng, i); } } @@ -86,25 +86,25 @@ static void dlg2mesh(void) { int n; - mesh.pml = ia.dlg[ia.pml].val.int_value; + mesh.pml = ia.dlg[ia.pml].val.lng; mesh.dens_obj = ia.dlg[ia.dens_obj].val.coord_value; mesh.dens_gap = ia.dlg[ia.dens_gap].val.coord_value; mesh.min_space = ia.dlg[ia.min_space].val.coord_value; - mesh.smooth = ia.dlg[ia.smooth].val.int_value; - mesh.noimpl = ia.dlg[ia.noimpl].val.int_value; - mesh.hor = ia.dlg[ia.hor].val.int_value; - mesh.ver = ia.dlg[ia.ver].val.int_value; + mesh.smooth = ia.dlg[ia.smooth].val.lng; + mesh.noimpl = ia.dlg[ia.noimpl].val.lng; + mesh.hor = ia.dlg[ia.hor].val.lng; + mesh.ver = ia.dlg[ia.ver].val.lng; TODO("enum lookup"); - mesh.subslines = ia.dlg[ia.subslines].val.int_value; + mesh.subslines = ia.dlg[ia.subslines].val.lng; mesh.def_subs_thick = ia.dlg[ia.def_subs_thick].val.coord_value; mesh.def_copper_thick = ia.dlg[ia.def_copper_thick].val.coord_value; - mesh.air_top = ia.dlg[ia.air_top].val.int_value; - mesh.air_bot = ia.dlg[ia.air_top].val.int_value; + mesh.air_top = ia.dlg[ia.air_top].val.lng; + mesh.air_bot = ia.dlg[ia.air_top].val.lng; mesh.dens_air = ia.dlg[ia.dens_air].val.coord_value; - mesh.smoothz = ia.dlg[ia.smoothz].val.int_value; + mesh.smoothz = ia.dlg[ia.smoothz].val.lng; mesh.max_air = ia.dlg[ia.max_air].val.coord_value; for(n = 0; n < 6; n++) - mesh.bnd[n] = bnds[ia.dlg[ia.bnd[n]].val.int_value]; + mesh.bnd[n] = bnds[ia.dlg[ia.bnd[n]].val.lng]; } #if 1 @@ -117,7 +117,7 @@ static void mesh_auto_add_smooth(vtc0_t *v, pcb_coord_t c1, pcb_coord_t c2, pcb_coord_t d1, pcb_coord_t d, pcb_coord_t d2); #define SAVE_INT(name) \ - pcb_append_printf(dst, "%s " #name" = %d\n", prefix, (int)me->dlg[me->name].val.int_value); + pcb_append_printf(dst, "%s " #name" = %d\n", prefix, (int)me->dlg[me->name].val.lng); #define SAVE_COORD(name) \ pcb_append_printf(dst, "%s " #name" = %.08$$mm\n", prefix, (pcb_coord_t)me->dlg[me->name].val.coord_value); void pcb_mesh_save(const mesh_dlg_t *me, gds_t *dst, const char *prefix) @@ -145,7 +145,7 @@ SAVE_COORD(def_copper_thick); pcb_append_printf(dst, "%s li:boundary = {", prefix); for(n = 0; n < 6; n++) { - int bidx = me->dlg[me->bnd[n]].val.int_value; + int bidx = me->dlg[me->bnd[n]].val.lng; const char *bs; if ((bidx < 0) || (bidx >= sizeof(bnds) / sizeof(bnds[0]))) bs = "invalid"; @@ -157,7 +157,7 @@ gds_append_str(dst, "}\n"); { - int sidx = me->dlg[me->subslines].val.int_value; + int sidx = me->dlg[me->subslines].val.lng; const char *bs; if ((sidx < 0) || (sidx >= sizeof(subslines) / sizeof(subslines[0]))) bs = "invalid"; @@ -186,7 +186,7 @@ pcb_message(PCB_MSG_ERROR, "Invalid mesh integer: " #name "\n"); \ return -1; \ } \ - PCB_DAD_SET_VALUE(me->dlg_hid_ctx, me->name, int_value, v); \ + PCB_DAD_SET_VALUE(me->dlg_hid_ctx, me->name, lng, v); \ } \ } while(0) @@ -229,7 +229,7 @@ pcb_message(PCB_MSG_ERROR, "Invalid mesh value '%s' for " #name "\n", node->data.text.value); \ return -1; \ } \ - PCB_DAD_SET_VALUE(me->dlg_hid_ctx, dst, int_value, __n__); \ + PCB_DAD_SET_VALUE(me->dlg_hid_ctx, dst, lng, __n__); \ } \ } while(0) @@ -612,7 +612,7 @@ vtc0_truncate(&mesh->line[PCB_MESH_Z].result, 0); - lns = num_subslines[ia.dlg[ia.subslines].val.int_value]; + lns = num_subslines[ia.dlg[ia.subslines].val.lng]; if (lns != 0) lns++; for(gid = 0; gid < PCB->LayerGroups.len; gid++) { @@ -652,8 +652,8 @@ } } - if (ia.dlg[ia.air_top].val.int_value) { - if (ia.dlg[ia.smoothz].val.int_value) { + if (ia.dlg[ia.air_top].val.lng) { + if (ia.dlg[ia.smoothz].val.lng) { mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ytop - ia.dlg[ia.max_air].val.coord_value, ytop, ia.dlg[ia.dens_air].val.coord_value, ia.dlg[ia.dens_air].val.coord_value, top_dens); } @@ -663,8 +663,8 @@ } } - if (ia.dlg[ia.air_bot].val.int_value) { - if (ia.dlg[ia.smoothz].val.int_value) { + if (ia.dlg[ia.air_bot].val.lng) { + if (ia.dlg[ia.smoothz].val.lng) { mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ybottom, ybottom + ia.dlg[ia.max_air].val.coord_value, bottom_dens, ia.dlg[ia.dens_air].val.coord_value, ia.dlg[ia.dens_air].val.coord_value); } @@ -1015,9 +1015,9 @@ dlg2mesh(); - if (ia.dlg[ia.hor].val.int_value) + if (ia.dlg[ia.hor].val.lng) mesh_auto(&mesh, PCB_MESH_HORIZONTAL); - if (ia.dlg[ia.ver].val.int_value) + if (ia.dlg[ia.ver].val.lng) mesh_auto(&mesh, PCB_MESH_VERTICAL); mesh_auto_z(&mesh); Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 26937) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 26938) @@ -327,13 +327,13 @@ gds_init(&model_calls); vti0_init(&scad_comp); - if (openscad_attribute_list[HA_models].default_val.int_value) + if (openscad_attribute_list[HA_models].default_val.lng) scad_insert_models(); openscad_hid_export_to_file(f, options); scad_close_layer_group(); - if (openscad_attribute_list[HA_drill].default_val.int_value) + if (openscad_attribute_list[HA_drill].default_val.lng) scad_draw_drills(); scad_draw_finish(); @@ -372,7 +372,7 @@ return 0; if (flags & PCB_LYT_MASK) { - if (!openscad_attribute_list[HA_mask].default_val.int_value) + if (!openscad_attribute_list[HA_mask].default_val.lng) return 0; if (flags & PCB_LYT_TOP) { scad_new_layer_group("top_mask", +2, "0,0.7,0,0.5"); @@ -385,7 +385,7 @@ } if (flags & PCB_LYT_SILK) { - if (!openscad_attribute_list[HA_silk].default_val.int_value) + if (!openscad_attribute_list[HA_silk].default_val.lng) return 0; if (flags & PCB_LYT_TOP) { scad_new_layer_group("top_silk", +3, "0,0,0"); @@ -398,7 +398,7 @@ } if (flags & PCB_LYT_COPPER) { - if (!openscad_attribute_list[HA_copper].default_val.int_value) + if (!openscad_attribute_list[HA_copper].default_val.lng) return 0; if (flags & PCB_LYT_TOP) { scad_new_layer_group("top_copper", +1, "1,0.4,0.2"); Index: trunk/src_plugins/export_openscad/scad_draw.c =================================================================== --- trunk/src_plugins/export_openscad/scad_draw.c (revision 26937) +++ trunk/src_plugins/export_openscad/scad_draw.c (revision 26938) @@ -158,7 +158,7 @@ fprintf(f, " union() {\n"); fprintf(f, " difference() {\n"); fprintf(f, " pcb_board_main();\n"); - if (openscad_attribute_list[HA_drill].default_val.int_value) + if (openscad_attribute_list[HA_drill].default_val.lng) fprintf(f, " pcb_drill();\n"); fprintf(f, " }\n"); fprintf(f, " }\n"); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 26937) +++ trunk/src_plugins/export_png/png.c (revision 26938) @@ -455,7 +455,7 @@ const char *result = NULL; const char *fmt; - fmt = filetypes[png_attribute_list[HA_filetype].default_val.int_value]; + fmt = filetypes[png_attribute_list[HA_filetype].default_val.lng]; if (fmt == NULL) { /* Do nothing */ } else if (strcmp(fmt, FMT_gif) == 0) @@ -736,7 +736,7 @@ rgb(&cop, 220, 145, 230); else { - if (png_options[HA_photo_plating].int_value == PLATING_GOLD) { + if (png_options[HA_photo_plating].lng == PLATING_GOLD) { /* ENIG */ rgb(&cop, 185, 146, 52); @@ -744,7 +744,7 @@ if (cc == TOP_SHADOW) blend(&cop, 0.7, &cop, &white); } - else if (png_options[HA_photo_plating].int_value == PLATING_TIN) { + else if (png_options[HA_photo_plating].lng == PLATING_TIN) { /* tinned */ rgb(&cop, 140, 150, 160); @@ -754,7 +754,7 @@ cop.g += r; cop.b += r; } - else if (png_options[HA_photo_plating].int_value == PLATING_SILVER) { + else if (png_options[HA_photo_plating].lng == PLATING_SILVER) { /* silver */ rgb(&cop, 192, 192, 185); @@ -762,7 +762,7 @@ if (cc == TOP_SHADOW) blend(&cop, 0.7, &cop, &white); } - else if (png_options[HA_photo_plating].int_value == PLATING_COPPER) { + else if (png_options[HA_photo_plating].lng == PLATING_COPPER) { /* copper */ rgb(&cop, 184, 115, 51); @@ -794,7 +794,7 @@ transparent = 1; } else if (silk) { - silk_colour = silk_colours[png_options[HA_photo_silk_colour].int_value]; + silk_colour = silk_colours[png_options[HA_photo_silk_colour].lng]; blend(&p, 1.0, &silk_colour, &silk_colour); if (silk == TOP_SHADOW) @@ -804,7 +804,7 @@ } else if (mask) { p = cop; - mask_colour = mask_colours[png_options[HA_photo_mask_colour].int_value]; + mask_colour = mask_colours[png_options[HA_photo_mask_colour].lng]; multiply(&p, &p, &mask_colour); add(&p, 1, &p, 0.2, &mask_colour); if (mask == TOP_SHADOW) @@ -815,7 +815,7 @@ else p = cop; - if (png_options[HA_use_alpha].int_value) { + if (png_options[HA_use_alpha].lng) { cc = (transparent) ? gdImageColorResolveAlpha(im, 0, 0, 0, 127) : gdImageColorResolveAlpha(im, p.r, p.g, p.b, 0); @@ -835,7 +835,7 @@ } /* actually write out the image */ - fmt = filetypes[png_options[HA_filetype].int_value]; + fmt = filetypes[png_options[HA_filetype].lng]; if (fmt == NULL) format_error = pcb_true; @@ -879,7 +879,7 @@ region.Y2 = PCB->hidlib.size_y; png_options = options; - if (options[HA_only_visible].int_value) + if (options[HA_only_visible].lng) bounds = pcb_data_bbox(&tmp, PCB->Data, pcb_false); else bounds = ®ion; @@ -886,8 +886,8 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); - as_shown = options[HA_as_shown].int_value; - if (!options[HA_as_shown].int_value) { + as_shown = options[HA_as_shown].lng; + if (!options[HA_as_shown].lng) { conf_force_set_bool(conf_core.editor.thin_draw, 0); conf_force_set_bool(conf_core.editor.thin_draw_poly, 0); /* conf_force_set_bool(conf_core.editor.check_planes, 0);*/ @@ -933,7 +933,7 @@ } } - in_mono = options[HA_mono].int_value; + in_mono = options[HA_mono].lng; png_head(); if (!photo_mode && conf_core.editor.show_solder_side) { @@ -1001,16 +1001,16 @@ pcb_cam_begin(PCB, &png_cam, options[HA_cam].str_value, png_attribute_list, NUM_OPTIONS, options); - if (options[HA_photo_mode].int_value) { + if (options[HA_photo_mode].lng) { photo_mode = 1; - options[HA_mono].int_value = 1; - options[HA_as_shown].int_value = 0; + options[HA_mono].lng = 1; + options[HA_as_shown].lng = 0; memset(photo_copper, 0, sizeof(photo_copper)); photo_silk = photo_mask = photo_drill = 0; photo_outline = 0; - if (options[HA_photo_flip_x].int_value) + if (options[HA_photo_flip_x].lng) photo_flip = PHOTO_FLIP_X; - else if (options[HA_photo_flip_y].int_value) + else if (options[HA_photo_flip_y].lng) photo_flip = PHOTO_FLIP_Y; else photo_flip = 0; @@ -1023,7 +1023,7 @@ filename = "pcb-out.png"; /* figure out width and height of the board */ - if (options[HA_only_visible].int_value) { + if (options[HA_only_visible].lng) { bbox = pcb_data_bbox(&tmp, PCB->Data, pcb_false); x_shift = bbox->X1; y_shift = bbox->Y1; @@ -1042,8 +1042,8 @@ * fit in our specified PNG file size */ xmax = ymax = dpi = 0; - if (options[HA_dpi].int_value != 0) { - dpi = options[HA_dpi].int_value; + if (options[HA_dpi].lng != 0) { + dpi = options[HA_dpi].lng; if (dpi < 0) { fprintf(stderr, "ERROR: dpi may not be < 0\n"); return; @@ -1050,22 +1050,22 @@ } } - if (options[HA_xmax].int_value > 0) { - xmax = options[HA_xmax].int_value; + if (options[HA_xmax].lng > 0) { + xmax = options[HA_xmax].lng; dpi = 0; } - if (options[HA_ymax].int_value > 0) { - ymax = options[HA_ymax].int_value; + if (options[HA_ymax].lng > 0) { + ymax = options[HA_ymax].lng; dpi = 0; } - if (options[HA_xymax].int_value > 0) { + if (options[HA_xymax].lng > 0) { dpi = 0; - if (options[HA_xymax].int_value < xmax || xmax == 0) - xmax = options[HA_xymax].int_value; - if (options[HA_xymax].int_value < ymax || ymax == 0) - ymax = options[HA_xymax].int_value; + if (options[HA_xymax].lng < xmax || xmax == 0) + xmax = options[HA_xymax].lng; + if (options[HA_xymax].lng < ymax || ymax == 0) + ymax = options[HA_xymax].lng; } if (xmax < 0 || ymax < 0) { @@ -1121,7 +1121,7 @@ white = (color_struct *) malloc(sizeof(color_struct)); white->r = white->g = white->b = 255; - if (options[HA_use_alpha].int_value) + if (options[HA_use_alpha].lng) white->a = 127; else white->a = 0; @@ -1152,12 +1152,12 @@ png_hid.force_compositing = !!photo_mode; - if ((!png_cam.active) && (!options[HA_as_shown].int_value)) + if ((!png_cam.active) && (!options[HA_as_shown].lng)) pcb_hid_save_and_show_layer_ons(save_ons); png_hid_export_to_file(f, options); - if ((!png_cam.active) && (!options[HA_as_shown].int_value)) + if ((!png_cam.active) && (!options[HA_as_shown].lng)) pcb_hid_restore_layer_ons(save_ons); png_foot(); Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 26937) +++ trunk/src_plugins/export_ps/eps.c (revision 26938) @@ -186,7 +186,7 @@ fprintf(f, "1 dup neg scale\n"); fprintf(f, "%g dup scale\n", options_[HA_scale].real_value); pcb_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2); - if (options_[HA_as_shown].int_value && conf_core.editor.show_solder_side) + if (options_[HA_as_shown].lng && conf_core.editor.show_solder_side) pcb_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2); #define Q (pcb_coord_t) PCB_MIL_TO_COORD(10) @@ -235,7 +235,7 @@ region.X2 = PCB->hidlib.size_x; region.Y2 = PCB->hidlib.size_y; - if (options[HA_only_visible].int_value) + if (options[HA_only_visible].lng) bounds = pcb_data_bbox(&tmp, PCB->Data, pcb_false); else bounds = ®ion; @@ -284,8 +284,8 @@ } memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); - as_shown = options[HA_as_shown].int_value; - if (!options[HA_as_shown].int_value) { + as_shown = options[HA_as_shown].lng; + if (!options[HA_as_shown].lng) { qsort(pcb_layer_stack, pcb_max_layer, sizeof(pcb_layer_stack[0]), layer_sort); } linewidth = -1; @@ -292,7 +292,7 @@ lastcap = -1; lastcolor = -1; - in_mono = options[HA_mono].int_value; + in_mono = options[HA_mono].lng; if (f != NULL) eps_print_header(f, pcb_hid_export_fn(filename)); @@ -342,10 +342,10 @@ else f = NULL; - if ((!eps_cam.active) && (!options[HA_as_shown].int_value)) + if ((!eps_cam.active) && (!options[HA_as_shown].lng)) pcb_hid_save_and_show_layer_ons(save_ons); eps_hid_export_to_file(f, options); - if ((!eps_cam.active) && (!options[HA_as_shown].int_value)) + if ((!eps_cam.active) && (!options[HA_as_shown].lng)) pcb_hid_restore_layer_ons(save_ons); fclose(f); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 26937) +++ trunk/src_plugins/export_ps/ps.c (revision 26938) @@ -529,17 +529,17 @@ conf_force_set_bool(conf_core.editor.check_planes, 0); global.f = the_file; - global.drill_helper = options[HA_drillhelper].int_value; + global.drill_helper = options[HA_drillhelper].lng; global.drill_helper_size = options[HA_drillhelpersize].coord_value; - global.align_marks = options[HA_alignmarks].int_value; - global.outline = options[HA_outline].int_value; - global.mirror = options[HA_mirror].int_value; - global.fillpage = options[HA_fillpage].int_value; - global.automirror = options[HA_automirror].int_value; - global.incolor = options[HA_color].int_value; - global.invert = options[HA_psinvert].int_value; + global.align_marks = options[HA_alignmarks].lng; + global.outline = options[HA_outline].lng; + global.mirror = options[HA_mirror].lng; + global.fillpage = options[HA_fillpage].lng; + global.automirror = options[HA_automirror].lng; + global.incolor = options[HA_color].lng; + global.invert = options[HA_psinvert].lng; global.fade_ratio = PCB_CLAMP(options[HA_psfade].real_value, 0, 1); - global.media_idx = options[HA_media].int_value; + global.media_idx = options[HA_media].lng; global.media_width = pcb_media_data[global.media_idx].width; global.media_height = pcb_media_data[global.media_idx].height; global.ps_width = global.media_width - 2.0 * pcb_media_data[global.media_idx].margin_x; @@ -547,9 +547,9 @@ global.scale_factor = options[HA_scale].real_value; global.calibration_x = options[HA_xcalib].real_value; global.calibration_y = options[HA_ycalib].real_value; - global.drillcopper = options[HA_drillcopper].int_value; - global.legend = options[HA_legend].int_value; - global.single_page = options[HA_single_page].int_value; + global.drillcopper = options[HA_drillcopper].lng; + global.legend = options[HA_legend].lng; + global.single_page = options[HA_single_page].lng; if (the_file) ps_start_file(the_file); @@ -581,7 +581,7 @@ global.exps.view.X2 = PCB->hidlib.size_x; global.exps.view.Y2 = PCB->hidlib.size_y; - if ((!global.multi_file && !global.multi_file_cam) && (options[HA_toc].int_value)) { + if ((!global.multi_file && !global.multi_file_cam) && (options[HA_toc].lng)) { /* %%Page DSC requires both a label and an ordinal */ fprintf(the_file, "%%%%Page: TableOfContents 1\n"); fprintf(the_file, "/Times-Roman findfont 24 scalefont setfont\n"); @@ -627,11 +627,11 @@ /* cam mode shall result in a single file, no matter what other attributes say */ if (ps_cam.active) { - global.multi_file = options[HA_multifile].int_value; + global.multi_file = options[HA_multifile].lng; global.multi_file_cam = (ps_cam.fn_template != NULL); /* template means multiple files potentially */ } else { - global.multi_file = options[HA_multifile].int_value; + global.multi_file = options[HA_multifile].lng; global.multi_file_cam = 0; } Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 26937) +++ trunk/src_plugins/export_stat/stat.c (revision 26938) @@ -165,9 +165,9 @@ fprintf(f, "ha:pcb-rnd-board-stats-v2 {\n"); fprintf(f, " ha:meta {\n"); fprintf(f, " date={%s}\n", buff); - fprintf(f, " built=%d\n", options[HA_built].int_value); - fprintf(f, " lht_built=%s\n", (options[HA_lht_built].int_value ? "yes" : "no")); - fprintf(f, " orig_rnd=%s\n", (options[HA_orig].int_value ? "yes" : "no")); + fprintf(f, " built=%d\n", options[HA_built].lng); + fprintf(f, " lht_built=%s\n", (options[HA_lht_built].lng ? "yes" : "no")); + fprintf(f, " orig_rnd=%s\n", (options[HA_orig].lng ? "yes" : "no")); fprintf(f, " first_ver=%s\n", options[HA_first_ver].str_value); fprintf(f, " curr_ver=%s\n", PCB_VERSION); #ifdef PCB_REVISION Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 26937) +++ trunk/src_plugins/export_svg/svg.c (revision 26938) @@ -231,13 +231,13 @@ /* conf_force_set_bool(conf_core.editor.check_planes, 0);*/ conf_force_set_bool(conf_core.editor.show_solder_side, 0); - if (options[HA_photo_mode].int_value) { + if (options[HA_photo_mode].lng) { photo_mode = 1; } else photo_mode = 0; - if (options[HA_flip].int_value) { + if (options[HA_flip].lng) { flip = 1; conf_force_set_bool(conf_core.editor.show_solder_side, 1); } @@ -250,13 +250,13 @@ 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y, board_color); } - opacity = options[HA_opacity].int_value; + opacity = options[HA_opacity].lng; gds_init(&sbright); gds_init(&sdark); gds_init(&snormal); - if (options[HA_as_shown].int_value) { + if (options[HA_as_shown].lng) { /* disable (exporter default) hiding overlay in as_shown */ memset(&xform_tmp, 0, sizeof(xform_tmp)); xform = &xform_tmp; Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 26937) +++ trunk/src_plugins/export_xy/xy.c (revision 26938) @@ -134,12 +134,12 @@ xy_options[HA_format].enumerations = (const char **)fmt_names.array; /* set default unit and filename */ - if (xy_options[HA_unit].default_val.int_value == last_unit_value) { + if (xy_options[HA_unit].default_val.lng == last_unit_value) { if (pcbhl_conf.editor.grid_unit) - xy_options[HA_unit].default_val.int_value = pcbhl_conf.editor.grid_unit->index; + xy_options[HA_unit].default_val.lng = pcbhl_conf.editor.grid_unit->index; else - xy_options[HA_unit].default_val.int_value = get_unit_struct("mil")->index; - last_unit_value = xy_options[HA_unit].default_val.int_value; + xy_options[HA_unit].default_val.lng = get_unit_struct("mil")->index; + last_unit_value = xy_options[HA_unit].default_val.lng; } if ((PCB != NULL) && (xy_options[HA_xyfile].default_val.str_value == NULL)) pcb_derive_default_filename(PCB->hidlib.filename, &xy_options[HA_xyfile], ".xy"); @@ -804,12 +804,12 @@ if (!xy_filename) xy_filename = "pcb-out.xy"; - if (options[HA_unit].int_value == -1) + if (options[HA_unit].lng == -1) xy_unit = get_unit_struct("mil"); else - xy_unit = &pcb_units[options[HA_unit].int_value]; + xy_unit = &pcb_units[options[HA_unit].lng]; - tid = vts0_get(&fmt_ids, options[HA_format].int_value, 0); + tid = vts0_get(&fmt_ids, options[HA_format].lng, 0); if ((tid == NULL) || (*tid == NULL)) { pcb_message(PCB_MSG_ERROR, "export_xy: invalid template selected\n"); return; Index: trunk/src_plugins/extedit/extedit_dad.c =================================================================== --- trunk/src_plugins/extedit/extedit_dad.c (revision 26937) +++ trunk/src_plugins/extedit/extedit_dad.c (revision 26938) @@ -40,8 +40,8 @@ static void ee_data2dialog(ee_t *ee) { - PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wmethod, int_value, ee->mthi); - PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wfmt, int_value, methods[ee->mthi].fmt); + PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wmethod, lng, ee->mthi); + PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wfmt, lng, methods[ee->mthi].fmt); PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str_value, pcb_strdup(methods[ee->mthi].command)); /* we have only one format, so disable the combo box for selecting it */ @@ -56,7 +56,7 @@ if (lock) return; - ee->mthi = ee->dlg[ee->wmethod].val.int_value; + ee->mthi = ee->dlg[ee->wmethod].val.lng; lock = 1; ee_data2dialog(ee); Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 26937) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 26938) @@ -200,7 +200,7 @@ { switch(ctx->attrs[widx].type) { case PCB_HATT_BOOL: - ctx->attrs[widx].val.int_value = XmToggleButtonGetState(ctx->wl[widx]); + ctx->attrs[widx].val.lng = XmToggleButtonGetState(ctx->wl[widx]); break; case PCB_HATT_STRING: free((char *)ctx->attrs[widx].val.str_value); @@ -222,7 +222,7 @@ stdarg_n = 0; stdarg(XmNuserData, &uptr); XtGetValues(btn, stdarg_args, stdarg_n); - ctx->attrs[widx].val.int_value = uptr - ctx->attrs[widx].enumerations; + ctx->attrs[widx].val.lng = uptr - ctx->attrs[widx].enumerations; } break; default: @@ -410,7 +410,7 @@ break; case PCB_HATT_BOOL: stdarg(XmNlabelString, empty); - stdarg(XmNset, ctx->results[i].int_value); + stdarg(XmNset, ctx->results[i].lng); ctx->wl[i] = XmCreateToggleButton(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n); XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]); break; @@ -461,7 +461,7 @@ btn = XmCreatePushButton(submenu, XmStrCast("menubutton"), stdarg_args, stdarg_n); XtManageChild(btn); XmStringFree(label); - if (sn == ctx->attrs[i].val.int_value) + if (sn == ctx->attrs[i].val.lng) default_button = btn; XtAddCallback(btn, XmNactivateCallback, valchg, ctx->wl[i]); (ctx->btn[i])[sn] = btn; @@ -515,7 +515,7 @@ } break; case PCB_HATT_BEGIN_TABBED: - ltf_tabbed_set(ctx->wl[idx], val->int_value); + ltf_tabbed_set(ctx->wl[idx], val->lng); break; case PCB_HATT_BEGIN_HPANE: case PCB_HATT_BEGIN_VPANE: @@ -528,7 +528,7 @@ XtVaSetValues(ctx->wl[idx], XmNlabelString, XmStringCreatePCB(val->str_value), NULL); break; case PCB_HATT_BOOL: - XtVaSetValues(ctx->wl[idx], XmNset, val->int_value, NULL); + XtVaSetValues(ctx->wl[idx], XmNset, val->lng, NULL); break; case PCB_HATT_STRING: XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(val->str_value), NULL); @@ -556,7 +556,7 @@ break; case PCB_HATT_ENUM: for (n = 0; ctx->attrs[idx].enumerations[n]; n++) { - if (n == val->int_value) { + if (n == val->lng) { stdarg_n = 0; stdarg(XmNmenuHistory, (ctx->btn[idx])[n]); XtSetValues(ctx->wl[idx], stdarg_args, stdarg_n); Index: trunk/src_plugins/hid_lesstif/dlg_attr_box.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_box.c (revision 26937) +++ trunk/src_plugins/hid_lesstif/dlg_attr_box.c (revision 26938) @@ -234,7 +234,7 @@ tctx->at = -1; /* make sure one of the pages is shown */ - if (ltf_tabbed_set_(tctx, ctx->attrs[i].val.int_value) != 0) + if (ltf_tabbed_set_(tctx, ctx->attrs[i].val.lng) != 0) ltf_tabbed_set_(tctx, 0); return res; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 26937) +++ trunk/src_plugins/hid_lesstif/main.c (revision 26938) @@ -1716,7 +1716,7 @@ r->resource_type = XtRInt; r->default_type = XtRInt; r->resource_size = sizeof(int); - r->default_addr = &(a->default_val.int_value); + r->default_addr = &(a->default_val.lng); rcount++; break; case PCB_HATT_COORD: @@ -1744,7 +1744,7 @@ r->resource_type = XtRBoolean; r->default_type = XtRInt; r->resource_size = sizeof(int); - r->default_addr = &(a->default_val.int_value); + r->default_addr = &(a->default_val.lng); rcount++; break; default: @@ -1797,7 +1797,7 @@ if (a->value) *(int *) a->value = v->i; else - a->default_val.int_value = v->i; + a->default_val.lng = v->i; rcount++; break; case PCB_HATT_COORD: @@ -1811,7 +1811,7 @@ if (a->value) *(char *) a->value = v->i; else - a->default_val.int_value = v->i; + a->default_val.lng = v->i; rcount++; break; case PCB_HATT_REAL: Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 26937) +++ trunk/src_plugins/io_lihata/write.c (revision 26938) @@ -1767,9 +1767,9 @@ io_lihata_save_t *save = plg_ctx; if (apply) { - int omit_font = !!sub->dlg[save->womit_font].val.int_value; - int omit_config = !!sub->dlg[save->womit_config].val.int_value; - int omit_styles = !!sub->dlg[save->womit_styles].val.int_value; + int omit_font = !!sub->dlg[save->womit_font].val.lng; + int omit_config = !!sub->dlg[save->womit_config].val.lng; + int omit_styles = !!sub->dlg[save->womit_styles].val.lng; if (omit_font != !!conf_io_lihata.plugins.io_lihata.omit_font) conf_setf(CFR_CLI, "plugins/io_lihata/omit_font", 0, "%d", omit_font); Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 26937) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 26938) @@ -94,7 +94,7 @@ if (ctx->inhibit_valchg) return; - dst->val.int_value = gtk_toggle_button_get_active(button); + dst->val.lng = gtk_toggle_button_get_active(button); change_cb(ctx, dst); } @@ -125,7 +125,7 @@ if (ctx->inhibit_valchg) return; - dst->val.int_value = gtk_combo_box_get_active(combo_box); + dst->val.lng = gtk_combo_box_get_active(combo_box); change_cb(ctx, dst); } @@ -140,7 +140,7 @@ /* Gets the index (starting from 0) of the current page in the notebook. If the notebook has no pages, then -1 will be returned and no call-back occur. */ if (gtk_notebook_get_current_page(nb) >= 0) { - dst->val.int_value = page_num; + dst->val.lng = page_num; change_cb(ctx, dst); } } @@ -439,7 +439,7 @@ case PCB_HATT_BOOL: /* put this in a check button */ - widget = chk_btn_new(parent, ctx->attrs[j].val.int_value, set_flag_cb, &(ctx->attrs[j]), NULL); + widget = chk_btn_new(parent, ctx->attrs[j].val.lng, set_flag_cb, &(ctx->attrs[j]), NULL); gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text); g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx); ctx->wl[j] = widget; @@ -464,7 +464,7 @@ gtkc_combo_box_text_append_text(combo, ctx->attrs[j].enumerations[i]); i++; } - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), ctx->attrs[j].val.int_value); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), ctx->attrs[j].val.lng); g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(enum_changed_cb), &(ctx->attrs[j])); break; @@ -618,9 +618,9 @@ case PCB_HATT_BOOL: { int chk = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ctx->wl[idx])); - if (chk == val->int_value) + if (chk == val->lng) goto nochg; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ctx->wl[idx]), val->int_value); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ctx->wl[idx]), val->lng); } break; @@ -627,9 +627,9 @@ case PCB_HATT_ENUM: { int en = gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->wl[idx])); - if (en == val->int_value) + if (en == val->lng) goto nochg; - gtk_combo_box_set_active(GTK_COMBO_BOX(ctx->wl[idx]), val->int_value); + gtk_combo_box_set_active(GTK_COMBO_BOX(ctx->wl[idx]), val->lng); } break; @@ -647,7 +647,7 @@ break; case PCB_HATT_BEGIN_TABBED: - gtk_notebook_set_current_page(GTK_NOTEBOOK(ctx->wl[idx]), val->int_value); + gtk_notebook_set_current_page(GTK_NOTEBOOK(ctx->wl[idx]), val->lng); break; } Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 26937) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 26938) @@ -467,7 +467,7 @@ break; case PCB_HATT_INTEGER: PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); - PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, int_value, i); + PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, lng, i); break; case PCB_HATT_STRING: case PCB_HATT_LABEL: @@ -512,7 +512,7 @@ case PCB_HATT_INTEGER: case PCB_HATT_ENUM: res->type = FGW_INT; - res->val.nat_int = dad->dlg[wid].val.int_value; + res->val.nat_int = dad->dlg[wid].val.lng; break; case PCB_HATT_STRING: case PCB_HATT_LABEL: Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 26937) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 26938) @@ -143,7 +143,7 @@ pcb_hid_attr_val_t val; clrpick_t *ctx = caller_data; - pcb_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.int_value), clamp(ctx->dlg[ctx->wg].val.int_value), clamp(ctx->dlg[ctx->wb].val.int_value), 255); + pcb_color_load_int(&ctx->clr, clamp(ctx->dlg[ctx->wr].val.lng), clamp(ctx->dlg[ctx->wg].val.lng), clamp(ctx->dlg[ctx->wb].val.lng), 255); val.clr_value = ctx->clr; pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wclr, &val); } @@ -189,11 +189,11 @@ PCB_DAD_NEW("fallback_color_pick", ctx.dlg, "Change color", &ctx, pcb_true, NULL); - val.int_value = ctx.clr.r; + val.lng = ctx.clr.r; pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wr, &val); - val.int_value = ctx.clr.g; + val.lng = ctx.clr.g; pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wg, &val); - val.int_value = ctx.clr.b; + val.lng = ctx.clr.b; pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wb, &val); val.clr_value = ctx.clr; pcb_gui->attr_dlg_set_value(ctx.dlg_hid_ctx, ctx.wclr, &val); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 26937) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 26938) @@ -123,7 +123,7 @@ pcb_hid_attribute_t *atxt = &log_ctx.dlg[log_ctx.wtxt]; pcb_hid_text_t *txt = (pcb_hid_text_t *)atxt->enumerations; - if ((log_ctx.dlg[log_ctx.wscroll].val.int_value) && (txt->hid_scroll_to_bottom != NULL)) + 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); } @@ -170,7 +170,7 @@ pcb_hid_text_t *txt = (pcb_hid_text_t *)atxt->enumerations; txt->hid_set_readonly(atxt, ctx->dlg_hid_ctx, 1); } - hv.int_value = 1; + hv.lng = 1; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wscroll, &hv); log_import(ctx); maybe_scroll_to_bottom(); Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 26937) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 26938) @@ -86,7 +86,7 @@ pcb_hid_attr_val_t hv; for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) { - hv.int_value = (n == target); + hv.lng = (n == target); pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); } rstdlg_pcb2dlg(target); @@ -105,8 +105,8 @@ for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) { pcb_hid_attr_val_t hv; - hv.int_value = (n == target); - if (rst.sub.dlg[rst.wlab[n]].val.int_value != hv.int_value) + hv.lng = (n == target); + if (rst.sub.dlg[rst.wlab[n]].val.lng != hv.lng) pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv); hv.str_value = PCB->RouteStyle.array[n].name; Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 26937) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 26938) @@ -409,13 +409,13 @@ } *period = dlg[wspc].val.coord_value; - if (dlg[wcont].val.int_value) *want_contour = 1; + if (dlg[wcont].val.lng) *want_contour = 1; *dir = 0; - if (dlg[whor].val.int_value) *dir |= PCB_CPOLY_HATCH_HORIZONTAL; - if (dlg[wver].val.int_value) *dir |= PCB_CPOLY_HATCH_VERTICAL; + if (dlg[whor].val.lng) *dir |= PCB_CPOLY_HATCH_HORIZONTAL; + if (dlg[wver].val.lng) *dir |= PCB_CPOLY_HATCH_VERTICAL; - *flg = pcb_flag_make(dlg[wclr].val.int_value ? PCB_FLAG_CLEARLINE : 0); + *flg = pcb_flag_make(dlg[wclr].val.lng ? PCB_FLAG_CLEARLINE : 0); PCB_DAD_FREE(dlg); return 0; Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 26937) +++ trunk/src_plugins/propedit/propdlg.c (revision 26938) @@ -214,7 +214,7 @@ case PCB_PROPT_ANGLE: case PCB_PROPT_INT: case PCB_PROPT_BOOL: - if (!ctx->dlg[ctx->wabs[p->type]].val.int_value) + if (!ctx->dlg[ctx->wabs[p->type]].val.lng) return; default: break; } @@ -226,7 +226,7 @@ case PCB_PROPT_COORD: hv.coord_value = pv->coord; break; case PCB_PROPT_ANGLE: hv.real_value = pv->angle; break; case PCB_PROPT_BOOL: - case PCB_PROPT_INT: hv.int_value = pv->i; break; + case PCB_PROPT_INT: hv.lng = pv->i; break; case PCB_PROPT_COLOR: hv.clr_value = pv->clr; break; case PCB_PROPT_invalid: case PCB_PROPT_max: return; @@ -258,7 +258,7 @@ pcb_dad_tree_clear(tree); if (p == NULL) { /* deselect or not found */ - hv.int_value = 0; + hv.lng = 0; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); return; } @@ -279,7 +279,7 @@ r->user_data = pvs[n].val; } - hv.int_value = p->type; + hv.lng = p->type; pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wtype, &hv); prop_valedit_update(ctx, p, pvs[0].val); @@ -323,22 +323,22 @@ break; case PCB_PROPT_COORD: sctx.c = ctx->dlg[ctx->wedit[p->type]].val.coord_value; - sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.int_value; + sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.lng; sctx.c_valid = 1; break; case PCB_PROPT_ANGLE: sctx.d = ctx->dlg[ctx->wedit[p->type]].val.real_value; - sctx.d_absolute = ctx->dlg[ctx->wabs[p->type]].val.int_value; + sctx.d_absolute = ctx->dlg[ctx->wabs[p->type]].val.lng; sctx.d_valid = 1; break; case PCB_PROPT_INT: - sctx.c = ctx->dlg[ctx->wedit[p->type]].val.int_value; - sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.int_value; + sctx.c = ctx->dlg[ctx->wedit[p->type]].val.lng; + sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.lng; sctx.c_valid = 1; break; case PCB_PROPT_BOOL: - sctx.c = ctx->dlg[ctx->wedit[p->type]].val.int_value; - sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.int_value; + sctx.c = ctx->dlg[ctx->wedit[p->type]].val.lng; + sctx.c_absolute = ctx->dlg[ctx->wabs[p->type]].val.lng; sctx.c_valid = 1; break; case PCB_PROPT_COLOR: @@ -618,7 +618,7 @@ gdl_append(&propdlgs, ctx, link); /* default all abs */ - hv.int_value = 1; + hv.lng = 1; for(n = 0; n < PCB_PROPT_max; n++) pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wabs[n], &hv); } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 26937) +++ trunk/src_plugins/script/live_script.c (revision 26938) @@ -277,7 +277,7 @@ free(src); fclose(f); - lang = lvs->lang_engines[lvs->dlg[lvs->wlang].val.int_value]; + lang = lvs->lang_engines[lvs->dlg[lvs->wlang].val.lng]; live_stop(lvs); @@ -292,7 +292,7 @@ pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wrun, 0); pcb_gui->attr_dlg_widget_state(lvs->dlg_hid_ctx, lvs->wstop, 1); - if (!lvs->dlg[lvs->wpers].val.int_value) + if (!lvs->dlg[lvs->wpers].val.lng) live_stop(lvs); if ((pcb_num_undo() != numu) && (lvs->undo_pre == pcb_undo_serial())) Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 26937) +++ trunk/src_plugins/shape/shape_dialog.c (revision 26938) @@ -48,7 +48,7 @@ ctx_t *shp = caller_data; /* elliptical logics */ - if (!shp->dlg[shp->pell].val.int_value) { + if (!shp->dlg[shp->pell].val.lng) { pcb_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->pry, coord_value, shp->dlg[shp->prx].val.coord_value); } @@ -57,7 +57,7 @@ del_obj(shp); shp->obj = (pcb_any_obj_t *)regpoly_place( - shp->data, shp->layer, shp->dlg[shp->corners].val.int_value, + shp->data, shp->layer, shp->dlg[shp->corners].val.lng, shp->dlg[shp->prx].val.coord_value, shp->dlg[shp->pry].val.coord_value, shp->dlg[shp->prot].val.real_value, shp->dlg[shp->pcx].val.coord_value, shp->dlg[shp->pcy].val.coord_value); @@ -70,7 +70,7 @@ int n; /* elliptical logics */ - if (!shp->dlg[shp->rell].val.int_value) { + if (!shp->dlg[shp->rell].val.lng) { pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->ry, coord_value, shp->dlg[shp->rx].val.coord_value); } @@ -78,7 +78,7 @@ pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_true); /* rectangular logics */ - if (!shp->dlg[shp->rrect].val.int_value) { + if (!shp->dlg[shp->rrect].val.lng) { pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_false); PCB_DAD_SET_VALUE(hid_ctx, shp->h, coord_value, shp->dlg[shp->w].val.coord_value); } @@ -86,7 +86,7 @@ pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_true); for(n = 0; n < 4; n++) - corner[n] = shp->dlg[shp->corner[n]].val.int_value; + corner[n] = shp->dlg[shp->corner[n]].val.lng; del_obj(shp); shp->obj = (pcb_any_obj_t *)roundrect_place( @@ -124,7 +124,7 @@ return; hid_ctx = shape_active->dlg_hid_ctx; - tab = shape_active->dlg[shape_active->tab].val.int_value; + tab = shape_active->dlg[shape_active->tab].val.lng; switch(tab) { case 0: shp_chg_regpoly(hid_ctx, shape_active, NULL); break; case 1: shp_chg_roundrect(hid_ctx, shape_active, NULL); break;