Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 29355) +++ trunk/src/crosshair.c (revision 29356) @@ -1108,7 +1108,7 @@ pcb_stub_stroke_record(ev_x, ev_y); if (pcb_crosshair_move_absolute(ev_x, ev_y)) { /* update object position and cursor location */ - pcb_tool_adjust_attached_objects(&PCB->hidlib); + pcb_tool_adjust_attached(&PCB->hidlib); pcb_event(&PCB->hidlib, PCB_EVENT_DRAW_CROSSHAIR_CHATT, NULL); pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } Index: trunk/src/funchash_core_list.h =================================================================== --- trunk/src/funchash_core_list.h (revision 29355) +++ trunk/src/funchash_core_list.h (revision 29356) @@ -98,6 +98,7 @@ action_entry(Polygon) action_entry(PolygonHole) action_entry(Pop) +action_entry(Press) action_entry(PreviousPoint) action_entry(Push) action_entry(Rats) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 29355) +++ trunk/src/gui_act.c (revision 29356) @@ -144,7 +144,7 @@ /* toggle line-adjust flag */ case F_ToggleAllDirections: conf_toggle_editor(all_direction_lines); - pcb_tool_adjust_attached_objects(PCB_ACT_HIDLIB); + pcb_tool_adjust_attached(PCB_ACT_HIDLIB); break; case F_CycleClip: @@ -156,7 +156,7 @@ else { 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_tool_adjust_attached(PCB_ACT_HIDLIB); pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); break; @@ -439,8 +439,9 @@ } break; + case F_Press: case F_Notify: - pcb_notify_mode(PCB_ACT_HIDLIB); + pcb_press_mode(PCB_ACT_HIDLIB); break; case F_PasteBuffer: pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); Index: trunk/src/hidlib_pcb.c =================================================================== --- trunk/src/hidlib_pcb.c (revision 29355) +++ trunk/src/hidlib_pcb.c (revision 29356) @@ -29,5 +29,5 @@ void pcb_hidlib_adjust_attached_objects(pcb_hidlib_t *hl) { - pcb_tool_adjust_attached_objects(hl); + pcb_tool_adjust_attached(hl); } Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 29355) +++ trunk/src/librnd/core/tool.c (revision 29356) @@ -224,19 +224,19 @@ wrap_void(uninit, ()); } -void pcb_tool_notify_mode(pcb_hidlib_t *hidlib) +void pcb_tool_press(pcb_hidlib_t *hidlib) { - wrap_void(notify_mode, (hidlib)); + wrap_void(press, (hidlib)); } -void pcb_tool_release_mode(pcb_hidlib_t *hidlib) +void pcb_tool_release(pcb_hidlib_t *hidlib) { - wrap_void(release_mode, (hidlib)); + wrap_void(release, (hidlib)); } -void pcb_tool_adjust_attached_objects(pcb_hidlib_t *hl) +void pcb_tool_adjust_attached(pcb_hidlib_t *hl) { - wrap_void(adjust_attached_objects, (hl)); + wrap_void(adjust_attached, (hl)); } void pcb_tool_draw_attached(pcb_hidlib_t *hl) Index: trunk/src/librnd/core/tool.h =================================================================== --- trunk/src/librnd/core/tool.h (revision 29355) +++ trunk/src/librnd/core/tool.h (revision 29356) @@ -60,9 +60,9 @@ /* tool implementation */ void (*init)(void); void (*uninit)(void); - void (*notify_mode)(pcb_hidlib_t *hl); - void (*release_mode)(pcb_hidlib_t *hl); - void (*adjust_attached_objects)(pcb_hidlib_t *hl); + void (*press)(pcb_hidlib_t *hl); + void (*release)(pcb_hidlib_t *hl); + void (*adjust_attached)(pcb_hidlib_t *hl); void (*draw_attached)(pcb_hidlib_t *hl); pcb_bool (*undo_act)(pcb_hidlib_t *hl); pcb_bool (*redo_act)(pcb_hidlib_t *hl); @@ -107,9 +107,9 @@ /**** Tool function wrappers; calling these will operate on the current tool as defined in pcbhl_conf.editor.mode ****/ -void pcb_tool_notify_mode(pcb_hidlib_t *hidlib); -void pcb_tool_release_mode(pcb_hidlib_t *hidlib); -void pcb_tool_adjust_attached_objects(pcb_hidlib_t *hl); +void pcb_tool_press(pcb_hidlib_t *hidlib); +void pcb_tool_release(pcb_hidlib_t *hidlib); +void pcb_tool_adjust_attached(pcb_hidlib_t *hl); void pcb_tool_draw_attached(pcb_hidlib_t *hl); pcb_bool pcb_tool_undo_act(pcb_hidlib_t *hl); pcb_bool pcb_tool_redo_act(pcb_hidlib_t *hl); Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 29355) +++ trunk/src/remove_act.c (revision 29356) @@ -75,7 +75,7 @@ pcb_hid_get_coords("Click on object to delete", &pcb_crosshair_note.X, &pcb_crosshair_note.Y, 0); pcb_tool_save(PCB_ACT_HIDLIB); pcb_tool_select_by_name(PCB_ACT_HIDLIB, "remove"); - pcb_notify_mode(PCB_ACT_HIDLIB); + pcb_press_mode(PCB_ACT_HIDLIB); pcb_tool_restore(PCB_ACT_HIDLIB); } break; Index: trunk/src/tool_logic.c =================================================================== --- trunk/src/tool_logic.c (revision 29355) +++ trunk/src/tool_logic.c (revision 29356) @@ -187,7 +187,7 @@ return; pcb_grabbed.status = pcb_false; - pcb_tool_release_mode(hidlib); + pcb_tool_release(hidlib); if (pcb_tool_is_saved) pcb_tool_restore(hidlib); @@ -195,7 +195,7 @@ pcb_draw(); } -void pcb_notify_mode(pcb_hidlib_t *hidlib) +void pcb_press_mode(pcb_hidlib_t *hidlib) { pcb_board_t *pcb = (pcb_board_t *)hidlib; @@ -209,6 +209,6 @@ if (pcb_data_clear_flag(pcb->Data, PCB_FLAG_WARN, 1, 0) > 0) pcb_board_set_changed_flag(pcb_true); } - pcb_tool_notify_mode(hidlib); + pcb_tool_press(hidlib); pcb_draw(); } Index: trunk/src/tool_logic.h =================================================================== --- trunk/src/tool_logic.h (revision 29355) +++ trunk/src/tool_logic.h (revision 29356) @@ -44,7 +44,7 @@ /* does what's appropriate for the current mode setting (when clicked). This normally means creation of an object at the current crosshair location. new created objects are added to the create undo list of course */ -void pcb_notify_mode(pcb_hidlib_t *hidlib); +void pcb_press_mode(pcb_hidlib_t *hidlib); void pcb_release_mode(pcb_hidlib_t *hidlib); Index: trunk/src_plugins/tool_std/tool_arc.c =================================================================== --- trunk/src_plugins/tool_std/tool_arc.c (revision 29355) +++ trunk/src_plugins/tool_std/tool_arc.c (revision 29356) @@ -57,7 +57,7 @@ pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.AttachedLine.Point1.X; pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y; - pcb_tool_adjust_attached_objects(NULL); + pcb_tool_adjust_attached(NULL); } pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); } @@ -186,7 +186,7 @@ pcb_arc_get_end((pcb_arc_t *) ptr2, 0, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y); pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X; pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y; - pcb_tool_adjust_attached_objects(hl); + pcb_tool_adjust_attached(hl); if (--pcb_added_lines == 0) pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; } Index: trunk/src_plugins/tool_std/tool_arrow.c =================================================================== --- trunk/src_plugins/tool_std/tool_arrow.c (revision 29355) +++ trunk/src_plugins/tool_std/tool_arrow.c (revision 29356) @@ -60,7 +60,7 @@ } /* Called some time after the click if there was a release but no second click - a.k.a. finalize single click (some things are already done in pcb_notify_mode + a.k.a. finalize single click (some things are already done in pcb_press_mode at the initial click event) */ static void click_timer_cb(pcb_hidval_t hv) { Index: trunk/src_plugins/tool_std/tool_line.c =================================================================== --- trunk/src_plugins/tool_std/tool_line.c (revision 29355) +++ trunk/src_plugins/tool_std/tool_line.c (revision 29356) @@ -70,7 +70,7 @@ pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.AttachedBox.Point1.X; pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.AttachedBox.Point1.Y; - pcb_tool_adjust_attached_objects(NULL); + pcb_tool_adjust_attached(NULL); } else { if (conf_core.editor.auto_drc) { @@ -441,7 +441,7 @@ pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = ptr2->Point2.Y; } pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y); - pcb_tool_adjust_attached_objects(hl); + pcb_tool_adjust_attached(hl); if (--pcb_added_lines == 0) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; last_layer = PCB_CURRLAYER(pcb);