Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 29334) +++ trunk/doc/developer/renames (revision 29335) @@ -1781,3 +1781,4 @@ pcb_hid_actions_init -> pcb_actions_init pcb_poly_from_arc -> pcb_poly_from_pcb_arc pcb_poly_from_line -> pcb_poly_from_pcb_line +pcb_notify_crosshair_change -> pcb_hid_notify_crosshair_change Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 29334) +++ trunk/src/buffer.c (revision 29335) @@ -198,7 +198,7 @@ else ctx.buffer.extraflg = 0; - pcb_notify_crosshair_change(hidlib, pcb_false); + pcb_hid_notify_crosshair_change(hidlib, pcb_false); ctx.buffer.src = pcb->Data; ctx.buffer.dst = Buffer->Data; pcb_selected_operation(pcb, pcb->Data, fnc, &ctx, pcb_false, PCB_OBJ_ANY & (~PCB_OBJ_SUBC_PART), on_locked_too); @@ -214,7 +214,7 @@ } Buffer->from_outside = 0; free(Buffer->source_path); Buffer->source_path = NULL; - pcb_notify_crosshair_change(hidlib, pcb_true); + pcb_hid_notify_crosshair_change(hidlib, pcb_true); } void pcb_buffer_add_selected(pcb_board_t *pcb, pcb_buffer_t *Buffer, pcb_coord_t X, pcb_coord_t Y, pcb_bool LeaveSelected, pcb_bool keep_id) @@ -465,9 +465,9 @@ return 0; } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); pcb_buffer_rotate(PCB_PASTEBUFFER, ang); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return 0; } @@ -580,9 +580,9 @@ PCB_ACT_IRES(0); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); pcb_buffer_scale(PCB_PASTEBUFFER, x, y, th, recurse); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return 0; } @@ -967,7 +967,7 @@ force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y')); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); switch (op) { /* clear contents of paste buffer */ case F_Clear: @@ -1095,7 +1095,7 @@ case F_Save: name = sbufnum; rv = pcb_actionva(PCB_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return rv; case F_ToLayout: @@ -1120,7 +1120,7 @@ } else { - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_FAIL(PasteBuffer); } @@ -1143,13 +1143,13 @@ number = strtol(sbufnum, &end, 10); if (*end != 0) { pcb_message(PCB_MSG_ERROR, "invalid buffer number '%s': should be an integer\n", sbufnum); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return FGW_ERR_ARG_CONV; } number--; if ((number < 0) || (number >= PCB_MAX_BUFFER)) { pcb_message(PCB_MSG_ERROR, "invalid buffer number '%d': out of range 1..%d\n", number+1, PCB_MAX_BUFFER); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return FGW_ERR_ARG_CONV; } } @@ -1157,7 +1157,7 @@ number = conf_core.editor.buffer_number; res->type = FGW_STR; res->val.str = pcb_buffers[number].source_path; - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return 0; /* set number */ @@ -1171,12 +1171,12 @@ } } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_IRES(0); return 0; error:; - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_IRES(-1); return 0; } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 29334) +++ trunk/src/crosshair.c (revision 29335) @@ -1014,7 +1014,7 @@ x = z; z = pcb_crosshair.Y; pcb_crosshair.Y = y; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); /* Our caller notifies when it has done */ + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); /* Our caller notifies when it has done */ /* now move forward again */ pcb_crosshair.X = x; pcb_crosshair.Y = z; @@ -1031,7 +1031,7 @@ pcb_coord_t save_grid = PCB->hidlib.grid; PCB->hidlib.grid = 1; if (pcb_crosshair_move_absolute(X, Y)) - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); pcb_gui->set_crosshair(pcb_gui, pcb_crosshair.X, pcb_crosshair.Y, HID_SC_WARP_POINTER); PCB->hidlib.grid = save_grid; } @@ -1122,7 +1122,7 @@ /* update object position and cursor location */ pcb_tool_adjust_attached_objects(&PCB->hidlib); pcb_event(&PCB->hidlib, PCB_EVENT_DRAW_CROSSHAIR_CHATT, NULL); - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } } @@ -1138,11 +1138,11 @@ buf->obj = pcb_crosshair.AttachedObject.State; buf->line = pcb_crosshair.AttachedLine.State; buf->box = pcb_crosshair.AttachedBox.State; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); return buf; } @@ -1150,11 +1150,11 @@ { old_crosshair_t *buf = susp_data; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.State = buf->obj; pcb_crosshair.AttachedLine.State = buf->line; pcb_crosshair.AttachedBox.State = buf->box; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); free(buf); } @@ -1163,10 +1163,10 @@ void pcb_hidlib_crosshair_move_to(pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot) { if (!mouse_mot) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); if (pcb_crosshair_move_absolute(abs_x, abs_y)) - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } else pcb_event_move_crosshair(abs_x, abs_y); Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 29334) +++ trunk/src/file_act.c (revision 29335) @@ -76,17 +76,17 @@ case F_SubcToBuffer: case F_Subcircuit: case F_Footprint: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, format)) pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_LayoutToBuffer: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, name, format)) pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_Layout: @@ -146,7 +146,7 @@ /* PCB usgae: at the moment, while having only one global PCB, this function legitimately uses that */ - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); /* do emergency saving * clear the old struct and allocate memory for the new one */ @@ -174,7 +174,7 @@ pcb_center_display(PCB->hidlib.size_x / 2, PCB->hidlib.size_y / 2); pcb_board_changed(0); pcb_hid_redraw(PCB); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_IRES(0); return 0; } Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 29334) +++ trunk/src/gui_act.c (revision 29335) @@ -148,7 +148,7 @@ break; case F_CycleClip: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (conf_core.editor.all_direction_lines) { conf_toggle_editor(all_direction_lines); pcb_conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",0); @@ -157,27 +157,27 @@ pcb_conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); } pcb_tool_adjust_attached_objects(PCB_ACT_HIDLIB); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_CycleCrosshair: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); pcb_conf_setf(CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx)); if (pcb_ch_shape_NUM == pcbhl_conf.editor.crosshair_shape_idx) pcb_conf_set(CFR_CLI, "editor/crosshair_shape_idx", 0, "0", POL_OVERWRITE); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleRubberBandMode: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(rubber_band_mode); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleStartDirection: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(swap_start_direction); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleUniqueNames: @@ -185,21 +185,21 @@ break; case F_ToggleSnapPin: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(snap_pin); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleSnapOffGridLine: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(snap_offgrid_line); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleHighlightOnPoint: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(highlight_on_point); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleLocalRef: @@ -244,7 +244,7 @@ break; case F_ToggleAutoDRC: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); conf_toggle_editor(auto_drc); if (conf_core.editor.auto_drc && pcbhl_conf.editor.mode == pcb_crosshair.tool_line) { if (pcb_data_clear_flag(PCB->Data, PCB_FLAG_FOUND, 1, 1) > 0) { @@ -260,7 +260,7 @@ pcb_find_free(&fctx); } } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; case F_ToggleCheckPlanes: @@ -292,7 +292,7 @@ PCB_ACT_HIDLIB->grid = 1; if (pcb_crosshair_move_absolute(pcb_crosshair.X, pcb_crosshair.Y)) - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */ + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */ pcb_hidlib_set_grid(PCB_ACT_HIDLIB, oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y); pcb_grid_inval(); } @@ -396,7 +396,7 @@ /* it is okay to use crosshair directly here, the mode command is called from a click when it needs coords */ pcb_crosshair_note.X = pcb_crosshair.X; pcb_crosshair_note.Y = pcb_crosshair.Y; - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); switch(fgw_keyword(&argv[1])) { case F_Arc: pcb_tool_select_by_name(PCB_ACT_HIDLIB, "arc"); @@ -457,7 +457,7 @@ action script, so actions after this one could do things that would be executed only after non-recognized gestures */ pcb_release_mode(PCB_ACT_HIDLIB); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return 1; } pcb_release_mode(PCB_ACT_HIDLIB); @@ -497,7 +497,7 @@ pcb_tool_save(PCB_ACT_HIDLIB); break; } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return 0; } @@ -800,22 +800,22 @@ /* set layer current and size from line or arc */ switch (type) { case PCB_OBJ_LINE: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); set_same_(((pcb_line_t *) ptr2)->Thickness, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (pcbhl_conf.editor.mode != pcb_crosshair.tool_line) pcb_tool_select_by_name(PCB_ACT_HIDLIB, "line"); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_ARC: - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); set_same_(((pcb_arc_t *) ptr2)->Thickness, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (pcbhl_conf.editor.mode != pcb_crosshair.tool_arc) pcb_tool_select_by_name(PCB_ACT_HIDLIB, "arc"); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; Index: trunk/src/librnd/core/hid.c =================================================================== --- trunk/src/librnd/core/hid.c (revision 29334) +++ trunk/src/librnd/core/hid.c (revision 29335) @@ -31,7 +31,7 @@ #include #include -void pcb_notify_crosshair_change(pcb_hidlib_t *hl, pcb_bool changes_complete) +void pcb_hid_notify_crosshair_change(pcb_hidlib_t *hl, pcb_bool changes_complete) { if (pcb_gui->notify_crosshair_change) pcb_gui->notify_crosshair_change(pcb_gui, changes_complete); Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 29334) +++ trunk/src/librnd/core/hid.h (revision 29335) @@ -641,7 +641,7 @@ * They should initiate a redraw of the crosshair attached objects - which may * (if necessary) mean repainting the whole screen if the GUI hasn't tracked the * location of existing attached drawing. */ -void pcb_notify_crosshair_change(pcb_hidlib_t *hl, pcb_bool changes_complete); +void pcb_hid_notify_crosshair_change(pcb_hidlib_t *hl, pcb_bool changes_complete); #endif Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 29334) +++ trunk/src/polygon_act.c (revision 29335) @@ -99,7 +99,7 @@ PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); if ((argc > 1) && ((pcbhl_conf.editor.mode == pcb_crosshair.tool_poly) || (pcbhl_conf.editor.mode == pcb_crosshair.tool_poly_hole))) { - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); switch(op) { /* close open polygon if possible */ case F_Close: @@ -116,7 +116,7 @@ pcb_polygon_go_to_prev_point(); break; } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); } PCB_ACT_IRES(0); return 0; Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 29334) +++ trunk/src/select_act.c (revision 29335) @@ -98,13 +98,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_true, pcb_true, pcb_false)) { pcb_board_set_changed_flag(pcb_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; } @@ -194,13 +194,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_false, pcb_true, pcb_false)) { pcb_board_set_changed_flag(pcb_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; } Index: trunk/src/tool.c =================================================================== --- trunk/src/tool.c (revision 29334) +++ trunk/src/tool.c (revision 29335) @@ -172,9 +172,9 @@ recursing = pcb_false; /* force a crosshair grid update because the valid range may have changed */ - pcb_notify_crosshair_change(hidlib, pcb_false); + pcb_hid_notify_crosshair_change(hidlib, pcb_false); pcb_crosshair_move_relative(0, 0); - pcb_notify_crosshair_change(hidlib, pcb_true); + pcb_hid_notify_crosshair_change(hidlib, pcb_true); if (pcb_gui != NULL) pcb_gui->set_mouse_cursor(pcb_gui, id); return 0; @@ -352,7 +352,7 @@ void pcb_tool_notify_block(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); switch (pcb_crosshair.AttachedBox.State) { case PCB_CH_STATE_FIRST: /* setup first point */ pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X; @@ -364,7 +364,7 @@ pcb_crosshair.AttachedBox.State = PCB_CH_STATE_THIRD; break; } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } /*** old helpers ***/ Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 29334) +++ trunk/src/undo_act.c (revision 29335) @@ -103,17 +103,17 @@ const char *function = NULL; PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); if (!function || !*function) { - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (pcb_tool_undo_act(PCB_ACT_HIDLIB)) if (pcb_undo(pcb_true) == 0) pcb_board_set_changed_flag(pcb_true); } else if (function) { - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (pcb_strcasecmp(function, "ClearList") == 0) pcb_undo_clear_list(pcb_false); } - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_IRES(0); return 0; } @@ -128,11 +128,11 @@ fgw_error_t pcb_act_Redo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); if (pcb_tool_redo_act(PCB_ACT_HIDLIB)) if (pcb_redo(pcb_true)) pcb_board_set_changed_flag(pcb_true); - pcb_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); PCB_ACT_IRES(0); return 0; } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 29334) +++ trunk/src_plugins/hid_lesstif/main.c (revision 29335) @@ -229,13 +229,13 @@ if (crosshair_on == show) return; - pcb_notify_crosshair_change(ltf_hidlib, pcb_false); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false); if (pcb_marked.status) pcb_notify_mark_change(pcb_false); crosshair_on = show; - pcb_notify_crosshair_change(ltf_hidlib, pcb_true); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true); if (pcb_marked.status) pcb_notify_mark_change(pcb_true); } @@ -483,12 +483,12 @@ return; in_move_event = 1; - pcb_notify_crosshair_change(ltf_hidlib, pcb_false); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false); if (panning) Pan(2, e->x, e->y); pcb_hidlib_crosshair_move_to(Px(e->x), Py(e->y), 1); pcb_hidlib_adjust_attached_objects(ltf_hidlib); - pcb_notify_crosshair_change(ltf_hidlib, pcb_true); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true); in_move_event = 0; } @@ -1011,7 +1011,7 @@ if (lesstif_button_event(w, e)) return; - pcb_notify_crosshair_change(ltf_hidlib, pcb_false); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false); pressed_button = e->xbutton.button; mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0) + ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0) @@ -1022,7 +1022,7 @@ #endif hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active); - pcb_notify_crosshair_change(ltf_hidlib, pcb_true); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true); break; } @@ -1032,7 +1032,7 @@ if (e->xbutton.button != pressed_button) return; lesstif_button_event(w, e); - pcb_notify_crosshair_change(ltf_hidlib, pcb_false); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_false); pressed_button = 0; mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0) + ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0) @@ -1043,7 +1043,7 @@ #endif + PCB_M_Release; hid_cfg_mouse_action(ltf_hidlib, &lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active); - pcb_notify_crosshair_change(ltf_hidlib, pcb_true); + pcb_hid_notify_crosshair_change(ltf_hidlib, pcb_true); break; } Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 29334) +++ trunk/src_plugins/loghid/hid-logger.c (revision 29335) @@ -51,7 +51,7 @@ static void log_notify_crosshair_change(pcb_hid_t *hid, pcb_bool changes_complete) { - pcb_fprintf(out_, "pcb_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false"); + pcb_fprintf(out_, "pcb_hid_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false"); delegatee_->notify_crosshair_change(hid, changes_complete); } Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 29334) +++ trunk/src_plugins/serpentine/serpentine.c (revision 29335) @@ -285,16 +285,16 @@ static void tool_serpentine_init(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } static void tool_serpentine_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } static void tool_serpentine_notify_mode(void) Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 29334) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 29335) @@ -1010,11 +1010,11 @@ static void tool_skline_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); attached_path_uninit(); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } static void tool_skline_notify_mode(pcb_hidlib_t *hl) Index: trunk/src_plugins/tool_std/tool_arc.c =================================================================== --- trunk/src_plugins/tool_std/tool_arc.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_arc.c (revision 29335) @@ -51,7 +51,7 @@ void pcb_tool_arc_init(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); if (pcb_tool_prev_id == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; @@ -59,12 +59,12 @@ pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y; pcb_tool_adjust_attached_objects(NULL); } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } void pcb_tool_arc_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_added_lines = 0; if (pcb_tool_next_id != pcb_crosshair.tool_line) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; @@ -71,7 +71,7 @@ if (!pcb_marked.user_placed) pcb_crosshair_set_local_ref(0, 0, pcb_false); } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } void pcb_tool_arc_notify_mode(pcb_hidlib_t *hl) @@ -175,7 +175,7 @@ { if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); return pcb_false; } if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) { Index: trunk/src_plugins/tool_std/tool_arrow.c =================================================================== --- trunk/src_plugins/tool_std/tool_arrow.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_arrow.c (revision 29335) @@ -51,11 +51,11 @@ void pcb_tool_arrow_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } /* Called some time after the click if there was a release but no second click @@ -67,7 +67,7 @@ pcb_board_t *pcb = hv.ptr; if (pcb_crosshair_note.Click) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair_note.Click = pcb_false; if (pcb_crosshair_note.Moving && !pcb_gui->shift_is_pressed(pcb_gui)) { pcb_grabbed.status = pcb_true; @@ -124,7 +124,7 @@ pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair_note.X; pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair_note.Y; } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } if (pcb_crosshair.extobj_edit != NULL) { Index: trunk/src_plugins/tool_std/tool_copy.c =================================================================== --- trunk/src_plugins/tool_std/tool_copy.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_copy.c (revision 29335) @@ -42,10 +42,10 @@ void pcb_tool_copy_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); pcb_crosshair.extobj_edit = NULL; } Index: trunk/src_plugins/tool_std/tool_insert.c =================================================================== --- trunk/src_plugins/tool_std/tool_insert.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_insert.c (revision 29335) @@ -53,11 +53,11 @@ void pcb_tool_insert_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.extobj_edit = NULL; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } void pcb_tool_insert_notify_mode(pcb_hidlib_t *hl) Index: trunk/src_plugins/tool_std/tool_line.c =================================================================== --- trunk/src_plugins/tool_std/tool_line.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_line.c (revision 29335) @@ -63,7 +63,7 @@ void pcb_tool_line_init(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); if (pcb_tool_prev_id == pcb_crosshair.tool_arc && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; @@ -79,12 +79,12 @@ } } } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } void pcb_tool_line_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_added_lines = 0; pcb_route_reset(&pcb_crosshair.Route); if (pcb_tool_next_id != pcb_crosshair.tool_arc) { @@ -92,7 +92,7 @@ if (!pcb_marked.user_placed) pcb_crosshair_set_local_ref(0, 0, pcb_false); } - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } /* creates points of a line (when clicked) */ Index: trunk/src_plugins/tool_std/tool_move.c =================================================================== --- trunk/src_plugins/tool_std/tool_move.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_move.c (revision 29335) @@ -44,10 +44,10 @@ void pcb_tool_move_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); pcb_crosshair.extobj_edit = NULL; } Index: trunk/src_plugins/tool_std/tool_poly.c =================================================================== --- trunk/src_plugins/tool_std/tool_poly.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_poly.c (revision 29335) @@ -44,10 +44,10 @@ void pcb_tool_poly_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedPolygon.PointN = 0; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } TODO("remove this when pcb_tool_poly_notify_mode() loses PCB") Index: trunk/src_plugins/tool_std/tool_polyhole.c =================================================================== --- trunk/src_plugins/tool_std/tool_polyhole.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_polyhole.c (revision 29335) @@ -45,10 +45,10 @@ void pcb_tool_polyhole_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedPolygon.PointN = 0; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } TODO("remove this when pcb_tool_polyhole_notify_mode() loses PCB") Index: trunk/src_plugins/tool_std/tool_rectangle.c =================================================================== --- trunk/src_plugins/tool_std/tool_rectangle.c (revision 29334) +++ trunk/src_plugins/tool_std/tool_rectangle.c (revision 29335) @@ -47,9 +47,9 @@ void pcb_tool_rectangle_uninit(void) { - pcb_notify_crosshair_change(&PCB->hidlib, pcb_false); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - pcb_notify_crosshair_change(&PCB->hidlib, pcb_true); + pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } void pcb_tool_rectangle_notify_mode(pcb_hidlib_t *hl)