Index: trunk/doc/developer/dad/TEMPLATE.c =================================================================== --- trunk/doc/developer/dad/TEMPLATE.c (revision 30978) +++ trunk/doc/developer/dad/TEMPLATE.c (revision 30979) @@ -61,7 +61,7 @@ foo_ctx_t foo_ctx; -static void foo_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) <<<- rename this +static void foo_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) <<<- rename this { foo_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30978) +++ trunk/src/buffer.c (revision 30979) @@ -1094,7 +1094,7 @@ if (argc <= 2) { name = pcb_gui->fileselect(pcb_gui, "Load Paste Buffer ...", "Choose a file to load the contents of the\npaste buffer from.\n", - default_file, ".lht", NULL, "buffer", PCB_HID_FSD_READ | PCB_HID_FSD_MAY_NOT_EXIST, NULL); + default_file, ".lht", NULL, "buffer", RND_HID_FSD_READ | RND_HID_FSD_MAY_NOT_EXIST, NULL); if (default_file) { free(default_file); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 30978) +++ trunk/src/crosshair.c (revision 30979) @@ -489,8 +489,8 @@ void pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) { if (!inhibit_drawing_mode) { - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_RESET, 1, NULL); - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_POSITIVE_XOR, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_RESET, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_POSITIVE_XOR, 1, NULL); } pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached); @@ -508,7 +508,7 @@ } if (!inhibit_drawing_mode) - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_FLUSH, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_FLUSH, 1, NULL); } @@ -518,8 +518,8 @@ if ((pcb_marked.status) || (hidlib->tool_grabbed.status)) { if (!inhibit_drawing_mode) { - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_RESET, 1, NULL); - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_POSITIVE, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_RESET, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_POSITIVE, 1, NULL); } pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.mark); } @@ -536,7 +536,7 @@ if ((pcb_marked.status) || (hidlib->tool_grabbed.status)) if (!inhibit_drawing_mode) - pcb_render->set_drawing_mode(pcb_gui, PCB_HID_COMP_FLUSH, 1, NULL); + pcb_render->set_drawing_mode(pcb_gui, RND_HID_COMP_FLUSH, 1, NULL); } Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 30978) +++ trunk/src/draw.c (revision 30979) @@ -253,8 +253,8 @@ ly = pcb_uilayers.array[i]; if ((ly != NULL) && (ly->meta.real.vis)) { if (!have_canvas) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); have_canvas = 1; } pcb_draw_layer(info, ly); @@ -261,7 +261,7 @@ } } if (have_canvas) - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } } @@ -270,8 +270,8 @@ static void draw_xor_marks(pcb_draw_info_t *info) { int per_side = conf_core.appearance.subc_layer_per_side; - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, info->drawn_area); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 1); @@ -291,16 +291,16 @@ rnd_event(&PCB->hidlib, RND_EVENT_GUI_DRAW_OVERLAY_XOR, "p", &pcb_draw_out.fgGC, NULL); pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 0); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } static void draw_rats(pcb_draw_info_t *info, const rnd_rnd_box_t *drawn_area) { if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_RATS, 0, NULL)) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); pcb_draw_rats(info, drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); pcb_render->end_layer(pcb_render); } } @@ -310,8 +310,8 @@ int per_side = conf_core.appearance.subc_layer_per_side; /* Draw pins' and pads' names */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); if (PCB->SubcOn) { @@ -323,7 +323,7 @@ pcb_draw_pstk_labels(info); } pcb_draw_pstk_names(info, info->xform->show_solder_side ? solder : component, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } static int has_auto(pcb_layergrp_t *grp) @@ -366,7 +366,7 @@ } } - pcb_render->render_burst(pcb_render, PCB_HID_BURST_START, info->drawn_area); + pcb_render->render_burst(pcb_render, RND_HID_BURST_START, info->drawn_area); memset(do_group, 0, sizeof(do_group)); lvly.top_fab = -1; @@ -420,9 +420,9 @@ pcb_draw_silk_doc(info, side, PCB_LYT_DOC, 0, 1); pcb_draw_silk_doc(info, side, PCB_LYT_SILK, 0, 1); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } @@ -462,8 +462,8 @@ goto finish; /* Draw padstacks below silk */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); if (pcb_render->gui) { rnd_xform_t tmp; xform_setup(info, &tmp, NULL); @@ -470,7 +470,7 @@ pcb_draw_ppv(info, info->xform->show_solder_side ? solder : component); info->xform = NULL; info->layer = NULL; } - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); /* Draw the solder mask if turned on */ gid = pcb_layergrp_get_top_mask(); @@ -497,10 +497,10 @@ } { /* holes_after: draw holes after copper, silk and mask, to make sure it punches through everything. */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); draw_everything_holes(info, side_copper_grp); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } gid = pcb_layergrp_get_top_paste(); @@ -929,8 +929,8 @@ pcb_layergrp_t *grp = pcb_get_layergrp(PCB, group); unsigned int gflg = grp->ltype; - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); for (i = n_entries - 1; i >= 0; i--) { layernum = layers[i]; @@ -957,7 +957,7 @@ pcb_draw_ppv(info, group); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } void pcb_erase_obj(int type, void *lptr, void *ptr) @@ -1180,10 +1180,10 @@ pcb_output_t save; expose_begin(&save, hid); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, 1, &e->view); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, 1, &e->view); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, 1, &e->view); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, 1, &e->view); e->expose_cb(pcb_draw_out.fgGC, e); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, 1, &e->view); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, 1, &e->view); pcb_render->end_layer(pcb_render); expose_end(&save); Index: trunk/src/draw_composite.c =================================================================== --- trunk/src/draw_composite.c (revision 30978) +++ trunk/src/draw_composite.c (revision 30979) @@ -50,18 +50,18 @@ static void comp_start_sub_(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_NEGATIVE, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_NEGATIVE, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_start_add_(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_start_sub(comp_ctx_t *ctx) { if (ctx->thin) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); pcb_render->set_color(pcb_draw_out.pmGC, ctx->color); return; } @@ -75,7 +75,7 @@ static void comp_start_add(comp_ctx_t *ctx) { if (ctx->thin) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); return; } @@ -87,12 +87,12 @@ static void comp_finish(comp_ctx_t *ctx) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->info->drawn_area); } static void comp_init(comp_ctx_t *ctx, int negative) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, ctx->info->drawn_area); if (ctx->thin) return; @@ -102,7 +102,7 @@ if ((!ctx->thin) && (negative)) { /* drawing the big poly for the negative */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->info->drawn_area); comp_fill_board(ctx); } } Index: trunk/src/draw_ly_spec.c =================================================================== --- trunk/src/draw_ly_spec.c (revision 30978) +++ trunk/src/draw_ly_spec.c (revision 30979) @@ -63,9 +63,9 @@ cctx.invert = 0; if ((cctx.grp == NULL) || (cctx.grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-add */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } else { comp_draw_layer(&cctx, pcb_draw_paste_auto_, &side); @@ -186,11 +186,11 @@ if ((lyt_type & PCB_LYT_SILK) && (pcb_is_silk_old_style(&cctx, lid))) { /* fallback: implicit layer -> original code: draw auto+manual */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_layer(info, pcb_get_layer(info->pcb->Data, lid)); pcb_draw_silk_auto(&cctx, &lyt_side); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); } else { comp_draw_layer(&cctx, pcb_draw_silk_auto, &lyt_side); @@ -271,13 +271,13 @@ if (pcb_layer_gui_set_layer(gid, g, (numobj == 0), &info->xform_exporter)) { /* boundary does NOT support compisiting, everything is drawn in positive */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); for(n = 0; n < g->len; n++) { pcb_layer_t *ly = pcb_get_layer(info->pcb->Data, g->lid[n]); pcb_draw_layer(info, ly); } - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } } @@ -287,8 +287,8 @@ We should check for pcb_render->gui here, but it's kinda cool seeing the auto-outline magically disappear when you first add something to the outline layer. */ - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color); pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round); @@ -295,7 +295,7 @@ pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid); pcb_render->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } @@ -307,19 +307,19 @@ if ((uslot != NULL) && (uslot->meta.real.vis)) { if (pcb_layer_gui_set_glayer(PCB, uslot->meta.real.grp, unplated <= 0, &info->xform)) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_pstk_slots(info, uslot->meta.real.grp, PCB_PHOLE_UNPLATED | PCB_PHOLE_BB); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } } if ((pslot != NULL) && (pslot->meta.real.vis)) { if (pcb_layer_gui_set_glayer(PCB, pslot->meta.real.grp, plated <= 0, &info->xform)) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area); pcb_draw_pstk_slots(info, pslot->meta.real.grp, PCB_PHOLE_PLATED | PCB_PHOLE_BB); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area); pcb_render->end_layer(pcb_render); } } @@ -330,10 +330,10 @@ static void pcb_draw_rats(pcb_draw_info_t *info, const rnd_rnd_box_t *drawn_area) { - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL); - pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); + pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); } static void pcb_draw_assembly(pcb_draw_info_t *info, pcb_layer_type_t lyt_side) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30978) +++ trunk/src/file_act.c (revision 30979) @@ -301,7 +301,7 @@ /* Run the save dialog, either the full version from the dialogs plugin (if available) or a simplified version. Return 0 on success and fill in name_out and fmt_out. */ -static int save_fmt_dialog(const char *title, const char *descr, char **default_file, const char *history_tag, pcb_hid_fsd_flags_t flags, char **name_out, const char **fmt_out) +static int save_fmt_dialog(const char *title, const char *descr, char **default_file, const char *history_tag, rnd_hid_fsd_flags_t flags, char **name_out, const char **fmt_out) { const fgw_func_t *f = rnd_act_lookup("save"); @@ -373,7 +373,7 @@ if (fn == NULL) { int sr = save_fmt_dialog("Save footprint lib to file ...", "Choose a file to save all subcircuits to.\n", - &default_file, "save_lib_file", PCB_HID_FSD_MAY_NOT_EXIST, &name, &fmt); + &default_file, "save_lib_file", RND_HID_FSD_MAY_NOT_EXIST, &name, &fmt); if (sr != 0) { RND_ACT_IRES(-1); return 0; @@ -405,7 +405,7 @@ if (fn == NULL) { int sr = save_fmt_dialog("Save footprint lib to directory ...", "Choose a file name pattern to save all subcircuits to.\n", - &default_file, "save_lib_dir", PCB_HID_FSD_IS_TEMPLATE, &name, &fmt); + &default_file, "save_lib_dir", RND_HID_FSD_IS_TEMPLATE, &name, &fmt); if (sr != 0) { RND_ACT_IRES(-1); return 0; Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 30978) +++ trunk/src/font_act.c (revision 30979) @@ -69,7 +69,7 @@ static const char *flt_pcb[] = {"*.font", "*.pcb_font", NULL}; static const char *flt_fonts[] = {"*.lht", "*.font", "*.pcb_font", NULL}; static const char *flt_any[] = {"*", "*.*", NULL}; - const pcb_hid_fsd_filter_t flt[] = { + const rnd_hid_fsd_filter_t flt[] = { {"any font", NULL, flt_fonts}, {"lihata pcb-rnd font", NULL, flt_lht}, {"gEDA pcb font", NULL, flt_pcb}, @@ -78,7 +78,7 @@ }; fname = pcb_gui->fileselect(pcb_gui, "Load PCB font file...", "Picks a PCB font file to load.\n", - default_file, ".font", flt, "pcbfont", PCB_HID_FSD_READ, NULL); + default_file, ".font", flt, "pcbfont", RND_HID_FSD_READ, NULL); if (fname == NULL) return 0; /* cancel */ if (default_file != NULL) { @@ -150,7 +150,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Save PCB font file...", "Picks a PCB font file to save.\n", - default_file, ".font", NULL, "pcbfont", PCB_HID_FSD_MAY_NOT_EXIST, NULL); + default_file, ".font", NULL, "pcbfont", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) RND_ACT_FAIL(save_font_to); if (default_file != NULL) { Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 30978) +++ trunk/src/librnd/core/error.c (revision 30979) @@ -226,7 +226,7 @@ memset(&fmtsub, 0, sizeof(fmtsub)); PCB_DAD_ENUM(fmtsub.dlg, fmts); wfmt = PCB_DAD_CURRENT(fmtsub.dlg); - fn = pcb_gui->fileselect(pcb_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", PCB_HID_FSD_MAY_NOT_EXIST, &fmtsub); + fn = pcb_gui->fileselect(pcb_gui, "Export log", NULL, "log.txt", NULL, NULL, "log", RND_HID_FSD_MAY_NOT_EXIST, &fmtsub); if (fn != NULL) { ret = rnd_log_export(NULL, fn, (fmtsub.dlg[wfmt].val.lng == 1)); if (ret != 0) Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30978) +++ trunk/src/librnd/core/gui_act.c (revision 30979) @@ -61,7 +61,7 @@ rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, CreateMenu, ;); if (argc > 1) { - pcb_menu_prop_t props; + rnd_menu_prop_t props; memset(&props, 0, sizeof(props)); props.action = (argc > 2) ? argv[2].val.str : NULL; Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 30978) +++ trunk/src/librnd/core/hid.h (revision 30979) @@ -75,35 +75,35 @@ /* File Watch flags */ /* Based upon those in dbus/dbus-connection.h */ typedef enum { - PCB_WATCH_READABLE = 1 << 0, /* As in POLLIN */ - PCB_WATCH_WRITABLE = 1 << 1, /* As in POLLOUT */ - PCB_WATCH_ERROR = 1 << 2, /* As in POLLERR */ - PCB_WATCH_HANGUP = 1 << 3 /* As in POLLHUP */ -} pcb_watch_flags_t; + RND_WATCH_READABLE = 1 << 0, /* As in POLLIN */ + RND_WATCH_WRITABLE = 1 << 1, /* As in POLLOUT */ + RND_WATCH_ERROR = 1 << 2, /* As in POLLERR */ + RND_WATCH_HANGUP = 1 << 3 /* As in POLLHUP */ +} rnd_watch_flags_t; -typedef enum pcb_composite_op_s { - PCB_HID_COMP_RESET, /* reset (allocate and clear) the sketch canvas */ - PCB_HID_COMP_POSITIVE, /* draw subsequent objects in positive, with color, no XOR allowed */ - PCB_HID_COMP_POSITIVE_XOR, /* draw subsequent objects in positive, with color, XOR allowed */ - PCB_HID_COMP_NEGATIVE, /* draw subsequent objects in negative, ignore color */ - PCB_HID_COMP_FLUSH /* combine the sketch canvas onto the output buffer and discard the sketch canvas */ -} pcb_composite_op_t; +typedef enum rnd_composite_op_s { + RND_HID_COMP_RESET, /* reset (allocate and clear) the sketch canvas */ + RND_HID_COMP_POSITIVE, /* draw subsequent objects in positive, with color, no XOR allowed */ + RND_HID_COMP_POSITIVE_XOR, /* draw subsequent objects in positive, with color, XOR allowed */ + RND_HID_COMP_NEGATIVE, /* draw subsequent objects in negative, ignore color */ + RND_HID_COMP_FLUSH /* combine the sketch canvas onto the output buffer and discard the sketch canvas */ +} rnd_composite_op_t; -typedef enum pcb_burst_op_s { - PCB_HID_BURST_START, - PCB_HID_BURST_END -} pcb_burst_op_t; +typedef enum rnd_burst_op_s { + RND_HID_BURST_START, + RND_HID_BURST_END +} rnd_burst_op_t; typedef enum pcb_hid_attr_ev_e { - PCB_HID_ATTR_EV_WINCLOSE = 2, /* window closed (window manager close) */ - PCB_HID_ATTR_EV_CODECLOSE /* closed by the code, including standard close buttons */ -} pcb_hid_attr_ev_t; + RND_HID_ATTR_EV_WINCLOSE = 2, /* window closed (window manager close) */ + RND_HID_ATTR_EV_CODECLOSE /* closed by the code, including standard close buttons */ +} rnd_hid_attr_ev_t; -typedef enum pcb_hid_fsd_flags_e { +typedef enum rnd_hid_fsd_flags_e { /* Prompts the user for a filename or directory name. For GUI HID's this would mean a file select dialog box. The 'flags' argument is the bitwise OR of the following values. */ - PCB_HID_FSD_READ = 1, + RND_HID_FSD_READ = 1, /* The function calling hid->fileselect will deal with the case where the selected file already exists. If not given, then the @@ -110,25 +110,25 @@ GUI will prompt with an "overwrite?" prompt. Only used when writing. */ - PCB_HID_FSD_MAY_NOT_EXIST = 2, + RND_HID_FSD_MAY_NOT_EXIST = 2, /* The call is supposed to return a file template (for gerber output for example) instead of an actual file. Only used when writing. */ - PCB_HID_FSD_IS_TEMPLATE = 4 -} pcb_hid_fsd_flags_t; + RND_HID_FSD_IS_TEMPLATE = 4 +} rnd_hid_fsd_flags_t; typedef struct { const char *name; const char *mime; const char **pat; /* NULL terminated array of file name patterns */ -} pcb_hid_fsd_filter_t; +} rnd_hid_fsd_filter_t; -extern const pcb_hid_fsd_filter_t pcb_hid_fsd_filter_any[]; +extern const rnd_hid_fsd_filter_t rnd_hid_fsd_filter_any[]; /* Optional fields of a menu item; all non-NULL fields are strdup'd in the HID. */ -typedef struct pcb_menu_prop_s { +typedef struct rnd_menu_prop_s { const char *action; const char *accel; const char *tip; /* tooltip */ @@ -137,25 +137,25 @@ const rnd_color_t *foreground; const rnd_color_t *background; const char *cookie; /* used for cookie based removal */ -} pcb_menu_prop_t; +} rnd_menu_prop_t; -typedef enum pcb_hid_clipfmt_e { - PCB_HID_CLIPFMT_TEXT /* plain text (c string with the \0 included) */ -} pcb_hid_clipfmt_t; +typedef enum rnd_hid_clipfmt_e { + RND_HID_CLIPFMT_TEXT /* plain text (c string with the \0 included) */ +} rnd_hid_clipfmt_t; typedef enum { - PCB_HID_DOCK_TOP_LEFT, /* hbox on the top, below the menubar */ - PCB_HID_DOCK_TOP_RIGHT, /* hbox on the top, next to the menubar */ - PCB_HID_DOCK_TOP_INFOBAR, /* vbox for horizontally aligned important messages, above ("on top of") the drawing area for critical warnings - may have bright background color */ - PCB_HID_DOCK_LEFT, - PCB_HID_DOCK_BOTTOM, - PCB_HID_DOCK_FLOAT, /* separate window */ + RND_HID_DOCK_TOP_LEFT, /* hbox on the top, below the menubar */ + RND_HID_DOCK_TOP_RIGHT, /* hbox on the top, next to the menubar */ + RND_HID_DOCK_TOP_INFOBAR, /* vbox for horizontally aligned important messages, above ("on top of") the drawing area for critical warnings - may have bright background color */ + RND_HID_DOCK_LEFT, + RND_HID_DOCK_BOTTOM, + RND_HID_DOCK_FLOAT, /* separate window */ - PCB_HID_DOCK_max -} pcb_hid_dock_t; + RND_HID_DOCK_max +} rnd_hid_dock_t; -extern int pcb_dock_is_vert[PCB_HID_DOCK_max]; /* 1 if a new dock box (parent of a new sub-DAD) should be a vbox, 0 if hbox */ -extern int pcb_dock_has_frame[PCB_HID_DOCK_max]; /* 1 if a new dock box (parent of a new sub-DAD) should be framed */ +extern int rnd_dock_is_vert[RND_HID_DOCK_max]; /* 1 if a new dock box (parent of a new sub-DAD) should be a vbox, 0 if hbox */ +extern int rnd_dock_has_frame[RND_HID_DOCK_max]; /* 1 if a new dock box (parent of a new sub-DAD) should be framed */ /* This is the main HID structure. */ struct rnd_hid_s { @@ -277,11 +277,11 @@ /* Composite layer drawing: manipulate the sketch canvas and set positive or negative drawing mode. The canvas covers the screen box. */ - void (*set_drawing_mode)(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen); + void (*set_drawing_mode)(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen); /* Announce start/end of a render burst for a specific screen screen box; A GUI hid should set the coord_per_pix value here for proper optimization. */ - void (*render_burst)(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen); + void (*render_burst)(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen); /*** gc vs. rnd_hid_t *: rnd_core_gc_t contains ->hid, so these calls don't need to get it as first arg. ***/ @@ -391,7 +391,7 @@ * get_path returns the current full path in res as an strdup'd string (caller needs to free it) * set_file_name replaces the file name portion of the current path from arg[0].d.s */ - char *(*fileselect)(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); + char *(*fileselect)(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); /* A generic dialog to ask for a set of attributes. If n_attrs_ is zero, attrs_(.name) must be NULL terminated. attr_dlg_run returns @@ -404,7 +404,7 @@ by window placement. Returns opaque hid_ctx. (Hid_ctx shall save rnd_hid_t so subsequent attr_dlg_*() calls don't have it as an argument) */ - void *(*attr_dlg_new)(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); + void *(*attr_dlg_new)(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); int (*attr_dlg_run)(void *hid_ctx); void (*attr_dlg_raise)(void *hid_ctx); /* raise the window to top */ void (*attr_dlg_close)(void *hid_ctx); /* close the GUI but do not yet free hid_ctx (results should be available) */ @@ -433,7 +433,7 @@ /* top window docking: enter a new docked part by registering a new subdialog or leave (remove a docked part) from a subdialog. Return 0 on success. */ - int (*dock_enter)(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id); + int (*dock_enter)(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id); void (*dock_leave)(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub); /* Something to alert the user. */ @@ -449,7 +449,7 @@ * and remove menu items that are no longer needed. * If action is NULL, the menu may get submenus. */ - void (*create_menu)(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props); + void (*create_menu)(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props); /* Removes a menu recursively */ int (*remove_menu)(rnd_hid_t *hid, const char *menu_path); @@ -496,15 +496,15 @@ /*** clipboard handling for GUI HIDs ***/ /* Place format/data/len on the clipboard; return 0 on success */ - int (*clip_set)(rnd_hid_t *hid, pcb_hid_clipfmt_t format, const void *data, size_t len); + int (*clip_set)(rnd_hid_t *hid, rnd_hid_clipfmt_t format, const void *data, size_t len); /* retrieve format/data/len from the clipboard; return 0 on success; data is a copy of the data, modifiable by the caller */ - int (*clip_get)(rnd_hid_t *hid, pcb_hid_clipfmt_t *format, void **data, size_t *len); + int (*clip_get)(rnd_hid_t *hid, rnd_hid_clipfmt_t *format, void **data, size_t *len); /* release the data from the last clip_get(); clip_get() and clip_free() should be called in pair */ - void (*clip_free)(rnd_hid_t *hid, pcb_hid_clipfmt_t format, void *data, size_t len); + void (*clip_free)(rnd_hid_t *hid, rnd_hid_clipfmt_t format, void *data, size_t len); /* run redraw-benchmark and return an FPS value (optional) */ double (*benchmark)(rnd_hid_t *hid); @@ -615,9 +615,9 @@ /* non-zero if DAD dialogs are available currently */ #define PCB_HAVE_GUI_ATTR_DLG \ ((pcb_gui != NULL) && (pcb_gui->gui) && (pcb_gui->attr_dlg_new != NULL) && (pcb_gui->attr_dlg_new != pcb_nogui_attr_dlg_new)) -void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); +void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); -int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id); +int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id); void pcb_hid_dock_leave(rnd_hid_dad_subdialog_t *sub); #define pcb_hid_redraw(pcb) pcb_gui->invalidate_all(pcb_gui) Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 30978) +++ trunk/src/librnd/core/hid_dad.c (revision 30979) @@ -29,8 +29,8 @@ #include #include -int pcb_dock_is_vert[PCB_HID_DOCK_max] = {0, 0, 0, 1, 0, 1}; /* Update this if pcb_hid_dock_t changes */ -int pcb_dock_has_frame[PCB_HID_DOCK_max] = {0, 0, 0, 1, 0, 0}; /* Update this if pcb_hid_dock_t changes */ +int rnd_dock_is_vert[RND_HID_DOCK_max] = {0, 0, 0, 1, 0, 1}; /* Update this if rnd_hid_dock_t changes */ +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; @@ -140,7 +140,7 @@ return pcb_attribute_dialog_(id, attrs, n_attrs, title, caller_data, NULL, 0, 0, 0, 0, NULL); } -int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id) +int pcb_hid_dock_enter(rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) { if ((pcb_gui == NULL) || (pcb_gui->dock_enter == NULL)) return -1; Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30978) +++ trunk/src/librnd/core/hid_dlg.c (revision 30979) @@ -136,7 +136,7 @@ static const char *cancel = "progress cancel"; #define REFRESH_RATE 100 -static void progress_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void progress_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pcb_hid_progress(0, 0, NULL); } Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30978) +++ trunk/src/librnd/core/hid_init.c (revision 30979) @@ -66,7 +66,7 @@ static const char *flt_any[] = {"*", "*.*", NULL}; -const pcb_hid_fsd_filter_t pcb_hid_fsd_filter_any[] = { +const rnd_hid_fsd_filter_t rnd_hid_fsd_filter_any[] = { { "all", NULL, flt_any }, { NULL, NULL, NULL } }; Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 30978) +++ trunk/src/librnd/core/hid_nogui.c (revision 30979) @@ -100,12 +100,12 @@ { } -static void nogui_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void nogui_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { CRASH("set_drawing_mode"); } -static void nogui_render_burst(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen) +static void nogui_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { /* the HID may decide to ignore this hook */ } @@ -331,7 +331,7 @@ /* FIXME - this could use some enhancement to actually use the other args */ static char *nogui_fileselect(rnd_hid_t *hid, const char *title, const char *descr, - const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) + const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) { char *answer; @@ -350,7 +350,7 @@ return rnd_strdup(answer); } -void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) +void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) { CRASH("attr_dlg_new"); } @@ -412,7 +412,7 @@ return 0; } -static void nogui_create_menu(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props) +static void nogui_create_menu(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props) { } @@ -428,9 +428,9 @@ static void *clip_data = NULL; static size_t clip_len; -static pcb_hid_clipfmt_t clip_format; +static rnd_hid_clipfmt_t clip_format; -static int nogui_clip_set(rnd_hid_t *hid, pcb_hid_clipfmt_t format, const void *data, size_t len) +static int nogui_clip_set(rnd_hid_t *hid, rnd_hid_clipfmt_t format, const void *data, size_t len) { free(clip_data); clip_data = malloc(len); @@ -444,7 +444,7 @@ return clip_warn(); } -static int nogui_clip_get(rnd_hid_t *hid, pcb_hid_clipfmt_t *format, void **data, size_t *len) +static int nogui_clip_get(rnd_hid_t *hid, rnd_hid_clipfmt_t *format, void **data, size_t *len) { if (clip_data == NULL) { *data = NULL; @@ -463,7 +463,7 @@ return clip_warn(); } -static void nogui_clip_free(rnd_hid_t *hid, pcb_hid_clipfmt_t format, void *data, size_t len) +static void nogui_clip_free(rnd_hid_t *hid, rnd_hid_clipfmt_t format, void *data, size_t len) { free(data); } Index: trunk/src/librnd/core/hid_nogui.h =================================================================== --- trunk/src/librnd/core/hid_nogui.h (revision 30978) +++ trunk/src/librnd/core/hid_nogui.h (revision 30979) @@ -5,7 +5,7 @@ rnd_hid_t *pcb_hid_nogui_get_hid(void); /* For checking if attr dialogs are not available: */ -void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); +void *pcb_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); int pcb_nogui_progress(long so_far, long total, const char *message); Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30978) +++ trunk/src/librnd/pcb_compat.h (revision 30979) @@ -557,3 +557,44 @@ #define pcb_core_gc_t rnd_core_gc_t #define pcb_hidval_t rnd_hidval_t #define PCB_HIDCONCAT RND_HIDCONCAT +#define PCB_WATCH_READABLE RND_WATCH_READABLE +#define PCB_WATCH_WRITABLE RND_WATCH_WRITABLE +#define PCB_WATCH_ERROR RND_WATCH_ERROR +#define PCB_WATCH_HANGUP RND_WATCH_HANGUP +#define pcb_watch_flags_t rnd_watch_flags_t +#define PCB_HID_COMP_RESET RND_HID_COMP_RESET +#define PCB_HID_COMP_POSITIVE RND_HID_COMP_POSITIVE +#define PCB_HID_COMP_POSITIVE_XOR RND_HID_COMP_POSITIVE_XOR +#define PCB_HID_COMP_NEGATIVE RND_HID_COMP_NEGATIVE +#define PCB_HID_COMP_FLUSH RND_HID_COMP_FLUSH +#define pcb_composite_op_t rnd_composite_op_t +#define PCB_HID_BURST_START RND_HID_BURST_START +#define PCB_HID_BURST_END RND_HID_BURST_END +#define PCB_HID_ATTR_EV_WINCLOSE RND_HID_ATTR_EV_WINCLOSE +#define PCB_HID_ATTR_EV_CODECLOSE RND_HID_ATTR_EV_CODECLOSE +#define PCB_HID_FSD_READ RND_HID_FSD_READ +#define PCB_HID_FSD_MAY_NOT_EXIST RND_HID_FSD_MAY_NOT_EXIST +#define PCB_HID_FSD_IS_TEMPLATE RND_HID_FSD_IS_TEMPLATE +#define pcb_burst_op_t rnd_burst_op_t +#define pcb_burst_op_s rnd_burst_op_s +#define pcb_composite_op_s rnd_composite_op_s +#define pcb_hid_attr_ev_t rnd_hid_attr_ev_t +#define pcb_hid_fsd_flags_e rnd_hid_fsd_flags_e +#define pcb_hid_fsd_flags_t rnd_hid_fsd_flags_t +#define pcb_hid_fsd_filter_t rnd_hid_fsd_filter_t +#define pcb_hid_fsd_filter_any rnd_hid_fsd_filter_any +#define pcb_menu_prop_s rnd_menu_prop_s +#define pcb_menu_prop_t rnd_menu_prop_t +#define pcb_hid_clipfmt_e rnd_hid_clipfmt_e +#define pcb_hid_clipfmt_t rnd_hid_clipfmt_t +#define pcb_hid_dock_t rnd_hid_dock_t +#define PCB_HID_CLIPFMT_TEXT RND_HID_CLIPFMT_TEXT +#define PCB_HID_DOCK_TOP_LEFT RND_HID_DOCK_TOP_LEFT +#define PCB_HID_DOCK_TOP_RIGHT RND_HID_DOCK_TOP_RIGHT +#define PCB_HID_DOCK_TOP_INFOBAR RND_HID_DOCK_TOP_INFOBAR +#define PCB_HID_DOCK_LEFT RND_HID_DOCK_LEFT +#define PCB_HID_DOCK_BOTTOM RND_HID_DOCK_BOTTOM +#define PCB_HID_DOCK_FLOAT RND_HID_DOCK_FLOAT +#define PCB_HID_DOCK_max RND_HID_DOCK_max +#define pcb_dock_is_vert rnd_dock_is_vert +#define pcb_dock_has_frame rnd_dock_has_frame Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30978) +++ trunk/src_plugins/asm/asm.c (revision 30979) @@ -310,7 +310,7 @@ } /*** UI callbacks ***/ -static void asm_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void asm_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { group_t **g; part_t **p; Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30978) +++ trunk/src_plugins/cam/cam_gui.c (revision 30979) @@ -235,7 +235,7 @@ } } -static void cam_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void cam_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { cam_dlg_t *ctx = caller_data; cam_uninit_inst(&ctx->cam); Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 30978) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 30979) @@ -44,7 +44,7 @@ cnstgui_ctx_t cnstgui_ctx; -static void cnstgui_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void cnstgui_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { cnstgui_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_about.c =================================================================== --- trunk/src_plugins/dialogs/dlg_about.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_about.c (revision 30979) @@ -41,7 +41,7 @@ about_ctx_t about_ctx; -static void about_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void about_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { about_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 30979) @@ -121,7 +121,7 @@ } } -static void export_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void export_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { export_ctx_t *ctx = caller_data; int n; Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30979) @@ -55,7 +55,7 @@ static const char *fontsel_cookie = "dlg_fontsel"; -static void fontsel_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void fontsel_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { fontsel_ctx_t *ctx = caller_data; Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 30979) @@ -89,7 +89,7 @@ PCB_DAD_CHANGE_CB(sub.dlg, ifb_file_chg_close_cb); PCB_DAD_END(sub.dlg); PCB_DAD_END(sub.dlg); - if (pcb_hid_dock_enter(&sub, PCB_HID_DOCK_TOP_INFOBAR, "file_changed") != 0) { + if (pcb_hid_dock_enter(&sub, RND_HID_DOCK_TOP_INFOBAR, "file_changed") != 0) { RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30979) @@ -129,7 +129,7 @@ return 0; } -static void pstklib_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pstklib_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pstk_lib_ctx_t *ctx = caller_data; Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30979) @@ -237,7 +237,7 @@ #include "dlg_library_param.c" -static void library_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void library_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { library_ctx_t *ctx = caller_data; Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 30979) @@ -29,7 +29,7 @@ #include -static void library_param_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void library_param_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { library_ctx_t *ctx = caller_data; htsi_entry_t *e; Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30979) @@ -71,13 +71,13 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); if (rnd_strcasecmp(function, "Netlist") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", PCB_HID_FSD_READ, NULL); + name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", RND_HID_FSD_READ, NULL); else if ((rnd_strcasecmp(function, "FootprintToBuffer") == 0) || (rnd_strcasecmp(function, "ElementToBuffer") == 0)) - name = pcb_gui->fileselect(pcb_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", PCB_HID_FSD_READ, NULL); + name = pcb_gui->fileselect(pcb_gui, "Load footprint to buffer", "Import footprint from file", last_footprint, NULL, NULL, "footprint", RND_HID_FSD_READ, NULL); else if (rnd_strcasecmp(function, "LayoutToBuffer") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL); + name = pcb_gui->fileselect(pcb_gui, "Load layout to buffer", "load layout (board) to buffer", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); else if (rnd_strcasecmp(function, "Layout") == 0) - name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL); + name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", RND_HID_FSD_READ, NULL); else { rnd_message(RND_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function); RND_ACT_IRES(1); @@ -557,7 +557,7 @@ timer_ctx.ptr = &save; save.timer_active = 1; save.timer = pcb_gui->add_timer(pcb_gui, save_timer, 300, timer_ctx); /* the timer needs to run at least once, to get some initialization done that can be done only after fmtsub got created */ - final_name = pcb_gui->fileselect(pcb_gui, prompt, NULL, name_in, NULL, NULL, "board", PCB_HID_FSD_MAY_NOT_EXIST, fmtsub); + final_name = pcb_gui->fileselect(pcb_gui, prompt, NULL, name_in, NULL, NULL, "board", RND_HID_FSD_MAY_NOT_EXIST, fmtsub); if (save.timer_active) pcb_gui->stop_timer(pcb_gui, save.timer); free(name_in); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30979) @@ -41,7 +41,7 @@ netlist_ctx_t netlist_ctx; -static void netlist_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void netlist_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { netlist_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30979) @@ -48,7 +48,7 @@ pinout_ctx_t pinout_ctx; -static void pinout_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pinout_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pinout_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30979) @@ -211,7 +211,7 @@ ctx->role = roles[attr->val.lng]; } -static void pref_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pref_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { long n; pref_ctx_t *ctx = caller_data; Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30979) @@ -40,7 +40,7 @@ int wnewval, winsa; } confedit_ctx_t; -static void pref_conf_edit_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pref_conf_edit_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pref_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30979) @@ -390,7 +390,7 @@ PCB_DAD_FREE(ctx->lib.help.dlg); } -static void pref_libhelp_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pref_libhelp_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { /* pref_libhelp_ctx_t *ctx = caller_data;*/ } Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30979) @@ -103,7 +103,7 @@ fname = pcb_gui->fileselect(pcb_gui, "Save window geometry to...", "Pick a file for saving window geometry to.\n", - "win_geo.lht", ".lht", NULL, "wingeo", PCB_HID_FSD_MAY_NOT_EXIST, NULL); + "win_geo.lht", ".lht", NULL, "wingeo", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) return; Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 30979) @@ -78,7 +78,7 @@ memset(e, 0, sizeof(search_expr_t)); } -static void search_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void search_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { int r, c; search_ctx_t *ctx = caller_data; Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30979) @@ -41,7 +41,7 @@ extern uundo_list_t pcb_uundo; -static void undo_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void undo_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { undo_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30978) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30979) @@ -68,7 +68,7 @@ view_ctx_t view_ctx; -static void view_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void view_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { view_ctx_t *ctx = caller_data; @@ -382,7 +382,7 @@ } } pcb_view_save_list_end(&tmp, NULL); - pcb_gui->clip_set(pcb_gui, PCB_HID_CLIPFMT_TEXT, tmp.array, tmp.used+1); + pcb_gui->clip_set(pcb_gui, RND_HID_CLIPFMT_TEXT, tmp.array, tmp.used+1); gds_uninit(&tmp); if (cut) view2dlg_list(ctx); @@ -391,7 +391,7 @@ static void view_paste_btn_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_btn) { view_ctx_t *ctx = caller_data; - pcb_hid_clipfmt_t cformat; + rnd_hid_clipfmt_t cformat; void *cdata, *load_ctx; size_t clen; pcb_view_t *v, *vt = NULL; @@ -411,7 +411,7 @@ if (pcb_gui->clip_get(pcb_gui, &cformat, &cdata, &clen) != 0) return; - if (cformat != PCB_HID_CLIPFMT_TEXT) { + if (cformat != RND_HID_CLIPFMT_TEXT) { pcb_gui->clip_free(pcb_gui, cformat, cdata, clen); return; } @@ -470,7 +470,7 @@ FILE *f; void *load_ctx; - fn = pcb_gui->fileselect(pcb_gui, "Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", PCB_HID_FSD_READ, NULL); + fn = pcb_gui->fileselect(pcb_gui, "Load view list", "Load all views from the list", "view.lht", "lht", NULL, "view", RND_HID_FSD_READ, NULL); if (fn == NULL) return; Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30978) +++ trunk/src_plugins/drc_query/dlg.c (revision 30979) @@ -53,7 +53,7 @@ gdl_list_t rule_edit_dialogs; -static void rule_edit_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void rule_edit_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { rule_edit_ctx_t *ctx = caller_data; @@ -354,7 +354,7 @@ static drc_rlist_ctx_t drc_rlist_ctx; -static void drc_rlist_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void drc_rlist_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { drc_rlist_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 30978) +++ trunk/src_plugins/export_dxf/dxf.c (revision 30979) @@ -443,21 +443,21 @@ free(gc); } -static void dxf_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void dxf_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { if (direct) return; switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_NEGATIVE: break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: break; } } Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 30978) +++ trunk/src_plugins/export_excellon/excellon.c (revision 30979) @@ -337,16 +337,16 @@ free(gc); } -static void excellon_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) +static void excellon_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) { switch(op) { - case PCB_HID_COMP_RESET: - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_RESET: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_FLUSH: break; - case PCB_HID_COMP_POSITIVE_XOR: - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_NEGATIVE: if (!warn.comp) { warn.comp = 1; rnd_message(RND_MSG_ERROR, "Excellon: can not draw composite layers (some features may be missing from the export)\n"); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30978) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30979) @@ -66,7 +66,7 @@ static int all_layers; static int is_mask, was_drill; static int is_drill, is_plated; -static pcb_composite_op_t gerber_drawing_mode, drawing_mode_issued; +static rnd_composite_op_t gerber_drawing_mode, drawing_mode_issued; static int flash_drills, line_slots; static int copy_outline_mode; static int want_cross_sect; @@ -321,7 +321,7 @@ gerber_ovr = 0; - drawing_mode_issued = PCB_HID_COMP_POSITIVE; + drawing_mode_issued = RND_HID_COMP_POSITIVE; if (!options) { gerber_get_export_options(hid, NULL); @@ -631,7 +631,7 @@ free(gc); } -static void gerber_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) +static void gerber_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) { gerber_drawing_mode = op; if ((f != NULL) && (gerber_debug)) @@ -671,11 +671,11 @@ { gerber_drawn_objs++; if ((f != NULL) && (gerber_drawing_mode != drawing_mode_issued)) { - if ((gerber_drawing_mode == PCB_HID_COMP_POSITIVE) || (gerber_drawing_mode == PCB_HID_COMP_POSITIVE_XOR)) { + if ((gerber_drawing_mode == RND_HID_COMP_POSITIVE) || (gerber_drawing_mode == RND_HID_COMP_POSITIVE_XOR)) { fprintf(f, "%%LPD*%%\r\n"); drawing_mode_issued = gerber_drawing_mode; } - else if (gerber_drawing_mode == PCB_HID_COMP_NEGATIVE) { + else if (gerber_drawing_mode == RND_HID_COMP_NEGATIVE) { fprintf(f, "%%LPC*%%\r\n"); drawing_mode_issued = gerber_drawing_mode; } @@ -725,7 +725,7 @@ int firstTime = 1; rnd_coord_t startX = 0, startY = 0; - if (is_mask && (gerber_drawing_mode != PCB_HID_COMP_POSITIVE) && (gerber_drawing_mode != PCB_HID_COMP_POSITIVE_XOR) && (gerber_drawing_mode != PCB_HID_COMP_NEGATIVE)) + if (is_mask && (gerber_drawing_mode != RND_HID_COMP_POSITIVE) && (gerber_drawing_mode != RND_HID_COMP_POSITIVE_XOR) && (gerber_drawing_mode != RND_HID_COMP_NEGATIVE)) return; use_gc(gc, 10 * 100); Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30978) +++ trunk/src_plugins/export_openems/excitation.c (revision 30979) @@ -329,7 +329,7 @@ { NULL, NULL} }; -static void exc_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void exc_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { exc_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30978) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30979) @@ -708,18 +708,18 @@ free(gc); } -static void openems_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void openems_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: rnd_message(RND_MSG_ERROR, "Can't draw composite layer, especially not on copper\n"); break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: break; } } Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 30978) +++ trunk/src_plugins/export_openems/mesh.c (revision 30979) @@ -956,7 +956,7 @@ mesh.ui_layer_z = pcb_uilayer_alloc(mesh_ui_cookie, "mesh z", &clr); } -static void ia_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void ia_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { PCB_DAD_FREE(ia.dlg); memset(&ia, 0, sizeof(ia)); @@ -971,7 +971,7 @@ fname = pcb_gui->fileselect(pcb_gui, "Save mesh settings...", "Picks file for saving mesh settings.\n", - default_file, ".lht", NULL, "mesh", PCB_HID_FSD_MAY_NOT_EXIST, NULL); + default_file, ".lht", NULL, "mesh", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) return; /* cancel */ @@ -1001,7 +1001,7 @@ fname = pcb_gui->fileselect(pcb_gui, "Load mesh settings...", "Picks file for loading mesh settings from.\n", - default_file, ".lht", NULL, "mesh", PCB_HID_FSD_READ, NULL); + default_file, ".lht", NULL, "mesh", RND_HID_FSD_READ, NULL); if (fname == NULL) return; /* cancel */ Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30978) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30979) @@ -429,21 +429,21 @@ free(gc); } -static void openscad_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void openscad_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: scad_new_layer(1); break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: scad_new_layer(0); break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: scad_close_layer(); break; } Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30978) +++ trunk/src_plugins/export_png/png.c (revision 30979) @@ -872,8 +872,8 @@ free(gc); } -static pcb_composite_op_t drawing_mode; -static void png_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static rnd_composite_op_t drawing_mode; +static void png_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { static gdImagePtr dst_im; drawing_mode = op; @@ -880,7 +880,7 @@ if ((direct) || (is_photo_drill)) /* photo drill is a special layer, no copositing on that */ return; switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: /* the main pixel buffer; drawn with color */ if (comp_im == NULL) { @@ -909,15 +909,15 @@ gdImageFilledRectangle(erase_im, 0, 0, gdImageSX(erase_im), gdImageSY(erase_im), black->c); break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: im = comp_im; break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: im = erase_im; break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: { int x, y, c, e; im = dst_im; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 30978) +++ trunk/src_plugins/export_ps/eps.c (revision 30979) @@ -45,7 +45,7 @@ static int print_group[PCB_MAX_LAYERGRP]; static int print_layer[PCB_MAX_LAYER]; static int fast_erase = -1; -static pcb_composite_op_t drawing_mode; +static rnd_composite_op_t drawing_mode; static long eps_drawn_objs; static rnd_export_opt_t eps_attribute_list[] = { @@ -443,22 +443,22 @@ free(gc); } -static void eps_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void eps_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { if (direct) return; drawing_mode = op; switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: fprintf(f, "gsave\n"); break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_NEGATIVE: break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: fprintf(f, "grestore\n"); lastcolor = -1; break; @@ -468,7 +468,7 @@ static void eps_set_color(rnd_hid_gc_t gc, const rnd_color_t *color) { - if (drawing_mode == PCB_HID_COMP_NEGATIVE) { + if (drawing_mode == RND_HID_COMP_NEGATIVE) { gc->color = 0xffffff; gc->erase = 1; return; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30978) +++ trunk/src_plugins/export_ps/ps.c (revision 30979) @@ -334,7 +334,7 @@ rnd_bool is_copper; rnd_bool is_paste; - pcb_composite_op_t drawing_mode; + rnd_composite_op_t drawing_mode; int ovr_all; long drawn_objs; } global; @@ -963,7 +963,7 @@ free(gc); } -static void ps_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void ps_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { global.drawing_mode = op; } @@ -971,7 +971,7 @@ static void ps_set_color(rnd_hid_gc_t gc, const rnd_color_t *color) { - if (global.drawing_mode == PCB_HID_COMP_NEGATIVE) { + if (global.drawing_mode == RND_HID_COMP_NEGATIVE) { gc->r = gc->g = gc->b = 255; gc->erase = 0; } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30978) +++ trunk/src_plugins/export_svg/svg.c (revision 30979) @@ -97,7 +97,7 @@ static int opacity = 100, drawing_mask, drawing_hole, photo_mode, flip; static gds_t sbright, sdark, snormal, sclip; -static pcb_composite_op_t drawing_mode; +static rnd_composite_op_t drawing_mode; static int comp_cnt; static long svg_drawn_objs; @@ -486,7 +486,7 @@ free(gc); } -static void svg_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void svg_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { drawing_mode = op; @@ -494,7 +494,7 @@ return; switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: comp_cnt++; gds_init(&sclip); pcb_append_printf(&snormal, "\n"); @@ -503,12 +503,12 @@ pcb_append_printf(&sclip, "\n", comp_cnt, PCB->hidlib.size_x, PCB->hidlib.size_y); break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_NEGATIVE: break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: pcb_append_printf(&snormal, "\n"); pcb_append_printf(&sclip, "\n"); gds_append_str(&snormal, sclip.array); @@ -527,9 +527,9 @@ static const char *svg_clip_color(rnd_hid_gc_t gc) { - if ((drawing_mode == PCB_HID_COMP_POSITIVE) || (drawing_mode == PCB_HID_COMP_POSITIVE_XOR)) + if ((drawing_mode == RND_HID_COMP_POSITIVE) || (drawing_mode == RND_HID_COMP_POSITIVE_XOR)) return "#FFFFFF"; - if (drawing_mode == PCB_HID_COMP_NEGATIVE) + if (drawing_mode == RND_HID_COMP_NEGATIVE) return "#000000"; return NULL; } Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30978) +++ trunk/src_plugins/extedit/extedit.c (revision 30979) @@ -131,7 +131,7 @@ ctx.stay = 1; ctx.fc = fc; hd.ptr = &ctx; - ctx.wid = pcb_gui->watch_file(pcb_gui, fd, PCB_WATCH_READABLE | PCB_WATCH_HANGUP, extedit_fd_watch, hd); + ctx.wid = pcb_gui->watch_file(pcb_gui, fd, RND_WATCH_READABLE | RND_WATCH_HANGUP, extedit_fd_watch, hd); while(ctx.stay) { if (pcb_gui != NULL) { n++; Index: trunk/src_plugins/exto_std/bus.c =================================================================== --- trunk/src_plugins/exto_std/bus.c (revision 30978) +++ trunk/src_plugins/exto_std/bus.c (revision 30979) @@ -352,7 +352,7 @@ } -static void pcb_bus_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pcb_bus_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pcb_subc_t *subc = caller_data; bus_t *bus = subc->extobj_data; Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 30978) +++ trunk/src_plugins/exto_std/dimension.c (revision 30979) @@ -390,7 +390,7 @@ return subc; } -static void pcb_dimension_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pcb_dimension_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pcb_subc_t *subc = caller_data; dimension *dim = subc->extobj_data; Index: trunk/src_plugins/exto_std/line_of_vias.c =================================================================== --- trunk/src_plugins/exto_std/line_of_vias.c (revision 30978) +++ trunk/src_plugins/exto_std/line_of_vias.c (revision 30979) @@ -290,7 +290,7 @@ } -static void pcb_line_of_vias_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void pcb_line_of_vias_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { pcb_subc_t *subc = caller_data; line_of_vias *lov = subc->extobj_data; Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 30978) +++ trunk/src_plugins/hid_batch/batch.c (revision 30979) @@ -279,7 +279,7 @@ { } -static void batch_create_menu(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props) +static void batch_create_menu(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props) { } Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30978) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 30979) @@ -361,7 +361,7 @@ } -static pcb_composite_op_t curr_drawing_mode; +static rnd_composite_op_t curr_drawing_mode; static void ghid_sketch_setup(render_priv_t *priv) { @@ -374,7 +374,7 @@ priv->out_clip = priv->sketch_clip; } -static void ghid_gdk_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void ghid_gdk_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { render_priv_t *priv = ghidgui->port.render_priv; @@ -388,12 +388,12 @@ if (direct) { priv->out_pixel = priv->base_pixel; priv->out_clip = NULL; - curr_drawing_mode = PCB_HID_COMP_POSITIVE; + curr_drawing_mode = RND_HID_COMP_POSITIVE; return; } switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: ghid_sketch_setup(priv); /* clear the canvas */ @@ -405,16 +405,16 @@ gdk_draw_rectangle(priv->out_clip, priv->clear_gc, TRUE, 0, 0, ghidgui->port.view.canvas_width, ghidgui->port.view.canvas_height); break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: priv->clip_color.pixel = 1; break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: priv->clip_color.pixel = 0; break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: if (priv->copy_gc == NULL) priv->copy_gc = gdk_gc_new(priv->out_pixel); gdk_gc_set_clip_mask(priv->copy_gc, priv->sketch_clip); @@ -428,7 +428,7 @@ curr_drawing_mode = op; } -static void ghid_gdk_render_burst(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen) +static void ghid_gdk_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; } @@ -595,7 +595,7 @@ GdkWindow *window = gtkc_widget_get_window(ghidgui->port.top_window); int need_setup = 0; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); if (gc->me_pointer != >k2_gdk_hid) { fprintf(stderr, "Fatal: GC from another HID passed to GTK HID\n"); @@ -637,7 +637,7 @@ double dx1, dy1, dx2, dy2; render_priv_t *priv = ghidgui->port.render_priv; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); dx1 = Vx((double) x1); dy1 = Vy((double) y1); @@ -672,7 +672,7 @@ double w, h, radius; render_priv_t *priv = ghidgui->port.render_priv; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); w = ghidgui->port.view.canvas_width * ghidgui->port.view.coord_per_px; h = ghidgui->port.view.canvas_height * ghidgui->port.view.coord_per_px; @@ -722,7 +722,7 @@ gint w, h, lw, sx1, sy1; render_priv_t *priv = ghidgui->port.render_priv; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); lw = gc->width; w = ghidgui->port.view.canvas_width * ghidgui->port.view.coord_per_px; @@ -775,7 +775,7 @@ gint w, h, vr; render_priv_t *priv = ghidgui->port.render_priv; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); w = ghidgui->port.view.canvas_width * ghidgui->port.view.coord_per_px; h = ghidgui->port.view.canvas_height * ghidgui->port.view.coord_per_px; @@ -859,7 +859,7 @@ render_priv_t *priv = ghidgui->port.render_priv; USE_GC_NOPEN(gc); - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); /* optimization: axis aligned rectangles can be drawn cheaper than polygons and they are common because of smd pads */ if (poly_is_aligned_rect(&b, n_coords, x, y)) { @@ -918,7 +918,7 @@ rnd_coord_t lsx, lsy, lastx = RND_MAX_COORD, lasty = RND_MAX_COORD, mindist = ghidgui->port.view.coord_per_px * 2; USE_GC_NOPEN(gc); - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); /* optimization: axis aligned rectangles can be drawn cheaper than polygons and they are common because of smd pads */ if (poly_is_aligned_rect(&b, n_coords, x, y)) { @@ -971,7 +971,7 @@ gint w, h, lw, xx, yy, sx1, sy1; render_priv_t *priv = ghidgui->port.render_priv; - assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE)); + assert((curr_drawing_mode == RND_HID_COMP_POSITIVE) || (curr_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == RND_HID_COMP_NEGATIVE)); lw = gc->width; w = ghidgui->port.view.canvas_width * ghidgui->port.view.coord_per_px; Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 30978) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 30979) @@ -62,7 +62,7 @@ rnd_coord_t width; } rnd_hid_gc_s; -void ghid_gl_render_burst(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen) +void ghid_gl_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { pcb_gui->coord_per_pix = ghidgui->port.view.coord_per_px; } @@ -291,7 +291,7 @@ render_priv_t *priv = ghidgui->port.render_priv; static GdkColormap *colormap = NULL; double r, g, b, a; - pcb_composite_op_t composite_op = hidgl_get_drawing_mode(); + rnd_composite_op_t composite_op = hidgl_get_drawing_mode(); if (*gc->pcolor->str == '\0') { fprintf(stderr, "set_gl_color_for_gc: gc->colorname = 0, setting to magenta\n"); @@ -301,7 +301,7 @@ if ((priv->current_color_packed == gc->pcolor->packed) && (priv->current_alpha_mult == gc->alpha_mult)) return; - priv->current_color_packed = (composite_op == PCB_HID_COMP_POSITIVE_XOR ? ~gc->pcolor->packed : gc->pcolor->packed); + priv->current_color_packed = (composite_op == RND_HID_COMP_POSITIVE_XOR ? ~gc->pcolor->packed : gc->pcolor->packed); priv->current_alpha_mult = gc->alpha_mult; if (colormap == NULL) @@ -331,7 +331,7 @@ cc->blue = cc->color.blue / 65535.; cc->color_set = 1; } - if (composite_op == PCB_HID_COMP_POSITIVE_XOR) { + if (composite_op == RND_HID_COMP_POSITIVE_XOR) { if (!cc->xor_set) { cc->xor_color.red = cc->color.red ^ ((unsigned)priv->bg_color.r << 8); cc->xor_color.green = cc->color.green ^ ((unsigned)priv->bg_color.g << 8); Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30978) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30979) @@ -185,7 +185,7 @@ Widget dialog; rnd_hid_attr_val_t property[RND_HATP_max]; Dimension minw, minh; - void (*close_cb)(void *caller_data, pcb_hid_attr_ev_t ev); + void (*close_cb)(void *caller_data, rnd_hid_attr_ev_t ev); char *id; unsigned close_cb_called:1; unsigned already_closing:1; @@ -592,7 +592,7 @@ if ((!ctx->close_cb_called) && (ctx->close_cb != NULL)) { ctx->close_cb_called = 1; - ctx->close_cb(ctx->caller_data, PCB_HID_ATTR_EV_WINCLOSE); + ctx->close_cb(ctx->caller_data, RND_HID_ATTR_EV_WINCLOSE); } else if (!ctx->widget_destroyed) { ctx->widget_destroyed = 1; @@ -605,7 +605,7 @@ if ((!ctx->close_cb_called) && (ctx->close_cb != NULL)) { ctx->close_cb_called = 1; - ctx->close_cb(ctx->caller_data, PCB_HID_ATTR_EV_CODECLOSE); + ctx->close_cb(ctx->caller_data, RND_HID_ATTR_EV_CODECLOSE); } } } @@ -632,7 +632,7 @@ XtUnmanageChild(ctx->wltop[n]); } -void *lesstif_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) +void *lesstif_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) { Widget topform, main_tbl; lesstif_attr_dlg_t *ctx; Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30978) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30979) @@ -127,7 +127,7 @@ return -1; } -char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) +char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) { XmString xms_ext = NULL, xms_load = NULL; pcb_ltf_fsd_t pctx; @@ -159,7 +159,7 @@ stdarg(XmNtitle, title); XtSetValues(XtParent(pctx.dialog), stdarg_args, stdarg_n); - if (flags & PCB_HID_FSD_READ) { + if (flags & RND_HID_FSD_READ) { xms_load = XmStringCreatePCB("Load From"); stdarg_n = 0; stdarg(XmNselectionLabelString, xms_load); Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.h =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.h (revision 30978) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.h (revision 30979) @@ -1,2 +1,2 @@ #include -char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); +char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); Index: trunk/src_plugins/hid_lesstif/lesstif.h =================================================================== --- trunk/src_plugins/hid_lesstif/lesstif.h (revision 30978) +++ trunk/src_plugins/hid_lesstif/lesstif.h (revision 30979) @@ -53,7 +53,7 @@ extern void lesstif_update_status_line(); extern void lesstif_attributes_dialog(rnd_hid_t *hid, const char *, rnd_attribute_list_t *); void *lesstif_attr_sub_new(Widget parent_box, rnd_hid_attribute_t *attrs, int n_attrs, void *caller_data); -char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); +char *pcb_ltf_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); rnd_hidlib_t *ltf_attr_get_dad_hidlib(void *hid_ctx); extern int pcb_ltf_ok; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30978) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30979) @@ -147,16 +147,16 @@ static void lesstif_begin(void); static void lesstif_end(void); -static Widget ltf_dockbox[PCB_HID_DOCK_max]; -static gdl_list_t ltf_dock[PCB_HID_DOCK_max]; +static Widget ltf_dockbox[RND_HID_DOCK_max]; +static gdl_list_t ltf_dock[RND_HID_DOCK_max]; typedef struct { void *hid_ctx; Widget frame; - pcb_hid_dock_t where; + rnd_hid_dock_t where; } docked_t; -static Widget ltf_create_dockbox(Widget parent, pcb_hid_dock_t where, int vert) +static Widget ltf_create_dockbox(Widget parent, rnd_hid_dock_t where, int vert) { stdarg(PxmNfillBoxVertical, vert); stdarg(XmNmarginWidth, 0); @@ -180,7 +180,7 @@ return -1; } -static int ltf_dock_enter(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id) +static int ltf_dock_enter(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) { docked_t *docked; Widget hvbox; @@ -192,7 +192,7 @@ docked->where = where; stdarg_n = 0; - stdarg(PxmNfillBoxVertical, pcb_dock_is_vert[where]); + stdarg(PxmNfillBoxVertical, rnd_dock_is_vert[where]); stdarg(XmNmarginWidth, 0); stdarg(XmNmarginHeight, 0); hvbox = PxmCreateFillBox(ltf_dockbox[where], "dockbox", stdarg_args, stdarg_n); @@ -199,7 +199,7 @@ TODO("hidlib: dock frame"); /* - if (pcb_dock_has_frame[where]) { + if (rnd_dock_has_frame[where]) { docked->frame = gtk_frame_new(id); gtk_container_add(GTK_CONTAINER(docked->frame), hvbox); } @@ -221,7 +221,7 @@ typedef struct { void *hid_ctx; Widget frame; - pcb_hid_dock_t where; + rnd_hid_dock_t where; } ltf_docked_t; static void ShowCrosshair(rnd_bool show) @@ -281,8 +281,8 @@ static int lesstif_direct = 0; -static pcb_composite_op_t lesstif_drawing_mode = 0; -#define use_mask() ((!lesstif_direct) && ((lesstif_drawing_mode == PCB_HID_COMP_POSITIVE) || (lesstif_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (lesstif_drawing_mode == PCB_HID_COMP_NEGATIVE))) +static rnd_composite_op_t lesstif_drawing_mode = 0; +#define use_mask() ((!lesstif_direct) && ((lesstif_drawing_mode == RND_HID_COMP_POSITIVE) || (lesstif_drawing_mode == RND_HID_COMP_POSITIVE_XOR) || (lesstif_drawing_mode == RND_HID_COMP_NEGATIVE))) static void zoom_max(); static void zoom_to(double factor, rnd_coord_t x, rnd_coord_t y); @@ -1523,7 +1523,7 @@ stdarg(XmNbottomAttachment, XmATTACH_FORM); stdarg(XmNleftAttachment, XmATTACH_FORM); stdarg(XmNrightAttachment, XmATTACH_FORM); - w = ltf_create_dockbox(messages, PCB_HID_DOCK_BOTTOM, 0); + w = ltf_create_dockbox(messages, RND_HID_DOCK_BOTTOM, 0); XtManageChild(w); } @@ -2020,7 +2020,7 @@ } DrawBackgroundImage(); pcbhl_expose_main(&lesstif_hid, &ctx, NULL); - lesstif_drawing_mode = PCB_HID_COMP_POSITIVE; + lesstif_drawing_mode = RND_HID_COMP_POSITIVE; draw_grid(); show_crosshair(0); /* To keep the drawn / not drawn info correct */ XSetFunction(display, my_gc, GXcopy); @@ -2175,12 +2175,12 @@ free(gc); } -static void lesstif_render_burst(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen) +static void lesstif_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { pcb_gui->coord_per_pix = view_zoom; } -static void lesstif_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) +static void lesstif_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) { lesstif_drawing_mode = op; @@ -2191,7 +2191,7 @@ } switch(op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: if (mask_pixmap == 0) { mask_pixmap = XCreatePixmap(display, window, pixmap_w, pixmap_h, XDefaultDepth(display, screen)); mask_bitmap = XCreatePixmap(display, window, pixmap_w, pixmap_h, 1); @@ -2204,16 +2204,16 @@ mask_gc = bset_gc; break; - case PCB_HID_COMP_POSITIVE: - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE_XOR: mask_gc = bset_gc; break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: mask_gc = bclear_gc; break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: pixmap = main_pixmap; /* blit back the result */ @@ -2702,13 +2702,13 @@ /* Should we only include those we were asked to watch? */ if (condition & POLLIN) - pcb_condition |= PCB_WATCH_READABLE; + pcb_condition |= RND_WATCH_READABLE; if (condition & POLLOUT) - pcb_condition |= PCB_WATCH_WRITABLE; + pcb_condition |= RND_WATCH_WRITABLE; if (condition & POLLERR) - pcb_condition |= PCB_WATCH_ERROR; + pcb_condition |= RND_WATCH_ERROR; if (condition & POLLHUP) - pcb_condition |= PCB_WATCH_HANGUP; + pcb_condition |= RND_WATCH_HANGUP; x.ptr = (void *) watch; if (!watch->func(x, watch->fd, pcb_condition, watch->user_data)) @@ -2722,13 +2722,13 @@ rnd_hidval_t ret; unsigned int xt_condition = 0; - if (condition & PCB_WATCH_READABLE) + if (condition & RND_WATCH_READABLE) xt_condition |= XtInputReadMask; - if (condition & PCB_WATCH_WRITABLE) + if (condition & RND_WATCH_WRITABLE) xt_condition |= XtInputWriteMask; - if (condition & PCB_WATCH_ERROR) + if (condition & RND_WATCH_ERROR) xt_condition |= XtInputExceptMask; - if (condition & PCB_WATCH_HANGUP) + if (condition & RND_WATCH_HANGUP) xt_condition |= XtInputExceptMask; watch->func = func; @@ -2740,7 +2740,7 @@ return ret; } -extern void *lesstif_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); +extern void *lesstif_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); extern int lesstif_attr_dlg_run(void *hid_ctx); extern void lesstif_attr_dlg_raise(void *hid_ctx); @@ -2804,7 +2804,7 @@ #include -static int ltf_clip_set(rnd_hid_t *hid, pcb_hid_clipfmt_t format, const void *data, size_t len) +static int ltf_clip_set(rnd_hid_t *hid, rnd_hid_clipfmt_t format, const void *data, size_t len) { static long cnt = 0; long item_id, data_id; @@ -2827,7 +2827,7 @@ return 0; } -static int ltf_clip_get(rnd_hid_t *hid, pcb_hid_clipfmt_t *format, void **data, size_t *len) +static int ltf_clip_get(rnd_hid_t *hid, rnd_hid_clipfmt_t *format, void **data, size_t *len) { int res; gds_t tmp; @@ -2857,7 +2857,7 @@ return 0; } -static void ltf_clip_free(rnd_hid_t *hid, pcb_hid_clipfmt_t format, void *data, size_t len) +static void ltf_clip_free(rnd_hid_t *hid, rnd_hid_clipfmt_t format, void *data, size_t len) { free(data); } @@ -2922,7 +2922,7 @@ XtSetValues(appwidget, stdarg_args, stdarg_n); } -void lesstif_create_menu(rnd_hid_t *hid, const char *menu, const pcb_menu_prop_t *props); +void lesstif_create_menu(rnd_hid_t *hid, const char *menu, const rnd_menu_prop_t *props); int lesstif_remove_menu(rnd_hid_t *hid, const char *menu); int lesstif_remove_menu_node(rnd_hid_t *hid, lht_node_t *node); rnd_hid_cfg_t *lesstif_get_menu_cfg(rnd_hid_t *hid); Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 30978) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 30979) @@ -651,7 +651,7 @@ } -void lesstif_create_menu(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props) +void lesstif_create_menu(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props) { pcb_hid_cfg_create_menu(lesstif_cfg, menu_path, props, lesstif_create_menu_widget, NULL); } Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 30978) +++ trunk/src_plugins/hid_remote/remote.c (revision 30979) @@ -192,7 +192,7 @@ } static const char *drawing_mode_names[] = { "reset", "positive", "negative", "flush"}; -static void remote_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) +static void remote_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *drw_screen) { if ((op >= 0) && (op < sizeof(drawing_mode_names) / sizeof(drawing_mode_names[0]))) proto_send_set_drawing_mode(drawing_mode_names[op], direct); @@ -350,7 +350,7 @@ { } -static void *remote_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) +static void *remote_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) { return NULL; } @@ -376,7 +376,7 @@ { } -static void remote_create_menu(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props) +static void remote_create_menu(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props) { } Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 30978) +++ trunk/src_plugins/import_calay/calay.c (revision 30979) @@ -204,7 +204,7 @@ if (!fname_net || !*fname_net) { fname_net = pcb_gui->fileselect(pcb_gui, "Load calay netlist file...", "Picks a calay netlist file to load.\n", - default_file, NETEXT, NULL, "calay", PCB_HID_FSD_READ, NULL); + default_file, NETEXT, NULL, "calay", RND_HID_FSD_READ, NULL); if (fname_net == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 30978) +++ trunk/src_plugins/import_dsn/dsn.c (revision 30979) @@ -223,7 +223,7 @@ "Load a routed dsn or ses file...", "Select dsn or ses file to load.\nThe file could be generated using the tool downloaded from freeroute.net\n", NULL, /* default file name */ - ".dsn", NULL, "dsn", PCB_HID_FSD_READ, NULL); + ".dsn", NULL, "dsn", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; } Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30978) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30979) @@ -173,7 +173,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load freepcb netlist...", "Picks a freepcb netlist file to load.\n", - default_file, ".net", NULL, "freepcb", PCB_HID_FSD_READ, NULL); + default_file, ".net", NULL, "freepcb", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 30978) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 30979) @@ -158,7 +158,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load HP-GL file...", "Picks a HP-GL plot file to load.\n", - default_file, ".hpgl", NULL, "hpgl", PCB_HID_FSD_READ, NULL); + default_file, ".hpgl", NULL, "hpgl", RND_HID_FSD_READ, NULL); if (fname == NULL) return 0; /* cancel */ if (default_file != NULL) { Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30978) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30979) @@ -370,7 +370,7 @@ if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(pcb_gui, "Load IPC-D-356 netlist...", "Pick an IPC-D-356 netlist file.\n", - default_file, ".net", NULL, "ipcd356", PCB_HID_FSD_READ, NULL); + default_file, ".net", NULL, "ipcd356", RND_HID_FSD_READ, NULL); if (fname == NULL) { RND_ACT_IRES(1); return 0; Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 30978) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 30979) @@ -299,7 +299,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load ltspice net+asc file pair...", "Picks a ltspice mentor net or asc file to load.\n", - default_file, ".asc", NULL, "ltspice", PCB_HID_FSD_READ, NULL); + default_file, ".asc", NULL, "ltspice", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30978) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30979) @@ -267,7 +267,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load mentor edf netlist file...", "Picks a mentor edf file to load.\n", - default_file, ".edf", NULL, "mentor_sch", PCB_HID_FSD_READ, NULL); + default_file, ".edf", NULL, "mentor_sch", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 30978) +++ trunk/src_plugins/import_mucs/mucs.c (revision 30979) @@ -76,7 +76,7 @@ fname = pcb_gui->fileselect(pcb_gui, "Load mucs routing session Resource File...", "Picks a mucs session resource file to load.\n" "This file could be generated by mucs-pcb\n", - default_file, ".l1", NULL, "unixplot", PCB_HID_FSD_READ, NULL); + default_file, ".l1", NULL, "unixplot", RND_HID_FSD_READ, NULL); if (fname == NULL) { RND_ACT_IRES(1); return 0; Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30978) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30979) @@ -74,7 +74,7 @@ } } -static void isch_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void isch_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { int n; isch_ctx_t *ctx = caller_data; @@ -206,7 +206,7 @@ if (*cwd == '\0') rnd_get_wd(cwd); - name = pcb_gui->fileselect(pcb_gui, "Import schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", PCB_HID_FSD_MAY_NOT_EXIST, NULL); + name = pcb_gui->fileselect(pcb_gui, "Import schematics", "Import netlist and footprints from schematics", cwd, NULL, NULL, "schematics", RND_HID_FSD_MAY_NOT_EXIST, NULL); if (name == NULL) return; Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 30978) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 30979) @@ -183,7 +183,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load tinycad netlist file...", "Picks a tinycad netlist file to load.\n", - default_file, ".net", NULL, "tinycad", PCB_HID_FSD_READ, NULL); + default_file, ".net", NULL, "tinycad", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 30978) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 30979) @@ -81,7 +81,7 @@ if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(pcb_gui, "Load .hyp file...", "Picks a hyperlynx file to load.\n", "default.hyp", - ".hyp", NULL, "hyp", PCB_HID_FSD_READ, NULL); + ".hyp", NULL, "hyp", RND_HID_FSD_READ, NULL); } if (fname == NULL) { Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 30978) +++ trunk/src_plugins/io_kicad/read_net.c (revision 30979) @@ -226,7 +226,7 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load eeschema netlist file...", "Picks a eeschema netlist file to load.\n", - default_file, ".net", NULL, "eeschema", PCB_HID_FSD_READ, NULL); + default_file, ".net", NULL, "eeschema", RND_HID_FSD_READ, NULL); if (fname == NULL) return 1; if (default_file != NULL) { Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 30978) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 30979) @@ -120,7 +120,7 @@ if ((fname == NULL) || (*fname == '\0')) { \ fname = pcb_gui->fileselect(pcb_gui, "Load tedax " #type " file...", \ "Picks a tedax " #type " file to load.\n", \ - default_file, ".tdx", NULL, "tedax-" #type, PCB_HID_FSD_READ, NULL); \ + default_file, ".tdx", NULL, "tedax-" #type, RND_HID_FSD_READ, NULL); \ if (fname == NULL) \ return 1; \ if (default_file != NULL) { \ Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 30979) @@ -59,7 +59,7 @@ GtkWidget *dialog; int close_cb_called; rnd_hid_attr_val_t property[RND_HATP_max]; - void (*close_cb)(void *caller_data, pcb_hid_attr_ev_t ev); + void (*close_cb)(void *caller_data, rnd_hid_attr_ev_t ev); char *id; gulong destroy_handler; unsigned inhibit_valchg:1; @@ -208,7 +208,7 @@ } typedef struct { - void (*cb)(void *ctx, pcb_hid_attr_ev_t ev); + void (*cb)(void *ctx, rnd_hid_attr_ev_t ev); void *ctx; attr_dlg_t *attrdlg; } resp_ctx_t; @@ -721,7 +721,7 @@ if (!ctx->close_cb_called) { ctx->close_cb_called = 1; if (ctx->close_cb != NULL) { - ctx->close_cb(ctx->caller_data, PCB_HID_ATTR_EV_CODECLOSE); + ctx->close_cb(ctx->caller_data, RND_HID_ATTR_EV_CODECLOSE); return; /* ctx is invalid now */ } } @@ -770,7 +770,7 @@ ghid_attr_dlg_widget_hide_(ctx, n, 1); } -void *ghid_attr_dlg_new(pcb_gtk_t *gctx, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) +void *ghid_attr_dlg_new(pcb_gtk_t *gctx, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) { GtkWidget *content_area; GtkWidget *main_vbox; Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.h (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.h (revision 30979) @@ -2,7 +2,7 @@ #include #include "pcb_gtk.h" -void *ghid_attr_dlg_new(pcb_gtk_t *gctx, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); +void *ghid_attr_dlg_new(pcb_gtk_t *gctx, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); int ghid_attr_dlg_run(void *hid_ctx); void ghid_attr_dlg_raise(void *hid_ctx); void ghid_attr_dlg_close(void *hid_ctx); Index: trunk/src_plugins/lib_gtk_common/dlg_fileselect.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 30979) @@ -116,7 +116,7 @@ return -1; } -char *pcb_gtk_fileselect(pcb_gtk_t *gctx, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) +char *pcb_gtk_fileselect(pcb_gtk_t *gctx, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) { GtkWidget *top_window = gctx->wtop_window; gchar *path = NULL, *base = NULL, *res = NULL; @@ -124,7 +124,7 @@ file_history_t *hi; int n, free_flt = 0; pcb_gtk_fsd_t pctx; - pcb_hid_fsd_filter_t flt_local[3]; + rnd_hid_fsd_filter_t flt_local[3]; if (!inited) { htsp_init(&history, strhash, strkeyeq); @@ -156,7 +156,7 @@ flt_local[0].pat = malloc(sizeof(char *) * 2); flt_local[0].pat[0] = pcb_concat("*", default_ext, NULL); flt_local[0].pat[1] = NULL; - flt_local[1] = pcb_hid_fsd_filter_any[0]; + flt_local[1] = rnd_hid_fsd_filter_any[0]; flt = flt_local; free_flt = 1; } @@ -164,13 +164,13 @@ pctx.dialog = gtk_file_chooser_dialog_new( title, GTK_WINDOW(top_window), - (flags & PCB_HID_FSD_READ) ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE, + (flags & RND_HID_FSD_READ) ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(pctx.dialog), GTK_RESPONSE_OK); if (flt != NULL) { - const pcb_hid_fsd_filter_t *f; + const rnd_hid_fsd_filter_t *f; for(f = flt; f->name != NULL; f++) { GtkFileFilter *gf; gf = gtk_file_filter_new(); @@ -206,7 +206,7 @@ if ((base != NULL) && (*base != '\0')) { /* default_file is useful only for write */ - if (!(flags & PCB_HID_FSD_READ)) + if (!(flags & RND_HID_FSD_READ)) gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(pctx.dialog), base); g_free(base); } Index: trunk/src_plugins/lib_gtk_common/dlg_fileselect.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fileselect.h (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_fileselect.h (revision 30979) @@ -1,4 +1,4 @@ #include #include -char *pcb_gtk_fileselect(pcb_gtk_t *gctx, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); +char *pcb_gtk_fileselect(pcb_gtk_t *gctx, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub); Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30979) @@ -72,13 +72,13 @@ void *hid_ctx; GtkWidget *frame; pcb_gtk_topwin_t *tw; - pcb_hid_dock_t where; + rnd_hid_dock_t where; } docked_t; GdkColor clr_orange = {0, 0xffff, 0xaaaa, 0x3333}; -static GdkColor *pcb_dock_color[PCB_HID_DOCK_max] = {NULL, NULL, &clr_orange, NULL, NULL, NULL}; /* force change color when docked */ -int pcb_gtk_tw_dock_enter(pcb_gtk_topwin_t *tw, rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id) +static GdkColor *pcb_dock_color[RND_HID_DOCK_max] = {NULL, NULL, &clr_orange, NULL, NULL, NULL}; /* force change color when docked */ +int pcb_gtk_tw_dock_enter(pcb_gtk_topwin_t *tw, rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) { docked_t *docked; GtkWidget *hvbox; @@ -87,12 +87,12 @@ docked = calloc(sizeof(docked_t), 1); docked->where = where; - if (pcb_dock_is_vert[where]) + if (rnd_dock_is_vert[where]) hvbox = gtkc_vbox_new(FALSE, 0); else hvbox = gtkc_hbox_new(TRUE, 0); - if (pcb_dock_has_frame[where]) { + if (rnd_dock_has_frame[where]) { docked->frame = gtk_frame_new(id); gtk_container_add(GTK_CONTAINER(docked->frame), hvbox); } @@ -119,7 +119,7 @@ pcb_gtk_dad_fixcolor(sub->dlg_hid_ctx, pcb_dock_color[where]); /* workaround: the left dock is in a pane that should be adjusted to the default x size of newcomers if narrower */ - if ((where == PCB_HID_DOCK_LEFT) && (sub->dlg_defx > 0)) { + if ((where == RND_HID_DOCK_LEFT) && (sub->dlg_defx > 0)) { int curr = gtk_paned_get_position(GTK_PANED(tw->hpaned_middle)); if (curr < sub->dlg_defx) gtk_paned_set_position(GTK_PANED(tw->hpaned_middle), sub->dlg_defx); @@ -363,9 +363,9 @@ pcb_gtk_topwin_t *tw = ctx; if (show) - gtk_widget_show(tw->dockbox[PCB_HID_DOCK_BOTTOM]); + gtk_widget_show(tw->dockbox[RND_HID_DOCK_BOTTOM]); else - gtk_widget_hide(tw->dockbox[PCB_HID_DOCK_BOTTOM]); + gtk_widget_hide(tw->dockbox[RND_HID_DOCK_BOTTOM]); } /* Create the top_window contents. The config settings should be loaded @@ -401,14 +401,14 @@ tw->menu.menu_bar = ghid_load_menus(&tw->menu, ghidgui->hidlib, &tw->ghid_cfg); gtk_box_pack_start(GTK_BOX(tw->menubar_toolbar_vbox), tw->menu.menu_bar, FALSE, FALSE, 0); - tw->dockbox[PCB_HID_DOCK_TOP_LEFT] = gtkc_hbox_new(TRUE, 2); - gtk_box_pack_start(GTK_BOX(tw->menubar_toolbar_vbox), tw->dockbox[PCB_HID_DOCK_TOP_LEFT], FALSE, FALSE, 0); + tw->dockbox[RND_HID_DOCK_TOP_LEFT] = gtkc_hbox_new(TRUE, 2); + gtk_box_pack_start(GTK_BOX(tw->menubar_toolbar_vbox), tw->dockbox[RND_HID_DOCK_TOP_LEFT], FALSE, FALSE, 0); tw->position_hbox = gtkc_hbox_new(FALSE, 0); gtk_box_pack_end(GTK_BOX(tw->top_hbox), tw->position_hbox, FALSE, FALSE, 0); - tw->dockbox[PCB_HID_DOCK_TOP_RIGHT] = gtkc_vbox_new(FALSE, 8); - gtk_box_pack_end(GTK_BOX(GTK_BOX(tw->position_hbox)), tw->dockbox[PCB_HID_DOCK_TOP_RIGHT], FALSE, FALSE, 0); + tw->dockbox[RND_HID_DOCK_TOP_RIGHT] = gtkc_vbox_new(FALSE, 8); + gtk_box_pack_end(GTK_BOX(GTK_BOX(tw->position_hbox)), tw->dockbox[RND_HID_DOCK_TOP_RIGHT], FALSE, FALSE, 0); tw->hpaned_middle = gtkc_hpaned_new(); gtk_box_pack_start(GTK_BOX(vbox_main), tw->hpaned_middle, TRUE, TRUE, 0); @@ -421,8 +421,8 @@ tw->left_toolbar = gtkc_vbox_new(FALSE, 0); gtk_paned_pack1(GTK_PANED(tw->hpaned_middle), tw->left_toolbar, FALSE, FALSE); - tw->dockbox[PCB_HID_DOCK_LEFT] = gtkc_vbox_new(FALSE, 8); - gtk_box_pack_start(GTK_BOX(GTK_BOX(tw->left_toolbar)), tw->dockbox[PCB_HID_DOCK_LEFT], TRUE, TRUE, 0); + tw->dockbox[RND_HID_DOCK_LEFT] = gtkc_vbox_new(FALSE, 8); + gtk_box_pack_start(GTK_BOX(GTK_BOX(tw->left_toolbar)), tw->dockbox[RND_HID_DOCK_LEFT], TRUE, TRUE, 0); /* -- main content */ tw->vbox_middle = gtkc_vbox_new(FALSE, 0); @@ -434,16 +434,16 @@ /* info bar: hboxi->event_box->hbox2: hboxi is for the layout (horizontal fill) the event box is neeed for background color - vbox is tw->dockbox[PCB_HID_DOCK_TOP_INFOBAR] where DAD widgets are packed */ + vbox is tw->dockbox[RND_HID_DOCK_TOP_INFOBAR] where DAD widgets are packed */ hboxi = gtkc_hbox_new(TRUE, 0); - tw->dockbox[PCB_HID_DOCK_TOP_INFOBAR] = gtkc_vbox_new(TRUE, 0); + tw->dockbox[RND_HID_DOCK_TOP_INFOBAR] = gtkc_vbox_new(TRUE, 0); evb = gtk_event_box_new(); - gtk_container_add(GTK_CONTAINER(evb), tw->dockbox[PCB_HID_DOCK_TOP_INFOBAR]); + gtk_container_add(GTK_CONTAINER(evb), tw->dockbox[RND_HID_DOCK_TOP_INFOBAR]); gtk_box_pack_start(GTK_BOX(hboxi), evb, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(tw->vbox_middle), hboxi, FALSE, FALSE, 0); - if (pcb_dock_color[PCB_HID_DOCK_TOP_INFOBAR] != NULL) - gtk_widget_modify_bg(evb, GTK_STATE_NORMAL, pcb_dock_color[PCB_HID_DOCK_TOP_INFOBAR]); + if (pcb_dock_color[RND_HID_DOCK_TOP_INFOBAR] != NULL) + gtk_widget_modify_bg(evb, GTK_STATE_NORMAL, pcb_dock_color[RND_HID_DOCK_TOP_INFOBAR]); hbox = gtkc_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(tw->vbox_middle), hbox, TRUE, TRUE, 0); @@ -490,8 +490,8 @@ tw->bottom_hbox = gtkc_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(tw->vbox_middle), tw->bottom_hbox, FALSE, FALSE, 0); - tw->dockbox[PCB_HID_DOCK_BOTTOM] = gtkc_hbox_new(TRUE, 2); - gtk_box_pack_start(GTK_BOX(tw->bottom_hbox), tw->dockbox[PCB_HID_DOCK_BOTTOM], FALSE, FALSE, 0); + tw->dockbox[RND_HID_DOCK_BOTTOM] = gtkc_hbox_new(TRUE, 2); + gtk_box_pack_start(GTK_BOX(tw->bottom_hbox), tw->dockbox[RND_HID_DOCK_BOTTOM], FALSE, FALSE, 0); tw->cmd.prompt_label = gtk_label_new("action:"); gtk_box_pack_start(GTK_BOX(tw->bottom_hbox), tw->cmd.prompt_label, FALSE, FALSE, 0); Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.h (revision 30978) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.h (revision 30979) @@ -21,7 +21,7 @@ void pcb_gtk_tw_interface_set_sensitive(pcb_gtk_topwin_t *tw, gboolean sensitive); -int pcb_gtk_tw_dock_enter(pcb_gtk_topwin_t *tw, rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id); +int pcb_gtk_tw_dock_enter(pcb_gtk_topwin_t *tw, rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id); void pcb_gtk_tw_dock_leave(pcb_gtk_topwin_t *tw, rnd_hid_dad_subdialog_t *sub); void pcb_gtk_tw_set_title(pcb_gtk_topwin_t *tw, const char *title); Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30978) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30979) @@ -279,12 +279,12 @@ return pcb_gtk_watch_file((pcb_gtk_t *)hid->hid_data, fd, condition, func, user_data); } -static char *ghid_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) +static char *ghid_fileselect(rnd_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const rnd_hid_fsd_filter_t *flt, const char *history_tag, rnd_hid_fsd_flags_t flags, rnd_hid_dad_subdialog_t *sub) { return pcb_gtk_fileselect((pcb_gtk_t *)hid->hid_data, title, descr, default_file, default_ext, flt, history_tag, flags, sub); } -static void *ghid_attr_dlg_new_(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) +static void *ghid_attr_dlg_new_(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny) { return ghid_attr_dlg_new((pcb_gtk_t *)hid->hid_data, id, attrs, n_attrs, title, caller_data, modal, button_cb, defx, defy, minx, miny); } @@ -326,7 +326,7 @@ return pcb_hid_cfg_remove_menu_node(gctx->topwin.ghid_cfg, node, ghid_remove_menu_widget, gctx->topwin.menu.menu_bar); } -static void ghid_create_menu(rnd_hid_t *hid, const char *menu_path, const pcb_menu_prop_t *props) +static void ghid_create_menu(rnd_hid_t *hid, const char *menu_path, const rnd_menu_prop_t *props) { pcb_gtk_t *gctx = hid->hid_data; pcb_hid_cfg_create_menu(gctx->topwin.ghid_cfg, menu_path, props, ghid_create_menu_widget, &gctx->topwin.menu); @@ -364,12 +364,12 @@ return pcb_gtk_cmd_command_entry(&gctx->topwin.cmd, ovr, cursor); } -static int ghid_clip_set(rnd_hid_t *hid, pcb_hid_clipfmt_t format, const void *data, size_t len) +static int ghid_clip_set(rnd_hid_t *hid, rnd_hid_clipfmt_t format, const void *data, size_t len) { GtkClipboard *cbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); switch(format) { - case PCB_HID_CLIPFMT_TEXT: + case RND_HID_CLIPFMT_TEXT: gtk_clipboard_set_text(cbrd, data, len); break; } @@ -378,13 +378,13 @@ -int ghid_clip_get(rnd_hid_t *hid, pcb_hid_clipfmt_t *format, void **data, size_t *len) +int ghid_clip_get(rnd_hid_t *hid, rnd_hid_clipfmt_t *format, void **data, size_t *len) { GtkClipboard *cbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); if (gtk_clipboard_wait_is_text_available(cbrd)) { gchar *txt = gtk_clipboard_wait_for_text(cbrd); - *format = PCB_HID_CLIPFMT_TEXT; + *format = RND_HID_CLIPFMT_TEXT; *data = txt; *len = strlen(txt) + 1; return 0; @@ -393,10 +393,10 @@ return -1; } -void ghid_clip_free(rnd_hid_t *hid, pcb_hid_clipfmt_t format, void *data, size_t len) +void ghid_clip_free(rnd_hid_t *hid, rnd_hid_clipfmt_t format, void *data, size_t len) { switch(format) { - case PCB_HID_CLIPFMT_TEXT: + case RND_HID_CLIPFMT_TEXT: g_free(data); break; } @@ -432,7 +432,7 @@ return i/10.0; } -static int ghid_dock_enter(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, pcb_hid_dock_t where, const char *id) +static int ghid_dock_enter(rnd_hid_t *hid, rnd_hid_dad_subdialog_t *sub, rnd_hid_dock_t where, const char *id) { pcb_gtk_t *gctx = hid->hid_data; return pcb_gtk_tw_dock_enter(&gctx->topwin, sub, where, id); Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h =================================================================== --- trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30978) +++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 30979) @@ -129,8 +129,8 @@ int active; /* 0 before init finishes */ /* docking */ - GtkWidget *dockbox[PCB_HID_DOCK_max]; - gdl_list_t dock[PCB_HID_DOCK_max]; + GtkWidget *dockbox[RND_HID_DOCK_max]; + gdl_list_t dock[RND_HID_DOCK_max]; }; /* needed for a type in pcb_gtk_t - DO NOT ADD .h files that are not required for the structs! */ Index: trunk/src_plugins/lib_gtk_common/util_watch.c =================================================================== --- trunk/src_plugins/lib_gtk_common/util_watch.c (revision 30978) +++ trunk/src_plugins/lib_gtk_common/util_watch.c (revision 30979) @@ -49,13 +49,13 @@ rnd_bool res; if (condition & G_IO_IN) - pcb_condition |= PCB_WATCH_READABLE; + pcb_condition |= RND_WATCH_READABLE; if (condition & G_IO_OUT) - pcb_condition |= PCB_WATCH_WRITABLE; + pcb_condition |= RND_WATCH_WRITABLE; if (condition & G_IO_ERR) - pcb_condition |= PCB_WATCH_ERROR; + pcb_condition |= RND_WATCH_ERROR; if (condition & G_IO_HUP) - pcb_condition |= PCB_WATCH_HANGUP; + pcb_condition |= RND_WATCH_HANGUP; x.ptr = (void *)watch; res = watch->func(x, watch->fd, pcb_condition, watch->user_data); @@ -73,13 +73,13 @@ rnd_hidval_t ret; unsigned int glib_condition = 0; - if (condition & PCB_WATCH_READABLE) + if (condition & RND_WATCH_READABLE) glib_condition |= G_IO_IN; - if (condition & PCB_WATCH_WRITABLE) + if (condition & RND_WATCH_WRITABLE) glib_condition |= G_IO_OUT; - if (condition & PCB_WATCH_ERROR) + if (condition & RND_WATCH_ERROR) glib_condition |= G_IO_ERR; - if (condition & PCB_WATCH_HANGUP) + if (condition & RND_WATCH_HANGUP) glib_condition |= G_IO_HUP; watch->func = func; Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30978) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30979) @@ -102,7 +102,7 @@ free(dad); } -static void dad_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void dad_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { dad_t *dad = caller_data; PCB_DAD_FREE(dad->dlg); Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30978) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30979) @@ -47,7 +47,7 @@ static log_ctx_t log_ctx; -static void log_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void log_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { log_ctx_t *ctx = caller_data; ctx->active = 0; Index: trunk/src_plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30978) +++ trunk/src_plugins/lib_hid_common/grid_menu.c (revision 30979) @@ -45,7 +45,7 @@ rnd_conflist_t *lst; rnd_conf_listitem_t *li; char *end = path + strlen(path); - pcb_menu_prop_t props; + rnd_menu_prop_t props; char act[256], chk[256]; int idx; Index: trunk/src_plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30978) +++ trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30979) @@ -258,7 +258,7 @@ pcb_create_menu_widget_t cb; void *cb_ctx; lht_node_t *parent; - const pcb_menu_prop_t *props; + const rnd_menu_prop_t *props; int target_level; int err; lht_node_t *after; @@ -334,7 +334,7 @@ return node; } -int pcb_hid_cfg_create_menu(rnd_hid_cfg_t *hr, const char *path, const pcb_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx) +int pcb_hid_cfg_create_menu(rnd_hid_cfg_t *hr, const char *path, const rnd_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx) { const char *name; create_menu_ctx_t cmc; Index: trunk/src_plugins/lib_hid_common/menu_helper.h =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.h (revision 30978) +++ trunk/src_plugins/lib_hid_common/menu_helper.h (revision 30979) @@ -35,7 +35,7 @@ NOTE: unlike other cookies, this cookie is strdup()'d. */ typedef int (*pcb_create_menu_widget_t)(void *ctx, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item); -int pcb_hid_cfg_create_menu(rnd_hid_cfg_t *hr, const char *path, const pcb_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx); +int pcb_hid_cfg_create_menu(rnd_hid_cfg_t *hr, const char *path, const rnd_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx); /* Looks up an integer (usually boolean) value by conf path or by running an action (if name has a parenthesis). When an action is run, it has 0 Index: trunk/src_plugins/lib_hid_common/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_common/toolbar.c (revision 30978) +++ trunk/src_plugins/lib_hid_common/toolbar.c (revision 30979) @@ -173,7 +173,7 @@ if (cfg == NULL) return; toolbar_docked_create(cfg); - if (pcb_hid_dock_enter(&toolbar.sub, PCB_HID_DOCK_TOP_LEFT, "Toolbar") == 0) { + if (pcb_hid_dock_enter(&toolbar.sub, RND_HID_DOCK_TOP_LEFT, "Toolbar") == 0) { toolbar.sub_inited = 1; toolbar_pcb2dlg(); } Index: trunk/src_plugins/lib_hid_gl/hidgl.c =================================================================== --- trunk/src_plugins/lib_hid_gl/hidgl.c (revision 30978) +++ trunk/src_plugins/lib_hid_gl/hidgl.c (revision 30979) @@ -49,7 +49,7 @@ stencilgl_init(); } -static pcb_composite_op_t composite_op = PCB_HID_COMP_RESET; +static rnd_composite_op_t composite_op = RND_HID_COMP_RESET; static rnd_bool direct_mode = pcb_true; static int comp_stencil_bit = 0; @@ -135,14 +135,14 @@ comp_stencil_bit = 0; } -pcb_composite_op_t hidgl_get_drawing_mode() +rnd_composite_op_t hidgl_get_drawing_mode() { return composite_op; } -void hidgl_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +void hidgl_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { - rnd_bool xor_mode = (composite_op == PCB_HID_COMP_POSITIVE_XOR ? pcb_true : pcb_false); + rnd_bool xor_mode = (composite_op == RND_HID_COMP_POSITIVE_XOR ? pcb_true : pcb_false); /* If the previous mode was NEGATIVE then all of the primitives drawn * in that mode were used only for creating the stencil and will not be @@ -150,7 +150,7 @@ * discarded by rewinding the primitive buffer to the marker that was * set when entering NEGATIVE mode. */ - if (composite_op == PCB_HID_COMP_NEGATIVE) { + if (composite_op == RND_HID_COMP_NEGATIVE) { drawgl_flush(); drawgl_rewind_to_marker(); } @@ -159,19 +159,19 @@ direct_mode = direct; switch (op) { - case PCB_HID_COMP_RESET: + case RND_HID_COMP_RESET: mode_reset(direct, screen); break; - case PCB_HID_COMP_POSITIVE_XOR: + case RND_HID_COMP_POSITIVE_XOR: mode_positive_xor(direct, screen); break; - case PCB_HID_COMP_POSITIVE: + case RND_HID_COMP_POSITIVE: mode_positive(direct, screen); break; - case PCB_HID_COMP_NEGATIVE: + case RND_HID_COMP_NEGATIVE: mode_negative(direct, screen); break; - case PCB_HID_COMP_FLUSH: + case RND_HID_COMP_FLUSH: mode_flush(direct, xor_mode, screen); break; default: @@ -481,7 +481,7 @@ int slices; int i; - assert((composite_op == PCB_HID_COMP_POSITIVE) || (composite_op == PCB_HID_COMP_POSITIVE_XOR) || (composite_op == PCB_HID_COMP_NEGATIVE)); + assert((composite_op == RND_HID_COMP_POSITIVE) || (composite_op == RND_HID_COMP_POSITIVE_XOR) || (composite_op == RND_HID_COMP_NEGATIVE)); slices = calc_slices(vr / scale, 2 * M_PI); Index: trunk/src_plugins/lib_hid_gl/hidgl.h =================================================================== --- trunk/src_plugins/lib_hid_gl/hidgl.h (revision 30978) +++ trunk/src_plugins/lib_hid_gl/hidgl.h (revision 30979) @@ -42,7 +42,7 @@ void hidgl_fill_pcb_polygon(rnd_polyarea_t *poly, const rnd_rnd_box_t *clip_box, double scale, int fullpoly); void hidgl_fill_rect(rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2); void hidgl_init(void); -void hidgl_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen); -pcb_composite_op_t hidgl_get_drawing_mode(); +void hidgl_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen); +rnd_composite_op_t hidgl_get_drawing_mode(); #endif /* PCB_HID_COMMON_HIDGL_H */ Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 30978) +++ trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 30979) @@ -54,7 +54,7 @@ int plen = strlen(path); int len_avail = 125; char *end = path + plen; - pcb_menu_prop_t props; + rnd_menu_prop_t props; char act[256], chk[256]; int idx, max_ml, sect; rnd_layergrp_id_t gid; @@ -169,7 +169,7 @@ *end = '\0'; } -static void custom_layer_attr_key(pcb_layer_t *l, rnd_layer_id_t lid, const char *attrname, const char *menu_prefix, const char *action_prefix, pcb_menu_prop_t *keyprops, char *path, char *end, int len_avail) +static void custom_layer_attr_key(pcb_layer_t *l, rnd_layer_id_t lid, const char *attrname, const char *menu_prefix, const char *action_prefix, rnd_menu_prop_t *keyprops, char *path, char *end, int len_avail) { char *key = rnd_attribute_get(&l->Attributes, attrname); if (key != NULL) { @@ -190,7 +190,7 @@ char act[256]; rnd_layer_id_t lid; pcb_layer_t *l; - pcb_menu_prop_t keyprops; + rnd_menu_prop_t keyprops; pcb_hid_cfg_del_anchor_menus(node, ctx->anch); Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30978) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30979) @@ -832,7 +832,7 @@ static void layersel_build(void) { layersel_docked_create(&layersel, PCB); - if (pcb_hid_dock_enter(&layersel.sub, PCB_HID_DOCK_LEFT, "layersel") == 0) { + if (pcb_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) { layersel.sub_inited = 1; layersel_update_vis(&layersel, PCB); } Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30978) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 30979) @@ -53,7 +53,7 @@ static void rst_install_menu(void *ctx, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path) { - pcb_menu_prop_t props; + rnd_menu_prop_t props; char *end = path + strlen(path); char act[256], chk[256]; int idx; @@ -210,7 +210,7 @@ { if (PCB_HAVE_GUI_ATTR_DLG) { rst_docked_create(); - if (pcb_hid_dock_enter(&rst.sub, PCB_HID_DOCK_LEFT, "Route styles") == 0) + if (pcb_hid_dock_enter(&rst.sub, RND_HID_DOCK_LEFT, "Route styles") == 0) rst.sub_inited = 1; } rst_update(); Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30978) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30979) @@ -37,7 +37,7 @@ rstdlg_ctx_t rstdlg_ctx; -static void rstdlg_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void rstdlg_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { rstdlg_ctx_t *ctx = caller_data; Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 30978) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 30979) @@ -306,13 +306,13 @@ { if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) { status_docked_create_st(); - if (pcb_hid_dock_enter(&status.stsub, PCB_HID_DOCK_BOTTOM, "status") == 0) { + if (pcb_hid_dock_enter(&status.stsub, RND_HID_DOCK_BOTTOM, "status") == 0) { status.stsub_inited = 1; status_st_pcb2dlg(); } status_docked_create_rd(); - if (pcb_hid_dock_enter(&status.rdsub, PCB_HID_DOCK_TOP_RIGHT, "readout") == 0) { + if (pcb_hid_dock_enter(&status.rdsub, RND_HID_DOCK_TOP_RIGHT, "readout") == 0) { status.rdsub_inited = 1; status_rd_pcb2dlg(); } Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 30978) +++ trunk/src_plugins/loghid/hid-logger.c (revision 30979) @@ -85,7 +85,7 @@ delegatee_->destroy_gc(gc); } -static void log_set_drawing_mode(rnd_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) +static void log_set_drawing_mode(rnd_hid_t *hid, rnd_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen) { if (screen != NULL) pcb_fprintf(out_, "set_drawing_mode(%d,%d,[%mm;%mm,%mm;%mm])\n", op, direct, screen->X1, screen->Y1, screen->X2, screen->Y2); @@ -94,7 +94,7 @@ delegatee_->set_drawing_mode(hid, op, direct, screen); } -static void log_render_burst(rnd_hid_t *hid, pcb_burst_op_t op, const rnd_rnd_box_t *screen) +static void log_render_burst(rnd_hid_t *hid, rnd_burst_op_t op, const rnd_rnd_box_t *screen) { pcb_fprintf(out_, "render_burst(%d,[%mm;%mm,%mm;%mm])\n", op, screen->X1, screen->Y1, screen->X2, screen->Y2); delegatee_->render_burst(hid, op, screen); Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30978) +++ trunk/src_plugins/order/order.c (revision 30979) @@ -84,7 +84,7 @@ static void order_install_menu(void *ctx, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path) { char *end = path + strlen(path); - pcb_menu_prop_t props; + rnd_menu_prop_t props; char act[256]; memset(&props, 0,sizeof(props)); Index: trunk/src_plugins/order/order_dlg.c =================================================================== --- trunk/src_plugins/order/order_dlg.c (revision 30978) +++ trunk/src_plugins/order/order_dlg.c (revision 30979) @@ -1,6 +1,6 @@ order_ctx_t order_ctx; -static void order_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void order_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { order_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30978) +++ trunk/src_plugins/propedit/propdlg.c (revision 30979) @@ -52,7 +52,7 @@ static void prop_refresh(propdlg_t *ctx); -static void propdlgclose_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void propdlgclose_cb(void *caller_data, rnd_hid_attr_ev_t ev) { propdlg_t *ctx = caller_data; gdl_remove(&propdlgs, ctx, link); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30978) +++ trunk/src_plugins/report/report.c (revision 30979) @@ -83,7 +83,7 @@ PCB_DAD_DECL_NOINIT(dlg) } rdialog_ctx_t; -static void rdialog_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void rdialog_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { rdialog_ctx_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30978) +++ trunk/src_plugins/script/live_script.c (revision 30979) @@ -75,7 +75,7 @@ } -static void lvs_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void lvs_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { live_script_t *lvs = caller_data; @@ -359,7 +359,7 @@ const char *default_ext = live_default_ext(lvs); fn = pcb_gui->fileselect(pcb_gui, "Load live script", "Load the a live script from file", - lvs->fn, default_ext, pcb_hid_fsd_filter_any, "live_script", PCB_HID_FSD_READ, NULL); + lvs->fn, default_ext, rnd_hid_fsd_filter_any, "live_script", RND_HID_FSD_READ, NULL); if (fn == NULL) return 0; } @@ -405,7 +405,7 @@ fn = pcb_gui->fileselect(pcb_gui, "Save live script", "Save the source of a live script", - lvs->fn, default_ext, pcb_hid_fsd_filter_any, "live_script", 0, NULL); + lvs->fn, default_ext, rnd_hid_fsd_filter_any, "live_script", 0, NULL); if (fn == NULL) return 0; } @@ -502,7 +502,7 @@ static void lvs_install_menu(void *ctx, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path) { char *end = path + strlen(path); - pcb_menu_prop_t props; + rnd_menu_prop_t props; char act[256]; memset(&props, 0,sizeof(props)); @@ -537,7 +537,7 @@ htsp_entry_t *e; for(e = htsp_first(&pcb_live_scripts); e != NULL; e = htsp_next(&pcb_live_scripts, e)) { live_script_t *lvs = e->value; - lvs_close_cb(lvs, PCB_HID_ATTR_EV_CODECLOSE); + lvs_close_cb(lvs, RND_HID_ATTR_EV_CODECLOSE); } htsp_uninit(&pcb_live_scripts); if ((pcb_gui != NULL) && (pcb_gui->remove_menu != NULL)) Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30978) +++ trunk/src_plugins/script/script_act.c (revision 30979) @@ -150,7 +150,7 @@ script_dlg_s2d(&script_dlg); } -static void script_dlg_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void script_dlg_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { script_dlg_t *ctx = caller_data; PCB_DAD_FREE(ctx->dlg); @@ -188,7 +188,7 @@ { script_dlg_t *ctx = caller_data; int failed; - char *tmp, *fn = pcb_gui->fileselect(pcb_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", PCB_HID_FSD_READ, NULL); + char *tmp, *fn = pcb_gui->fileselect(pcb_gui, "script to load", "Select a script file to load", NULL, NULL, NULL, "script", RND_HID_FSD_READ, NULL); pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}}; typedef struct { PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 30978) +++ trunk/src_plugins/shape/shape_dialog.c (revision 30979) @@ -24,7 +24,7 @@ /* Last open non-modal shape dialog */ static ctx_t *shape_active = NULL; -static void shp_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void shp_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { ctx_t *shp = caller_data; Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30978) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30979) @@ -148,7 +148,7 @@ "Picks a vendor resource file to load.\n" "This file can contain drc settings for a\n" "particular vendor as well as a list of\n" - "predefined drills which are allowed.", default_file, ".res", NULL, "vendor", PCB_HID_FSD_READ, NULL); + "predefined drills which are allowed.", default_file, ".res", NULL, "vendor", RND_HID_FSD_READ, NULL); if (fname == NULL) { RND_ACT_IRES(1); return 0;