Index: trunk/doc/developer/dad/TEMPLATE.c =================================================================== --- trunk/doc/developer/dad/TEMPLATE.c (revision 30981) +++ trunk/doc/developer/dad/TEMPLATE.c (revision 30982) @@ -75,7 +75,7 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(foo_ctx.dlg); - PCB_DAD_COMPFLAG(foo_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(foo_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(foo_ctx.dlg, "foo"); PCB_DAD_BUTTON_CLOSES(foo_ctx.dlg, clbtn); PCB_DAD_END(foo_ctx.dlg); Index: trunk/doc/developer/dad/TEMPLATE_MODAL.c =================================================================== --- trunk/doc/developer/dad/TEMPLATE_MODAL.c (revision 30981) +++ trunk/doc/developer/dad/TEMPLATE_MODAL.c (revision 30982) @@ -56,7 +56,7 @@ PCB_DAD_DECL(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, "foo"); PCB_DAD_BUTTON_CLOSES(dlg, clbtn); PCB_DAD_END(dlg); Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30981) +++ trunk/src/brave.c (revision 30982) @@ -198,7 +198,7 @@ PCB_DAD_DECL(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, "Experimental features for the brave"); PCB_DAD_BEGIN_TABLE(dlg, 3); @@ -214,7 +214,7 @@ } PCB_DAD_END(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_END(dlg); PCB_DAD_BEGIN_HBOX(dlg); if (len != 0) { Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30981) +++ trunk/src/buffer.c (revision 30982) @@ -519,9 +519,9 @@ memset(&ctx, 0, sizeof(ctx)); PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(ctx.dlg, 2); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx.dlg, "scale X"); PCB_DAD_REAL(ctx.dlg, ""); Index: trunk/src/extobj_act.c =================================================================== --- trunk/src/extobj_act.c (revision 30981) +++ trunk/src/extobj_act.c (revision 30982) @@ -43,7 +43,7 @@ PCB_DAD_DECL(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, "Choose extended object:"); if ((last > 0) && (last < pcb_extobj_i2o.used)) { pcb_extobj_t *eo = pcb_extobj_i2o.array[last]; Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 30981) +++ trunk/src/librnd/core/hid_attrib.c (revision 30982) @@ -33,41 +33,41 @@ #include #include -pcb_hid_attr_node_t *hid_attr_nodes = 0; +rnd_hid_attr_node_t *rnd_hid_attr_nodes = 0; -void pcb_export_register_opts(rnd_export_opt_t *a, int n, const char *cookie, int copy) +void rnd_export_register_opts(rnd_export_opt_t *a, int n, const char *cookie, int copy) { - pcb_hid_attr_node_t *ha; + rnd_hid_attr_node_t *ha; /* printf("%d attributes registered\n", n); */ - ha = malloc(sizeof(pcb_hid_attr_node_t)); - ha->next = hid_attr_nodes; - hid_attr_nodes = ha; + ha = malloc(sizeof(rnd_hid_attr_node_t)); + ha->next = rnd_hid_attr_nodes; + rnd_hid_attr_nodes = ha; ha->opts = a; ha->n = n; ha->cookie = cookie; } -void pcb_export_uninit(void) +void rnd_export_uninit(void) { - pcb_hid_attr_node_t *ha, *next; - for (ha = hid_attr_nodes; ha; ha = next) { + rnd_hid_attr_node_t *ha, *next; + for (ha = rnd_hid_attr_nodes; ha; ha = next) { next = ha->next; if (ha->cookie != NULL) fprintf(stderr, "WARNING: attribute %s by %s is not uninited, check your plugins' uninit!\n", ha->opts->name, ha->cookie); free(ha); } - hid_attr_nodes = NULL; + rnd_hid_attr_nodes = NULL; } -void pcb_export_remove_opts_by_cookie(const char *cookie) +void rnd_export_remove_opts_by_cookie(const char *cookie) { - pcb_hid_attr_node_t *ha, *next, *prev = NULL; - for (ha = hid_attr_nodes; ha; ha = next) { + rnd_hid_attr_node_t *ha, *next, *prev = NULL; + for (ha = rnd_hid_attr_nodes; ha; ha = next) { next = ha->next; if (ha->cookie == cookie) { if (prev == NULL) - hid_attr_nodes = next; + rnd_hid_attr_nodes = next; else prev->next = next; free(ha); @@ -79,46 +79,46 @@ int pcb_hid_parse_command_line(int *argc, char ***argv) { - pcb_hid_attr_node_t *ha; + rnd_hid_attr_node_t *ha; int i, e, ok; char *filename = NULL; - for (ha = hid_attr_nodes; ha; ha = ha->next) + for (ha = rnd_hid_attr_nodes; ha; ha = ha->next) for (i = 0; i < ha->n; i++) { rnd_export_opt_t *a = ha->opts + i; switch (a->type) { - case PCB_HATT_LABEL: + case RND_HATT_LABEL: break; - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: if (a->value) *(int *) a->value = a->default_val.lng; break; - case PCB_HATT_COORD: + case RND_HATT_COORD: if (a->value) *(rnd_coord_t *) a->value = a->default_val.crd; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: if (a->value) *(char *) a->value = a->default_val.lng; break; - case PCB_HATT_REAL: + case RND_HATT_REAL: if (a->value) *(double *) a->value = a->default_val.dbl; break; - case PCB_HATT_STRING: + case RND_HATT_STRING: if (a->value) *(const char **) a->value = rnd_strdup(PCB_EMPTY(a->default_val.str)); break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: if (a->value) *(int *) a->value = a->default_val.lng; break; - case PCB_HATT_UNIT: + case RND_HATT_UNIT: if (a->value) *(int *) a->value = a->default_val.lng; break; default: - if (PCB_HATT_IS_COMPOSITE(a->type)) /* function callback */ + if (RND_HATT_IS_COMPOSITE(a->type)) /* function callback */ break; rnd_message(RND_MSG_ERROR, "Invalid attribute type %d for attribute %s\n", a->type, a->name); abort(); @@ -133,7 +133,7 @@ bool_val = 1; arg_ofs = 2; try_no_arg: - for (ha = hid_attr_nodes; ha; ha = ha->next) + for (ha = rnd_hid_attr_nodes; ha; ha = ha->next) for (i = 0; i < ha->n; i++) if (strcmp((*argv)[0] + arg_ofs, ha->opts[i].name) == 0) { rnd_export_opt_t *a = ha->opts + i; @@ -140,9 +140,9 @@ char *ep; const rnd_unit_t *unit; switch (ha->opts[i].type) { - case PCB_HATT_LABEL: + case RND_HATT_LABEL: break; - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: if (a->value) *(int *) a->value = strtol((*argv)[1], 0, 0); else @@ -150,7 +150,7 @@ (*argc)--; (*argv)++; break; - case PCB_HATT_COORD: + case RND_HATT_COORD: if (a->value) *(rnd_coord_t *) a->value = pcb_get_value((*argv)[1], NULL, NULL, NULL); else @@ -158,7 +158,7 @@ (*argc)--; (*argv)++; break; - case PCB_HATT_REAL: + case RND_HATT_REAL: if (a->value) *(double *) a->value = strtod((*argv)[1], 0); else @@ -166,7 +166,7 @@ (*argc)--; (*argv)++; break; - case PCB_HATT_STRING: + case RND_HATT_STRING: if (a->value) *(char **) a->value = rnd_strdup(PCB_EMPTY((*argv)[1])); else @@ -174,13 +174,13 @@ (*argc)--; (*argv)++; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: if (a->value) *(char *) a->value = bool_val; else a->default_val.lng = bool_val; break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: ep = (*argv)[1]; ok = 0; for (e = 0; a->enumerations[e]; e++) @@ -197,7 +197,7 @@ (*argc)--; (*argv)++; break; - case PCB_HATT_UNIT: + case RND_HATT_UNIT: unit = get_unit_struct((*argv)[1]); if (unit == NULL) { fprintf(stderr, "ERROR: unit \"%s\" is unknown to pcb (option --%s)\n", (*argv)[1], a->name); @@ -258,7 +258,7 @@ const char *help; if (a->help_text == NULL) help = ""; else help = a->help_text; - if (PCB_HATT_IS_COMPOSITE(a->type)) { + if (RND_HATT_IS_COMPOSITE(a->type)) { pcb_hid_export_opt_func_t fnc = a->default_val.func; if (fnc != NULL) fnc(PCB_HIDEOF_USAGE, stderr, a); Index: trunk/src/librnd/core/hid_attrib.h =================================================================== --- trunk/src/librnd/core/hid_attrib.h (revision 30981) +++ trunk/src/librnd/core/hid_attrib.h (revision 30982) @@ -1,5 +1,5 @@ -#ifndef PCB_HID_ATTRIB_H -#define PCB_HID_ATTRIB_H +#ifndef RND_HID_ATTRIB_H +#define RND_HID_ATTRIB_H #include #include @@ -7,7 +7,7 @@ /* Used for HID attributes (exporting and printing, mostly). HA_boolean uses lng, HA_enum sets lng to the index and - str to the enumeration string. PCB_HATT_LABEL just shows the + str to the enumeration string. RND_HATT_LABEL just shows the default str. */ struct rnd_hid_attr_val_s { long lng; @@ -18,73 +18,73 @@ void (*func)(); }; -typedef enum pcb_hatt_compflags_e { - PCB_HATF_FRAME = 1, /* box/table has a visible frame around it */ - PCB_HATF_TIGHT = 2, /* box/table/button has minimal padding and spacing */ - PCB_HATF_SCROLL = 4, /* box/table is scrollable */ - PCB_HATF_HIDE_TABLAB = 8, /* hide tab labes of a TABBED - the tab mechanism works, but tab names are not displayed and are not clickable */ - PCB_HATF_CLR_STATIC = 8, /* color that can not be changed */ - PCB_HATF_LEFT_TAB = 16, /* display tab labels of TABBED on the left instead of on top (default) */ - PCB_HATF_TREE_COL = 32, /* first column of a PCB_HATT_TREE is a tree */ - PCB_HATF_EXPFILL = 64, /* for hbox and vbox: expand and fill */ - PCB_HATF_HIDE = 128,/* widget is initially hidden */ - PCB_HATF_TOGGLE = 256,/* for buttons and picbuttons: use a toggle button instead of a push button */ - PCB_HATF_TEXT_TRUNCATED = 512, /* label: do not set widget size for text, truncate text if widget is smaller */ - PCB_HATF_TEXT_VERTICAL = 1024,/* label: rotate text 90 degrees so it can be read from the right */ - PCB_HATF_PRV_BOARD = 2048, /* indicates that a preview widget is showing a section of the board so it needs to be redrawn when the board is redrawn */ - PCB_HATF_WIDTH_CHR = 4096, /* ->geo_width is specified in charactes */ - PCB_HATF_HEIGHT_CHR = 8192 /* ->geo_width is specified in charactes */ -} pcb_hatt_compflags_t; +typedef enum rnd_hatt_compflags_e { + RND_HATF_FRAME = 1, /* box/table has a visible frame around it */ + RND_HATF_TIGHT = 2, /* box/table/button has minimal padding and spacing */ + RND_HATF_SCROLL = 4, /* box/table is scrollable */ + RND_HATF_HIDE_TABLAB = 8, /* hide tab labes of a TABBED - the tab mechanism works, but tab names are not displayed and are not clickable */ + RND_HATF_CLR_STATIC = 8, /* color that can not be changed */ + RND_HATF_LEFT_TAB = 16, /* display tab labels of TABBED on the left instead of on top (default) */ + RND_HATF_TREE_COL = 32, /* first column of a RND_HATT_TREE is a tree */ + RND_HATF_EXPFILL = 64, /* for hbox and vbox: expand and fill */ + RND_HATF_HIDE = 128,/* widget is initially hidden */ + RND_HATF_TOGGLE = 256,/* for buttons and picbuttons: use a toggle button instead of a push button */ + RND_HATF_TEXT_TRUNCATED = 512, /* label: do not set widget size for text, truncate text if widget is smaller */ + RND_HATF_TEXT_VERTICAL = 1024,/* label: rotate text 90 degrees so it can be read from the right */ + RND_HATF_PRV_BOARD = 2048, /* indicates that a preview widget is showing a section of the board so it needs to be redrawn when the board is redrawn */ + RND_HATF_WIDTH_CHR = 4096, /* ->geo_width is specified in charactes */ + RND_HATF_HEIGHT_CHR = 8192 /* ->geo_width is specified in charactes */ +} rnd_hatt_compflags_t; -typedef enum pcb_hid_attr_type_e { +typedef enum rnd_hid_attr_type_e { /* atomic entry types */ - PCB_HATT_LABEL, - PCB_HATT_INTEGER, - PCB_HATT_REAL, - PCB_HATT_STRING, /* WARNING: string, must be malloc()'d, can't be a (const char *) */ - PCB_HATT_BOOL, - PCB_HATT_ENUM, - PCB_HATT_UNIT, - PCB_HATT_COORD, - PCB_HATT_BUTTON, /* push button; default value is the label */ - PCB_HATT_TREE, /* tree/list/table view; number of columns: pcb_hatt_table_cols; data is in field 'wdata' */ - PCB_HATT_PROGRESS, /* progress bar; displays dbl between 0 and 1 */ - PCB_HATT_PREVIEW, /* preview/render widget; callbacks in 'wdata' */ - PCB_HATT_PICTURE, /* static picture from xpm - picture data in wdata */ - PCB_HATT_PICBUTTON, /* button with static picture from xpm - picture data in wdata */ - PCB_HATT_COLOR, /* color pick (user input: select a color) */ - PCB_HATT_TEXT, /* plain text editor; data is in 'wdata' as pcb_hid_text_t */ + RND_HATT_LABEL, + RND_HATT_INTEGER, + RND_HATT_REAL, + RND_HATT_STRING, /* WARNING: string, must be malloc()'d, can't be a (const char *) */ + RND_HATT_BOOL, + RND_HATT_ENUM, + RND_HATT_UNIT, + RND_HATT_COORD, + RND_HATT_BUTTON, /* push button; default value is the label */ + RND_HATT_TREE, /* tree/list/table view; number of columns: rnd_hatt_table_cols; data is in field 'wdata' */ + RND_HATT_PROGRESS, /* progress bar; displays dbl between 0 and 1 */ + RND_HATT_PREVIEW, /* preview/render widget; callbacks in 'wdata' */ + RND_HATT_PICTURE, /* static picture from xpm - picture data in wdata */ + RND_HATT_PICBUTTON, /* button with static picture from xpm - picture data in wdata */ + RND_HATT_COLOR, /* color pick (user input: select a color) */ + RND_HATT_TEXT, /* plain text editor; data is in 'wdata' as pcb_hid_text_t */ /* groups (e.g. boxes) */ - PCB_HATT_BEGIN_HBOX, /* NOTE: PCB_HATT_IS_COMPOSITE() depends on it */ - PCB_HATT_BEGIN_VBOX, - PCB_HATT_BEGIN_HPANE, /* horizontal split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ - PCB_HATT_BEGIN_VPANE, /* vertical split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ - PCB_HATT_BEGIN_TABLE, /* wdata_aux1 is the number of columns */ - PCB_HATT_BEGIN_TABBED, /* tabbed view (e.g. notebook); ->wdata stores the tab names and a NULL; default_val's integer value is the index of the current tab */ - PCB_HATT_BEGIN_COMPOUND, /* subtree emulating a single widget; (pcb_hid_compound_t *) stored in END's wdata */ - PCB_HATT_END /* close one level of PCB_HATT_* */ -} pcb_hid_attr_type_t; + RND_HATT_BEGIN_HBOX, /* NOTE: RND_HATT_IS_COMPOSITE() depends on it */ + RND_HATT_BEGIN_VBOX, + RND_HATT_BEGIN_HPANE, /* horizontal split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ + RND_HATT_BEGIN_VPANE, /* vertical split and offer two vboxes; the split ratio is dbl between 0 and 1, that describes the left side's size */ + RND_HATT_BEGIN_TABLE, /* wdata_aux1 is the number of columns */ + RND_HATT_BEGIN_TABBED, /* tabbed view (e.g. notebook); ->wdata stores the tab names and a NULL; default_val's integer value is the index of the current tab */ + RND_HATT_BEGIN_COMPOUND, /* subtree emulating a single widget; (pcb_hid_compound_t *) stored in END's wdata */ + RND_HATT_END /* close one level of PCB_HATT_* */ +} rnd_hid_attr_type_t; -#define PCB_HATT_IS_COMPOSITE(type) \ - (((type) >= PCB_HATT_BEGIN_HBOX) && ((type) < PCB_HATT_END)) +#define RND_HATT_IS_COMPOSITE(type) \ + (((type) >= RND_HATT_BEGIN_HBOX) && ((type) < RND_HATT_END)) -#define PCB_HAT_IS_STR(type) (type == PCB_HATT_STRING) +#define RND_HAT_IS_STR(type) (type == RND_HATT_STRING) /* alternative field names in struct rnd_hid_attribute_s */ -#define pcb_hatt_flags hatt_flags -#define pcb_hatt_table_cols wdata_aux1 +#define rnd_hatt_flags hatt_flags +#define rnd_hatt_table_cols wdata_aux1 struct rnd_hid_attribute_s { const char *name; const char *help_text; - pcb_hid_attr_type_t type; + rnd_hid_attr_type_t type; double min_val, max_val; /* for integer and real */ rnd_hid_attr_val_t val; /* Also actual value for global attributes. */ - /* PCB_HATT_ENUM: const char ** (NULL terminated list of values) - PCB_HATT_PICTURE & PCB_HATT_PICBUTTON: const char **xpm - PCB_HATT_TREE and others: (pcb_hid_*_t *) */ + /* RND_HATT_ENUM: const char ** (NULL terminated list of values) + RND_HATT_PICTURE & RND_HATT_PICBUTTON: const char **xpm + RND_HATT_TREE and others: (pcb_hid_*_t *) */ void *wdata; /* main widget data */ int wdata_aux1; /* auixiliary widget data - should phase out long term */ @@ -98,7 +98,7 @@ unsigned int hatt_flags; /* geometry */ - int geo_width; /* when PCB_HATF_WIDTH_CHR is set, width of the widget in characters, on creation-time */ + int geo_width; /* when RND_HATF_WIDTH_CHR is set, width of the widget in characters, on creation-time */ int geo_height; }; @@ -105,10 +105,10 @@ struct rnd_export_opt_s { const char *name; const char *help_text; - pcb_hid_attr_type_t type; + rnd_hid_attr_type_t type; double min_val, max_val; /* for integer and real */ rnd_hid_attr_val_t default_val; - const char **enumerations; /* NULL terminated list of values for a PCB_HATT_ENUM */ + const char **enumerations; /* NULL terminated list of values for a RND_HATT_ENUM */ /* If set, this is used for global attributes (i.e. those set @@ -123,22 +123,22 @@ current session won't register and the registration is lost immediately after the export because pcb-rnd exits. Cam or dialog box direct exporting won't go through this. */ -extern void pcb_export_register_opts(rnd_export_opt_t *, int, const char *cookie, int copy); +extern void rnd_export_register_opts(rnd_export_opt_t *, int, const char *cookie, int copy); /* Remove all attributes registered with the given cookie */ -void pcb_export_remove_opts_by_cookie(const char *cookie); +void rnd_export_remove_opts_by_cookie(const char *cookie); /* remove all attributes and free the list */ -void pcb_export_uninit(void); +void rnd_export_uninit(void); -typedef struct pcb_hid_attr_node_s { - struct pcb_hid_attr_node_s *next; +typedef struct rnd_hid_attr_node_s { + struct rnd_hid_attr_node_s *next; rnd_export_opt_t *opts; int n; const char *cookie; -} pcb_hid_attr_node_t; +} rnd_hid_attr_node_t; -extern pcb_hid_attr_node_t *hid_attr_nodes; +extern rnd_hid_attr_node_t *rnd_hid_attr_nodes; void pcb_hid_usage(rnd_export_opt_t *a, int numa); void pcb_hid_usage_option(const char *name, const char *help); @@ -152,8 +152,8 @@ /* Convert between compflag bit value and name */ -const char *pcb_hid_compflag_bit2name(pcb_hatt_compflags_t bit); -pcb_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name); +const char *pcb_hid_compflag_bit2name(rnd_hatt_compflags_t bit); +rnd_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name); /*** When an rnd_export_opt_t item is a box, the following function is called from its ->func ***/ Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 30981) +++ trunk/src/librnd/core/hid_dad.c (revision 30982) @@ -33,21 +33,21 @@ int rnd_dock_has_frame[RND_HID_DOCK_max] = {0, 0, 0, 1, 0, 0}; /* Update this if rnd_hid_dock_t changes */ typedef struct { - pcb_hatt_compflags_t flag; + rnd_hatt_compflags_t flag; const char *name; } comflag_name_t; static comflag_name_t compflag_names[] = { - {PCB_HATF_FRAME, "frame"}, - {PCB_HATF_SCROLL, "scroll"}, - {PCB_HATF_HIDE_TABLAB, "hide_tablab"}, - {PCB_HATF_LEFT_TAB, "left_tab"}, - {PCB_HATF_TREE_COL, "tree_col"}, - {PCB_HATF_EXPFILL, "expfill"}, + {RND_HATF_FRAME, "frame"}, + {RND_HATF_SCROLL, "scroll"}, + {RND_HATF_HIDE_TABLAB, "hide_tablab"}, + {RND_HATF_LEFT_TAB, "left_tab"}, + {RND_HATF_TREE_COL, "tree_col"}, + {RND_HATF_EXPFILL, "expfill"}, {0, NULL} }; -const char *pcb_hid_compflag_bit2name(pcb_hatt_compflags_t bit) +const char *pcb_hid_compflag_bit2name(rnd_hatt_compflags_t bit) { comflag_name_t *n; for(n = compflag_names; n->flag != 0; n++) @@ -56,7 +56,7 @@ return NULL; } -pcb_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name) +rnd_hatt_compflags_t pcb_hid_compflag_name2bit(const char *name) { comflag_name_t *n; for(n = compflag_names; n->flag != 0; n++) @@ -96,18 +96,18 @@ int n, level = 1, cnt = 0; for(n = start_from; n < n_attrs; n++) { - if ((level == 1) && (attrs[n].type != PCB_HATT_END)) + if ((level == 1) && (attrs[n].type != RND_HATT_END)) cnt++; switch(attrs[n].type) { - case PCB_HATT_END: + case RND_HATT_END: level--; if (level == 0) return cnt; break; - case PCB_HATT_BEGIN_TABLE: - case PCB_HATT_BEGIN_HBOX: - case PCB_HATT_BEGIN_VBOX: - case PCB_HATT_BEGIN_COMPOUND: + case RND_HATT_BEGIN_TABLE: + case RND_HATT_BEGIN_HBOX: + case RND_HATT_BEGIN_VBOX: + case RND_HATT_BEGIN_COMPOUND: level++; break; default: Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 30981) +++ trunk/src/librnd/core/hid_dad.h (revision 30982) @@ -131,7 +131,7 @@ }; typedef struct { - int wbegin, wend; /* widget index to the correspoding PCB_HATT_BEGIN_COMPOUND and PCB_HATT_END */ + int wbegin, wend; /* widget index to the correspoding RND_HATT_BEGIN_COMPOUND and RND_HATT_END */ /* compound implementation callbacks */ int (*widget_state)(rnd_hid_attribute_t *end, void *hid_ctx, int idx, rnd_bool enabled); @@ -142,8 +142,8 @@ void (*set_help)(rnd_hid_attribute_t *attr, const char *text); /* set the tooltip help; attr is the END */ void (*set_field_num)(rnd_hid_attribute_t *attr, const char *fieldname, long l, double d, rnd_coord_t c); /* set value during creation; attr is the END */ void (*set_field_ptr)(rnd_hid_attribute_t *attr, const char *fieldname, void *ptr); /* set value during creation; attr is the END */ - void (*set_geo)(rnd_hid_attribute_t *attr, pcb_hatt_compflags_t flg, int geo); /* set geometry during creation; attr is the END */ - void (*free)(rnd_hid_attribute_t *attrib); /* called by DAD on free'ing the PCB_HATT_BEGIN_COMPOUND and PCB_HATT_END_COMPOUND widget */ + void (*set_geo)(rnd_hid_attribute_t *attr, rnd_hatt_compflags_t flg, int geo); /* set geometry during creation; attr is the END */ + void (*free)(rnd_hid_attribute_t *attrib); /* called by DAD on free'ing the RND_HATT_BEGIN_COMPOUND and PCB_HATT_END_COMPOUND widget */ } pcb_hid_compound_t; #include @@ -240,24 +240,24 @@ #define PCB_DAD_BEGIN_TABLE(table, cols) \ do { \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_TABLE); \ - PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_table_cols, cols); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_TABLE); \ + PCB_DAD_SET_ATTR_FIELD(table, rnd_hatt_table_cols, cols); \ } while(0) #define PCB_DAD_BEGIN_TABBED(table, tabs) \ do { \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_TABBED); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_TABBED); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, tabs); \ } while(0) -#define PCB_DAD_BEGIN_HBOX(table) PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_HBOX) -#define PCB_DAD_BEGIN_VBOX(table) PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_VBOX) -#define PCB_DAD_END(table) PCB_DAD_BEGIN(table, PCB_HATT_END) -#define PCB_DAD_COMPFLAG(table, val) PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_flags, val | (table[table ## _len-1].pcb_hatt_flags & PCB_HATF_TREE_COL)) +#define PCB_DAD_BEGIN_HBOX(table) PCB_DAD_BEGIN(table, RND_HATT_BEGIN_HBOX) +#define PCB_DAD_BEGIN_VBOX(table) PCB_DAD_BEGIN(table, RND_HATT_BEGIN_VBOX) +#define PCB_DAD_END(table) PCB_DAD_BEGIN(table, RND_HATT_END) +#define PCB_DAD_COMPFLAG(table, val) PCB_DAD_SET_ATTR_FIELD(table, rnd_hatt_flags, val | (table[table ## _len-1].rnd_hatt_flags & RND_HATF_TREE_COL)) #define PCB_DAD_LABEL(table, text) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_LABEL); \ + PCB_DAD_ALLOC(table, RND_HATT_LABEL); \ PCB_DAD_SET_ATTR_FIELD(table, name, rnd_strdup(text)); \ } while(0) @@ -264,19 +264,19 @@ /* Add label usign printf formatting syntax: PCB_DAD_LABELF(tbl, ("a=%d", 12)); */ #define PCB_DAD_LABELF(table, printf_args) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_LABEL); \ + PCB_DAD_ALLOC(table, RND_HATT_LABEL); \ PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup_printf printf_args); \ } while(0) #define PCB_DAD_ENUM(table, choices) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_ENUM); \ + PCB_DAD_ALLOC(table, RND_HATT_ENUM); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, choices); \ } while(0) #define PCB_DAD_BOOL(table, label) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_BOOL); \ + PCB_DAD_ALLOC(table, RND_HATT_BOOL); \ PCB_DAD_SET_ATTR_FIELD(table, name, rnd_strdup(label)); \ } while(0) @@ -299,25 +299,25 @@ } while(0) #define PCB_DAD_STRING(table) \ - PCB_DAD_ALLOC(table, PCB_HATT_STRING); \ + PCB_DAD_ALLOC(table, RND_HATT_STRING); \ #define PCB_DAD_TEXT(table, user_ctx_) \ do { \ pcb_hid_text_t *txt = calloc(sizeof(pcb_hid_text_t), 1); \ txt->user_ctx = user_ctx_; \ - PCB_DAD_ALLOC(table, PCB_HATT_TEXT); \ + PCB_DAD_ALLOC(table, RND_HATT_TEXT); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, txt); \ } while(0) #define PCB_DAD_BUTTON(table, text) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_BUTTON); \ + PCB_DAD_ALLOC(table, RND_HATT_BUTTON); \ table[table ## _len - 1].val.str = text; \ } while(0) #define PCB_DAD_BUTTON_CLOSE(table, text, retval) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_BUTTON); \ + PCB_DAD_ALLOC(table, RND_HATT_BUTTON); \ table[table ## _len - 1].val.str = text; \ table[table ## _len - 1].val.lng = retval; \ table[table ## _len - 1].wdata = (&table ## _ret_override); \ @@ -329,7 +329,7 @@ do { \ pcb_hid_dad_buttons_t *__n__; \ PCB_DAD_BEGIN_HBOX(table); \ - PCB_DAD_COMPFLAG(table, PCB_HATF_EXPFILL); \ + PCB_DAD_COMPFLAG(table, RND_HATF_EXPFILL); \ PCB_DAD_END(table); \ for(__n__ = buttons; __n__->label != NULL; __n__++) { \ PCB_DAD_BUTTON_CLOSE(table, __n__->label, __n__->retval); \ @@ -347,7 +347,7 @@ #define PCB_DAD_PROGRESS(table) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_PROGRESS); \ + PCB_DAD_ALLOC(table, RND_HATT_PROGRESS); \ } while(0) #define PCB_DAD_PREVIEW(table, expose_cb, mouse_cb, free_cb, initial_view_box, min_sizex_px_, min_sizey_px_, user_ctx_) \ @@ -366,7 +366,7 @@ prv->initial_view.Y2 = ((rnd_rnd_box_t *)(initial_view_box))->Y2; \ prv->initial_view_valid = 1; \ } \ - PCB_DAD_ALLOC(table, PCB_HATT_PREVIEW); \ + PCB_DAD_ALLOC(table, RND_HATT_PREVIEW); \ prv->attrib = &table[table ## _len-1]; \ PCB_DAD_SET_ATTR_FIELD(table, wdata, prv); \ } while(0) @@ -381,13 +381,13 @@ #define PCB_DAD_PICTURE(table, xpm) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_PICTURE); \ + PCB_DAD_ALLOC(table, RND_HATT_PICTURE); \ table[table ## _len - 1].wdata = xpm; \ } while(0) #define PCB_DAD_PICBUTTON(table, xpm) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_PICBUTTON); \ + PCB_DAD_ALLOC(table, RND_HATT_PICBUTTON); \ table[table ## _len - 1].wdata = xpm; \ } while(0) @@ -394,18 +394,18 @@ #define PCB_DAD_COLOR(table) \ do { \ - PCB_DAD_ALLOC(table, PCB_HATT_COLOR); \ + PCB_DAD_ALLOC(table, RND_HATT_COLOR); \ } while(0) #define PCB_DAD_BEGIN_HPANE(table) \ do { \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_HPANE); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_HPANE); \ table[table ## _len - 1].val.dbl = 0.5; \ } while(0) #define PCB_DAD_BEGIN_VPANE(table) \ do { \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_VPANE); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_VPANE); \ table[table ## _len - 1].val.dbl = 0.5; \ } while(0) @@ -413,11 +413,11 @@ do { \ pcb_hid_tree_t *tree = calloc(sizeof(pcb_hid_tree_t), 1); \ htsp_init(&tree->paths, strhash, strkeyeq); \ - PCB_DAD_ALLOC(table, PCB_HATT_TREE); \ + PCB_DAD_ALLOC(table, RND_HATT_TREE); \ tree->attrib = &table[table ## _len-1]; \ tree->hdr = opt_header; \ - PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_table_cols, cols); \ - PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_flags, first_col_is_tree ? PCB_HATF_TREE_COL : 0); \ + PCB_DAD_SET_ATTR_FIELD(table, rnd_hatt_table_cols, cols); \ + PCB_DAD_SET_ATTR_FIELD(table, rnd_hatt_flags, first_col_is_tree ? RND_HATF_TREE_COL : 0); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, tree); \ } while(0) @@ -472,7 +472,7 @@ #define PCB_DAD_HELP(table, val) \ do { \ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_END: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_help != NULL)) \ @@ -487,8 +487,8 @@ #define PCB_DAD_DEFAULT_PTR(table, val_) \ do {\ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_val_ptr != NULL)) \ @@ -505,8 +505,8 @@ #define PCB_DAD_DEFAULT_NUM(table, val_) \ do {\ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_val_num != NULL)) \ @@ -537,11 +537,11 @@ pcb_hid_preview_t *__prv__; \ pcb_hid_tree_t *__tree__; \ switch(table[(widx)].type) { \ - case PCB_HATT_PREVIEW: \ + case RND_HATT_PREVIEW: \ __prv__ = table[(widx)].wdata; \ __prv__->attrib = &table[(widx)]; \ break; \ - case PCB_HATT_TREE: \ + case RND_HATT_TREE: \ __tree__ = table[(widx)].wdata; \ __tree__->attrib = &table[(widx)]; \ break; \ @@ -577,42 +577,42 @@ #define PCB_DAD_SET_ATTR_FIELD_VAL(table, field, val) \ do { \ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_LABEL: \ + case RND_HATT_LABEL: \ assert(0); \ break; \ - case PCB_HATT_INTEGER: \ - case PCB_HATT_BOOL: \ - case PCB_HATT_ENUM: \ - case PCB_HATT_UNIT: \ - case PCB_HATT_BEGIN_TABBED: \ + case RND_HATT_INTEGER: \ + case RND_HATT_BOOL: \ + case RND_HATT_ENUM: \ + case RND_HATT_UNIT: \ + case RND_HATT_BEGIN_TABBED: \ table[table ## _len - 1].field.lng = (int)val; \ break; \ - case PCB_HATT_COORD: \ + case RND_HATT_COORD: \ table[table ## _len - 1].field.crd = (rnd_coord_t)val; \ break; \ - case PCB_HATT_REAL: \ - case PCB_HATT_PROGRESS: \ - case PCB_HATT_BEGIN_HPANE: \ - case PCB_HATT_BEGIN_VPANE: \ + case RND_HATT_REAL: \ + case RND_HATT_PROGRESS: \ + case RND_HATT_BEGIN_HPANE: \ + case RND_HATT_BEGIN_VPANE: \ table[table ## _len - 1].field.dbl = (double)val; \ break; \ - case PCB_HATT_STRING: \ - case PCB_HATT_TEXT: \ - case PCB_HATT_BUTTON: \ - case PCB_HATT_TREE: \ + case RND_HATT_STRING: \ + case RND_HATT_TEXT: \ + case RND_HATT_BUTTON: \ + case RND_HATT_TREE: \ table[table ## _len - 1].field.str = (char *)val; \ break; \ - case PCB_HATT_COLOR: \ + case RND_HATT_COLOR: \ table[table ## _len - 1].field.clr = *(rnd_color_t *)val; \ break; \ - case PCB_HATT_BEGIN_HBOX: \ - case PCB_HATT_BEGIN_VBOX: \ - case PCB_HATT_BEGIN_TABLE: \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ - case PCB_HATT_PREVIEW: \ - case PCB_HATT_PICTURE: \ - case PCB_HATT_PICBUTTON: \ + case RND_HATT_BEGIN_HBOX: \ + case RND_HATT_BEGIN_VBOX: \ + case RND_HATT_BEGIN_TABLE: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ + case RND_HATT_PREVIEW: \ + case RND_HATT_PICTURE: \ + case RND_HATT_PICBUTTON: \ assert(0); \ } \ } while(0) @@ -620,41 +620,41 @@ #define PCB_DAD_SET_ATTR_FIELD_NUM(table, field, val_) \ do { \ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_LABEL: \ + case RND_HATT_LABEL: \ assert(0); \ break; \ - case PCB_HATT_INTEGER: \ - case PCB_HATT_BOOL: \ - case PCB_HATT_ENUM: \ - case PCB_HATT_BEGIN_TABBED: \ + case RND_HATT_INTEGER: \ + case RND_HATT_BOOL: \ + case RND_HATT_ENUM: \ + case RND_HATT_BEGIN_TABBED: \ table[table ## _len - 1].field.lng = (int)val_; \ break; \ - case PCB_HATT_COORD: \ + case RND_HATT_COORD: \ table[table ## _len - 1].field.crd = (rnd_coord_t)val_; \ break; \ - case PCB_HATT_REAL: \ - case PCB_HATT_PROGRESS: \ - case PCB_HATT_BEGIN_HPANE: \ - case PCB_HATT_BEGIN_VPANE: \ + case RND_HATT_REAL: \ + case RND_HATT_PROGRESS: \ + case RND_HATT_BEGIN_HPANE: \ + case RND_HATT_BEGIN_VPANE: \ table[table ## _len - 1].field.dbl = (double)val_; \ break; \ - case PCB_HATT_STRING: \ - case PCB_HATT_TEXT: \ - case PCB_HATT_BUTTON: \ - case PCB_HATT_TREE: \ - case PCB_HATT_COLOR: \ - case PCB_HATT_UNIT: \ + case RND_HATT_STRING: \ + case RND_HATT_TEXT: \ + case RND_HATT_BUTTON: \ + case RND_HATT_TREE: \ + case RND_HATT_COLOR: \ + case RND_HATT_UNIT: \ assert(!"please use the _PTR() variant instead of the _NUM() variant"); \ break; \ - case PCB_HATT_BEGIN_HBOX: \ - case PCB_HATT_BEGIN_VBOX: \ - case PCB_HATT_BEGIN_TABLE: \ - case PCB_HATT_PREVIEW: \ - case PCB_HATT_PICTURE: \ - case PCB_HATT_PICBUTTON: \ + case RND_HATT_BEGIN_HBOX: \ + case RND_HATT_BEGIN_VBOX: \ + case RND_HATT_BEGIN_TABLE: \ + case RND_HATT_PREVIEW: \ + case RND_HATT_PICTURE: \ + case RND_HATT_PICBUTTON: \ assert(0); \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_field_num != NULL)) \ @@ -669,21 +669,21 @@ #define PCB_DAD_SET_ATTR_FIELD_PTR(table, field, val_) \ do { \ switch(table[table ## _len - 1].type) { \ - case PCB_HATT_LABEL: \ + case RND_HATT_LABEL: \ assert(0); \ break; \ - case PCB_HATT_INTEGER: \ - case PCB_HATT_BOOL: \ - case PCB_HATT_ENUM: \ - case PCB_HATT_BEGIN_TABBED: \ - case PCB_HATT_COORD: \ - case PCB_HATT_REAL: \ - case PCB_HATT_PROGRESS: \ - case PCB_HATT_BEGIN_HPANE: \ - case PCB_HATT_BEGIN_VPANE: \ + case RND_HATT_INTEGER: \ + case RND_HATT_BOOL: \ + case RND_HATT_ENUM: \ + case RND_HATT_BEGIN_TABBED: \ + case RND_HATT_COORD: \ + case RND_HATT_REAL: \ + case RND_HATT_PROGRESS: \ + case RND_HATT_BEGIN_HPANE: \ + case RND_HATT_BEGIN_VPANE: \ assert(!"please use the _NUM() variant instead of the _PTR() variant"); \ break; \ - case PCB_HATT_UNIT: \ + case RND_HATT_UNIT: \ { \ int __n__, __v__ = pcb_get_n_units(0); \ if (val_ != NULL) { \ @@ -696,24 +696,24 @@ } \ } \ break; \ - case PCB_HATT_STRING: \ - case PCB_HATT_TEXT: \ - case PCB_HATT_BUTTON: \ - case PCB_HATT_TREE: \ + case RND_HATT_STRING: \ + case RND_HATT_TEXT: \ + case RND_HATT_BUTTON: \ + case RND_HATT_TREE: \ table[table ## _len - 1].field.str = (char *)val_; \ break; \ - case PCB_HATT_COLOR: \ + case RND_HATT_COLOR: \ table[table ## _len - 1].field.clr = *((rnd_color_t *)val_); \ break; \ - case PCB_HATT_BEGIN_HBOX: \ - case PCB_HATT_BEGIN_VBOX: \ - case PCB_HATT_BEGIN_TABLE: \ - case PCB_HATT_PREVIEW: \ - case PCB_HATT_PICTURE: \ - case PCB_HATT_PICBUTTON: \ + case RND_HATT_BEGIN_HBOX: \ + case RND_HATT_BEGIN_VBOX: \ + case RND_HATT_BEGIN_TABLE: \ + case RND_HATT_PREVIEW: \ + case RND_HATT_PICTURE: \ + case RND_HATT_PICBUTTON: \ assert(0); \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if ((cmp != NULL) && (cmp->set_field_ptr != NULL)) \ @@ -728,26 +728,26 @@ #define PCB_DAD_FREE_FIELD(table, field) \ do { \ switch(table[field].type) { \ - case PCB_HATT_LABEL: \ + case RND_HATT_LABEL: \ free((char *)table[field].name); \ break; \ - case PCB_HATT_INTEGER: \ - case PCB_HATT_BOOL: \ - case PCB_HATT_ENUM: \ - case PCB_HATT_COORD: \ - case PCB_HATT_UNIT: \ - case PCB_HATT_REAL: \ - case PCB_HATT_PROGRESS: \ - case PCB_HATT_STRING: \ - case PCB_HATT_BUTTON: \ - case PCB_HATT_PICTURE: \ - case PCB_HATT_PICBUTTON: \ - case PCB_HATT_COLOR: \ + case RND_HATT_INTEGER: \ + case RND_HATT_BOOL: \ + case RND_HATT_ENUM: \ + case RND_HATT_COORD: \ + case RND_HATT_UNIT: \ + case RND_HATT_REAL: \ + case RND_HATT_PROGRESS: \ + case RND_HATT_STRING: \ + case RND_HATT_BUTTON: \ + case RND_HATT_PICTURE: \ + case RND_HATT_PICBUTTON: \ + case RND_HATT_COLOR: \ break; \ - case PCB_HATT_TREE: \ + case RND_HATT_TREE: \ pcb_dad_tree_free(&table[field]); \ break; \ - case PCB_HATT_PREVIEW: \ + case RND_HATT_PREVIEW: \ { \ pcb_hid_preview_t *prv = table[field].wdata; \ if (prv->user_free_cb != NULL) \ @@ -757,7 +757,7 @@ free(prv); \ } \ break; \ - case PCB_HATT_TEXT: \ + case RND_HATT_TEXT: \ { \ pcb_hid_text_t *txt = table[field].wdata; \ if (txt->user_free_cb != NULL) \ @@ -767,19 +767,19 @@ free(txt); \ } \ break; \ - case PCB_HATT_BEGIN_COMPOUND: \ - case PCB_HATT_END: \ + case RND_HATT_BEGIN_COMPOUND: \ + case RND_HATT_END: \ { \ pcb_hid_compound_t *cmp = table[field].wdata; \ if ((cmp != NULL) && (cmp->free != NULL)) \ cmp->free(&table[field]); \ } \ - case PCB_HATT_BEGIN_HBOX: \ - case PCB_HATT_BEGIN_VBOX: \ - case PCB_HATT_BEGIN_HPANE: \ - case PCB_HATT_BEGIN_VPANE: \ - case PCB_HATT_BEGIN_TABLE: \ - case PCB_HATT_BEGIN_TABBED: \ + case RND_HATT_BEGIN_HBOX: \ + case RND_HATT_BEGIN_VBOX: \ + case RND_HATT_BEGIN_HPANE: \ + case RND_HATT_BEGIN_VPANE: \ + case RND_HATT_BEGIN_TABLE: \ + case RND_HATT_BEGIN_TABBED: \ break; \ } \ } while(0) @@ -786,13 +786,13 @@ #define PCB_DAD_WIDTH_CHR(table, width) \ do { \ - if ((table[table ## _len - 1].type) == PCB_HATT_END) { \ + if ((table[table ## _len - 1].type) == RND_HATT_END) { \ pcb_hid_compound_t *cmp = table[table ## _len - 1].wdata; \ if (cmp->set_geo != NULL) \ - cmp->set_geo(&table[table ## _len - 1], PCB_HATF_HEIGHT_CHR, (width)); \ + cmp->set_geo(&table[table ## _len - 1], RND_HATF_HEIGHT_CHR, (width)); \ } \ else { \ - PCB_DAD_OR_ATTR_FIELD(table, hatt_flags, PCB_HATF_HEIGHT_CHR); \ + PCB_DAD_OR_ATTR_FIELD(table, hatt_flags, RND_HATF_HEIGHT_CHR); \ PCB_DAD_SET_ATTR_FIELD(table, geo_width, (width)); \ } \ } while(0) Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 30981) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 30982) @@ -176,9 +176,9 @@ def_unit = spin->unit == NULL ? pcbhl_conf.editor.grid_unit : spin->unit; PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(ctx.dlg, 2); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx.dlg, "Original:"); PCB_DAD_LABEL(ctx.dlg, str->val.str); PCB_DAD_LABEL(ctx.dlg, "With new unit:"); @@ -218,9 +218,9 @@ PCB_DAD_END(ctx.dlg); PCB_DAD_BEGIN_HBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx.dlg); PCB_DAD_BUTTON_CLOSES(ctx.dlg, clbtn); PCB_DAD_END(ctx.dlg); @@ -523,7 +523,7 @@ void pcb_dad_spin_free(rnd_hid_attribute_t *attr) { - if (attr->type == PCB_HATT_END) { + 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); @@ -614,13 +614,13 @@ 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, pcb_hatt_compflags_t flg, int geo) +void pcb_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_attribute_t *str = end - spin->cmp.wend + spin->wstr; - if (flg == PCB_HATF_HEIGHT_CHR) { - str->hatt_flags |= PCB_HATF_HEIGHT_CHR; + if (flg == RND_HATF_HEIGHT_CHR) { + str->hatt_flags |= RND_HATF_HEIGHT_CHR; str->geo_width = geo; } } Index: trunk/src/librnd/core/hid_dad_spin.h =================================================================== --- trunk/src/librnd/core/hid_dad_spin.h (revision 30981) +++ trunk/src/librnd/core/hid_dad_spin.h (revision 30982) @@ -51,19 +51,19 @@ PCB_DAD_SPIN_COORD, PCB_DAD_SPIN_FREQ } type; - pcb_hid_attr_type_t wtype; + rnd_hid_attr_type_t wtype; gdl_elem_t link; } pcb_hid_dad_spin_t; -#define PCB_DAD_SPIN_INT(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_INT, PCB_HATT_INTEGER, 0, 0) -#define PCB_DAD_SPIN_DOUBLE(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_DOUBLE, PCB_HATT_REAL, 0, 0) -#define PCB_DAD_SPIN_COORD(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_COORD, PCB_HATT_COORD, 1, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL) -#define PCB_DAD_SPIN_FREQ(table) PCB_DAD_SPIN_ANY(table, PCB_DAD_SPIN_FREQ, PCB_HATT_REAL, 1, PCB_UNIT_FREQ) +#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) -/* Return the widget-type (PCB_DAD_HATT) of a spinbox at the PCB_HATT_END widget; +/* 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 == PCB_HATT_END) && (((pcb_hid_dad_spin_t *)((attr)->wdata))->cmp.free == pcb_dad_spin_free)) ? ((pcb_hid_dad_spin_t *)((attr)->wdata))->wtype : PCB_HATT_END) + ((((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) /*** implementation ***/ @@ -70,12 +70,12 @@ #define PCB_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); \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_COMPOUND); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_COMPOUND); \ spin->cmp.wbegin = PCB_DAD_CURRENT(table); \ PCB_DAD_SET_ATTR_FIELD(table, wdata, spin); \ PCB_DAD_BEGIN_HBOX(table); \ spin->wall = PCB_DAD_CURRENT(table); \ - PCB_DAD_COMPFLAG(table, PCB_HATF_TIGHT); \ + PCB_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ PCB_DAD_STRING(table); \ PCB_DAD_DEFAULT_PTR(table, rnd_strdup("")); \ PCB_DAD_ENTER_CB(table, pcb_dad_spin_txt_enter_cb); \ @@ -83,7 +83,7 @@ PCB_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wstr = PCB_DAD_CURRENT(table); \ PCB_DAD_BEGIN_VBOX(table); \ - PCB_DAD_COMPFLAG(table, PCB_HATF_TIGHT); \ + PCB_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ PCB_DAD_PICBUTTON(table, pcb_hid_dad_spin_up); \ PCB_DAD_CHANGE_CB(table, pcb_dad_spin_up_cb); \ PCB_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ @@ -94,7 +94,7 @@ spin->wdown = PCB_DAD_CURRENT(table); \ PCB_DAD_END(table); \ PCB_DAD_BEGIN_VBOX(table); \ - PCB_DAD_COMPFLAG(table, PCB_HATF_TIGHT); \ + PCB_DAD_COMPFLAG(table, RND_HATF_TIGHT); \ if (has_unit) { \ PCB_DAD_PICBUTTON(table, pcb_hid_dad_spin_unit); \ PCB_DAD_CHANGE_CB(table, pcb_dad_spin_unit_cb); \ @@ -102,7 +102,7 @@ spin->wunit = PCB_DAD_CURRENT(table); \ } \ PCB_DAD_PICTURE(table, pcb_hid_dad_spin_warn); \ - PCB_DAD_COMPFLAG(table, PCB_HATF_HIDE); \ + PCB_DAD_COMPFLAG(table, RND_HATF_HIDE); \ PCB_DAD_SET_ATTR_FIELD(table, user_data, (const char **)spin); \ spin->wwarn = PCB_DAD_CURRENT(table); \ PCB_DAD_END(table); \ @@ -148,7 +148,7 @@ 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, pcb_hatt_compflags_t flg, int geo); +void pcb_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 */ Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 30981) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 30982) @@ -45,7 +45,7 @@ if (tree->user_free_cb != NULL) tree->user_free_cb(tree->attrib, tree->hid_wdata, r); - if (attr->pcb_hatt_flags & PCB_HATF_TREE_COL) + if (attr->rnd_hatt_flags & RND_HATF_TREE_COL) free(r->path); free(r); Index: trunk/src/librnd/core/hid_dad_tree.h =================================================================== --- trunk/src/librnd/core/hid_dad_tree.h (revision 30981) +++ trunk/src/librnd/core/hid_dad_tree.h (revision 30982) @@ -119,7 +119,7 @@ RND_INLINE void pcb_dad_tree_set_hash(rnd_hid_attribute_t *attr, pcb_hid_row_t *row) { pcb_hid_tree_t *tree = attr->wdata; - if (attr->pcb_hatt_flags & PCB_HATF_TREE_COL) { + if (attr->rnd_hatt_flags & RND_HATF_TREE_COL) { gds_t path; gds_init(&path); pcb_dad_tree_build_path(tree, &path, row); Index: trunk/src/librnd/core/hid_dad_unit.h =================================================================== --- trunk/src/librnd/core/hid_dad_unit.h (revision 30981) +++ trunk/src/librnd/core/hid_dad_unit.h (revision 30982) @@ -46,7 +46,7 @@ #define PCB_DAD_UNIT(table, family_) \ do { \ pcb_hid_dad_unit_t *unit = calloc(sizeof(pcb_hid_dad_unit_t), 1); \ - PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_COMPOUND); \ + PCB_DAD_BEGIN(table, RND_HATT_BEGIN_COMPOUND); \ unit->cmp.wbegin = PCB_DAD_CURRENT(table); \ pcb_dad_unit_init(family_); \ PCB_DAD_ENUM(table, pcb_dad_unit_enum); \ Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30981) +++ trunk/src/librnd/core/hid_dlg.c (revision 30982) @@ -217,7 +217,7 @@ /* need to have a manual cancel button as it needs to call the close cb before really closing the window */ PCB_DAD_BEGIN_HBOX(ctx.dlg); PCB_DAD_BEGIN_HBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx.dlg); PCB_DAD_BUTTON(ctx.dlg, "cancel"); PCB_DAD_CHANGE_CB(ctx.dlg, progress_close_btn_cb); Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30981) +++ trunk/src/librnd/core/hid_init.c (revision 30982) @@ -139,7 +139,7 @@ pup_uninit(&pcb_pup); - pcb_export_uninit(); + rnd_export_uninit(); for(pd = pcb_plugin_dir_first; pd != NULL; pd = next) { next = pd->next; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30981) +++ trunk/src/librnd/pcb_compat.h (revision 30982) @@ -616,3 +616,56 @@ #define pcb_hid_busy rnd_hid_busy #define pcb_hid_notify_crosshair_change rnd_hid_notify_crosshair_change #define pcb_hid_attr_ev_e rnd_hid_attr_ev_e +#define pcb_hatt_compflags_e rnd_hatt_compflags_e +#define pcb_hatt_compflags_t rnd_hatt_compflags_t +#define PCB_HATF_FRAME RND_HATF_FRAME +#define PCB_HATF_TIGHT RND_HATF_TIGHT +#define PCB_HATF_SCROLL RND_HATF_SCROLL +#define PCB_HATF_HIDE_TABLAB RND_HATF_HIDE_TABLAB +#define PCB_HATF_CLR_STATIC RND_HATF_CLR_STATIC +#define PCB_HATF_LEFT_TAB RND_HATF_LEFT_TAB +#define PCB_HATF_TREE_COL RND_HATF_TREE_COL +#define PCB_HATF_EXPFILL RND_HATF_EXPFILL +#define PCB_HATF_HIDE RND_HATF_HIDE +#define PCB_HATF_TOGGLE RND_HATF_TOGGLE +#define PCB_HATF_TEXT_TRUNCATED RND_HATF_TEXT_TRUNCATED +#define PCB_HATF_TEXT_VERTICAL RND_HATF_TEXT_VERTICAL +#define PCB_HATF_PRV_BOARD RND_HATF_PRV_BOARD +#define PCB_HATF_WIDTH_CHR RND_HATF_WIDTH_CHR +#define PCB_HATF_HEIGHT_CHR RND_HATF_HEIGHT_CHR +#define PCB_HATT_LABEL RND_HATT_LABEL +#define PCB_HATT_INTEGER RND_HATT_INTEGER +#define PCB_HATT_REAL RND_HATT_REAL +#define PCB_HATT_STRING RND_HATT_STRING +#define PCB_HATT_BOOL RND_HATT_BOOL +#define PCB_HATT_ENUM RND_HATT_ENUM +#define PCB_HATT_UNIT RND_HATT_UNIT +#define PCB_HATT_COORD RND_HATT_COORD +#define PCB_HATT_BUTTON RND_HATT_BUTTON +#define PCB_HATT_TREE RND_HATT_TREE +#define PCB_HATT_PROGRESS RND_HATT_PROGRESS +#define PCB_HATT_PREVIEW RND_HATT_PREVIEW +#define PCB_HATT_PICTURE RND_HATT_PICTURE +#define PCB_HATT_PICBUTTON RND_HATT_PICBUTTON +#define PCB_HATT_COLOR RND_HATT_COLOR +#define PCB_HATT_TEXT RND_HATT_TEXT +#define PCB_HATT_BEGIN_HBOX RND_HATT_BEGIN_HBOX +#define PCB_HATT_BEGIN_VBOX RND_HATT_BEGIN_VBOX +#define PCB_HATT_BEGIN_HPANE RND_HATT_BEGIN_HPANE +#define PCB_HATT_BEGIN_VPANE RND_HATT_BEGIN_VPANE +#define PCB_HATT_BEGIN_TABLE RND_HATT_BEGIN_TABLE +#define PCB_HATT_BEGIN_TABBED RND_HATT_BEGIN_TABBED +#define PCB_HATT_BEGIN_COMPOUND RND_HATT_BEGIN_COMPOUND +#define PCB_HATT_END RND_HATT_END +#define pcb_hid_attr_type_t rnd_hid_attr_type_t +#define pcb_hid_attr_type_e rnd_hid_attr_type_e +#define pcb_hatt_flags rnd_hatt_flags +#define pcb_hatt_table_cols rnd_hatt_table_cols +#define PCB_HATT_IS_COMPOSITE RND_HATT_IS_COMPOSITE +#define PCB_HAT_IS_STR RND_HAT_IS_STR +#define pcb_export_register_opts rnd_export_register_opts +#define pcb_export_remove_opts_by_cookie rnd_export_remove_opts_by_cookie +#define pcb_export_uninit rnd_export_uninit +#define pcb_hid_attr_node_s rnd_hid_attr_node_s +#define pcb_hid_attr_node_t rnd_hid_attr_node_t +#define hid_attr_nodes rnd_hid_attr_nodes Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30981) +++ trunk/src_plugins/asm/asm.c (revision 30982) @@ -535,10 +535,10 @@ asm_greyout(1); PCB_DAD_BEGIN_VBOX(asm_ctx.dlg); - PCB_DAD_COMPFLAG(asm_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(asm_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(asm_ctx.dlg, 6, 1, hdr); asm_ctx.wtbl = PCB_DAD_CURRENT(asm_ctx.dlg); - PCB_DAD_COMPFLAG(asm_ctx.dlg, PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(asm_ctx.dlg, RND_HATF_SCROLL); for(g = (group_t **)asm_ctx.grps.array, n = 0; n < asm_ctx.grps.used; g++,n++) { pcb_hid_row_t *parent, *child; row[0] = (*g)->name; Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30981) +++ trunk/src_plugins/cam/cam.c (revision 30982) @@ -285,7 +285,7 @@ rnd_conf_unreg_file(CAM_CONF_FN, cam_conf_internal); rnd_conf_unreg_fields("plugins/cam/"); rnd_remove_actions_by_cookie(cam_cookie); - pcb_export_remove_opts_by_cookie(cam_cookie); + rnd_export_remove_opts_by_cookie(cam_cookie); } rnd_hid_t export_cam_hid; Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30981) +++ trunk/src_plugins/cam/cam_gui.c (revision 30982) @@ -248,11 +248,11 @@ { PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, text); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_END(ctx->dlg); } @@ -269,13 +269,13 @@ ctx->cam.vars = pcb_cam_vars_alloc(); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* left */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 1, 0, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, cam_job_select_cb); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); ctx->wjobs = PCB_DAD_CURRENT(ctx->dlg); @@ -284,7 +284,7 @@ PCB_DAD_HELP(ctx->dlg, "Filter text:\nlist jobs with matching name only"); PCB_DAD_CHANGE_CB(ctx->dlg, cam_gui_filter_cb); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* filler */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "export!"); PCB_DAD_CHANGE_CB(ctx->dlg, cam_gui_export_cb); @@ -293,25 +293,25 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* right */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VPANE(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* top */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); header_label(ctx, "CAM job script"); PCB_DAD_BEGIN_TABBED(ctx->dlg, script_tabs); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 3, 0, digest_hdr); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wdigest = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_TEXT(ctx->dlg, ctx); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wtxt = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* bottom */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); header_label(ctx, "CAM options"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); /* special options */ PCB_DAD_LABEL(ctx->dlg, "outfile"); @@ -328,7 +328,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_TREE(ctx->dlg, 2, 0, opt_hdr); /* option table */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wopts = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 30981) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 30982) @@ -204,7 +204,7 @@ return 0; /* do not open another */ PCB_DAD_BEGIN_VBOX(cnstgui_ctx.dlg); - PCB_DAD_COMPFLAG(cnstgui_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(cnstgui_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(cnstgui_ctx.dlg, tab_names); /* line */ Index: trunk/src_plugins/dialogs/dlg_about.c =================================================================== --- trunk/src_plugins/dialogs/dlg_about.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_about.c (revision 30982) @@ -60,9 +60,9 @@ return; PCB_DAD_BEGIN_VBOX(about_ctx.dlg); - PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(about_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(about_ctx.dlg, tabs); - PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(about_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(about_ctx.dlg); PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_program()); PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_copyright()); @@ -70,14 +70,14 @@ PCB_DAD_END(about_ctx.dlg); PCB_DAD_BEGIN_VBOX(about_ctx.dlg); - PCB_DAD_COMPFLAG(about_ctx.dlg, /*PCB_HATF_SCROLL |*/ /*PCB_HATF_FRAME |*/ PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(about_ctx.dlg, /*RND_HATF_SCROLL |*/ /*RND_HATF_FRAME |*/ RND_HATF_EXPFILL); PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_compile_options()); - PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(about_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_END(about_ctx.dlg); PCB_DAD_BEGIN_VBOX(about_ctx.dlg); - PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(about_ctx.dlg, RND_HATF_SCROLL); gds_init(&s); for (e = htsp_first(&rnd_file_loaded); e; e = htsp_next(&rnd_file_loaded, e)) { htsp_entry_t *e2; Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 30982) @@ -178,9 +178,9 @@ export_ctx.tab_name[i] = NULL; PCB_DAD_BEGIN_VBOX(export_ctx.dlg); - PCB_DAD_COMPFLAG(export_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(export_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(export_ctx.dlg, export_ctx.tab_name); - PCB_DAD_COMPFLAG(export_ctx.dlg, PCB_HATF_LEFT_TAB|PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(export_ctx.dlg, RND_HATF_LEFT_TAB|RND_HATF_EXPFILL); export_ctx.tabs = PCB_DAD_CURRENT(export_ctx.dlg); for(n = 0; n < export_ctx.len; n++) { int numo; @@ -193,33 +193,33 @@ } PCB_DAD_BEGIN_VBOX(export_ctx.dlg); if (numo > 12) - PCB_DAD_COMPFLAG(export_ctx.dlg, PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(export_ctx.dlg, RND_HATF_SCROLL); export_ctx.exp_attr[n] = exp_attr = malloc(sizeof(int) * numo); for(i = 0; i < numo; i++) { PCB_DAD_BEGIN_HBOX(export_ctx.dlg) switch(opts[i].type) { - case PCB_HATT_COORD: + case RND_HATT_COORD: PCB_DAD_COORD(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.crd); break; - case PCB_HATT_INTEGER: + case RND_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.lng); break; - case PCB_HATT_REAL: + case RND_HATT_REAL: PCB_DAD_REAL(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.dbl); break; - case PCB_HATT_UNIT: + case RND_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.lng); break; default: - if (PCB_HATT_IS_COMPOSITE(opts[i].type)) { + if (RND_HATT_IS_COMPOSITE(opts[i].type)) { pcb_hid_export_opt_func_t fnc = opts[i].default_val.func; if (fnc != NULL) fnc(PCB_HIDEOF_DAD, &export_ctx, &opts[i]); Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30982) @@ -123,7 +123,7 @@ pcb_undo_save_serial(); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); sprintf(tmp, "Object flags of %s #%ld\n", pcb_obj_type_name(ctx.obj_type), ctx.obj->ID); PCB_DAD_LABEL(dlg, tmp); Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30982) @@ -174,9 +174,9 @@ else ctx->txt_id = NULL; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, fontsel_expose_cb, fontsel_mouse_cb, fontsel_free_cb, &vbox, 200, 200, ctx); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "Load font"); Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 30982) @@ -66,24 +66,24 @@ if (strcmp(cmd, "open") == 0) { if (!active) { PCB_DAD_BEGIN_HBOX(sub.dlg); - PCB_DAD_COMPFLAG(sub.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(sub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); PCB_DAD_BEGIN_VBOX(sub.dlg); PCB_DAD_PICTURE(sub.dlg, pcp_dlg_xpm_by_name("warning")); PCB_DAD_END(sub.dlg); PCB_DAD_BEGIN_VBOX(sub.dlg); - PCB_DAD_COMPFLAG(sub.dlg, PCB_HATF_EXPFILL); - PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, PCB_HATF_EXPFILL); PCB_DAD_END(sub.dlg); + PCB_DAD_COMPFLAG(sub.dlg, RND_HATF_EXPFILL); + PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, RND_HATF_EXPFILL); PCB_DAD_END(sub.dlg); PCB_DAD_LABEL(sub.dlg, "line0"); wlab[0] = PCB_DAD_CURRENT(sub.dlg); PCB_DAD_LABEL(sub.dlg, "line1"); wlab[1] = PCB_DAD_CURRENT(sub.dlg); - PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, PCB_HATF_EXPFILL); PCB_DAD_END(sub.dlg); + PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, RND_HATF_EXPFILL); PCB_DAD_END(sub.dlg); PCB_DAD_END(sub.dlg); PCB_DAD_BEGIN_VBOX(sub.dlg); PCB_DAD_BUTTON(sub.dlg, "Reload"); PCB_DAD_HELP(sub.dlg, "Load the new verison of the file from disk,\ndiscarding any in-memory change on the board"); PCB_DAD_CHANGE_CB(sub.dlg, ifb_file_chg_reload_cb); - PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, PCB_HATF_EXPFILL); PCB_DAD_END(sub.dlg); + PCB_DAD_BEGIN_HBOX(sub.dlg); PCB_DAD_COMPFLAG(sub.dlg, RND_HATF_EXPFILL); PCB_DAD_END(sub.dlg); PCB_DAD_BUTTON(sub.dlg, "Cancel"); PCB_DAD_HELP(sub.dlg, "Hide this info bar until the file changes again on disk"); PCB_DAD_CHANGE_CB(sub.dlg, ifb_file_chg_close_cb); Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30982) @@ -307,9 +307,9 @@ num_copper++; PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(dlg, 2); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); for(n = 0; n < ctx.data->LayerN; n++) { lb_widx_t *w = ctx.widx+n; /* left side */ Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30982) @@ -516,7 +516,7 @@ htip_set(&pstk_libs, subc_id, ctx); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); if (hint != NULL) PCB_DAD_LABEL(ctx->dlg, hint); @@ -524,9 +524,9 @@ PCB_DAD_BEGIN_HPANE(ctx->dlg); /* left */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 3, 0, hdr); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, pstklib_select); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); ctx->wlist = PCB_DAD_CURRENT(ctx->dlg); @@ -562,9 +562,9 @@ /* right */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, pstklib_expose, NULL, NULL, NULL, 200, 200, ctx); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30982) @@ -654,19 +654,19 @@ library_ctx.prev_pcb->LayerGroups.len = n; PCB_DAD_BEGIN_VBOX(library_ctx.dlg); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(library_ctx.dlg); /* left */ PCB_DAD_BEGIN_VBOX(library_ctx.dlg); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(library_ctx.dlg, 1, 1, NULL); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_TREE_SET_CB(library_ctx.dlg, selected_cb, library_select); PCB_DAD_TREE_SET_CB(library_ctx.dlg, ctx, &library_ctx); library_ctx.wtree = PCB_DAD_CURRENT(library_ctx.dlg); PCB_DAD_BEGIN_HBOX(library_ctx.dlg); PCB_DAD_STRING(library_ctx.dlg); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_HELP(library_ctx.dlg, "filter: display only footprints matching this text\n(if empty: display all)"); PCB_DAD_CHANGE_CB(library_ctx.dlg, library_filter_cb); library_ctx.wfilt = PCB_DAD_CURRENT(library_ctx.dlg); @@ -682,7 +682,7 @@ /* right */ PCB_DAD_BEGIN_VPANE(library_ctx.dlg); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); /* right top */ PCB_DAD_PREVIEW(library_ctx.dlg, library_expose, library_mouse, NULL, NULL, 100, 100, &library_ctx); library_ctx.wpreview = PCB_DAD_CURRENT(library_ctx.dlg); @@ -689,9 +689,9 @@ /* right bottom */ PCB_DAD_BEGIN_VBOX(library_ctx.dlg); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(library_ctx.dlg, "Refreshing"); - PCB_DAD_COMPFLAG(library_ctx.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(library_ctx.dlg, RND_HATF_HIDE); library_ctx.wpend = PCB_DAD_CURRENT(library_ctx.dlg); PCB_DAD_LABEL(library_ctx.dlg, " "); library_ctx.wnopend = PCB_DAD_CURRENT(library_ctx.dlg); Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 30982) @@ -66,7 +66,7 @@ int vlen, len, n; switch(a->type) { - case PCB_HATT_ENUM: + case RND_HATT_ENUM: hv.lng = 0; /* fallback in case the loop doesn't find any match */ vlen = strlen(val); for(n = 0, s = a->wdata; *s != NULL; s++,n++) { @@ -81,10 +81,10 @@ } } break; - case PCB_HATT_STRING: + case RND_HATT_STRING: hv.str = val; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: if ((val == NULL) || (*val == '\0')) return; hv.lng = \ @@ -91,8 +91,8 @@ (*val == '1') || (*val == 't') || (*val == 'T') || (*val == 'y') || (*val == 'Y') || \ (((val[0] == 'o') || (val[0] == 'O')) && ((val[1] == 'n') || (val[1] == 'N'))); break; - case PCB_HATT_COORD: - case PCB_HATT_END: /* compound widget for the spinbox! */ + case RND_HATT_COORD: + case RND_HATT_END: /* compound widget for the spinbox! */ hv.crd = pcb_get_value_ex(val, NULL, NULL, NULL, "mil", NULL); break; default: @@ -124,7 +124,7 @@ vtp0_uninit(&curr_enum); \ free(name); name = NULL; \ free(help); help = NULL; \ - curr_type = PCB_HATT_END; \ + curr_type = RND_HATT_END; \ curr = -1; \ vtp0_init(&curr_enum); \ vtp0_append(&curr_enum, rnd_strdup("")); \ @@ -138,30 +138,30 @@ rnd_message(RND_MSG_ERROR, "too many parameters, displaying only the first %d\n", MAX_PARAMS); \ break; \ } \ - if (curr_type == PCB_HATT_END) \ + if (curr_type == RND_HATT_END) \ break; \ pre_append(); \ PCB_DAD_LABEL(library_ctx.pdlg, name); \ PCB_DAD_HELP(library_ctx.pdlg, rnd_strdup(help)); \ switch(curr_type) { \ - case PCB_HATT_COORD: \ - case PCB_HATT_END: \ + case RND_HATT_COORD: \ + case RND_HATT_END: \ PCB_DAD_COORD(library_ctx.pdlg, ""); \ ctx->pwid[curr] = PCB_DAD_CURRENT(library_ctx.pdlg); \ PCB_DAD_MINMAX(library_ctx.pdlg, 0, PCB_MM_TO_COORD(512)); \ PCB_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ - case PCB_HATT_STRING: \ + case RND_HATT_STRING: \ PCB_DAD_STRING(library_ctx.pdlg); \ ctx->pwid[curr] = PCB_DAD_CURRENT(library_ctx.pdlg); \ PCB_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ - case PCB_HATT_BOOL: \ + case RND_HATT_BOOL: \ PCB_DAD_BOOL(library_ctx.pdlg, ""); \ ctx->pwid[curr] = PCB_DAD_CURRENT(library_ctx.pdlg); \ PCB_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ break; \ - case PCB_HATT_ENUM: \ + case RND_HATT_ENUM: \ PCB_DAD_ENUM(library_ctx.pdlg, (const char **)curr_enum.array); \ ctx->pwid[curr] = PCB_DAD_CURRENT(library_ctx.pdlg); \ PCB_DAD_CHANGE_CB(library_ctx.pdlg, library_param_cb); \ @@ -183,7 +183,7 @@ char *name = NULL, *help = NULL, *help_def = NULL; vtp0_t curr_enum; int curr, examples = 0, numrows = 0; - pcb_hid_attr_type_t curr_type = PCB_HATT_END; + rnd_hid_attr_type_t curr_type = RND_HATT_END; curr = -1; @@ -248,7 +248,7 @@ free(help); name = rnd_strdup(col); help = rnd_strdup(arg); - curr_type = PCB_HATT_STRING; /* assume string until a dim or enum overrides that */ + curr_type = RND_HATT_STRING; /* assume string until a dim or enum overrides that */ } else if (strncmp(cmd, "default:", 6) == 0) { free(help_def); @@ -257,15 +257,15 @@ help_def = rnd_strdup(arg); } else if (strncmp(cmd, "dim:", 4) == 0) { - curr_type = PCB_HATT_COORD; + curr_type = RND_HATT_COORD; } else if (strncmp(cmd, "bool:", 5) == 0) { - curr_type = PCB_HATT_BOOL; + curr_type = RND_HATT_BOOL; } else if (strncmp(cmd, "enum:", 5) == 0) { char *evl; - curr_type = PCB_HATT_ENUM; + curr_type = RND_HATT_ENUM; colsplit(); colsplit(); if (arg != NULL) { if (strlen(arg) > 32) { @@ -310,10 +310,10 @@ continue; switch(a->type) { - case PCB_HATT_LABEL: - case PCB_HATT_BEGIN_TABLE: + case RND_HATT_LABEL: + case RND_HATT_BEGIN_TABLE: continue; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: val = ((const char **)(a->wdata))[a->val.lng]; if (val != NULL) { if (*val != '\0') { @@ -325,14 +325,14 @@ val = NULL; } break; - case PCB_HATT_STRING: + case RND_HATT_STRING: val = a->val.str; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: val = a->val.lng ? "yes" : "no"; break; - case PCB_HATT_COORD: - case PCB_HATT_END: + case RND_HATT_COORD: + case RND_HATT_END: val = buff; pcb_snprintf(buff, sizeof(buff), "%$$mH", a->val.crd); break; @@ -530,14 +530,14 @@ int w, oversized = 0; PCB_DAD_BEGIN_VBOX(library_ctx.pdlg); - PCB_DAD_COMPFLAG(library_ctx.pdlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.pdlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(library_ctx.pdlg, "n/a"); ctx->pwdesc = PCB_DAD_CURRENT(library_ctx.pdlg); PCB_DAD_BEGIN_TABLE(library_ctx.pdlg, 2); - PCB_DAD_COMPFLAG(library_ctx.pdlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(library_ctx.pdlg, RND_HATF_EXPFILL); w = PCB_DAD_CURRENT(library_ctx.pdlg); if (library_param_build(ctx, l, f) > 16) { - library_ctx.pdlg[w].pcb_hatt_flags |= PCB_HATF_SCROLL; + library_ctx.pdlg[w].rnd_hatt_flags |= RND_HATF_SCROLL; oversized = 1; } PCB_DAD_END(library_ctx.pdlg); Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30982) @@ -315,7 +315,7 @@ save->fmt_tab_names[tabs+1] = NULL; PCB_DAD_BEGIN_TABBED(save->fmtsub->dlg, save->fmt_tab_names); - PCB_DAD_COMPFLAG(save->fmtsub->dlg, PCB_HATF_HIDE_TABLAB); + PCB_DAD_COMPFLAG(save->fmtsub->dlg, RND_HATF_HIDE_TABLAB); save->wopts = PCB_DAD_CURRENT(save->fmtsub->dlg); /* pre-creation tab switch not yet supported: PCB_DAD_DEFAULT_NUM(save->fmtsub->dlg, save->opt_tab[0]);*/ @@ -365,7 +365,7 @@ PCB_DAD_DEFAULT_NUM(save->fmtsub->dlg, !!dialogs_conf.plugins.dialogs.file_select_dialog.save_as_format_guess); PCB_DAD_HELP(save->fmtsub->dlg, guess_help); PCB_DAD_LABEL(save->fmtsub->dlg, "(guess failed)"); - PCB_DAD_COMPFLAG(save->fmtsub->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(save->fmtsub->dlg, RND_HATF_HIDE); PCB_DAD_HELP(save->fmtsub->dlg, "This file name is not naturally connected to\nany file format; file format\nis left on what was last selected/recognized"); save->wguess_err = PCB_DAD_CURRENT(save->fmtsub->dlg); PCB_DAD_END(save->fmtsub->dlg); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30982) @@ -325,15 +325,15 @@ netlist_ctx.pcb = pcb; PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* layout */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(netlist_ctx.dlg); - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* left */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(netlist_ctx.dlg, 2, 0, hdr); - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); netlist_ctx.wnetlist = PCB_DAD_CURRENT(netlist_ctx.dlg); PCB_DAD_TREE_SET_CB(netlist_ctx.dlg, selected_cb, netlist_row_selected); PCB_DAD_TREE_SET_CB(netlist_ctx.dlg, ctx, &netlist_ctx); @@ -340,20 +340,20 @@ PCB_DAD_END(netlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* right */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VPANE(netlist_ctx.dlg); - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); wvpan = PCB_DAD_CURRENT(netlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* right-top */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(netlist_ctx.dlg, netlist_expose, netlist_mouse, NULL, &netlist_ctx.bb_prv, 100, 100, &netlist_ctx); - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_PRV_BOARD); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD); netlist_ctx.wprev = PCB_DAD_CURRENT(netlist_ctx.dlg); PCB_DAD_END(netlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* right-bottom */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(netlist_ctx.dlg, 1, 0, hdr2); - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); netlist_ctx.wtermlist = PCB_DAD_CURRENT(netlist_ctx.dlg); PCB_DAD_TREE_SET_CB(netlist_ctx.dlg, selected_cb, termlist_row_selected); PCB_DAD_TREE_SET_CB(netlist_ctx.dlg, ctx, &netlist_ctx); @@ -420,7 +420,7 @@ PCB_DAD_BUTTON(netlist_ctx.dlg, "found"); PCB_DAD_CHANGE_CB(netlist_ctx.dlg, netlist_claim_fnd_cb); PCB_DAD_BEGIN_VBOX(netlist_ctx.dlg); /* fill between buttons and close */ - PCB_DAD_COMPFLAG(netlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(netlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_END(netlist_ctx.dlg); PCB_DAD_BUTTON_CLOSES(netlist_ctx.dlg, clbtn); PCB_DAD_END(netlist_ctx.dlg); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 30982) @@ -747,7 +747,7 @@ #define spring(dlg) \ PCB_DAD_BEGIN_VBOX(dlg); \ - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); \ + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); \ PCB_DAD_END(dlg); void pcb_pstkedit_dialog(pse_t *pse, int target_tab) @@ -761,7 +761,7 @@ target_tab -= pse->disable_instance_tab; PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(dlg, tabs + pse->disable_instance_tab); pse->tab = PCB_DAD_CURRENT(dlg); @@ -769,7 +769,7 @@ /* Tab 0: this instance */ PCB_DAD_BEGIN_VBOX(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(dlg, RND_HATF_FRAME); PCB_DAD_LABEL(dlg, "Settings that affect only this padstack instance"); PCB_DAD_BEGIN_HBOX(dlg); PCB_DAD_LABEL(dlg, "prototype"); @@ -813,7 +813,7 @@ PCB_DAD_BEGIN_VBOX(dlg); PCB_DAD_BEGIN_HBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, "Geometry of all padstacks with this proto"); PCB_DAD_LABEL(dlg, "[SMIRROR]"); PCB_DAD_HELP(dlg, "The layer stack of this specific padstack is mirrored.\nEditing the prototype will have mirrored effect,\ne.g. editing top side will affect the bottom side\nof this padstack instance."); @@ -820,7 +820,7 @@ pse->prsmirror = PCB_DAD_CURRENT(dlg); spring(dlg); PCB_DAD_BEGIN_HBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(dlg, RND_HATF_FRAME); PCB_DAD_LABEL(dlg, "Prototype name:"); PCB_DAD_STRING(dlg); PCB_DAD_CHANGE_CB(dlg, pse_chg_prname); @@ -828,9 +828,9 @@ PCB_DAD_END(dlg); PCB_DAD_END(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(dlg, RND_HATF_FRAME); PCB_DAD_BEGIN_TABLE(dlg, 3); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(dlg, RND_HATF_FRAME); /* header */ PCB_DAD_LABEL(dlg, "Per layer-type shape"); @@ -865,7 +865,7 @@ PCB_DAD_LABEL(dlg, "-"); pse->proto_info[n] = PCB_DAD_CURRENT(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT); PCB_DAD_END(dlg); PCB_DAD_END(dlg); Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30982) @@ -145,7 +145,7 @@ ctx->data = data; ctx->subc_id = sc->ID; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, pinout_expose, pinout_mouse, NULL, &sc->BoundingBox, 200, 200, ctx); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "Term ID:"); Index: trunk/src_plugins/dialogs/dlg_plugins.c =================================================================== --- trunk/src_plugins/dialogs/dlg_plugins.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_plugins.c (revision 30982) @@ -74,7 +74,7 @@ PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, str.array); PCB_DAD_BUTTON_CLOSES(dlg, clbtn); PCB_DAD_END(dlg); Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30982) @@ -270,9 +270,9 @@ } PCB_DAD_BEGIN_VBOX(pref_ctx.dlg); - PCB_DAD_COMPFLAG(pref_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(pref_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(pref_ctx.dlg, tabs); - PCB_DAD_COMPFLAG(pref_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(pref_ctx.dlg, RND_HATF_EXPFILL); pref_ctx.wtab = PCB_DAD_CURRENT(pref_ctx.dlg); PCB_DAD_BEGIN_VBOX(pref_ctx.dlg); /* General */ pcb_dlg_pref_general_create(&pref_ctx); @@ -309,7 +309,7 @@ PCB_DAD_END(pref_ctx.dlg); PCB_DAD_BEGIN_VBOX(pref_ctx.dlg); PCB_DAD_BEGIN_HBOX(pref_ctx.dlg); - PCB_DAD_COMPFLAG(pref_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(pref_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(pref_ctx.dlg, "All changes are made to role:"); PCB_DAD_ENUM(pref_ctx.dlg, role_names); pref_ctx.wrole = PCB_DAD_CURRENT(pref_ctx.dlg); Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30982) @@ -94,12 +94,12 @@ const char *path_prefix = "appearance/color"; - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(ctx->dlg, tabs); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_LEFT_TAB); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_LEFT_TAB); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* generic */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); pl = strlen(path_prefix); ctx->color.ngen = 0; @@ -129,7 +129,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); /* layer */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); nat = rnd_conf_get_field("appearance/color/layer"); if (nat->type == RND_CFN_COLOR) { PCB_DAD_LABEL(ctx->dlg, "NOTE: these colors are used only\nwhen creating new layers."); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30982) @@ -346,7 +346,7 @@ static const char *hdr_nat[] = {"role", "prio", "value", NULL}; PCB_DAD_BEGIN_TABBED(pref_ctx.dlg, type_tabs); - PCB_DAD_COMPFLAG(pref_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_HIDE_TABLAB); + PCB_DAD_COMPFLAG(pref_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_HIDE_TABLAB); ctx->conf.wnattype = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "Data type: string"); @@ -398,19 +398,19 @@ ctx->conf.wnatval[6] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, "Data type: list of strings"); ctx->conf.wsrc[7] = -1; PCB_DAD_TREE(ctx->dlg, 3, 0, hdr_nat); /* input state */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->conf.wnatval[7] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, "Data type: list of hash subtrees"); ctx->conf.wsrc[8] = -1; PCB_DAD_TREE(ctx->dlg, 3, 0, hdr_nat); /* input state */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->conf.wnatval[8] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); @@ -424,16 +424,16 @@ { static const char *hdr_intree[] = {"role", "prio", "policy", "value", NULL}; - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); ctx->conf.wmainp = PCB_DAD_CURRENT(ctx->dlg); /* left: tree */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 1, 1, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->conf.wtree = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, dlg_conf_select_node_cb); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); @@ -445,11 +445,11 @@ /* right: details */ PCB_DAD_BEGIN_VPANE(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); /* right/top: conf file */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, ""); ctx->conf.wname = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, ""); @@ -467,7 +467,7 @@ /* right/bottom: native file */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "NATIVE: in-memory conf node after the merge"); build_natval(ctx); Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30982) @@ -289,7 +289,7 @@ ctx->role = r->user_data2.lng; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, ctx->nat->hash_path); @@ -342,9 +342,9 @@ break; case RND_CFN_LIST: PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 1, 0, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wnewval = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "Edit..."); @@ -368,7 +368,7 @@ rnd_conf_listitem_t *i; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); rnd_conflist_foreach(pctx->conf.selected_nat->val.list, &it, i) { lht_node_t *rule = i->prop.src; PCB_DAD_BUTTON(ctx->dlg, rule->name); Index: trunk/src_plugins/dialogs/dlg_pref_general.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_general.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_general.c (revision 30982) @@ -62,7 +62,7 @@ void pcb_dlg_pref_general_create(pref_ctx_t *ctx) { PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Top window layout"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); pcb_pref_create_conftable(ctx, perf_topwin, pref_general_dlg2conf); @@ -70,7 +70,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Backup"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); pcb_pref_create_conftable(ctx, perf_backup, pref_general_dlg2conf); @@ -78,7 +78,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Command line entry"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); pcb_pref_create_conftable(ctx, perf_cli, pref_general_dlg2conf); Index: trunk/src_plugins/dialogs/dlg_pref_layer.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 30982) @@ -52,10 +52,10 @@ { rnd_rnd_box_t vbox = {0, 0, PCB_MM_TO_COORD(150), PCB_MM_TO_COORD(150)}; - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, layersel_expose_cb, layersel_mouse_cb, layersel_free_cb, &vbox, 200, 200, ctx); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); } Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30982) @@ -437,14 +437,14 @@ static const char *hdr[] = {"configured path", "actual path on the filesystem", "config source", NULL}; pcb_hid_tree_t *tree; - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); /* get the parent vbox, which is the tab's page vbox, to expand and fill */ + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); /* get the parent vbox, which is the tab's page vbox, to expand and fill */ PCB_DAD_LABEL(ctx->dlg, "Ordered list of footprint library search directories."); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME | PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME | RND_HATF_SCROLL | RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 3, 0, hdr); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); ctx->lib.wlist = PCB_DAD_CURRENT(ctx->dlg); tree = ctx->dlg[ctx->lib.wlist].wdata; tree->user_free_cb = pref_lib_row_free; Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30982) @@ -100,7 +100,7 @@ pcb_drc_impl_t *di; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Board size"); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "Width="); @@ -119,7 +119,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "*OBSOLETE* DRC; do not use; details:"); PCB_DAD_STRING(ctx->dlg); PCB_DAD_DEFAULT_PTR(ctx->dlg, "http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=deprecation#olddrc"); @@ -130,7 +130,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Configure DRC rules:"); for(di = gdl_first(&pcb_drc_impls); di != NULL; di = di->link.next) { char *ra = rnd_strdup(di->list_rules_action); /* need to strdup it just in case the plugin is unloaded while the preferences dialog is open */ @@ -143,7 +143,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "misc sizes"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); PCB_DAD_LABEL(ctx->dlg, "polygon isle minimum size\n[square um]"); Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30982) @@ -115,9 +115,9 @@ void pcb_dlg_pref_win_create(pref_ctx_t *ctx) { - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Load window geometry and enable window placement:"); PCB_DAD_BOOL(ctx->dlg, ""); PCB_DAD_HELP(ctx->dlg, "When enabled, pcb-rnd will load window geometry from config files\nand try to resize and place windows accordingly.\nSizes can be saved once (golden arrangement)\nor at every exit (retrain last setup),\nsee below."); @@ -125,13 +125,13 @@ PCB_DAD_CHANGE_CB(ctx->dlg, pref_win_master_cb); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx->dlg, "Save window geometry to..."); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "... in the design (board) file"); PCB_DAD_END(ctx->dlg); @@ -146,7 +146,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "... in the project file"); PCB_DAD_END(ctx->dlg); @@ -161,7 +161,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "... in the user config"); PCB_DAD_END(ctx->dlg); @@ -176,7 +176,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "... in a custom file"); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_printcalib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30982) @@ -30,11 +30,11 @@ static rnd_hid_attribute_t printer_calibrate_attrs[] = { {"Enter Values here:", "", - PCB_HATT_LABEL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_LABEL, 0, 0, {0, 0, 0}, 0, 0}, {"x-calibration", "X scale for calibrating your printer", - PCB_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0}, + RND_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0}, {"y-calibration", "Y scale for calibrating your printer", - PCB_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0} + RND_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0} }; const char pcb_acts_PrintCalibrate[] = "PrintCalibrate()"; Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 30982) @@ -91,7 +91,7 @@ static void hspacer(search_ctx_t *ctx) { PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); } @@ -98,7 +98,7 @@ static void vspacer(search_ctx_t *ctx) { PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); } @@ -332,7 +332,7 @@ int row, col; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, "Query expression:"); PCB_DAD_STRING(ctx->dlg); PCB_DAD_WIDTH_CHR(ctx->dlg, 64); @@ -343,7 +343,7 @@ ctx->wact = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME | PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME | RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "Enable the wizard:"); PCB_DAD_BOOL(ctx->dlg, ""); @@ -355,27 +355,27 @@ if (row > 0) { PCB_DAD_BEGIN_HBOX(ctx->dlg); ctx->wand[row] = PCB_DAD_CURRENT(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_HIDE); PCB_DAD_LABEL(ctx->dlg, "AND"); PCB_DAD_END(ctx->dlg); } PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, /*PCB_HATF_EXPFILL | */PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, /*RND_HATF_EXPFILL | */RND_HATF_HIDE); ctx->wrowbox[row] = PCB_DAD_CURRENT(ctx->dlg); for(col = 0; col < MAX_COL; col++) { ctx->visible[row][col] = 0; if (col > 0) { PCB_DAD_LABEL(ctx->dlg, " OR "); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wor[row][col] = PCB_DAD_CURRENT(ctx->dlg); } PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME | PCB_HATF_TIGHT | PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME | RND_HATF_TIGHT | RND_HATF_HIDE); ctx->wexpr[row][col] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, NEW_EXPR_LAB); ctx->wexpr_lab[row][col] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_TIGHT); PCB_DAD_PICBUTTON(ctx->dlg, icon_del); PCB_DAD_HELP(ctx->dlg, "Remove expression"); ctx->wexpr_del[row][col] = PCB_DAD_CURRENT(ctx->dlg); @@ -389,7 +389,7 @@ } hspacer(ctx); PCB_DAD_BUTTON(ctx->dlg, "append OR"); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wnew_or[row] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_CHANGE_CB(ctx->dlg, search_append_col_cb); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 30982) @@ -292,11 +292,11 @@ ctx->last_rtype = RIGHT_max; PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 1, 1, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_SCROLL); ctx->wleft = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, srch_expr_left_cb); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); @@ -308,39 +308,39 @@ PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_STRING(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_STR] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); PCB_DAD_INTEGER(ctx->dlg, ""); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_INT] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, -(1L<<30), (1L<<30)); PCB_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); PCB_DAD_REAL(ctx->dlg, ""); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_DOUBLE] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, -(1L<<30), (1L<<30)); PCB_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); PCB_DAD_COORD(ctx->dlg, ""); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_COORD] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_MINMAX(ctx->dlg, -RND_MAX_COORD, RND_MAX_COORD); PCB_DAD_CHANGE_CB(ctx->dlg, srchexpr_right_cb); PCB_DAD_TREE(ctx->dlg, 1, 0, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE); ctx->wright[RIGHT_CONST] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, srch_expr_right_table_cb); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON_CLOSES(ctx->dlg, clbtn); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30982) @@ -101,7 +101,7 @@ memset(&ctx, 0, sizeof(ctx)); PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(ctx.dlg, tabs); PCB_DAD_CHANGE_CB(ctx.dlg, cb_tab_chg); ctx.wtab = PCB_DAD_CURRENT(ctx.dlg); @@ -118,7 +118,7 @@ PCB_DAD_LABEL(ctx.dlg, "text3"); PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ctx.dlg, "spin test"); PCB_DAD_BUTTON(ctx.dlg, "reset all to 42"); PCB_DAD_CHANGE_CB(ctx.dlg, pcb_act_spin_reset); @@ -187,10 +187,10 @@ /* tab 2: tree table widget */ PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx.dlg, 3, 1, hdr); ctx.tt = PCB_DAD_CURRENT(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_SCROLL); PCB_DAD_CHANGE_CB(ctx.dlg, cb_ttbl_select); PCB_DAD_TREE_SET_CB(ctx.dlg, free_cb, cb_ttbl_free_row); PCB_DAD_TREE_SET_CB(ctx.dlg, selected_cb, cb_ttbl_row_selected); @@ -244,9 +244,9 @@ /* tab 5: text */ PCB_DAD_BEGIN_VBOX(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TEXT(ctx.dlg, NULL); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); PCB_DAD_CHANGE_CB(ctx.dlg, cb_text_edit); ctx.wtxt = PCB_DAD_CURRENT(ctx.dlg); PCB_DAD_BEGIN_HBOX(ctx.dlg); Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30982) @@ -124,9 +124,9 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(undo_ctx.dlg); - PCB_DAD_COMPFLAG(undo_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(undo_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(undo_ctx.dlg, 3, 0, hdr); - PCB_DAD_COMPFLAG(undo_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(undo_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); undo_ctx.wlist = PCB_DAD_CURRENT(undo_ctx.dlg); PCB_DAD_BEGIN_HBOX(undo_ctx.dlg); Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30981) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30982) @@ -588,14 +588,14 @@ ctx->wpos = -1; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); /* left */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "Number of violations:"); @@ -604,7 +604,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_TREE(ctx->dlg, 2, 1, hdr); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, view_select); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); ctx->wlist = PCB_DAD_CURRENT(ctx->dlg); @@ -626,10 +626,10 @@ /* right */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, ctx); ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_PRV_BOARD); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD); PCB_DAD_LABEL(ctx->dlg, "(description)"); ctx->wdescription = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "(measure)"); @@ -647,7 +647,7 @@ PCB_DAD_CHANGE_CB(ctx->dlg, view_refresh_btn_cb); } PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "Close"); PCB_DAD_CHANGE_CB(ctx->dlg, view_close_btn_cb); @@ -666,13 +666,13 @@ ctx->wlist = -1; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_PREVIEW(ctx->dlg, view_expose_cb, view_mouse_cb, NULL, NULL, 100, 100, ctx); ctx->wprev = PCB_DAD_CURRENT(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_PRV_BOARD); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_PRV_BOARD); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "(description)"); ctx->wdescription = PCB_DAD_CURRENT(ctx->dlg); @@ -685,7 +685,7 @@ PCB_DAD_BUTTON(ctx->dlg, "Previous"); PCB_DAD_CHANGE_CB(ctx->dlg, view_prev_btn_cb); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, "na"); ctx->wpos = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "/"); @@ -704,7 +704,7 @@ PCB_DAD_CHANGE_CB(ctx->dlg, view_refresh_btn_cb); } PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "Close"); PCB_DAD_CHANGE_CB(ctx->dlg, view_close_btn_cb); Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30981) +++ trunk/src_plugins/drc_query/dlg.c (revision 30982) @@ -259,7 +259,7 @@ info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, rnd_conf_role_name(role)); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(ctx->dlg, info); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "DRC violation type (group):"); @@ -285,7 +285,7 @@ PCB_DAD_LABEL(ctx->dlg, "DRC rule query script:"); PCB_DAD_TEXT(ctx->dlg, ctx); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wquery = PCB_DAD_CURRENT(ctx->dlg); @@ -294,7 +294,7 @@ PCB_DAD_CHANGE_CB(ctx->dlg, rule_btn_run_cb); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME | RND_HATF_TIGHT); PCB_DAD_BUTTON(ctx->dlg, "Save"); PCB_DAD_CHANGE_CB(ctx->dlg, rule_btn_save_cb); ctx->wsave = PCB_DAD_CURRENT(ctx->dlg); @@ -306,7 +306,7 @@ PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON_CLOSES(ctx->dlg, clbtn); @@ -561,15 +561,15 @@ return 0; /* do not open another */ PCB_DAD_BEGIN_VBOX(drc_rlist_ctx.dlg); - PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(drc_rlist_ctx.dlg); wpane = PCB_DAD_CURRENT(drc_rlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(drc_rlist_ctx.dlg); /* left */ - PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(drc_rlist_ctx.dlg, "Rules available:"); PCB_DAD_TREE(drc_rlist_ctx.dlg, 4, 0, lst_hdr); - PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); drc_rlist_ctx.wlist = PCB_DAD_CURRENT(drc_rlist_ctx.dlg); PCB_DAD_TREE_SET_CB(drc_rlist_ctx.dlg, selected_cb, rlist_select); PCB_DAD_TREE_SET_CB(drc_rlist_ctx.dlg, ctx, &drc_rlist_ctx); @@ -584,7 +584,7 @@ PCB_DAD_END(drc_rlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(drc_rlist_ctx.dlg); /* right */ - PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(drc_rlist_ctx.dlg); PCB_DAD_LABEL(drc_rlist_ctx.dlg, "Rule: "); PCB_DAD_LABEL(drc_rlist_ctx.dlg, ""); @@ -592,7 +592,7 @@ PCB_DAD_END(drc_rlist_ctx.dlg); PCB_DAD_BEGIN_VBOX(drc_rlist_ctx.dlg); - PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(drc_rlist_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_LABEL(drc_rlist_ctx.dlg, "Type/group:"); PCB_DAD_LABEL(drc_rlist_ctx.dlg, "-"); drc_rlist_ctx.wtype = PCB_DAD_CURRENT(drc_rlist_ctx.dlg); Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 30981) +++ trunk/src_plugins/export_bom/bom.c (revision 30982) @@ -38,11 +38,11 @@ %end-doc */ {"bomfile", "Name of the BOM output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_bomfile 0 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 1 }; @@ -254,7 +254,7 @@ static int bom_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); + rnd_export_register_opts(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -264,7 +264,7 @@ void pplg_uninit_export_bom(void) { - pcb_export_remove_opts_by_cookie(bom_cookie); + rnd_export_remove_opts_by_cookie(bom_cookie); } int pplg_init_export_bom(void) Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 30981) +++ trunk/src_plugins/export_dsn/dsn.c (revision 30982) @@ -80,24 +80,24 @@ static rnd_export_opt_t dsn_options[] = { {"dsnfile", "SPECCTRA output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_dsnfile 0 {"trackwidth", "track width in mils", - PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, + RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, #define HA_trackwidth 1 {"clearance", "clearance in mils", - PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, + RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0}, #define HA_clearance 2 {"viawidth", "via width in mils", - PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(27)}, 0, + RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(27)}, 0, 0}, #define HA_viawidth 3 {"viadrill", "via drill diameter in mils", - PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(15)}, 0, + RND_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(15)}, 0, 0}, #define HA_viadrill 4 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 5 }; @@ -605,7 +605,7 @@ void pplg_uninit_export_dsn(void) { - pcb_export_remove_opts_by_cookie(dsn_cookie); + rnd_export_remove_opts_by_cookie(dsn_cookie); } int pplg_init_export_dsn(void) @@ -623,7 +623,7 @@ dsn_hid.parse_arguments = dsn_parse_arguments; pcb_hid_register_hid(&dsn_hid); - pcb_export_register_opts(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); + rnd_export_register_opts(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0); return 0; } Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 30981) +++ trunk/src_plugins/export_dxf/dxf.c (revision 30982) @@ -119,7 +119,7 @@ %end-doc */ {"outfile", "Graphics output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_dxffile 0 /* %start-doc options "93 DXF Options" @@ -130,7 +130,7 @@ %end-doc */ {"template", "DXF template (lihata file)", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_template 1 /* %start-doc options "93 DXF Options" @@ -141,7 +141,7 @@ %end-doc */ {"thin", "Draw outline and drill with thin lines", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_thin 2 /* %start-doc options "93 DXF Options" @@ -152,7 +152,7 @@ %end-doc */ {"poly-fill", "Fill polygons using hatch", - PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, #define HA_poly_fill 3 /* %start-doc options "93 DXF Options" @@ -163,7 +163,7 @@ %end-doc */ {"poly-contour", "Draw polygons contour with thin line", - PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, #define HA_poly_contour 4 /* %start-doc options "93 DXF Options" @@ -174,7 +174,7 @@ %end-doc */ {"drill-fill", "Fill drill (hole) circles using hatch", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_drill_fill 5 /* %start-doc options "93 DXF Options" @@ -185,11 +185,11 @@ %end-doc */ {"drill-contour", "Draw drill contour with thin line", - PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0}, #define HA_drill_contour 6 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 7 }; @@ -347,7 +347,7 @@ static int dxf_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0); + rnd_export_register_opts(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -528,7 +528,7 @@ void pplg_uninit_export_dxf(void) { - pcb_export_remove_opts_by_cookie(dxf_cookie); + rnd_export_remove_opts_by_cookie(dxf_cookie); } int pplg_init_export_dxf(void) Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30981) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30982) @@ -174,27 +174,27 @@ %end-doc */ {"filename", "excellon output file base - used to generate default plated and/or unplated file name in case they are not specified", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_excellonfile 0 {"filename-plated", "excellon output file name for plated features", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_excellonfile_plated 1 {"filename-unplated", "excellon output file name for unplated features", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_excellonfile_unplated 2 {"coord-format", "Coordinate format (resolution)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, coord_format_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, coord_format_names, 0}, #define HA_excellonfile_coordfmt 3 {"aperture-per-file", "Restart aperture numbering in each new file", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_apeture_per_file 4 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 5 }; @@ -301,7 +301,7 @@ static int excellon_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(excellon_options, NUM_OPTIONS, excellon_cookie, 0); + rnd_export_register_opts(excellon_options, NUM_OPTIONS, excellon_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -484,7 +484,7 @@ void pplg_uninit_export_excellon(void) { - pcb_export_remove_opts_by_cookie(excellon_cookie); + rnd_export_remove_opts_by_cookie(excellon_cookie); free(filename); rnd_conf_unreg_fields("plugins/export_excellon/"); rnd_event_unbind_allcookie(excellon_cookie); Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30981) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 30982) @@ -69,11 +69,11 @@ /* other HIDs expect this to be first. */ {"outfile", "Output file name", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_fidocadjfile 0 {"libfile", "path to PCB.fcl", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_libfile 1 }; @@ -342,7 +342,7 @@ static int fidocadj_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0); + rnd_export_register_opts(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -358,7 +358,7 @@ void pplg_uninit_export_fidocadj(void) { - pcb_export_remove_opts_by_cookie(fidocadj_cookie); + rnd_export_remove_opts_by_cookie(fidocadj_cookie); } int pplg_init_export_fidocadj(void) Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 30981) +++ trunk/src_plugins/export_gcode/gcode.c (revision 30982) @@ -61,39 +61,39 @@ rnd_export_opt_t gcode_attribute_list[] = { {"outfile", "file name prefix for non-cam", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_outfile 0 {"dias", "tool diameters", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_template 1 {"layer-script", "rendering script for layer graphics", - PCB_HATT_STRING, 0, 0, {0, def_layer_script, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, def_layer_script, 0}, 0, 0}, #define HA_layer_script 2 {"mech-script", "rendering script for boundary/mech/drill", - PCB_HATT_STRING, 0, 0, {0, def_mech_script, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, def_mech_script, 0}, 0, 0}, #define HA_mech_script 3 {"mill-depth", "Milling depth on layers", - PCB_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-0.05)}, 0}, + RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-0.05)}, 0}, #define HA_layerdepth 4 {"total-cut-depth", "Total milling depth when cutting through the board (if 0, use pcb thickness)", - PCB_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-1.6)}, 0}, + RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(-1.6)}, 0}, #define HA_totalcutdepth 5 {"cut-depth", "Milling depth increment in each pass", - PCB_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, + RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, #define HA_cutdepth 6 {"safe-Z", "Safe Z (above the board) for traverse move", - PCB_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, + RND_HATT_COORD, PCB_MM_TO_COORD(-10), PCB_MM_TO_COORD(100), {0, 0, 0, PCB_MM_TO_COORD(0.5)}, 0}, #define HA_safeZ 7 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 8 }; @@ -379,7 +379,7 @@ static int gcode_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), pcb_export_gcode_cookie, 0); + rnd_export_register_opts(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), pcb_export_gcode_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30981) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30982) @@ -199,7 +199,7 @@ static rnd_export_opt_t gerber_options[] = { {"", "WARNING", - PCB_HATT_BEGIN_VBOX, 0, 0, {0, 0, 0, 0, {0}, gerber_warning}, 0, 0}, + RND_HATT_BEGIN_VBOX, 0, 0, {0, 0, 0, 0, {0}, gerber_warning}, 0, 0}, #define HA_warning 0 /* %start-doc options "90 Gerber Export" @@ -210,7 +210,7 @@ %end-doc */ {"gerberfile", "Gerber output file base", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_gerberfile 1 /* %start-doc options "90 Gerber Export" @@ -221,7 +221,7 @@ %end-doc */ {"all-layers", "Output all layers, even empty ones", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_all_layers 2 /* %start-doc options "90 Gerber Export" @@ -232,25 +232,25 @@ %end-doc */ {"verbose", "Print file names and aperture counts on stdout", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_verbose 3 {"copy-outline", "Copy outline onto other layers", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, copy_outline_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, copy_outline_names, 0}, #define HA_copy_outline 4 {"cross-sect", "Export the cross section layer", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cross_sect 5 {"coord-format", "Coordinate format (resolution)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, coord_format_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, coord_format_names, 0}, #define HA_coord_format 6 {"aperture-per-file", "Restart aperture numbering in each new file", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_apeture_per_file 7 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 8 }; @@ -421,7 +421,7 @@ static int gerber_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(gerber_options, NUM_OPTIONS, gerber_cookie, 0); + rnd_export_register_opts(gerber_options, NUM_OPTIONS, gerber_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -1035,7 +1035,7 @@ break; case PCB_HIDEOF_DAD: PCB_DAD_BEGIN_VBOX(dad->dlg); - PCB_DAD_COMPFLAG(dad->dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); PCB_DAD_BEGIN_HBOX(dad->dlg); PCB_DAD_PICTURE(dad->dlg, pcp_dlg_xpm_by_name("warning")); PCB_DAD_BEGIN_VBOX(dad->dlg); @@ -1064,7 +1064,7 @@ void pplg_uninit_export_gerber(void) { - pcb_export_remove_opts_by_cookie(gerber_cookie); + rnd_export_remove_opts_by_cookie(gerber_cookie); rnd_conf_unreg_fields("plugins/export_gerber/"); rnd_event_unbind_allcookie(gerber_cookie); } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 30981) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 30982) @@ -409,12 +409,12 @@ { "netlistfile", "Name of the IPC-D-356 Netlist output file", - PCB_HATT_STRING, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_ipcd356_filename 0 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 1 }; @@ -477,7 +477,7 @@ void pplg_uninit_export_ipcd356(void) { - pcb_export_remove_opts_by_cookie(ipcd356_cookie); + rnd_export_remove_opts_by_cookie(ipcd356_cookie); } int pplg_init_export_ipcd356(void) @@ -498,6 +498,6 @@ pcb_hid_register_hid(&ipcd356_hid); - pcb_export_register_opts(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0); + rnd_export_register_opts(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0); return 0; } Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 30981) +++ trunk/src_plugins/export_lpr/lpr.c (revision 30982) @@ -33,7 +33,7 @@ %end-doc */ {"lprcommand", "Command to use for printing", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_lprcommand 0 }; @@ -96,7 +96,7 @@ static int lpr_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { lpr_get_export_options(hid, 0); - pcb_export_register_opts(lpr_options, num_lpr_options, lpr_cookie, 0); + rnd_export_register_opts(lpr_options, num_lpr_options, lpr_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30981) +++ trunk/src_plugins/export_openems/excitation.c (revision 30982) @@ -291,10 +291,10 @@ static void exc_user_dad(int idx) { PCB_DAD_BEGIN_VBOX(exc_ctx.dlg); - PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(exc_ctx.dlg, "Specify the excitation setup script:"); PCB_DAD_TEXT(exc_ctx.dlg, NULL); - PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb); exc_ctx.exc_data[idx].w[I_SCRIPT] = PCB_DAD_CURRENT(exc_ctx.dlg); PCB_DAD_END(exc_ctx.dlg); @@ -419,7 +419,7 @@ } PCB_DAD_BEGIN_VBOX(exc_ctx.dlg); - PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(exc_ctx.dlg); PCB_DAD_LABEL(exc_ctx.dlg, "Excitation type:"); PCB_DAD_ENUM(exc_ctx.dlg, excnames); @@ -427,7 +427,7 @@ PCB_DAD_CHANGE_CB(exc_ctx.dlg, select_cb); PCB_DAD_END(exc_ctx.dlg); PCB_DAD_BEGIN_TABBED(exc_ctx.dlg, excnames); - PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_HIDE_TABLAB); + PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_HIDE_TABLAB); exc_ctx.wtab = PCB_DAD_CURRENT(exc_ctx.dlg); for(n = 0, e = excitations; e->name != NULL; n++,e++) { if (e->dad != NULL) Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30981) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30982) @@ -95,59 +95,59 @@ rnd_export_opt_t openems_attribute_list[] = { {"outfile", "Graphics output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_openemsfile 0 {"def-copper-thick", "Default copper thickness", - PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0}, + RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0}, #define HA_def_copper_thick 1 {"def-substrate-thick", "Default substrate thickness", - PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0}, + RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0}, #define HA_def_substrate_thick 2 {"def-copper-cond", "Default copper conductivity", - PCB_HATT_STRING, 0, 0, {0, "56*10^6", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "56*10^6", 0}, 0, 0}, #define HA_def_copper_cond 3 {"def-subst-epsilon", "Default substrate epsilon", - PCB_HATT_STRING, 0, 0, {0, "3.66", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "3.66", 0}, 0, 0}, #define HA_def_subst_epsilon 4 {"def-subst-mue", "Default substrate mue", - PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, #define HA_def_subst_mue 5 {"def-subst-kappa", "Default substrate kappa", - PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, #define HA_def_subst_kappa 6 {"def-subst-sigma", "Default substrate sigma", - PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0}, #define HA_def_subst_sigma 7 {"void-name", "Name of the void (sorrunding material)", - PCB_HATT_STRING, 0, 0, {0, "AIR", 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, "AIR", 0}, 0, 0}, #define HA_void_name 8 {"void-epsilon", "epsilon value for the void (sorrunding material)", - PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0}, + RND_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0}, #define HA_void_epsilon 9 {"void-mue", "mue value for the void (sorrunding material)", - PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0}, + RND_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0}, #define HA_void_mue 10 {"segments", "kludge: number of segments used to approximate round cap trace ends", - PCB_HATT_INTEGER, 0, 100, {10, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 100, {10, 0, 0}, 0, 0}, #define HA_segments 11 {"base-prio", "base priority: if the board displaces the chassis", - PCB_HATT_INTEGER, 0, 10, {0, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 10, {0, 0, 0}, 0, 0}, #define HA_base_prio 12 {"port-resistance", "default port resistance", - PCB_HATT_REAL, 0, 1000, {0, 0, 50}, 0, 0} + RND_HATT_REAL, 0, 1000, {0, 0, 50}, 0, 0} #define HA_def_port_res 13 }; @@ -683,7 +683,7 @@ static int openems_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0); + rnd_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -835,7 +835,7 @@ { pcb_openems_excitation_uninit(); rnd_remove_actions_by_cookie(openems_cookie); - pcb_export_remove_opts_by_cookie(openems_cookie); + rnd_export_remove_opts_by_cookie(openems_cookie); } int pplg_init_export_openems(void) Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 30981) +++ trunk/src_plugins/export_openems/mesh.c (revision 30982) @@ -1061,7 +1061,7 @@ PCB_DAD_BEGIN_VBOX(ia.dlg); PCB_DAD_BEGIN_HBOX(ia.dlg); PCB_DAD_BEGIN_VBOX(ia.dlg); - PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ia.dlg, "XY-mesh"); PCB_DAD_BEGIN_HBOX(ia.dlg); PCB_DAD_COORD(ia.dlg, ""); @@ -1117,7 +1117,7 @@ PCB_DAD_END(ia.dlg); PCB_DAD_BEGIN_VBOX(ia.dlg); - PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ia.dlg, "Z-mesh"); PCB_DAD_BEGIN_HBOX(ia.dlg); @@ -1186,7 +1186,7 @@ PCB_DAD_BEGIN_HBOX(ia.dlg); PCB_DAD_BEGIN_VBOX(ia.dlg); - PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME); PCB_DAD_LABEL(ia.dlg, "Boundary"); for(n = 0; n < 6; n+=2) { char name[64]; Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30981) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30982) @@ -93,31 +93,31 @@ %end-doc */ {"outfile", "Graphics output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_openscadfile 0 {"copper", "enable exporting outer copper layers", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_copper 1 {"silk", "enable exporting silk layers", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_silk 2 {"mask", "enable exporting mask layers", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_mask 3 {"models", "enable searching and inserting model files", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_models 4 {"drill", "enable drilling holes", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_drill 5 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 6 }; @@ -353,7 +353,7 @@ static int openscad_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0); + rnd_export_register_opts(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -661,7 +661,7 @@ void pplg_uninit_export_openscad(void) { - pcb_export_remove_opts_by_cookie(openscad_cookie); + rnd_export_remove_opts_by_cookie(openscad_cookie); rnd_remove_actions_by_cookie(openscad_cookie); } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30981) +++ trunk/src_plugins/export_png/png.c (revision 30982) @@ -176,7 +176,7 @@ %end-doc */ {"outfile", "Graphics output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_pngfile 0 /* %start-doc options "93 PNG Options" @@ -187,7 +187,7 @@ %end-doc */ {"dpi", "Scale factor (pixels/inch). 0 to scale to specified size", - PCB_HATT_INTEGER, 0, 10000, {100, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 10000, {100, 0, 0}, 0, 0}, #define HA_dpi 1 /* %start-doc options "93 PNG Options" @@ -198,7 +198,7 @@ %end-doc */ {"x-max", "Maximum width (pixels). 0 to not constrain", - PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, #define HA_xmax 2 /* %start-doc options "93 PNG Options" @@ -209,7 +209,7 @@ %end-doc */ {"y-max", "Maximum height (pixels). 0 to not constrain", - PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, #define HA_ymax 3 /* %start-doc options "93 PNG Options" @@ -220,7 +220,7 @@ %end-doc */ {"xy-max", "Maximum width and height (pixels). 0 to not constrain", - PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0}, #define HA_xymax 4 /* %start-doc options "93 PNG Options" @@ -231,7 +231,7 @@ %end-doc */ {"as-shown", "Export layers as shown on screen", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_as_shown 5 /* %start-doc options "93 PNG Options" @@ -242,7 +242,7 @@ %end-doc */ {"monochrome", "Convert to monochrome", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_mono 6 /* %start-doc options "93 PNG Options" @@ -253,7 +253,7 @@ %end-doc */ {"only-visible", "Limit the bounds of the PNG image to the visible items", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_only_visible 7 /* %start-doc options "93 PNG Options" @@ -264,7 +264,7 @@ %end-doc */ {"use-alpha", "Make the background and any holes transparent", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_use_alpha 8 /* %start-doc options "93 PNG Options" @@ -276,7 +276,7 @@ %end-doc */ {"format", "Export file format", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, filetypes, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, filetypes, 0}, #define HA_filetype 9 /* %start-doc options "93 PNG Options" @@ -290,7 +290,7 @@ %end-doc */ {"png-bloat", "Amount (in/mm/mil/pix) to add to trace/pad/pin edges (1 = 1/100 mil) (OBSOLETE - do not use this feature!)", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_bloat 10 /* %start-doc options "93 PNG Options" @@ -302,7 +302,7 @@ %end-doc */ {"photo-mode", "Photo-realistic export mode", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_photo_mode 11 /* %start-doc options "93 PNG Options" @@ -313,7 +313,7 @@ %end-doc */ {"photo-flip-x", "Show reverse side of the board, left-right flip", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_photo_flip_x 12 /* %start-doc options "93 PNG Options" @@ -324,7 +324,7 @@ %end-doc */ {"photo-flip-y", "Show reverse side of the board, up-down flip", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_photo_flip_y 13 /* %start-doc options "93 PNG Options" @@ -337,7 +337,7 @@ %end-doc */ {"photo-mask-colour", "Colour for the exported colour mask (green, red, blue, purple)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, mask_colour_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, mask_colour_names, 0}, #define HA_photo_mask_colour 14 /* %start-doc options "93 PNG Options" @@ -351,7 +351,7 @@ %end-doc */ {"photo-plating", "Type of plating applied to exposed copper in photo-mode (tinned, gold, silver, copper)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, plating_type_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, plating_type_names, 0}, #define HA_photo_plating 15 /* %start-doc options "93 PNG Options" @@ -364,11 +364,11 @@ %end-doc */ {"photo-silk-colour", "Colour for the exported colour silk (white, black, yellow)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, silk_colour_names, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, silk_colour_names, 0}, #define HA_photo_silk_colour 16 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 17 }; @@ -793,7 +793,7 @@ static int png_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); + rnd_export_register_opts(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -1403,7 +1403,7 @@ void pplg_uninit_export_png(void) { - pcb_export_remove_opts_by_cookie(png_cookie); + rnd_export_remove_opts_by_cookie(png_cookie); } int pplg_init_export_png(void) Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 30981) +++ trunk/src_plugins/export_ps/eps.c (revision 30982) @@ -59,7 +59,7 @@ %end-doc */ {"eps-file", "Encapsulated Postscript output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_psfile 0 /* %start-doc options "92 Encapsulated Postscript Export" @@ -70,7 +70,7 @@ %end-doc */ {"eps-scale", "EPS scale", - PCB_HATT_REAL, 0, 100, {0, 0, 1.0}, 0, 0}, + RND_HATT_REAL, 0, 100, {0, 0, 1.0}, 0, 0}, #define HA_scale 1 /* %start-doc options "92 Encapsulated Postscript Export" @@ -82,7 +82,7 @@ %end-doc */ {"as-shown", "Export layers as shown on screen", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_as_shown 2 /* %start-doc options "92 Encapsulated Postscript Export" @@ -93,7 +93,7 @@ %end-doc */ {"monochrome", "Convert to monochrome", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_mono 3 /* %start-doc options "92 Encapsulated Postscript Export" @@ -105,11 +105,11 @@ %end-doc */ {"only-visible", "Limit the bounds of the EPS file to the visible items", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_only_visible 4 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 5 }; @@ -359,7 +359,7 @@ static int eps_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); + rnd_export_register_opts(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30981) +++ trunk/src_plugins/export_ps/ps.c (revision 30982) @@ -58,7 +58,7 @@ %end-doc */ {"psfile", "Postscript output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_psfile 0 /* %start-doc options "91 Postscript Export" @@ -70,7 +70,7 @@ %end-doc */ {"drill-helper", "Draw small holes to center drill but in copper", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_drillhelper 1 /* %start-doc options "91 Postscript Export" @@ -82,7 +82,7 @@ %end-doc */ {"align-marks", "Print alignment marks on each sheet", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_alignmarks 2 /* %start-doc options "91 Postscript Export" @@ -93,7 +93,7 @@ %end-doc */ {"outline", "Print outline on each sheet", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_outline 3 /* %start-doc options "91 Postscript Export" @ftable @code @@ -103,7 +103,7 @@ %end-doc */ {"mirror", "Print mirror image of every page", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_mirror 4 /* %start-doc options "91 Postscript Export" @@ -114,7 +114,7 @@ %end-doc */ {"fill-page", "Scale board to fill page", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_fillpage 5 /* %start-doc options "91 Postscript Export" @@ -125,7 +125,7 @@ %end-doc */ {"auto-mirror", "Print mirror image of appropriate layers", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_automirror 6 /* %start-doc options "91 Postscript Export" @@ -136,7 +136,7 @@ %end-doc */ {"ps-color", "Prints in color", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_color 7 /* %start-doc options "91 Postscript Export" @@ -148,7 +148,7 @@ %end-doc */ {"ps-invert", "Draw objects as white-on-black", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_psinvert 8 /* %start-doc options "91 Postscript Export" @@ -164,7 +164,7 @@ %end-doc */ {"media", "media type", - PCB_HATT_ENUM, 0, 0, {22, 0, 0}, pcb_medias, 0}, + RND_HATT_ENUM, 0, 0, {22, 0, 0}, pcb_medias, 0}, #define HA_media 9 /* %start-doc options "91 Postscript Export" @@ -176,7 +176,7 @@ %end-doc */ {"psfade", "Fade amount for assembly drawings (0.0=missing, 1.0=solid)", - PCB_HATT_REAL, 0, 1, {0, 0, 0.40}, 0, 0}, + RND_HATT_REAL, 0, 1, {0, 0, 0.40}, 0, 0}, #define HA_psfade 10 /* %start-doc options "91 Postscript Export" @@ -187,7 +187,7 @@ %end-doc */ {"scale", "Scale value to compensate for printer sizing errors (1.0 = full scale)", - PCB_HATT_REAL, 0.01, 4, {0, 0, 1.00}, 0, 0}, + RND_HATT_REAL, 0.01, 4, {0, 0, 1.00}, 0, 0}, #define HA_scale 11 /* %start-doc options "91 Postscript Export" @@ -199,7 +199,7 @@ %end-doc */ {"multi-file", "Produce multiple files, one per page, instead of a single file", - PCB_HATT_BOOL, 0, 0, {0, 0, 0.40}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0.40}, 0, 0}, #define HA_multifile 12 /* %start-doc options "91 Postscript Export" @@ -210,7 +210,7 @@ %end-doc */ {"xcalib", "Paper width. Used for x-Axis calibration", - PCB_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0}, + RND_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0}, #define HA_xcalib 13 /* %start-doc options "91 Postscript Export" @@ -221,7 +221,7 @@ %end-doc */ {"ycalib", "Paper height. Used for y-Axis calibration", - PCB_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0}, + RND_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0}, #define HA_ycalib 14 /* %start-doc options "91 Postscript Export" @@ -232,7 +232,7 @@ %end-doc */ {"drill-copper", "Draw drill holes in pins / vias, instead of leaving solid copper", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_drillcopper 15 /* %start-doc options "91 Postscript Export" @@ -244,7 +244,7 @@ %end-doc */ {"show-legend", "Print file name and scale on printout", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_legend 16 /* %start-doc options "91 Postscript Export" @@ -256,7 +256,7 @@ %end-doc */ {"show-toc", "Print Table of Content", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_toc 17 @@ -269,7 +269,7 @@ %end-doc */ {"single-page", "Merge all drawings on a single page", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_single_page 18 /* %start-doc options "91 Postscript Export" @@ -281,12 +281,12 @@ %end-doc */ {"drill-helper-size", "Diameter of the small hole when drill-helper is on", - PCB_HATT_COORD, 0, PCB_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0}, + RND_HATT_COORD, 0, PCB_MM_TO_COORD(10), {0, 0, 0, PCB_MIN_PINORVIAHOLE}, 0, 0}, #define HA_drillhelpersize 19 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 20 }; @@ -672,7 +672,7 @@ static int ps_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); + rnd_export_register_opts(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -1251,7 +1251,7 @@ rnd_hid_attribute_t ps_calib_attribute_list[] = { {"lprcommand", "Command to print", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, }; static const char *const calib_lines[] = { @@ -1470,7 +1470,7 @@ static void plugin_ps_uninit(void) { rnd_remove_actions_by_cookie(ps_cookie); - pcb_export_remove_opts_by_cookie(ps_cookie); + rnd_export_remove_opts_by_cookie(ps_cookie); ps_inited = 0; } Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 30981) +++ trunk/src_plugins/export_stat/stat.c (revision 30982) @@ -72,36 +72,36 @@ /* other HIDs expect this to be first. */ {"outfile", "Output file name", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_statfile 0 {"board_id", "Short name of the board so it can be identified for updates", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_board_id 1 {"orig", "This design started its life in pcb-rnd", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_orig 2 {"lht_built", "This design was already in lihata when real boards got built", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_lht_built 3 {"built", "how many actual/physical boards got built", - PCB_HATT_INTEGER, 0, 1000000, {0, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 1000000, {0, 0, 0}, 0, 0}, #define HA_built 4 {"first_ver", "the version of pcb-rnd you first used on this board", - PCB_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0}, #define HA_first_ver 5 {"license", "license of the design", - PCB_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0}, #define HA_license 6 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 7 }; @@ -373,7 +373,7 @@ static int stat_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0); + rnd_export_register_opts(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -393,7 +393,7 @@ free((char *)stat_attribute_list[HA_license].default_val.str); stat_attribute_list[HA_first_ver].default_val.str = NULL; stat_attribute_list[HA_license].default_val.str = NULL; - pcb_export_remove_opts_by_cookie(stat_cookie); + rnd_export_remove_opts_by_cookie(stat_cookie); } int pplg_init_export_stat(void) Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 30981) +++ trunk/src_plugins/export_stl/export_stl.c (revision 30982) @@ -42,27 +42,27 @@ rnd_export_opt_t stl_attribute_list[] = { {"outfile", "STL output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_stlfile 0 {"models", "enable searching and inserting model files", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_models 1 {"drill", "enable drilling holes", - PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0}, #define HA_drill 2 {"override-thickness", "override calculated board thickness (when non-zero)", - PCB_HATT_COORD, 0, 0, {1, 0, 0}, 0, 0}, + RND_HATT_COORD, 0, 0, {1, 0, 0}, 0, 0}, #define HA_ovrthick 3 {"z-center", "when true: z=0 is the center of board cross section, instead of being at the bottom side", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_zcent 4 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 5 }; @@ -227,7 +227,7 @@ static int stl_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0]), stl_cookie, 0); + rnd_export_register_opts(stl_attribute_list, sizeof(stl_attribute_list) / sizeof(stl_attribute_list[0]), stl_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30981) +++ trunk/src_plugins/export_svg/svg.c (revision 30982) @@ -136,7 +136,7 @@ %end-doc */ {"outfile", "Graphics output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_svgfile 0 /* %start-doc options "93 SVG Options" @@ -148,7 +148,7 @@ %end-doc */ {"photo-mode", "Photo-realistic export mode", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_photo_mode 1 /* %start-doc options "93 SVG Options" @@ -160,7 +160,7 @@ %end-doc */ {"opacity", "Layer opacity", - PCB_HATT_INTEGER, 0, 100, {100, 0, 0}, 0, 0}, + RND_HATT_INTEGER, 0, 100, {100, 0, 0}, 0, 0}, #define HA_opacity 2 /* %start-doc options "93 SVG Options" @@ -172,15 +172,15 @@ %end-doc */ {"flip", "Flip board", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_flip 3 {"as-shown", "Render similar to as shown on screen (display overlays)", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}, #define HA_as_shown 4 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0} + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0} #define HA_cam 5 }; @@ -379,7 +379,7 @@ static int svg_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); + rnd_export_register_opts(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -886,7 +886,7 @@ void pplg_uninit_export_svg(void) { - pcb_export_remove_opts_by_cookie(svg_cookie); + rnd_export_remove_opts_by_cookie(svg_cookie); } int pplg_init_export_svg(void) Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 30981) +++ trunk/src_plugins/export_test/export_test.c (revision 30982) @@ -31,7 +31,7 @@ %end-doc */ {"export_testfile", "Name of the export_test output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_export_testfile 0 }; @@ -88,7 +88,7 @@ static int export_test_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); + rnd_export_register_opts(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 30981) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 30982) @@ -356,7 +356,7 @@ void pplg_uninit_export_vfs_fuse(void) { - pcb_export_remove_opts_by_cookie(export_vfs_fuse_cookie); + rnd_export_remove_opts_by_cookie(export_vfs_fuse_cookie); free(fuse_argv); fuse_argv = NULL; free(fuse_ret_argv); Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 30981) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 30982) @@ -26,11 +26,11 @@ static rnd_export_opt_t export_vfs_mc_options[] = { {"cmd", "mc command", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_export_vfs_mc_cmd 0 {"qpath", "query path", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_export_vfs_mc_qpath 1 }; @@ -135,7 +135,7 @@ static int export_vfs_mc_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0); + rnd_export_register_opts(export_vfs_mc_options, sizeof(export_vfs_mc_options) / sizeof(export_vfs_mc_options[0]), export_vfs_mc_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -145,7 +145,7 @@ void pplg_uninit_export_vfs_mc(void) { - pcb_export_remove_opts_by_cookie(export_vfs_mc_cookie); + rnd_export_remove_opts_by_cookie(export_vfs_mc_cookie); } int pplg_init_export_vfs_mc(void) Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 30981) +++ trunk/src_plugins/export_xy/xy.c (revision 30982) @@ -56,7 +56,7 @@ %end-doc */ {"xyfile", "Name of the XY output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_xyfile 0 /* %start-doc options "8 XY Creation" @@ -67,14 +67,14 @@ %end-doc */ {"xy-unit", "XY units", - PCB_HATT_UNIT, 0, 0, {-1, 0, 0}, NULL, 0}, + RND_HATT_UNIT, 0, 0, {-1, 0, 0}, NULL, 0}, #define HA_unit 1 {"format", "file format (template)", - PCB_HATT_ENUM, 0, 0, {0, 0, 0}, NULL, 0}, + RND_HATT_ENUM, 0, 0, {0, 0, 0}, NULL, 0}, #define HA_format 2 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 3 }; @@ -840,7 +840,7 @@ static int xy_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); + rnd_export_register_opts(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -850,7 +850,7 @@ void pplg_uninit_export_xy(void) { - pcb_export_remove_opts_by_cookie(xy_cookie); + rnd_export_remove_opts_by_cookie(xy_cookie); rnd_conf_unreg_file(CONF_FN, export_xy_conf_internal); rnd_conf_unreg_fields("plugins/export_xy/"); free_fmts(); Index: trunk/src_plugins/exto_std/bus.c =================================================================== --- trunk/src_plugins/exto_std/bus.c (revision 30981) +++ trunk/src_plugins/exto_std/bus.c (revision 30982) @@ -377,7 +377,7 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(bus->dlg); - PCB_DAD_COMPFLAG(bus->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(bus->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(bus->dlg, 2); pcb_exto_dlg_int(bus->dlg, subc, "width", "extobj::width", "number of traces in the bus"); pcb_exto_dlg_coord(bus->dlg, subc, "thickness", "extobj::thickness", "thickness of each trace"); Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 30981) +++ trunk/src_plugins/exto_std/dimension.c (revision 30982) @@ -415,7 +415,7 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(dim->dlg); - PCB_DAD_COMPFLAG(dim->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dim->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(dim->dlg, 2); pcb_exto_dlg_coord(dim->dlg, subc, "displacement", "extobj::displace", "distance between base line and dimension line"); pcb_exto_dlg_str(dim->dlg, subc, "format", "extobj::format", "printf coord format string of the dimension value"); Index: trunk/src_plugins/exto_std/line_of_vias.c =================================================================== --- trunk/src_plugins/exto_std/line_of_vias.c (revision 30981) +++ trunk/src_plugins/exto_std/line_of_vias.c (revision 30982) @@ -315,7 +315,7 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(lov->dlg); - PCB_DAD_COMPFLAG(lov->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(lov->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(lov->dlg, 2); pcb_exto_dlg_coord(lov->dlg, subc, "pitch", "extobj::pitch", "target distance between center of vias"); pcb_exto_dlg_coord(lov->dlg, subc, "clearance", "extobj::clearance", "global clarance value on vias"); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 30981) +++ trunk/src_plugins/hid_batch/batch.c (revision 30982) @@ -332,7 +332,7 @@ void pplg_uninit_hid_batch(void) { rnd_event_unbind_allcookie(batch_cookie); - pcb_export_remove_opts_by_cookie(batch_cookie); + rnd_export_remove_opts_by_cookie(batch_cookie); } int pplg_init_hid_batch(void) Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30981) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30982) @@ -197,14 +197,14 @@ static void attribute_dialog_readres(lesstif_attr_dlg_t *ctx, int widx) { switch(ctx->attrs[widx].type) { - case PCB_HATT_BOOL: + case RND_HATT_BOOL: ctx->attrs[widx].val.lng = XmToggleButtonGetState(ctx->wl[widx]); break; - case PCB_HATT_STRING: + case RND_HATT_STRING: free((char *)ctx->attrs[widx].val.str); ctx->attrs[widx].val.str = rnd_strdup(XmTextGetString(ctx->wl[widx])); return; /* can't rely on central copy because of the allocation */ - case PCB_HATT_ENUM: + case RND_HATT_ENUM: { const char **uptr; Widget btn; @@ -302,42 +302,42 @@ for (i = start_from; i < ctx->n_attrs; i++) { Widget w; - if (ctx->attrs[i].type == PCB_HATT_END) + if (ctx->attrs[i].type == RND_HATT_END) break; /* Add content */ stdarg_n = 0; stdarg(XmNalignment, XmALIGNMENT_END); - if ((ctx->attrs[i].pcb_hatt_flags & PCB_HATF_EXPFILL) || (ctx->attrs[i].type == PCB_HATT_BEGIN_HPANE) || (ctx->attrs[i].type == PCB_HATT_BEGIN_VPANE)) + if ((ctx->attrs[i].rnd_hatt_flags & RND_HATF_EXPFILL) || (ctx->attrs[i].type == RND_HATT_BEGIN_HPANE) || (ctx->attrs[i].type == RND_HATT_BEGIN_VPANE)) stdarg(PxmNfillBoxFill, 1); stdarg(XmNuserData, ctx); switch(ctx->attrs[i].type) { - case PCB_HATT_BEGIN_HBOX: - w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'h', 0, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL)); + case RND_HATT_BEGIN_HBOX: + w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'h', 0, (ctx->attrs[i].rnd_hatt_flags & RND_HATF_FRAME), (ctx->attrs[i].rnd_hatt_flags & RND_HATF_SCROLL)); XtManageChild(w); ctx->wl[i] = w; i = attribute_dialog_add(ctx, w, i+1); break; - case PCB_HATT_BEGIN_VBOX: - w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'v', 0, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL)); + case RND_HATT_BEGIN_VBOX: + w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'v', 0, (ctx->attrs[i].rnd_hatt_flags & RND_HATF_FRAME), (ctx->attrs[i].rnd_hatt_flags & RND_HATF_SCROLL)); XtManageChild(w); ctx->wl[i] = w; i = attribute_dialog_add(ctx, w, i+1); break; - case PCB_HATT_BEGIN_HPANE: - case PCB_HATT_BEGIN_VPANE: - i = ltf_pane_create(ctx, i, parent, (ctx->attrs[i].type == PCB_HATT_BEGIN_HPANE)); + case RND_HATT_BEGIN_HPANE: + case RND_HATT_BEGIN_VPANE: + i = ltf_pane_create(ctx, i, parent, (ctx->attrs[i].type == RND_HATT_BEGIN_HPANE)); break; - case PCB_HATT_BEGIN_TABLE: + case RND_HATT_BEGIN_TABLE: /* create content table */ - numcol = ctx->attrs[i].pcb_hatt_table_cols; + numcol = ctx->attrs[i].rnd_hatt_table_cols; len = pcb_hid_attrdlg_num_children(ctx->attrs, i+1, ctx->n_attrs); numch = len / numcol + !!(len % numcol); - w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 't', numch, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL)); + w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 't', numch, (ctx->attrs[i].rnd_hatt_flags & RND_HATF_FRAME), (ctx->attrs[i].rnd_hatt_flags & RND_HATF_SCROLL)); ctx->wl[i] = w; @@ -357,55 +357,55 @@ XtManageChild(w); break; - case PCB_HATT_BEGIN_TABBED: + case RND_HATT_BEGIN_TABBED: i = ltf_tabbed_create(ctx, parent, &ctx->attrs[i], i); break; - case PCB_HATT_BEGIN_COMPOUND: + case RND_HATT_BEGIN_COMPOUND: i = attribute_dialog_add(ctx, parent, i+1); break; - case PCB_HATT_PREVIEW: + case RND_HATT_PREVIEW: ctx->wl[i] = ltf_preview_create(ctx, parent, &ctx->attrs[i]); break; - case PCB_HATT_TEXT: + case RND_HATT_TEXT: ctx->wl[i] = ltf_text_create(ctx, parent, &ctx->attrs[i]); break; - case PCB_HATT_TREE: + case RND_HATT_TREE: ctx->wl[i] = ltf_tree_create(ctx, parent, &ctx->attrs[i]); break; - case PCB_HATT_PICTURE: + case RND_HATT_PICTURE: ctx->wl[i] = ltf_picture_create(ctx, parent, &ctx->attrs[i]); break; - case PCB_HATT_PICBUTTON: + case RND_HATT_PICBUTTON: ctx->wl[i] = ltf_picbutton_create(ctx, parent, &ctx->attrs[i]); XtAddCallback(ctx->wl[i], XmNactivateCallback, valchg, ctx->wl[i]); XtSetValues(ctx->wl[i], stdarg_args, stdarg_n); break; - case PCB_HATT_COLOR: - ctx->wl[i] = ltf_colorbtn_create(ctx, parent, &ctx->attrs[i], (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_CLR_STATIC)); + case RND_HATT_COLOR: + ctx->wl[i] = ltf_colorbtn_create(ctx, parent, &ctx->attrs[i], (ctx->attrs[i].rnd_hatt_flags & RND_HATF_CLR_STATIC)); /* callback handled internally */ XtSetValues(ctx->wl[i], stdarg_args, stdarg_n); break; - case PCB_HATT_LABEL: + case RND_HATT_LABEL: stdarg_n = 0; stdarg(XmNalignment, XmALIGNMENT_BEGINNING); ctx->wl[i] = XmCreateLabel(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n); break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: stdarg(XmNlabelString, empty); stdarg(XmNset, ctx->attrs[i].val.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; - case PCB_HATT_STRING: - stdarg(XmNcolumns, ((ctx->attrs[i].hatt_flags & PCB_HATF_HEIGHT_CHR) ? ctx->attrs[i].geo_width : 40)); + case RND_HATT_STRING: + stdarg(XmNcolumns, ((ctx->attrs[i].hatt_flags & RND_HATF_HEIGHT_CHR) ? ctx->attrs[i].geo_width : 40)); stdarg(XmNresizeWidth, True); stdarg(XmNvalue, ctx->attrs[i].val.str); ctx->wl[i] = XmCreateTextField(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n); @@ -413,18 +413,18 @@ XtAddCallback(ctx->wl[i], XmNactivateCallback, activated, ctx->wl[i]); break; - case PCB_HATT_INTEGER: - case PCB_HATT_COORD: - case PCB_HATT_REAL: + case RND_HATT_INTEGER: + case RND_HATT_COORD: + case RND_HATT_REAL: stdarg_n = 0; stdarg(XmNalignment, XmALIGNMENT_BEGINNING); ctx->wl[i] = XmCreateLabel(parent, XmStrCast("ERROR: old spin widget"), stdarg_args, stdarg_n); break; - case PCB_HATT_PROGRESS: + case RND_HATT_PROGRESS: ctx->wl[i] = ltf_progress_create(ctx, parent); break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: { static XmString empty = 0; Widget submenu, default_button = 0; @@ -464,7 +464,7 @@ } } break; - case PCB_HATT_BUTTON: + case RND_HATT_BUTTON: stdarg(XmNlabelString, XmStringCreatePCB(ctx->attrs[i].val.str)); ctx->wl[i] = XmCreatePushButton(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n); XtAddCallback(ctx->wl[i], XmNactivateCallback, valchg, ctx->wl[i]); @@ -491,12 +491,12 @@ save = ctx->inhibit_valchg; ctx->inhibit_valchg = 1; switch(ctx->attrs[idx].type) { - case PCB_HATT_BEGIN_HBOX: - case PCB_HATT_BEGIN_VBOX: - case PCB_HATT_BEGIN_TABLE: - case PCB_HATT_BEGIN_COMPOUND: + case RND_HATT_BEGIN_HBOX: + case RND_HATT_BEGIN_VBOX: + case RND_HATT_BEGIN_TABLE: + case RND_HATT_BEGIN_COMPOUND: goto err; - case PCB_HATT_END: + case RND_HATT_END: { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->set_value != NULL)) @@ -505,47 +505,47 @@ goto err; } break; - case PCB_HATT_BEGIN_TABBED: + case RND_HATT_BEGIN_TABBED: ltf_tabbed_set(ctx->wl[idx], val->lng); break; - case PCB_HATT_BEGIN_HPANE: - case PCB_HATT_BEGIN_VPANE: + case RND_HATT_BEGIN_HPANE: + case RND_HATT_BEGIN_VPANE: /* not possible to change the pane with the default motif widget */ break; - case PCB_HATT_BUTTON: + case RND_HATT_BUTTON: XtVaSetValues(ctx->wl[idx], XmNlabelString, XmStringCreatePCB(val->str), NULL); break; - case PCB_HATT_LABEL: + case RND_HATT_LABEL: XtVaSetValues(ctx->wl[idx], XmNlabelString, XmStringCreatePCB(val->str), NULL); break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: XtVaSetValues(ctx->wl[idx], XmNset, val->lng, NULL); break; - case PCB_HATT_STRING: + case RND_HATT_STRING: XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(val->str), NULL); ctx->attrs[idx].val.str = rnd_strdup(val->str); copied = 1; break; - case PCB_HATT_INTEGER: - case PCB_HATT_COORD: - case PCB_HATT_REAL: + case RND_HATT_INTEGER: + case RND_HATT_COORD: + case RND_HATT_REAL: goto err; - case PCB_HATT_PROGRESS: + case RND_HATT_PROGRESS: ltf_progress_set(ctx, idx, val->dbl); break; - case PCB_HATT_COLOR: + case RND_HATT_COLOR: ltf_colorbtn_set(ctx, idx, &val->clr); break; - case PCB_HATT_PREVIEW: + case RND_HATT_PREVIEW: ltf_preview_set(ctx, idx, val->dbl); break; - case PCB_HATT_TEXT: + case RND_HATT_TEXT: ltf_text_set(ctx, idx, val->str); break; - case PCB_HATT_TREE: + case RND_HATT_TREE: ltf_tree_set(ctx, idx, val->str); break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: { const char **vals = ctx->attrs[idx].wdata; for (n = 0; vals[n]; n++) { @@ -628,7 +628,7 @@ { int n; for(n = 0; n < ctx->n_attrs; n++) - if (ctx->attrs[n].pcb_hatt_flags & PCB_HATF_HIDE) + if (ctx->attrs[n].rnd_hatt_flags & RND_HATF_HIDE) XtUnmanageChild(ctx->wltop[n]); } @@ -666,7 +666,7 @@ XtSetValues(topform, stdarg_args, stdarg_n); - if (!PCB_HATT_IS_COMPOSITE(attrs[0].type)) { + if (!RND_HATT_IS_COMPOSITE(attrs[0].type)) { stdarg_n = 0; main_tbl = pcb_motif_box(topform, XmStrCast("layout"), 't', pcb_hid_attrdlg_num_children(ctx->attrs, 0, ctx->n_attrs), 0, 0); XtManageChild(main_tbl); @@ -781,10 +781,10 @@ if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL)) return -1; - if (ctx->attrs[idx].type == PCB_HATT_BEGIN_COMPOUND) + if (ctx->attrs[idx].type == RND_HATT_BEGIN_COMPOUND) return -1; - if (ctx->attrs[idx].type == PCB_HATT_END) { + if (ctx->attrs[idx].type == RND_HATT_END) { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_state != NULL)) cmp->widget_state(&ctx->attrs[idx], ctx, idx, enabled); @@ -803,9 +803,9 @@ if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL)) return -1; - if (ctx->attrs[idx].type == PCB_HATT_BEGIN_COMPOUND) + if (ctx->attrs[idx].type == RND_HATT_BEGIN_COMPOUND) return -1; - if (ctx->attrs[idx].type == PCB_HATT_END) { + if (ctx->attrs[idx].type == RND_HATT_END) { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_hide != NULL)) cmp->widget_hide(&ctx->attrs[idx], ctx, idx, hide); Index: trunk/src_plugins/hid_lesstif/dlg_attr_box.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_box.c (revision 30981) +++ trunk/src_plugins/hid_lesstif/dlg_attr_box.c (revision 30982) @@ -174,11 +174,11 @@ tctx = calloc(1, sizeof(ltf_tab_t) + sizeof(ltf_tabbtn_t) * numtabs-1); tctx->len = numtabs; - if (!(ctx->attrs[i].pcb_hatt_flags & PCB_HATF_HIDE_TABLAB)) { + if (!(ctx->attrs[i].rnd_hatt_flags & RND_HATF_HIDE_TABLAB)) { int n; /* create the boxing for the labels */ - if (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LEFT_TAB) { + if (ctx->attrs[i].rnd_hatt_flags & RND_HATF_LEFT_TAB) { wtop = pcb_motif_box(parent, "tabbed_top", 'h', 0, 0, 0); wtab = pcb_motif_box(wtop, "tabbed_tabs", 'v', 0, 0, 0); } Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30981) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30982) @@ -203,7 +203,7 @@ pd->window = XtWindow(pw); pd->pw = pw; - pd->redraw_with_board = !!(attr->hatt_flags & PCB_HATF_PRV_BOARD); + pd->redraw_with_board = !!(attr->hatt_flags & RND_HATF_PRV_BOARD); XtAddCallback(pw, XmNexposeCallback, (XtCallbackProc)pcb_ltf_preview_callback, (XtPointer)pd); XtAddCallback(pw, XmNresizeCallback, (XtCallbackProc)pcb_ltf_preview_callback, (XtPointer)pd); @@ -481,7 +481,7 @@ stdarg(XmNresizePolicy, XmRESIZE_GROW); stdarg(XmNeditMode, XmMULTI_LINE_EDIT); stdarg(XmNuserData, ctx); - if (attr->pcb_hatt_flags & PCB_HATF_SCROLL) + if (attr->rnd_hatt_flags & RND_HATF_SCROLL) wtxt = XmCreateScrolledText(parent, XmStrCast("dad_text"), stdarg_args, stdarg_n); else wtxt = XmCreateText(parent, XmStrCast("dad_text"), stdarg_args, stdarg_n); Index: trunk/src_plugins/hid_lesstif/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30981) +++ trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 30982) @@ -418,7 +418,7 @@ ht->hid_expcoll_cb = ltf_tree_expcoll_cb; ht->hid_update_hide_cb = ltf_tree_update_hide_cb; - xm_tree_table_tree_mode(lt->w, !!(attr->pcb_hatt_flags & PCB_HATF_TREE_COL)); + xm_tree_table_tree_mode(lt->w, !!(attr->rnd_hatt_flags & RND_HATF_TREE_COL)); if (ht->hdr != NULL) { int n; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30981) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30982) @@ -249,7 +249,7 @@ rnd_export_opt_t lesstif_attribute_list[] = { {"install", "Install private colormap", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &use_private_colormap}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &use_private_colormap}, #define HA_colormap 0 /* %start-doc options "22 lesstif GUI Options" @@ -260,7 +260,7 @@ %end-doc */ {"listen", "Listen on standard input for actions", - PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &stdin_listen}, + RND_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &stdin_listen}, #define HA_listen 1 /* %start-doc options "22 lesstif GUI Options" @@ -273,7 +273,7 @@ %end-doc */ {"bg-image", "Background Image", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, &background_image_file}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, &background_image_file}, #define HA_bg_image 2 }; @@ -1646,7 +1646,7 @@ static int lesstif_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { Atom close_atom; - pcb_hid_attr_node_t *ha; + rnd_hid_attr_node_t *ha; int acount = 0, amax; int rcount = 0, rmax; int i, err; @@ -1660,15 +1660,15 @@ lesstif_reg_attrs(); - for (ha = hid_attr_nodes; ha; ha = ha->next) + for (ha = rnd_hid_attr_nodes; ha; ha = ha->next) for (i = 0; i < ha->n; i++) { rnd_export_opt_t *a = ha->opts + i; switch (a->type) { - case PCB_HATT_INTEGER: - case PCB_HATT_COORD: - case PCB_HATT_REAL: - case PCB_HATT_STRING: - case PCB_HATT_BOOL: + case RND_HATT_INTEGER: + case RND_HATT_COORD: + case RND_HATT_REAL: + case RND_HATT_STRING: + case RND_HATT_BOOL: acount++; rcount++; break; @@ -1696,7 +1696,7 @@ new_values = (val_union *) malloc((rmax + 1) * sizeof(val_union)); rcount = 0; - for (ha = hid_attr_nodes; ha; ha = ha->next) + for (ha = rnd_hid_attr_nodes; ha; ha = ha->next) for (i = 0; i < ha->n; i++) { rnd_export_opt_t *a = ha->opts + i; XrmOptionDescRec *o = new_options + acount; @@ -1714,15 +1714,15 @@ o->specifier = tmpres; switch (a->type) { - case PCB_HATT_INTEGER: - case PCB_HATT_COORD: - case PCB_HATT_REAL: - case PCB_HATT_STRING: + case RND_HATT_INTEGER: + case RND_HATT_COORD: + case RND_HATT_REAL: + case RND_HATT_STRING: o->argKind = XrmoptionSepArg; o->value = NULL; acount++; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: o->argKind = XrmoptionNoArg; o->value = XmStrCast("True"); acount++; @@ -1736,7 +1736,7 @@ r->resource_offset = sizeof(val_union) * rcount; switch (a->type) { - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: r->resource_type = XtRInt; r->default_type = XtRInt; r->resource_size = sizeof(int); @@ -1743,7 +1743,7 @@ r->default_addr = &(a->default_val.lng); rcount++; break; - case PCB_HATT_COORD: + case RND_HATT_COORD: r->resource_type = XmStrCast(XtRPCBCoord); r->default_type = XmStrCast(XtRPCBCoord); r->resource_size = sizeof(rnd_coord_t); @@ -1750,7 +1750,7 @@ r->default_addr = &(a->default_val.crd); rcount++; break; - case PCB_HATT_REAL: + case RND_HATT_REAL: r->resource_type = XmStrCast(XtRDouble); r->default_type = XmStrCast(XtRDouble); r->resource_size = sizeof(double); @@ -1757,7 +1757,7 @@ r->default_addr = &(a->default_val.dbl); rcount++; break; - case PCB_HATT_STRING: + case RND_HATT_STRING: r->resource_type = XtRString; r->default_type = XtRString; r->resource_size = sizeof(char *); @@ -1764,7 +1764,7 @@ r->default_addr = (char *) a->default_val.str; rcount++; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: r->resource_type = XtRBoolean; r->default_type = XtRInt; r->resource_size = sizeof(int); @@ -1812,12 +1812,12 @@ #endif /* RND_HAVE_XRENDER */ rcount = 0; - for (ha = hid_attr_nodes; ha; ha = ha->next) + for (ha = rnd_hid_attr_nodes; ha; ha = ha->next) for (i = 0; i < ha->n; i++) { rnd_export_opt_t *a = ha->opts + i; val_union *v = new_values + rcount; switch (a->type) { - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: if (a->value) *(int *) a->value = v->i; else @@ -1824,7 +1824,7 @@ a->default_val.lng = v->i; rcount++; break; - case PCB_HATT_COORD: + case RND_HATT_COORD: if (a->value) *(rnd_coord_t *) a->value = v->c; else @@ -1831,7 +1831,7 @@ a->default_val.crd = v->c; rcount++; break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: if (a->value) *(char *) a->value = v->i; else @@ -1838,7 +1838,7 @@ a->default_val.lng = v->i; rcount++; break; - case PCB_HATT_REAL: + case RND_HATT_REAL: if (a->value) *(double *) a->value = v->f; else @@ -1845,7 +1845,7 @@ a->default_val.dbl = v->f; rcount++; break; - case PCB_HATT_STRING: + case RND_HATT_STRING: if (a->value) *(char **) a->value = v->s; else @@ -2932,7 +2932,7 @@ void pplg_uninit_hid_lesstif(void) { - pcb_export_remove_opts_by_cookie(lesstif_cookie); + rnd_export_remove_opts_by_cookie(lesstif_cookie); rnd_event_unbind_allcookie(lesstif_cookie); rnd_conf_hid_unreg(lesstif_cookie); } @@ -3060,7 +3060,7 @@ static void lesstif_reg_attrs(void) { if (!lesstif_attrs_regd) - pcb_export_register_opts(lesstif_attribute_list, sizeof(lesstif_attribute_list)/sizeof(lesstif_attribute_list[0]), lesstif_cookie, 0); + rnd_export_register_opts(lesstif_attribute_list, sizeof(lesstif_attribute_list)/sizeof(lesstif_attribute_list[0]), lesstif_cookie, 0); lesstif_attrs_regd = 1; } @@ -3081,6 +3081,6 @@ static void lesstif_end(void) { rnd_remove_actions_by_cookie(lesstif_cookie); - pcb_export_remove_opts_by_cookie(lesstif_cookie); + rnd_export_remove_opts_by_cookie(lesstif_cookie); lesstif_active = 0; } Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30981) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30982) @@ -283,10 +283,10 @@ isch_ctx.len = len; PCB_DAD_BEGIN_VBOX(isch_ctx.dlg); - PCB_DAD_COMPFLAG(isch_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(isch_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(isch_ctx.dlg); /* format box */ - PCB_DAD_COMPFLAG(isch_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(isch_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HBOX(isch_ctx.dlg); PCB_DAD_LABEL(isch_ctx.dlg, "Format:"); PCB_DAD_ENUM(isch_ctx.dlg, isch_ctx.inames); @@ -295,13 +295,13 @@ PCB_DAD_HELP(isch_ctx.dlg, "Import file format (or plugin)"); PCB_DAD_END(isch_ctx.dlg); PCB_DAD_BEGIN_TABBED(isch_ctx.dlg, isch_ctx.inames); - PCB_DAD_COMPFLAG(isch_ctx.dlg, PCB_HATF_HIDE_TABLAB); + PCB_DAD_COMPFLAG(isch_ctx.dlg, RND_HATF_HIDE_TABLAB); isch_ctx.wtab = PCB_DAD_CURRENT(isch_ctx.dlg); for(n = 0; n < len; n++) isch_add_tab(pa[n]); PCB_DAD_END(isch_ctx.dlg); PCB_DAD_BEGIN_VBOX(isch_ctx.dlg); /* scrollable arg list */ - PCB_DAD_COMPFLAG(isch_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(isch_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); for(n = 0; n < MAX_ARGS; n++) { PCB_DAD_BEGIN_HBOX(isch_ctx.dlg); isch_ctx.warg_box[n] = PCB_DAD_CURRENT(isch_ctx.dlg); @@ -342,7 +342,7 @@ PCB_DAD_BUTTON(isch_ctx.dlg, "Import!"); PCB_DAD_CHANGE_CB(isch_ctx.dlg, isch_import_cb); PCB_DAD_BEGIN_HBOX(isch_ctx.dlg); - PCB_DAD_COMPFLAG(isch_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(isch_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_END(isch_ctx.dlg); PCB_DAD_BUTTON_CLOSES(isch_ctx.dlg, clbtn); PCB_DAD_END(isch_ctx.dlg); Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 30981) +++ trunk/src_plugins/io_tedax/tetest.c (revision 30982) @@ -175,11 +175,11 @@ static rnd_export_opt_t tedax_etest_options[] = { {"outfile", "Name of the tedax etest output file", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_outfile 0 {"cam", "CAM instruction", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}, #define HA_cam 1 }; @@ -237,7 +237,7 @@ static const char *tedax_etest_cookie = "tEDAx etest"; static int tedax_etest_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv) { - pcb_export_register_opts(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]), tedax_etest_cookie, 0); + rnd_export_register_opts(tedax_etest_options, sizeof(tedax_etest_options) / sizeof(tedax_etest_options[0]), tedax_etest_cookie, 0); return pcb_hid_parse_command_line(argc, argv); } @@ -245,7 +245,7 @@ void tedax_etest_uninit(void) { - pcb_export_remove_opts_by_cookie(tedax_etest_cookie); + rnd_export_remove_opts_by_cookie(tedax_etest_cookie); } void tedax_etest_init(void) Index: trunk/src_plugins/lib_gtk_common/dlg_attr_box.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_box.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_box.c (revision 30982) @@ -39,8 +39,8 @@ g_object_get(G_OBJECT(pane), "min-position", &minp, "max-position", &maxp, NULL); gtkc_widget_get_allocation(pane, &a); switch(ctx->attrs[idx].type) { - case PCB_HATT_BEGIN_HPANE: p = a.width; break; - case PCB_HATT_BEGIN_VPANE: p = a.height; break; + case RND_HATT_BEGIN_HPANE: p = a.width; break; + case RND_HATT_BEGIN_VPANE: p = a.height; break; default: abort(); } p = (double)p * ratio; @@ -73,7 +73,7 @@ ts.val.pane.next = 1; ctx->wl[j] = widget = ishor ? gtkc_hpaned_new() : gtkc_vpaned_new(); - bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, ctx->attrs[j].rnd_hatt_flags, &ctx->wltop[j]); gtk_box_pack_start(GTK_BOX(bparent), widget, TRUE, TRUE, 0); g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx); j = ghid_attr_dlg_add(ctx, widget, &ts, j+1); Index: trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_misc.c (revision 30982) @@ -52,7 +52,7 @@ gtk_widget_set_size_request(prg, -1, 16); gtk_widget_set_tooltip_text(prg, attr->help_text); - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); gtk_box_pack_start(GTK_BOX(bparent), prg, TRUE, TRUE, 0); g_object_set_data(G_OBJECT(prg), PCB_OBJ_PROP, ctx); return prg; @@ -109,7 +109,7 @@ hp->hid_wdata = ctx; hp->hid_zoomto_cb = ghid_preview_zoomto; - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); prv = pcb_gtk_preview_new(ctx->gctx, ctx->gctx->impl.init_drawing_widget, ctx->gctx->impl.preview_expose, ghid_preview_expose, ghid_preview_config, attr->wdata); gtk_box_pack_start(GTK_BOX(bparent), prv, TRUE, TRUE, 0); gtk_widget_set_tooltip_text(prv, attr->help_text); @@ -124,7 +124,7 @@ p->y_max = PCB_MM_TO_COORD(100); p->w_pixels = PCB_MM_TO_COORD(10); p->h_pixels = PCB_MM_TO_COORD(10); - p->redraw_with_board = !!(attr->hatt_flags & PCB_HATF_PRV_BOARD); + p->redraw_with_board = !!(attr->hatt_flags & RND_HATF_PRV_BOARD); gtk_widget_set_size_request(prv, hp->min_sizex_px, hp->min_sizey_px); return prv; @@ -134,8 +134,8 @@ { GtkWidget *bparent, *pic, *evb; GdkPixbuf *pixbuf; - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); - int expfill = (attr->pcb_hatt_flags & PCB_HATF_EXPFILL); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); + int expfill = (attr->rnd_hatt_flags & RND_HATF_EXPFILL); pixbuf = gdk_pixbuf_new_from_xpm_data(attr->wdata); pic = gtk_image_new_from_pixbuf(pixbuf); @@ -154,7 +154,7 @@ GtkWidget *bparent, *button, *img; GdkPixbuf *pixbuf; - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); pixbuf = gdk_pixbuf_new_from_xpm_data(attr->wdata); img = gtk_image_new_from_pixbuf(pixbuf); @@ -176,7 +176,7 @@ GtkWidget *bparent, *button; pcb_gtk_color_t gclr; - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); memset(&gclr, 0, sizeof(gclr)); ctx->gctx->impl.map_color(rnd_color_black, &gclr); Index: trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_tree.c (revision 30982) @@ -45,7 +45,7 @@ gtk_tree_store_insert_after(tstore, curr, par, sibling); } - for(c = 0; c < attr->pcb_hatt_table_cols; c++) { + for(c = 0; c < attr->rnd_hatt_table_cols; c++) { GValue v = {0}; g_value_init(&v, G_TYPE_STRING); if (c < r->cols) @@ -132,7 +132,7 @@ g_value_init(&v, G_TYPE_STRING); if (col < 0) { - for(col = 0; col < attr->pcb_hatt_table_cols; col++) { + for(col = 0; col < attr->rnd_hatt_table_cols; col++) { g_value_set_string(&v, row->cell[col]); gtk_tree_store_set_value(GTK_TREE_STORE(model), iter, col, &v); } @@ -174,7 +174,7 @@ if (iter.stamp == 0) return NULL; - gtk_tree_model_get(tm, &iter, attrib->pcb_hatt_table_cols, &r, -1); + gtk_tree_model_get(tm, &iter, attrib->rnd_hatt_table_cols, &r, -1); return r; } @@ -201,7 +201,7 @@ rnd_hid_attribute_t *attr = user_data; pcb_hid_row_t *r = NULL; - gtk_tree_model_get(model, iter, attr->pcb_hatt_table_cols, &r, -1); + gtk_tree_model_get(model, iter, attr->rnd_hatt_table_cols, &r, -1); if (r == NULL) return TRUE; /* should not happen; when it does, it's a bug - better make the row visible */ @@ -259,7 +259,7 @@ if (!gtk_tree_selection_get_selected(selection, &model, &iter)) return TRUE; - gtk_tree_model_get(model, &iter, attr->pcb_hatt_table_cols, &r, -1); + gtk_tree_model_get(model, &iter, attr->rnd_hatt_table_cols, &r, -1); if (r == NULL) return TRUE; @@ -298,7 +298,7 @@ if (arrow_key) { pcb_hid_row_t *r; - gtk_tree_model_get(model, &iter, attr->pcb_hatt_table_cols, &r, -1); + gtk_tree_model_get(model, &iter, attr->rnd_hatt_table_cols, &r, -1); if (r != NULL) { pcb_hid_tree_t *tree = attr->wdata; if (tree->user_browse_activate_cb != NULL) { /* let the user callbakc decide */ @@ -461,9 +461,9 @@ tree->hid_wdata = ctx; /* create columns */ - types = malloc(sizeof(GType) * (attr->pcb_hatt_table_cols+1)); + types = malloc(sizeof(GType) * (attr->rnd_hatt_table_cols+1)); colhdr = tree->hdr; - for(c = 0; c < attr->pcb_hatt_table_cols; c++) { + for(c = 0; c < attr->rnd_hatt_table_cols; c++) { GtkTreeViewColumn *col = gtk_tree_view_column_new(); if (tree->hdr != NULL) { gtk_tree_view_column_set_title(col, *colhdr == NULL ? "" : *colhdr); @@ -481,7 +481,7 @@ types[c] = G_TYPE_POINTER; /* import existing data */ - tstore = gtk_tree_store_newv(attr->pcb_hatt_table_cols+1, types); + tstore = gtk_tree_store_newv(attr->rnd_hatt_table_cols+1, types); free(types); ghid_tree_table_import(attr, tstore, &tree->rows, NULL); @@ -502,7 +502,7 @@ gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); gtk_widget_set_tooltip_text(view, attr->help_text); - bparent = frame_scroll(parent, attr->pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, attr->rnd_hatt_flags, &ctx->wltop[j]); gtk_box_pack_start(GTK_BOX(bparent), view, TRUE, TRUE, 0); g_object_set_data(G_OBJECT(view), PCB_OBJ_PROP, ctx); return view; Index: trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_attr_txt.c (revision 30982) @@ -228,7 +228,7 @@ dad_txt_t *tctx; - if (attr->pcb_hatt_flags & PCB_HATF_SCROLL) { + if (attr->rnd_hatt_flags & RND_HATF_SCROLL) { GtkWidget *scrolled = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(parent), scrolled, TRUE, TRUE, 0); Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30982) @@ -213,13 +213,13 @@ attr_dlg_t *attrdlg; } resp_ctx_t; -static GtkWidget *frame_scroll(GtkWidget *parent, pcb_hatt_compflags_t flags, GtkWidget **wltop) +static GtkWidget *frame_scroll(GtkWidget *parent, rnd_hatt_compflags_t flags, GtkWidget **wltop) { GtkWidget *fr; - int expfill = (flags & PCB_HATF_EXPFILL); + int expfill = (flags & RND_HATF_EXPFILL); int topped = 0; - if (flags & PCB_HATF_FRAME) { + if (flags & RND_HATF_FRAME) { fr = gtk_frame_new(NULL); gtk_box_pack_start(GTK_BOX(parent), fr, expfill, expfill, 0); @@ -230,7 +230,7 @@ topped = 1; /* remember the outmost parent */ } } - if (flags & PCB_HATF_SCROLL) { + if (flags & RND_HATF_SCROLL) { fr = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fr), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(parent), fr, TRUE, TRUE, 0); @@ -286,7 +286,7 @@ GtkWidget *combo, *widget, *entry, *vbox1, *hbox, *bparent, *parent, *tbl; for (j = start_from; j < ctx->n_attrs; j++) { - if (ctx->attrs[j].type == PCB_HATT_END) + if (ctx->attrs[j].type == RND_HATT_END) break; /* if we are filling a table, allocate parent boxes in row-major */ @@ -320,56 +320,56 @@ else parent = real_parent; - expfill = (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_EXPFILL); + expfill = (ctx->attrs[j].rnd_hatt_flags & RND_HATF_EXPFILL); /* create the actual widget from attrs */ switch (ctx->attrs[j].type) { - case PCB_HATT_BEGIN_HBOX: - bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags, &ctx->wltop[j]); - hbox = gtkc_hbox_new(FALSE, ((ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TIGHT) ? 0 : 4)); + case RND_HATT_BEGIN_HBOX: + bparent = frame_scroll(parent, ctx->attrs[j].rnd_hatt_flags, &ctx->wltop[j]); + hbox = gtkc_hbox_new(FALSE, ((ctx->attrs[j].rnd_hatt_flags & RND_HATF_TIGHT) ? 0 : 4)); gtk_box_pack_start(GTK_BOX(bparent), hbox, expfill, expfill, 0); ctx->wl[j] = hbox; j = ghid_attr_dlg_add(ctx, hbox, NULL, j+1); break; - case PCB_HATT_BEGIN_VBOX: - bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags, &ctx->wltop[j]); - vbox1 = gtkc_vbox_new(FALSE, ((ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TIGHT) ? 0 : 4)); - expfill = (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_EXPFILL); + case RND_HATT_BEGIN_VBOX: + bparent = frame_scroll(parent, ctx->attrs[j].rnd_hatt_flags, &ctx->wltop[j]); + vbox1 = gtkc_vbox_new(FALSE, ((ctx->attrs[j].rnd_hatt_flags & RND_HATF_TIGHT) ? 0 : 4)); + expfill = (ctx->attrs[j].rnd_hatt_flags & RND_HATF_EXPFILL); gtk_box_pack_start(GTK_BOX(bparent), vbox1, expfill, expfill, 0); ctx->wl[j] = vbox1; j = ghid_attr_dlg_add(ctx, vbox1, NULL, j+1); break; - case PCB_HATT_BEGIN_HPANE: - case PCB_HATT_BEGIN_VPANE: - j = ghid_pane_create(ctx, j, parent, (ctx->attrs[j].type == PCB_HATT_BEGIN_HPANE)); + case RND_HATT_BEGIN_HPANE: + case RND_HATT_BEGIN_VPANE: + j = ghid_pane_create(ctx, j, parent, (ctx->attrs[j].type == RND_HATT_BEGIN_HPANE)); break; - case PCB_HATT_BEGIN_TABLE: + case RND_HATT_BEGIN_TABLE: { ghid_attr_tb_t ts; - bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags, &ctx->wltop[j]); + bparent = frame_scroll(parent, ctx->attrs[j].rnd_hatt_flags, &ctx->wltop[j]); ts.type = TB_TABLE; - ts.val.table.cols = ctx->attrs[j].pcb_hatt_table_cols; + ts.val.table.cols = ctx->attrs[j].rnd_hatt_table_cols; ts.val.table.rows = pcb_hid_attrdlg_num_children(ctx->attrs, j+1, ctx->n_attrs) / ts.val.table.cols; ts.val.table.col = 0; ts.val.table.row = 0; tbl = gtkc_table_static(ts.val.table.rows, ts.val.table.cols, 1); - gtk_box_pack_start(GTK_BOX(bparent), tbl, expfill, expfill, ((ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TIGHT) ? 0 : 4)); + gtk_box_pack_start(GTK_BOX(bparent), tbl, expfill, expfill, ((ctx->attrs[j].rnd_hatt_flags & RND_HATF_TIGHT) ? 0 : 4)); ctx->wl[j] = tbl; j = ghid_attr_dlg_add(ctx, tbl, &ts, j+1); } break; - case PCB_HATT_BEGIN_TABBED: + case RND_HATT_BEGIN_TABBED: { ghid_attr_tb_t ts; ts.type = TB_TABBED; ts.val.tabbed.tablab = ctx->attrs[j].wdata; ctx->wl[j] = widget = gtk_notebook_new(); - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widget), !(ctx->attrs[j].pcb_hatt_flags & PCB_HATF_HIDE_TABLAB)); - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_LEFT_TAB) + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widget), !(ctx->attrs[j].rnd_hatt_flags & RND_HATF_HIDE_TABLAB)); + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_LEFT_TAB) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widget), GTK_POS_LEFT); else gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widget), GTK_POS_TOP); @@ -381,16 +381,16 @@ } break; - case PCB_HATT_BEGIN_COMPOUND: + case RND_HATT_BEGIN_COMPOUND: j = ghid_attr_dlg_add(ctx, parent, NULL, j+1); break; - case PCB_HATT_LABEL: + case RND_HATT_LABEL: { GtkRequisition req; int theight; - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TEXT_TRUNCATED) { + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TEXT_TRUNCATED) { /* workaround: need to get the real height - create a temporary, non-truncated label */ widget = gtk_label_new(ctx->attrs[j].name); gtk_widget_size_request(widget, &req); @@ -408,11 +408,11 @@ else if (theight > 128) theight = 128; - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TEXT_VERTICAL) + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TEXT_VERTICAL) gtk_label_set_angle(GTK_LABEL(widget), 90); - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TEXT_TRUNCATED) { - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TEXT_VERTICAL) { + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TEXT_TRUNCATED) { + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TEXT_VERTICAL) { gtk_misc_set_alignment(GTK_MISC(widget), 0, 1); gtk_widget_set_size_request(widget, theight, 1); } @@ -429,21 +429,21 @@ g_object_set_data(G_OBJECT(ctx->wltop[j]), PCB_OBJ_PROP, ctx); gtk_box_pack_start(GTK_BOX(parent), ctx->wltop[j], FALSE, FALSE, 0); - if (!(ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TEXT_TRUNCATED)) + if (!(ctx->attrs[j].rnd_hatt_flags & RND_HATF_TEXT_TRUNCATED)) gtk_misc_set_alignment(GTK_MISC(widget), 0., 0.5); gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text); } break; - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: ctx->wl[j] = gtk_label_new("ERROR: INTEGER entry"); break; - case PCB_HATT_COORD: + case RND_HATT_COORD: ctx->wl[j] = gtk_label_new("ERROR: COORD entry"); break; - case PCB_HATT_STRING: + case RND_HATT_STRING: ctx->wltop[j] = hbox = gtkc_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(parent), hbox, expfill, expfill, 0); @@ -458,12 +458,12 @@ g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(entry_changed_cb), &(ctx->attrs[j])); g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(entry_activate_cb), &(ctx->attrs[j])); - if (ctx->attrs[j].hatt_flags & PCB_HATF_HEIGHT_CHR) + if (ctx->attrs[j].hatt_flags & RND_HATF_HEIGHT_CHR) gtk_entry_set_width_chars(GTK_ENTRY(entry), ctx->attrs[j].geo_width); break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: /* put this in a check button */ 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); @@ -471,7 +471,7 @@ ctx->wl[j] = widget; break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: ctx->wltop[j] = hbox = gtkc_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(parent), hbox, expfill, expfill, 0); @@ -494,47 +494,47 @@ g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(enum_changed_cb), &(ctx->attrs[j])); break; - case PCB_HATT_TREE: + case RND_HATT_TREE: ctx->wl[j] = ghid_tree_table_create(ctx, &ctx->attrs[j], parent, j); break; - case PCB_HATT_PREVIEW: + case RND_HATT_PREVIEW: ctx->wl[j] = ghid_preview_create(ctx, &ctx->attrs[j], parent, j); break; - case PCB_HATT_TEXT: + case RND_HATT_TEXT: ctx->wl[j] = ghid_text_create(ctx, &ctx->attrs[j], parent); break; - case PCB_HATT_PICTURE: + case RND_HATT_PICTURE: ctx->wl[j] = ghid_picture_create(ctx, &ctx->attrs[j], parent, j, G_CALLBACK(label_click_cb), ctx); break; - case PCB_HATT_PICBUTTON: - ctx->wl[j] = ghid_picbutton_create(ctx, &ctx->attrs[j], parent, j, (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TOGGLE), expfill); + case RND_HATT_PICBUTTON: + ctx->wl[j] = ghid_picbutton_create(ctx, &ctx->attrs[j], parent, j, (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TOGGLE), expfill); g_signal_connect(G_OBJECT(ctx->wl[j]), "clicked", G_CALLBACK(button_changed_cb), &(ctx->attrs[j])); g_object_set_data(G_OBJECT(ctx->wl[j]), PCB_OBJ_PROP, ctx); break; - case PCB_HATT_COLOR: + case RND_HATT_COLOR: ctx->wl[j] = ghid_color_create(ctx, &ctx->attrs[j], parent, j); g_signal_connect(G_OBJECT(ctx->wl[j]), "color_set", G_CALLBACK(color_changed_cb), &(ctx->attrs[j])); g_object_set_data(G_OBJECT(ctx->wl[j]), PCB_OBJ_PROP, ctx); break; - case PCB_HATT_PROGRESS: + case RND_HATT_PROGRESS: ctx->wl[j] = ghid_progress_create(ctx, &ctx->attrs[j], parent, j); break; - case PCB_HATT_UNIT: + case RND_HATT_UNIT: ctx->wl[j] = gtk_label_new("ERROR: UNIT entry"); break; - case PCB_HATT_BUTTON: + case RND_HATT_BUTTON: hbox = gtkc_hbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(parent), hbox, expfill, expfill, 0); - if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_TOGGLE) + if (ctx->attrs[j].rnd_hatt_flags & RND_HATF_TOGGLE) ctx->wl[j] = gtk_toggle_button_new_with_label(ctx->attrs[j].val.str); else ctx->wl[j] = gtk_button_new_with_label(ctx->attrs[j].val.str); @@ -564,18 +564,18 @@ /* create the actual widget from attrs */ switch (ctx->attrs[idx].type) { - case PCB_HATT_BEGIN_HBOX: - case PCB_HATT_BEGIN_VBOX: - case PCB_HATT_BEGIN_TABLE: - case PCB_HATT_PICBUTTON: - case PCB_HATT_PICTURE: - case PCB_HATT_COORD: - case PCB_HATT_REAL: - case PCB_HATT_INTEGER: - case PCB_HATT_BEGIN_COMPOUND: + case RND_HATT_BEGIN_HBOX: + case RND_HATT_BEGIN_VBOX: + case RND_HATT_BEGIN_TABLE: + case RND_HATT_PICBUTTON: + case RND_HATT_PICTURE: + case RND_HATT_COORD: + case RND_HATT_REAL: + case RND_HATT_INTEGER: + case RND_HATT_BEGIN_COMPOUND: goto error; - case PCB_HATT_END: + case RND_HATT_END: { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->set_value != NULL)) @@ -585,38 +585,38 @@ } break; - case PCB_HATT_TREE: + case RND_HATT_TREE: ret = ghid_tree_table_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_PROGRESS: + case RND_HATT_PROGRESS: ret = ghid_progress_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_PREVIEW: + case RND_HATT_PREVIEW: ret = ghid_preview_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_TEXT: + case RND_HATT_TEXT: ret = ghid_text_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_COLOR: + case RND_HATT_COLOR: ret = ghid_color_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_BEGIN_HPANE: - case PCB_HATT_BEGIN_VPANE: + case RND_HATT_BEGIN_HPANE: + case RND_HATT_BEGIN_VPANE: ret = ghid_pane_set(ctx, idx, val); ctx->inhibit_valchg = save; return ret; - case PCB_HATT_LABEL: + case RND_HATT_LABEL: { const char *txt = gtk_label_get_text(GTK_LABEL(ctx->wl[idx])); if (strcmp(txt, val->str) == 0) @@ -627,7 +627,7 @@ - case PCB_HATT_STRING: + case RND_HATT_STRING: { const char *nv, *s = gtk_entry_get_text(GTK_ENTRY(ctx->wl[idx])); nv = val->str; @@ -641,7 +641,7 @@ } break; - case PCB_HATT_BOOL: + case RND_HATT_BOOL: { int chk = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ctx->wl[idx])); if (chk == val->lng) @@ -650,7 +650,7 @@ } break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: { int en = gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->wl[idx])); if (en == val->lng) @@ -659,11 +659,11 @@ } break; - case PCB_HATT_UNIT: + case RND_HATT_UNIT: abort(); break; - case PCB_HATT_BUTTON: + case RND_HATT_BUTTON: { const char *s = gtk_button_get_label(GTK_BUTTON(ctx->wl[idx])); if (strcmp(s, val->str) == 0) @@ -672,7 +672,7 @@ } break; - case PCB_HATT_BEGIN_TABBED: + case RND_HATT_BEGIN_TABBED: gtk_notebook_set_current_page(GTK_NOTEBOOK(ctx->wl[idx]), val->lng); break; } @@ -711,9 +711,9 @@ for(i = 0; i < ctx->n_attrs; i++) { switch(ctx->attrs[i].type) { - case PCB_HATT_TREE: ghid_tree_pre_free(ctx, &ctx->attrs[i], i); break; - case PCB_HATT_BUTTON: g_signal_handlers_block_by_func(G_OBJECT(ctx->wl[i]), G_CALLBACK(button_changed_cb), &(ctx->attrs[i])); break; - case PCB_HATT_PREVIEW: pcb_gtk_preview_del(ctx->gctx, PCB_GTK_PREVIEW(ctx->wl[i])); + case RND_HATT_TREE: ghid_tree_pre_free(ctx, &ctx->attrs[i], i); break; + case RND_HATT_BUTTON: g_signal_handlers_block_by_func(G_OBJECT(ctx->wl[i]), G_CALLBACK(button_changed_cb), &(ctx->attrs[i])); break; + case RND_HATT_PREVIEW: pcb_gtk_preview_del(ctx->gctx, PCB_GTK_PREVIEW(ctx->wl[i])); default: break; } } @@ -739,10 +739,10 @@ { GtkWidget *w; - if (ctx->attrs[idx].type == PCB_HATT_BEGIN_COMPOUND) + if (ctx->attrs[idx].type == RND_HATT_BEGIN_COMPOUND) return -1; - if (ctx->attrs[idx].type == PCB_HATT_END) { + if (ctx->attrs[idx].type == RND_HATT_END) { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_hide != NULL)) return cmp->widget_hide(&ctx->attrs[idx], ctx, idx, hide); @@ -766,7 +766,7 @@ { int n; for(n = 0; n < ctx->n_attrs; n++) - if (ctx->attrs[n].pcb_hatt_flags & PCB_HATF_HIDE) + if (ctx->attrs[n].rnd_hatt_flags & RND_HATF_HIDE) ghid_attr_dlg_widget_hide_(ctx, n, 1); } @@ -931,10 +931,10 @@ if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL)) return -1; - if (ctx->attrs[idx].type == PCB_HATT_BEGIN_COMPOUND) + if (ctx->attrs[idx].type == RND_HATT_BEGIN_COMPOUND) return -1; - if (ctx->attrs[idx].type == PCB_HATT_END) { + if (ctx->attrs[idx].type == RND_HATT_END) { pcb_hid_compound_t *cmp = ctx->attrs[idx].wdata; if ((cmp != NULL) && (cmp->widget_state != NULL)) cmp->widget_state(&ctx->attrs[idx], ctx, idx, enabled); @@ -945,12 +945,12 @@ gtk_widget_set_sensitive(ctx->wl[idx], enabled); switch(ctx->attrs[idx].type) { - case PCB_HATT_LABEL: + case RND_HATT_LABEL: pcb_gtk_set_selected(ctx->wltop[idx], (enabled == 2)); break; - case PCB_HATT_PICBUTTON: - case PCB_HATT_BUTTON: - if (ctx->attrs[idx].pcb_hatt_flags & PCB_HATF_TOGGLE) + case RND_HATT_PICBUTTON: + case RND_HATT_BUTTON: + if (ctx->attrs[idx].rnd_hatt_flags & RND_HATF_TOGGLE) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ctx->wl[idx]), (enabled == 2)); break; default:; @@ -1008,9 +1008,9 @@ int n; for(n = 0; n < ctx->n_attrs; n++) { switch(ctx->attrs[n].type) { - case PCB_HATT_BUTTON: - case PCB_HATT_LABEL: - case PCB_HATT_PICTURE: + case RND_HATT_BUTTON: + case RND_HATT_LABEL: + case RND_HATT_PICTURE: gtk_widget_modify_bg(ctx->wltop[n], GTK_STATE_NORMAL, color); default:; } Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30981) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30982) @@ -99,8 +99,8 @@ else docked->frame = hvbox; - if (PCB_HATT_IS_COMPOSITE(sub->dlg[0].type)) - expfill = (sub->dlg[0].pcb_hatt_flags & PCB_HATF_EXPFILL); + if (RND_HATT_IS_COMPOSITE(sub->dlg[0].type)) + expfill = (sub->dlg[0].rnd_hatt_flags & RND_HATF_EXPFILL); if ((sub->dlg_minx > 0) && (sub->dlg_miny > 0)) gtk_widget_set_size_request(docked->frame, sub->dlg_minx, sub->dlg_miny); Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30981) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30982) @@ -247,7 +247,7 @@ PCB_DAD_BEGIN_HBOX(dad->dlg); PCB_DAD_BEGIN_HBOX(dad->dlg); - PCB_DAD_COMPFLAG(dad->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL); PCB_DAD_END(dad->dlg); for(n = 3; n < argc; n+=2) { RND_PCB_ACT_CONVARG(n+0, FGW_STR, dad, txt = argv[n+0].val.str); @@ -420,7 +420,7 @@ } else if (rnd_strcasecmp(cmd, "flags") == 0) { int n; - pcb_hatt_compflags_t tmp, flg = 0; + rnd_hatt_compflags_t tmp, flg = 0; if (dad->running) goto cant_chg; @@ -446,7 +446,7 @@ int wid, i; double d; rnd_coord_t c; - pcb_hid_attr_type_t wtype; + rnd_hid_attr_type_t wtype; RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { @@ -456,27 +456,27 @@ } wtype = dad->dlg[wid].type; - if (dad->dlg[wid].type == PCB_HATT_END) /* composite widget's end or real end - the spin macro handles both */ + 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]); switch(wtype) { - case PCB_HATT_COORD: + case RND_HATT_COORD: RND_PCB_ACT_CONVARG(4, FGW_COORD, dad, c = fgw_coord(&argv[4])); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, crd, c); break; - case PCB_HATT_REAL: - case PCB_HATT_PROGRESS: + case RND_HATT_REAL: + case RND_HATT_PROGRESS: RND_PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, dbl, d); break; - case PCB_HATT_INTEGER: - case PCB_HATT_BOOL: + case RND_HATT_INTEGER: + case RND_HATT_BOOL: RND_PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, lng, i); break; - case PCB_HATT_STRING: - case PCB_HATT_LABEL: - case PCB_HATT_BUTTON: + case RND_HATT_STRING: + case RND_HATT_LABEL: + case RND_HATT_BUTTON: RND_PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, str, txt); break; @@ -489,7 +489,7 @@ } else if (rnd_strcasecmp(cmd, "get") == 0) { int wid; - pcb_hid_attr_type_t wtype; + rnd_hid_attr_type_t wtype; RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { @@ -498,11 +498,11 @@ } wtype = dad->dlg[wid].type; - if (dad->dlg[wid].type == PCB_HATT_END) /* composite widget's end or real end - the spin macro handles both */ + 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]); switch(wtype) { - case PCB_HATT_COORD: + case RND_HATT_COORD: txt = NULL; rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (txt != NULL) { @@ -519,15 +519,15 @@ fgw_coord(res) = dad->dlg[wid].val.crd; } break; - case PCB_HATT_INTEGER: - case PCB_HATT_BOOL: - case PCB_HATT_ENUM: + case RND_HATT_INTEGER: + case RND_HATT_BOOL: + case RND_HATT_ENUM: res->type = FGW_INT; res->val.nat_int = dad->dlg[wid].val.lng; break; - case PCB_HATT_STRING: - case PCB_HATT_LABEL: - case PCB_HATT_BUTTON: + case RND_HATT_STRING: + case RND_HATT_LABEL: + case RND_HATT_BUTTON: res->type = FGW_STR; res->val.str = (char *)dad->dlg[wid].val.str; break; Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30981) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30982) @@ -113,7 +113,7 @@ /* close buttons */ PCB_DAD_BEGIN_HBOX(dlg); PCB_DAD_BEGIN_HBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_END(dlg); for(n = 4; n < argc; n+=2) { RND_PCB_ACT_CONVARG(n+0, FGW_STR, gui_MessageBox, txt = argv[n+0].val.str); @@ -173,7 +173,7 @@ PCB_DAD_BEGIN_VBOX(ctx.dlg); PCB_DAD_COLOR(ctx.dlg); ctx.wclr = PCB_DAD_CURRENT(ctx.dlg); - PCB_DAD_COMPFLAG(ctx.dlg, PCB_HATF_CLR_STATIC); + PCB_DAD_COMPFLAG(ctx.dlg, RND_HATF_CLR_STATIC); PCB_DAD_BEGIN_TABLE(ctx.dlg, 2); PCB_DAD_LABEL(ctx.dlg, "red"); PCB_DAD_INTEGER(ctx.dlg, ""); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30981) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30982) @@ -143,9 +143,9 @@ ctx->hidlib = hidlib; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TEXT(ctx->dlg, NULL); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); ctx->wtxt = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_HBOX(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "clear"); @@ -153,13 +153,13 @@ PCB_DAD_BUTTON(ctx->dlg, "export"); PCB_DAD_CHANGE_CB(ctx->dlg, btn_export_cb); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_FRAME); PCB_DAD_BOOL(ctx->dlg, ""); ctx->wscroll = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "scroll"); PCB_DAD_END(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON_CLOSE(ctx->dlg, "close", 0); PCB_DAD_END(ctx->dlg); Index: trunk/src_plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_common/toolbar.c (revision 30981) +++ trunk/src_plugins/lib_hid_common/toolbar.c (revision 30982) @@ -92,7 +92,7 @@ else PCB_DAD_BUTTON(toolbar.sub.dlg, tool->name); PCB_DAD_CHANGE_CB(toolbar.sub.dlg, toolbar_select_cb); - PCB_DAD_COMPFLAG(toolbar.sub.dlg, PCB_HATF_TIGHT | PCB_HATF_TOGGLE); + PCB_DAD_COMPFLAG(toolbar.sub.dlg, RND_HATF_TIGHT | RND_HATF_TOGGLE); if (help != NULL) PCB_DAD_HELP(toolbar.sub.dlg, help); wid = PCB_DAD_CURRENT(toolbar.sub.dlg); @@ -152,7 +152,7 @@ toolbar.tid2wid.used = 0; PCB_DAD_BEGIN_HBOX(toolbar.sub.dlg); - PCB_DAD_COMPFLAG(toolbar.sub.dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(toolbar.sub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT); toolbar_create_static(cfg); toolbar_create_dyn_all(); @@ -159,7 +159,7 @@ /* eat up remaining space in the middle before displaying the dynamic tools */ PCB_DAD_BEGIN_HBOX(toolbar.sub.dlg); - PCB_DAD_COMPFLAG(toolbar.sub.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(toolbar.sub.dlg, RND_HATF_EXPFILL); PCB_DAD_END(toolbar.sub.dlg); /* later on dynamic tools would be displayed here */ Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30981) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30982) @@ -493,7 +493,7 @@ /* vertical group name */ PCB_DAD_LABEL(ls->sub.dlg, name); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_TEXT_VERTICAL | PCB_HATF_TEXT_TRUNCATED); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_TEXT_VERTICAL | RND_HATF_TEXT_TRUNCATED); PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg); PCB_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb); PCB_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb); @@ -501,12 +501,12 @@ /* vert sep */ PCB_DAD_BEGIN_HBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME); PCB_DAD_END(ls->sub.dlg); /* layer list box */ PCB_DAD_BEGIN_VBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT); } static void layersel_end_grp_open(layersel_ctx_t *ls) @@ -526,7 +526,7 @@ /* vert sep */ PCB_DAD_BEGIN_HBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME); PCB_DAD_END(ls->sub.dlg); } @@ -567,7 +567,7 @@ layer_vis_box(&lys->off_closed, 0, color, brd, hatch, 10, 10, 0); PCB_DAD_BEGIN_VBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT); PCB_DAD_PICTURE(ls->sub.dlg, lys->on_closed.xpm); lys->wvis_on_closed = PCB_DAD_CURRENT(ls->sub.dlg); PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); @@ -581,7 +581,7 @@ if (selectable) { PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_unsel); if (selected) - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE); lys->wunsel_closed = PCB_DAD_CURRENT(ls->sub.dlg); PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb); @@ -588,7 +588,7 @@ PCB_DAD_HELP(ls->sub.dlg, name); PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_sel); if (!selected) - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE); lys->wsel_closed = PCB_DAD_CURRENT(ls->sub.dlg); PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb); @@ -636,7 +636,7 @@ static void layersel_add_grpsep(layersel_ctx_t *ls) { PCB_DAD_BEGIN_HBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL); PCB_DAD_PICTURE(ls->sub.dlg, grpsep); PCB_DAD_END(ls->sub.dlg); @@ -742,7 +742,7 @@ static void hsep(layersel_ctx_t *ls) { PCB_DAD_BEGIN_VBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME); PCB_DAD_END(ls->sub.dlg); } @@ -750,7 +750,7 @@ { lgs_reset(ls); PCB_DAD_BEGIN_VBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT | RND_HATF_SCROLL); layersel_create_stack(&layersel, pcb); hsep(&layersel); layersel_create_global(&layersel, pcb); @@ -767,7 +767,7 @@ PCB_DAD_HELP(ls->sub.dlg, "collapse/close all layer groups\nso that layer names are\nnot displayed,\neach row is a layer group"); PCB_DAD_CHANGE_CB(ls->sub.dlg, all_close_cb); PCB_DAD_BEGIN_HBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL); PCB_DAD_END(ls->sub.dlg); PCB_DAD_END(ls->sub.dlg); PCB_DAD_END(ls->sub.dlg); Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30981) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30982) @@ -178,7 +178,7 @@ PCB_DAD_BEGIN_VBOX(rst.sub.dlg); for(n = 0; n < MAX_STYLES; n++) { PCB_DAD_BEGIN_HBOX(rst.sub.dlg); - PCB_DAD_COMPFLAG(rst.sub.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(rst.sub.dlg, RND_HATF_HIDE); rst.whbox[n] = PCB_DAD_CURRENT(rst.sub.dlg); PCB_DAD_BOOL(rst.sub.dlg, ""); rst.wchk[n] = PCB_DAD_CURRENT(rst.sub.dlg); Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30981) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30982) @@ -172,7 +172,7 @@ PCB_DAD_DECL(dlg); PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(dlg, 2); PCB_DAD_LABEL(dlg, "key"); PCB_DAD_STRING(dlg); @@ -253,7 +253,7 @@ } PCB_DAD_BEGIN_VBOX(rstdlg_ctx.dlg); - PCB_DAD_COMPFLAG(rstdlg_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(rstdlg_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(rstdlg_ctx.dlg, 2); PCB_DAD_LABEL(rstdlg_ctx.dlg, "Name:"); Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 30981) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 30982) @@ -252,14 +252,14 @@ static void status_docked_create_st() { PCB_DAD_BEGIN_VBOX(status.stsub.dlg); - PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT); PCB_DAD_LABEL(status.stsub.dlg, ""); - PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE); status.wsttxt = PCB_DAD_CURRENT(status.stsub.dlg); PCB_DAD_LABEL(status.stsub.dlg, ""); status.wst1 = PCB_DAD_CURRENT(status.stsub.dlg); PCB_DAD_LABEL(status.stsub.dlg, ""); - PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_HIDE); + PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE); status.wst2 = PCB_DAD_CURRENT(status.stsub.dlg); PCB_DAD_END(status.stsub.dlg); } @@ -268,7 +268,7 @@ static void vpad(rnd_hid_dad_subdialog_t *sub) { PCB_DAD_BEGIN_VBOX(sub->dlg); - PCB_DAD_COMPFLAG(sub->dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(sub->dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT); PCB_DAD_END(sub->dlg); } @@ -276,9 +276,9 @@ { int n; PCB_DAD_BEGIN_HBOX(status.rdsub.dlg); - PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_TIGHT); PCB_DAD_BEGIN_VBOX(status.rdsub.dlg); - PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME | PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME | RND_HATF_TIGHT); vpad(&status.rdsub); for(n = 0; n < 3; n++) { PCB_DAD_LABEL(status.rdsub.dlg, ""); @@ -287,7 +287,7 @@ vpad(&status.rdsub); PCB_DAD_END(status.rdsub.dlg); PCB_DAD_BEGIN_VBOX(status.rdsub.dlg); - PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME); + PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME); vpad(&status.rdsub); for(n = 0; n < 2; n++) { PCB_DAD_LABEL(status.rdsub.dlg, ""); Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 30981) +++ trunk/src_plugins/loghid/loghid.c (revision 30982) @@ -50,7 +50,7 @@ rnd_export_opt_t loghid_attribute_list[] = { {"target-hid", "the real GUI or export HID to relay calls to", - PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0} + RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0} #define HA_target_hid 0 }; #define NUM_OPTIONS sizeof(loghid_attribute_list) / sizeof(loghid_attribute_list[0]) @@ -60,7 +60,7 @@ rnd_hid_t *target, *me; const char *target_name; - pcb_export_register_opts(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); + rnd_export_register_opts(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0); pcb_hid_parse_command_line(argc, argv); target_name = loghid_attribute_list[HA_target_hid].default_val.str; @@ -114,7 +114,7 @@ void pplg_uninit_loghid(void) { - pcb_export_remove_opts_by_cookie(loghid_cookie); + rnd_export_remove_opts_by_cookie(loghid_cookie); } int pplg_init_loghid(void) Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30981) +++ trunk/src_plugins/order/order.c (revision 30982) @@ -119,9 +119,9 @@ static void autoload_field_crd(order_ctx_t *octx, pcb_order_field_t *f, rnd_coord_t c) { switch(f->type) { - case PCB_HATT_INTEGER: f->val.lng = c; break; - case PCB_HATT_COORD: f->val.crd = c; break; - case PCB_HATT_STRING: + case RND_HATT_INTEGER: f->val.lng = c; break; + case RND_HATT_COORD: f->val.crd = c; break; + case RND_HATT_STRING: free((char *)f->val.str); f->val.str = pcb_strdup_printf("%$mm", c); break; @@ -136,13 +136,13 @@ char **s; switch(f->type) { - case PCB_HATT_INTEGER: f->val.lng = l; break; - case PCB_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break; - case PCB_HATT_STRING: + case RND_HATT_INTEGER: f->val.lng = l; break; + case RND_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break; + case RND_HATT_STRING: free((char *)f->val.str); f->val.str = pcb_strdup_printf("%ld", l); break; - case PCB_HATT_ENUM: + case RND_HATT_ENUM: bestn = -1; /* find the closest enum value, rounding l up or down only */ for(n = 0, s = f->enum_vals; *s != NULL; n++,s++) { Index: trunk/src_plugins/order/order.h =================================================================== --- trunk/src_plugins/order/order.h (revision 30981) +++ trunk/src_plugins/order/order.h (revision 30982) @@ -63,7 +63,7 @@ } pcb_order_autoload_t; typedef struct pcb_order_field_s { - pcb_hid_attr_type_t type; + rnd_hid_attr_type_t type; rnd_hid_attr_val_t val; char **enum_vals; char *help; Index: trunk/src_plugins/order/order_dlg.c =================================================================== --- trunk/src_plugins/order/order_dlg.c (revision 30981) +++ trunk/src_plugins/order/order_dlg.c (revision 30982) @@ -30,14 +30,14 @@ vtp0_set(&order_ctx.names, n, NULL); PCB_DAD_BEGIN_VBOX(order_ctx.dlg); - PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(order_ctx.dlg, order_ctx.names.array); - PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_LEFT_TAB); + PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_LEFT_TAB); for(n = 0; n < pcb_order_imps.used; n++) { imp = pcb_order_imps.array[n]; if (imp->load_fields(pcb_order_imps.array[n], &order_ctx) == 0) { PCB_DAD_BEGIN_VBOX(order_ctx.dlg); - PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL); imp->populate_dad(pcb_order_imps.array[n], &order_ctx); PCB_DAD_END(order_ctx.dlg); @@ -62,26 +62,26 @@ PCB_DAD_BEGIN_HBOX(octx->dlg); PCB_DAD_LABEL(octx->dlg, f->name); PCB_DAD_BEGIN_VBOX(octx->dlg); - PCB_DAD_COMPFLAG(octx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(octx->dlg); switch(f->type) { - case PCB_HATT_ENUM: + case RND_HATT_ENUM: PCB_DAD_ENUM(octx->dlg, f->enum_vals); PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng); break; - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: PCB_DAD_INTEGER(octx->dlg, ""); PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng); break; - case PCB_HATT_COORD: + case RND_HATT_COORD: PCB_DAD_COORD(octx->dlg, ""); PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.crd); break; - case PCB_HATT_STRING: + case RND_HATT_STRING: PCB_DAD_STRING(octx->dlg); PCB_DAD_DEFAULT_PTR(octx->dlg, f->val.str); break; - case PCB_HATT_LABEL: break; + case RND_HATT_LABEL: break; default: PCB_DAD_LABEL(octx->dlg, ""); } Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 30981) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 30982) @@ -214,13 +214,13 @@ if (note != NULL) f->help = rnd_strdup(note); if (type == NULL) { - f->type = PCB_HATT_LABEL; + f->type = RND_HATT_LABEL; } else if (strcmp(type, "enum") == 0) { int di = 0, i; vtp0_t tmp; - f->type = PCB_HATT_ENUM; + f->type = RND_HATT_ENUM; vtp0_init(&tmp); for(v = n->children, i = 0; v != NULL; v = v->next) { char *s; @@ -238,26 +238,26 @@ f->val.lng = di; } else if (strcmp(type, "enum:country:code") == 0) { - f->type = PCB_HATT_ENUM; + f->type = RND_HATT_ENUM; f->enum_vals = form->country_codes.array; } else if (strcmp(type, "integer") == 0) { - f->type = PCB_HATT_INTEGER; + f->type = RND_HATT_INTEGER; if (dflt != NULL) f->val.lng = atoi(dflt); } else if (strcmp(type, "mm") == 0) { - f->type = PCB_HATT_COORD; + f->type = RND_HATT_COORD; if (dflt != NULL) f->val.crd = PCB_MM_TO_COORD(strtod(dflt, NULL)); } else if (strcmp(type, "string") == 0) { - f->type = PCB_HATT_STRING; + f->type = RND_HATT_STRING; if (dflt != NULL) f->val.str = rnd_strdup(dflt); } else { - f->type = PCB_HATT_LABEL; + f->type = RND_HATT_LABEL; } if (strcmp(f->name, "Layers") == 0) f->autoload = PCB_OAL_LAYERS; else if (strcmp(f->name, "Width") == 0) f->autoload = PCB_OAL_WIDTH; @@ -409,10 +409,10 @@ } PCB_DAD_BEGIN_VBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABLE(dlg, 2); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_LABEL(dlg, "=== Shipping ==="); PCB_DAD_LABEL(dlg, ""); XML_TBL(dlg, ship, shipcost, "ShipCost"); for(n = prices->children; n != NULL; n = n->next) { @@ -425,10 +425,10 @@ *tmp = 0; PCB_DAD_LABEL(dlg, " Total:"); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(dlg, RND_HATF_TIGHT); PCB_DAD_BEGIN_HBOX(dlg); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_TIGHT); + PCB_DAD_COMPFLAG(dlg, RND_HATF_TIGHT); PCB_DAD_LABEL(dlg, tmp); PCB_DAD_PICBUTTON(dlg, order_xpm); PCB_DAD_END(dlg); @@ -478,17 +478,17 @@ fprintf(fx, " <%s>", (char *)f->name); switch(f->type) { - case PCB_HATT_ENUM: + case RND_HATT_ENUM: fprintf(fx, "%s", f->enum_vals[f->val.lng]); break; - case PCB_HATT_INTEGER: + case RND_HATT_INTEGER: fprintf(fx, "%d", f->val.lng); break; - case PCB_HATT_COORD: + case RND_HATT_COORD: pcb_fprintf(fx, "%mm", f->val.crd); break; - case PCB_HATT_STRING: + case RND_HATT_STRING: if (f->val.str != NULL) fprintf(fx, "%s", f->val.str); break; @@ -532,13 +532,13 @@ pcbway_form_t *form = octx->odata; PCB_DAD_BEGIN_VBOX(octx->dlg); - PCB_DAD_COMPFLAG(octx->dlg, PCB_HATF_SCROLL | PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_SCROLL | RND_HATF_EXPFILL); for(n = 0; n < form->fields.used; n++) pcb_order_dad_field(octx, form->fields.array[n]); PCB_DAD_BEGIN_VBOX(octx->dlg); - PCB_DAD_COMPFLAG(octx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(octx->dlg, ""); PCB_DAD_LABEL(octx->dlg, ""); PCB_DAD_END(octx->dlg); @@ -547,7 +547,7 @@ PCB_DAD_BUTTON(octx->dlg, "Update data"); PCB_DAD_HELP(octx->dlg, "Copy data from board to form"); PCB_DAD_BEGIN_VBOX(octx->dlg); - PCB_DAD_COMPFLAG(octx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(octx->dlg); PCB_DAD_BUTTON(octx->dlg, "Quote & order"); PCB_DAD_HELP(octx->dlg, "Generate a price quote"); Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30981) +++ trunk/src_plugins/propedit/propdlg.c (revision 30982) @@ -391,7 +391,7 @@ PCB_DAD_BEGIN_VBOX(dlg); PCB_DAD_BEGIN_TABLE(dlg, 2); - PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(dlg, "Attribute key:"); PCB_DAD_STRING(dlg); wkey = PCB_DAD_CURRENT(dlg); @@ -471,7 +471,7 @@ static const char *abshelp = "When unticked each apply is a relative change added to\nthe current value of each object"; PCB_DAD_BEGIN_TABBED(ctx->dlg, type_tabs); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_HIDE_TABLAB); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_HIDE_TABLAB); ctx->wtype = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_LABEL(ctx->dlg, "(nothing to edit)"); @@ -486,7 +486,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); ctx->wabs[1] = 0; PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -504,7 +504,7 @@ ctx->wabs[2] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_HELP(ctx->dlg, abshelp); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -522,7 +522,7 @@ ctx->wabs[3] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_HELP(ctx->dlg, abshelp); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -541,7 +541,7 @@ ctx->wabs[4] = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_HELP(ctx->dlg, abshelp); PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -555,7 +555,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); ctx->wabs[5] = 0; PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -569,7 +569,7 @@ PCB_DAD_BEGIN_HBOX(ctx->dlg); ctx->wabs[6] = 0; PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_END(ctx->dlg); PCB_DAD_BUTTON(ctx->dlg, "apply"); PCB_DAD_CHANGE_CB(ctx->dlg, prop_data_force_cb); @@ -589,14 +589,14 @@ rnd_hid_attr_val_t hv; PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(ctx->dlg); /* left: property tree and filter */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(ctx->dlg, 5, 1, hdr); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); ctx->wtree = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, prop_select_node_cb); PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx); @@ -619,7 +619,7 @@ /* right: preview and per type edit */ PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_VBOX(ctx->dlg); PCB_DAD_PREVIEW(ctx->dlg, prop_prv_expose_cb, prop_prv_mouse_cb, NULL, &prvbb, 100, 100, ctx); PCB_DAD_END(ctx->dlg); @@ -627,7 +627,7 @@ ctx->wscope = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_HELP(ctx->dlg, "Scope: list of objects affected"); PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); PCB_DAD_TREE(ctx->dlg, 2, 0, hdr_val); ctx->wvals = PCB_DAD_CURRENT(ctx->dlg); PCB_DAD_CHANGE_CB(ctx->dlg, prop_preset_cb); Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30981) +++ trunk/src_plugins/script/live_script.c (revision 30982) @@ -213,9 +213,9 @@ lvs->name = rnd_strdup(name); lvs->longname = pcb_concat("_live_script_", name, NULL); PCB_DAD_BEGIN_VBOX(lvs->dlg); - PCB_DAD_COMPFLAG(lvs->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(lvs->dlg, RND_HATF_EXPFILL); PCB_DAD_TEXT(lvs->dlg, lvs); - PCB_DAD_COMPFLAG(lvs->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(lvs->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); lvs->wtxt = PCB_DAD_CURRENT(lvs->dlg); PCB_DAD_BEGIN_HBOX(lvs->dlg); @@ -252,7 +252,7 @@ PCB_DAD_ENUM(lvs->dlg, (const char **)lvs->langs); lvs->wlang = PCB_DAD_CURRENT(lvs->dlg); PCB_DAD_BEGIN_HBOX(lvs->dlg); - PCB_DAD_COMPFLAG(lvs->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(lvs->dlg, RND_HATF_EXPFILL); PCB_DAD_END(lvs->dlg); PCB_DAD_BUTTON_CLOSES(lvs->dlg, clbtn); PCB_DAD_END(lvs->dlg); Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30981) +++ trunk/src_plugins/script/script_act.c (revision 30982) @@ -242,14 +242,14 @@ return; /* do not open another */ PCB_DAD_BEGIN_VBOX(script_dlg.dlg); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_HPANE(script_dlg.dlg); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL); /* left side */ PCB_DAD_BEGIN_VBOX(script_dlg.dlg); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL); PCB_DAD_TREE(script_dlg.dlg, 3, 0, hdr); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); script_dlg.wslist = PCB_DAD_CURRENT(script_dlg.dlg); PCB_DAD_CHANGE_CB(script_dlg.dlg, slist_cb); PCB_DAD_BEGIN_HBOX(script_dlg.dlg); @@ -267,10 +267,10 @@ /* right side */ PCB_DAD_BEGIN_VBOX(script_dlg.dlg); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL); PCB_DAD_LABEL(script_dlg.dlg, "Actions:"); PCB_DAD_TREE(script_dlg.dlg, 1, 0, NULL); - PCB_DAD_COMPFLAG(script_dlg.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + PCB_DAD_COMPFLAG(script_dlg.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); script_dlg.walist = PCB_DAD_CURRENT(script_dlg.dlg); PCB_DAD_END(script_dlg.dlg); PCB_DAD_END(script_dlg.dlg); Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 30981) +++ trunk/src_plugins/shape/shape_dialog.c (revision 30982) @@ -150,7 +150,7 @@ shp->layer = layer; PCB_DAD_BEGIN_VBOX(shp->dlg); - PCB_DAD_COMPFLAG(shp->dlg, PCB_HATF_EXPFILL); + PCB_DAD_COMPFLAG(shp->dlg, RND_HATF_EXPFILL); PCB_DAD_BEGIN_TABBED(shp->dlg, tabs); shp->tab = PCB_DAD_CURRENT(shp->dlg); PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_tab);