Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5490) +++ trunk/doc-rnd/hacking/renames (revision 5491) @@ -1509,3 +1509,8 @@ IsPasteEmpty -> pcb_layer_is_paste_empty SOLDER_LAYER -> PCB_SOLDER_SIDE COMPONENT_LAYER -> PCB_COMPONENT_SIDE +LayerStringToLayerStack -> pcb_layervis_parse_string +ChangeGroupVisibility -> pcb_layervis_change_group_vis +ResetStackAndVisibility -> pcb_layervis_reset_stack +SaveStackAndVisibility -> pcb_layervis_save_stack +RestoreStackAndVisibility -> pcb_layervis_restore_stack Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 5490) +++ trunk/src/file_act.c (revision 5491) @@ -197,7 +197,7 @@ free(PCB->Name); PCB->Name = name; - ResetStackAndVisibility(); + pcb_layervis_reset_stack(); pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight); pcb_center_display(PCB->MaxWidth / 2, PCB->MaxHeight / 2); pcb_redraw(); Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 5490) +++ trunk/src/find_drc.c (revision 5491) @@ -333,8 +333,8 @@ IsBad = pcb_false; drcerr_count = 0; - SaveStackAndVisibility(); - ResetStackAndVisibility(); + pcb_layervis_save_stack(); + pcb_layervis_reset_stack(); pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); pcb_conn_lookup_init(); @@ -689,7 +689,7 @@ } - RestoreStackAndVisibility(); + pcb_layervis_restore_stack(); pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); pcb_gui->invalidate_all(); @@ -835,7 +835,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(pcb_layer_id(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true); + pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true); } pcb_center_display(X, Y); } Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 5490) +++ trunk/src/gui_act.c (revision 5491) @@ -1200,7 +1200,7 @@ return 1; } if (layer != CURRENT) { - ChangeGroupVisibility(pcb_layer_id(PCB->Data, layer), pcb_true, pcb_true); + pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, layer), pcb_true, pcb_true); pcb_redraw(); } return 0; Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 5490) +++ trunk/src/layer_vis.c (revision 5491) @@ -37,8 +37,8 @@ #include "compat_misc.h" /* - * Used by SaveStackAndVisibility() and - * RestoreStackAndVisibility() + * Used by pcb_layervis_save_stack() and + * pcb_layervis_restore_stack() */ static struct { pcb_bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn; @@ -53,7 +53,7 @@ * to correspond. */ -void LayerStringToLayerStack(const char *layer_string) +void pcb_layervis_parse_string(const char *layer_string) { static int listed_layers = 0; int l = strlen(layer_string); @@ -115,13 +115,13 @@ conf_set_editor(show_solder_side, 1); else if (isdigit((int) args[i][0])) { lno = atoi(args[i]); - ChangeGroupVisibility(lno, pcb_true, pcb_true); + pcb_layervis_change_group_vis(lno, pcb_true, pcb_true); } else { int found = 0; for (lno = 0; lno < pcb_max_copper_layer; lno++) if (strcasecmp(args[i], PCB->Data->Layer[lno].Name) == 0) { - ChangeGroupVisibility(lno, pcb_true, pcb_true); + pcb_layervis_change_group_vis(lno, pcb_true, pcb_true); found = 1; break; } @@ -165,7 +165,7 @@ * changes the visibility of all layers in a group * returns the number of changed layers */ -int ChangeGroupVisibility(int Layer, pcb_bool On, pcb_bool ChangeStackOrder) +int pcb_layervis_change_group_vis(int Layer, pcb_bool On, pcb_bool ChangeStackOrder) { int group, i, changed = 1; /* at least the current layer changes */ @@ -174,7 +174,7 @@ */ if (conf_core.rc.verbose) - printf("ChangeGroupVisibility(Layer=%d, On=%d, ChangeStackOrder=%d)\n", Layer, On, ChangeStackOrder); + printf("pcb_layervis_change_group_vis(Layer=%d, On=%d, ChangeStackOrder=%d)\n", Layer, On, ChangeStackOrder); /* decrement 'i' to keep stack in order of layergroup */ if ((group = pcb_layer_get_group(Layer)) >= 0) { @@ -206,7 +206,7 @@ /* --------------------------------------------------------------------------- * resets the layerstack setting */ -void ResetStackAndVisibility(void) +void pcb_layervis_reset_stack(void) { int comp_group; pcb_cardinal_t i; @@ -225,13 +225,13 @@ /* Bring the component group to the front and make it active. */ comp_group = pcb_layer_get_group(pcb_component_silk_layer); - ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], 1, 1); + pcb_layervis_change_group_vis(PCB->LayerGroups.Entries[comp_group][0], 1, 1); } /* --------------------------------------------------------------------------- * saves the layerstack setting */ -void SaveStackAndVisibility(void) +void pcb_layervis_save_stack(void) { pcb_cardinal_t i; static pcb_bool run = pcb_false; @@ -243,7 +243,7 @@ if (SavedStack.cnt != 0) { fprintf(stderr, - "SaveStackAndVisibility() layerstack was already saved and not" "yet restored. cnt = %d\n", SavedStack.cnt); + "pcb_layervis_save_stack() layerstack was already saved and not" "yet restored. cnt = %d\n", SavedStack.cnt); } for (i = 0; i < pcb_max_copper_layer + 2; i++) { @@ -262,16 +262,16 @@ /* --------------------------------------------------------------------------- * restores the layerstack setting */ -void RestoreStackAndVisibility(void) +void pcb_layervis_restore_stack(void) { pcb_cardinal_t i; if (SavedStack.cnt == 0) { - fprintf(stderr, "RestoreStackAndVisibility() layerstack has not" " been saved. cnt = %d\n", SavedStack.cnt); + fprintf(stderr, "pcb_layervis_restore_stack() layerstack has not" " been saved. cnt = %d\n", SavedStack.cnt); return; } else if (SavedStack.cnt != 1) { - fprintf(stderr, "RestoreStackAndVisibility() layerstack save count is" " wrong. cnt = %d\n", SavedStack.cnt); + fprintf(stderr, "pcb_layervis_restore_stack() layerstack save count is" " wrong. cnt = %d\n", SavedStack.cnt); } for (i = 0; i < pcb_max_copper_layer + 2; i++) { Index: trunk/src/layer_vis.h =================================================================== --- trunk/src/layer_vis.h (revision 5490) +++ trunk/src/layer_vis.h (revision 5491) @@ -34,19 +34,19 @@ /* Given a string description of a layer visibility stack, adjust the layer visibility to correspond */ -void LayerStringToLayerStack(const char *layer_string); +void pcb_layervis_parse_string(const char *layer_string); /* changes the visibility of all layers in a group; returns the number of changed layers */ -int ChangeGroupVisibility(int Layer, pcb_bool On, pcb_bool ChangeStackOrder); +int pcb_layervis_change_group_vis(int Layer, pcb_bool On, pcb_bool ChangeStackOrder); /* resets the layer visibility stack setting */ -void ResetStackAndVisibility(void); +void pcb_layervis_reset_stack(void); /* saves the layerstack setting */ -void SaveStackAndVisibility(void); +void pcb_layervis_save_stack(void); /* restores the layerstack setting */ -void RestoreStackAndVisibility(void); +void pcb_layervis_restore_stack(void); #endif Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 5490) +++ trunk/src/main.c (revision 5491) @@ -474,7 +474,7 @@ if (hid_argc > 0) command_line_pcb = hid_argv[0]; - ResetStackAndVisibility(); + pcb_layervis_reset_stack(); if (pcb_gui->gui) pcb_crosshair_init(); @@ -492,7 +492,7 @@ } if (conf_core.design.initial_layer_stack && conf_core.design.initial_layer_stack[0]) { - LayerStringToLayerStack(conf_core.design.initial_layer_stack); + pcb_layervis_parse_string(conf_core.design.initial_layer_stack); } /* read the library file and display it if it's not empty Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5490) +++ trunk/src/object_act.c (revision 5491) @@ -1091,7 +1091,7 @@ new_top = new_index; if (new_top != -1) - ChangeGroupVisibility(new_index, 1, 1); + pcb_layervis_change_group_vis(new_index, 1, 1); return 0; } Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 5490) +++ trunk/src/plug_io.c (revision 5491) @@ -319,7 +319,7 @@ pcb_board_remove(oldPCB); pcb_board_new_postproc(PCB, 0); - ResetStackAndVisibility(); + pcb_layervis_reset_stack(); if (how == 0) { /* update cursor location */ Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5490) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5491) @@ -16,7 +16,7 @@ void layout_switch_to_layer(int layer) { layer_check(layer); - ChangeGroupVisibility(layer, pcb_true, pcb_true); + pcb_layervis_change_group_vis(layer, pcb_true, pcb_true); pcb_redraw(); } Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5490) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5491) @@ -1368,8 +1368,8 @@ if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) { pcb_bool new_solder_vis = conf_core.editor.show_solder_side; - ChangeGroupVisibility(PCB->LayerGroups.Entries[comp_group][0], !new_solder_vis, !new_solder_vis); - ChangeGroupVisibility(PCB->LayerGroups.Entries[solder_group][0], new_solder_vis, new_solder_vis); + pcb_layervis_change_group_vis(PCB->LayerGroups.Entries[comp_group][0], !new_solder_vis, !new_solder_vis); + pcb_layervis_change_group_vis(PCB->LayerGroups.Entries[solder_group][0], new_solder_vis, new_solder_vis); } return 0; Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 5490) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 5491) @@ -215,7 +215,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); + pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); } pcb_draw_obj(object_type, ptr1, ptr2); } Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5490) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5491) @@ -433,7 +433,7 @@ ghid_LayersChanged(0, 0, 0); } else if (layer < pcb_max_copper_layer) - ChangeGroupVisibility(layer, TRUE, pcb_true); + pcb_layervis_change_group_vis(layer, TRUE, pcb_true); ignore_layer_update = pcb_false; @@ -482,7 +482,7 @@ break; default: /* Flip the visibility */ - ChangeGroupVisibility(layer, active, pcb_false); + pcb_layervis_change_group_vis(layer, active, pcb_false); redraw = TRUE; break; } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5490) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5491) @@ -626,15 +626,15 @@ if (conf_core.editor.show_solder_side) { if (active_group == comp_group) { if (comp_showing && !solder_showing) - ChangeGroupVisibility(comp_layer, 0, 0); - ChangeGroupVisibility(solder_layer, 1, 1); + pcb_layervis_change_group_vis(comp_layer, 0, 0); + pcb_layervis_change_group_vis(solder_layer, 1, 1); } } else { if (active_group == solder_group) { if (solder_showing && !comp_showing) - ChangeGroupVisibility(solder_layer, 0, 0); - ChangeGroupVisibility(comp_layer, 1, 1); + pcb_layervis_change_group_vis(solder_layer, 0, 0); + pcb_layervis_change_group_vis(comp_layer, 1, 1); } } } Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5490) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5491) @@ -273,7 +273,7 @@ PCB->RatDraw = (layer == LB_RATS); PCB->SilkActive = (layer == LB_SILK); if (layer < pcb_max_copper_layer) - ChangeGroupVisibility(layer, 1, 1); + pcb_layervis_change_group_vis(layer, 1, 1); for (l = 0; l < num_layer_buttons; l++) { LayerButtons *lb = layer_button_list + l; if (!lb->is_pick)