Index: tool_arc.c =================================================================== --- tool_arc.c (revision 31018) +++ tool_arc.c (revision 31019) @@ -52,12 +52,12 @@ void pcb_tool_arc_init(void) { rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); - if (pcb_tool_prev_id == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { + if (rnd_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; 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(NULL); + rnd_tool_adjust_attached(NULL); } rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } @@ -66,7 +66,7 @@ { rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_added_lines = 0; - if (pcb_tool_next_id != pcb_crosshair.tool_line) { + if (rnd_tool_next_id != pcb_crosshair.tool_line) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; if (!pcb_marked.user_placed) pcb_crosshair_set_local_ref(0, 0, rnd_false); @@ -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(hl); + rnd_tool_adjust_attached(hl); if (--pcb_added_lines == 0) pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; } @@ -196,9 +196,9 @@ void pcb_tool_arc_escape(rnd_hidlib_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) - pcb_tool_select_by_name(hl, "arrow"); + rnd_tool_select_by_name(hl, "arrow"); else - pcb_tool_select_by_name(hl, "arc"); + rnd_tool_select_by_name(hl, "arc"); } /* XPM */ @@ -233,7 +233,7 @@ }; pcb_tool_t pcb_tool_arc = { - "arc", NULL, NULL, 100, arc_icon, PCB_TOOL_CURSOR_NAMED("question_arrow"), 0, + "arc", NULL, NULL, 100, arc_icon, RND_TOOL_CURSOR_NAMED("question_arrow"), 0, pcb_tool_arc_init, pcb_tool_arc_uninit, pcb_tool_arc_notify_mode, Index: tool_arrow.c =================================================================== --- tool_arrow.c (revision 31018) +++ tool_arrow.c (revision 31019) @@ -78,17 +78,17 @@ pcb_buffer_add_selected(pcb, PCB_PASTEBUFFER, hl->tool_x, hl->tool_y, rnd_true, rnd_true); pcb_undo_save_serial(); pcb_remove_selected(rnd_false); - pcb_tool_save(hl); - pcb_tool_is_saved = rnd_true; - pcb_tool_select_by_name(hl, "buffer"); + rnd_tool_save(hl); + rnd_tool_is_saved = rnd_true; + rnd_tool_select_by_name(hl, "buffer"); } else if (hl->tool_hit && !rnd_gui->shift_is_pressed(rnd_gui)) { rnd_rnd_box_t box; hl->tool_grabbed.status = rnd_true; - pcb_tool_save(hl); - pcb_tool_is_saved = rnd_true; - pcb_tool_select_by_name(hl, rnd_gui->control_is_pressed(rnd_gui)? "copy" : "move"); + rnd_tool_save(hl); + rnd_tool_is_saved = rnd_true; + rnd_tool_select_by_name(hl, rnd_gui->control_is_pressed(rnd_gui)? "copy" : "move"); pcb_crosshair.AttachedObject.Ptr1 = pcb_crosshair_note.ptr1; pcb_crosshair.AttachedObject.Ptr2 = pcb_crosshair_note.ptr2; pcb_crosshair.AttachedObject.Ptr3 = pcb_crosshair_note.ptr3; @@ -269,7 +269,7 @@ }; pcb_tool_t pcb_tool_arrow = { - "arrow", NULL, NULL, 10, arrow_icon, PCB_TOOL_CURSOR_NAMED("left_ptr"), 0, + "arrow", NULL, NULL, 10, arrow_icon, RND_TOOL_CURSOR_NAMED("left_ptr"), 0, NULL, pcb_tool_arrow_uninit, pcb_tool_arrow_notify_mode, Index: tool_buffer.c =================================================================== --- tool_buffer.c (revision 31018) +++ tool_buffer.c (revision 31019) @@ -130,7 +130,7 @@ }; pcb_tool_t pcb_tool_buffer = { - "buffer", NULL, NULL, 100, buf_icon, PCB_TOOL_CURSOR_NAMED("hand"), 0, + "buffer", NULL, NULL, 100, buf_icon, RND_TOOL_CURSOR_NAMED("hand"), 0, pcb_tool_buffer_init, pcb_tool_buffer_uninit, pcb_tool_buffer_notify_mode, Index: tool_copy.c =================================================================== --- tool_copy.c (revision 31018) +++ tool_copy.c (revision 31019) @@ -120,7 +120,7 @@ } pcb_tool_t pcb_tool_copy = { - "copy", NULL, NULL, 100, NULL, PCB_TOOL_CURSOR_NAMED("crosshair"), 0, + "copy", NULL, NULL, 100, NULL, RND_TOOL_CURSOR_NAMED("crosshair"), 0, NULL, pcb_tool_copy_uninit, pcb_tool_copy_notify_mode, Index: tool_insert.c =================================================================== --- tool_insert.c (revision 31018) +++ tool_insert.c (revision 31019) @@ -186,7 +186,7 @@ }; pcb_tool_t pcb_tool_insert = { - "insert", NULL, NULL, 100, ins_icon, PCB_TOOL_CURSOR_NAMED("dotbox"), 0, + "insert", NULL, NULL, 100, ins_icon, RND_TOOL_CURSOR_NAMED("dotbox"), 0, NULL, pcb_tool_insert_uninit, pcb_tool_insert_notify_mode, Index: tool_line.c =================================================================== --- tool_line.c (revision 31018) +++ tool_line.c (revision 31019) @@ -65,12 +65,12 @@ void pcb_tool_line_init(void) { rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); - if (pcb_tool_prev_id == pcb_crosshair.tool_arc && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) { + if (rnd_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; 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(NULL); + rnd_tool_adjust_attached(NULL); } else { if (conf_core.editor.auto_drc) { @@ -88,7 +88,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_added_lines = 0; pcb_route_reset(&pcb_crosshair.Route); - if (pcb_tool_next_id != pcb_crosshair.tool_arc) { + if (rnd_tool_next_id != pcb_crosshair.tool_arc) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; if (!pcb_marked.user_placed) pcb_crosshair_set_local_ref(0, 0, rnd_false); @@ -158,7 +158,7 @@ * the file after saving. */ if (pcb_crosshair.X == pcb_crosshair.AttachedLine.Point1.X && pcb_crosshair.Y == pcb_crosshair.AttachedLine.Point1.Y) { - pcb_tool_select_by_name(hl, "line"); + rnd_tool_select_by_name(hl, "line"); return; } @@ -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(hl); + rnd_tool_adjust_attached(hl); if (--pcb_added_lines == 0) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; last_layer = PCB_CURRLAYER(pcb); @@ -478,9 +478,9 @@ void pcb_tool_line_escape(rnd_hidlib_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) - pcb_tool_select_by_name(hl, "arrow"); + rnd_tool_select_by_name(hl, "arrow"); else - pcb_tool_select_by_name(hl, "line"); + rnd_tool_select_by_name(hl, "line"); } /* XPM */ @@ -517,7 +517,7 @@ pcb_tool_t pcb_tool_line = { - "line", NULL, NULL, 100, line_icon, PCB_TOOL_CURSOR_NAMED("pencil"), 0, + "line", NULL, NULL, 100, line_icon, RND_TOOL_CURSOR_NAMED("pencil"), 0, pcb_tool_line_init, pcb_tool_line_uninit, pcb_tool_line_notify_mode, Index: tool_lock.c =================================================================== --- tool_lock.c (revision 31018) +++ tool_lock.c (revision 31019) @@ -120,7 +120,7 @@ 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f}; pcb_tool_t pcb_tool_lock = { - "lock", NULL, NULL, 100, lock_icon, PCB_TOOL_CURSOR_XBM(lockIcon_bits, lockMask_bits), 0, + "lock", NULL, NULL, 100, lock_icon, RND_TOOL_CURSOR_XBM(lockIcon_bits, lockMask_bits), 0, NULL, NULL, pcb_tool_lock_notify_mode, Index: tool_move.c =================================================================== --- tool_move.c (revision 31018) +++ tool_move.c (revision 31019) @@ -129,7 +129,7 @@ } pcb_tool_t pcb_tool_move = { - "move", NULL, NULL, 100, NULL, PCB_TOOL_CURSOR_NAMED("crosshair"), 0, + "move", NULL, NULL, 100, NULL, RND_TOOL_CURSOR_NAMED("crosshair"), 0, NULL, pcb_tool_move_uninit, pcb_tool_move_notify_mode, Index: tool_poly.c =================================================================== --- tool_poly.c (revision 31018) +++ tool_poly.c (revision 31019) @@ -153,9 +153,9 @@ void pcb_tool_poly_escape(rnd_hidlib_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) - pcb_tool_select_by_name(hl, "arrow"); + rnd_tool_select_by_name(hl, "arrow"); else - pcb_tool_select_by_name(hl, "poly"); + rnd_tool_select_by_name(hl, "poly"); } /* XPM */ @@ -190,7 +190,7 @@ }; pcb_tool_t pcb_tool_poly = { - "poly", NULL, NULL, 100, poly_icon, PCB_TOOL_CURSOR_NAMED("up_arrow"), 0, + "poly", NULL, NULL, 100, poly_icon, RND_TOOL_CURSOR_NAMED("up_arrow"), 0, NULL, pcb_tool_poly_uninit, pcb_tool_poly_notify_mode, Index: tool_polyhole.c =================================================================== --- tool_polyhole.c (revision 31018) +++ tool_polyhole.c (revision 31019) @@ -183,9 +183,9 @@ void pcb_tool_polyhole_escape(rnd_hidlib_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) - pcb_tool_select_by_name(hl, "arrow"); + rnd_tool_select_by_name(hl, "arrow"); else - pcb_tool_select_by_name(hl, "polyhole"); + rnd_tool_select_by_name(hl, "polyhole"); } /* XPM */ @@ -219,7 +219,7 @@ pcb_tool_t pcb_tool_polyhole = { - "polyhole", NULL, NULL, 100, polyhole_icon, PCB_TOOL_CURSOR_NAMED("up_arrow"), 0, + "polyhole", NULL, NULL, 100, polyhole_icon, RND_TOOL_CURSOR_NAMED("up_arrow"), 0, NULL, pcb_tool_polyhole_uninit, pcb_tool_polyhole_notify_mode, Index: tool_rectangle.c =================================================================== --- tool_rectangle.c (revision 31018) +++ tool_rectangle.c (revision 31019) @@ -118,9 +118,9 @@ void pcb_tool_rectangle_escape(rnd_hidlib_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) - pcb_tool_select_by_name(hl, "arrow"); + rnd_tool_select_by_name(hl, "arrow"); else - pcb_tool_select_by_name(hl, "rectangle"); + rnd_tool_select_by_name(hl, "rectangle"); } /* XPM */ @@ -156,7 +156,7 @@ pcb_tool_t pcb_tool_rectangle = { - "rectangle", NULL, NULL, 100, rect_icon, PCB_TOOL_CURSOR_NAMED("ul_angle"), 0, + "rectangle", NULL, NULL, 100, rect_icon, RND_TOOL_CURSOR_NAMED("ul_angle"), 0, NULL, pcb_tool_rectangle_uninit, pcb_tool_rectangle_notify_mode, Index: tool_remove.c =================================================================== --- tool_remove.c (revision 31018) +++ tool_remove.c (revision 31019) @@ -117,7 +117,7 @@ }; pcb_tool_t pcb_tool_remove = { - "remove", NULL, NULL, 100, del_icon, PCB_TOOL_CURSOR_NAMED("pirate"), 0, + "remove", NULL, NULL, 100, del_icon, RND_TOOL_CURSOR_NAMED("pirate"), 0, NULL, NULL, pcb_tool_remove_notify_mode, Index: tool_rotate.c =================================================================== --- tool_rotate.c (revision 31018) +++ tool_rotate.c (revision 31019) @@ -96,7 +96,7 @@ 0x1f, 0x60, 0x3b, 0x30, 0xe1, 0x3f, 0xc0, 0x0f}; pcb_tool_t pcb_tool_rotate = { - "rotate", NULL, NULL, 100, rot_icon, PCB_TOOL_CURSOR_XBM(rotateIcon_bits, rotateMask_bits), 0, + "rotate", NULL, NULL, 100, rot_icon, RND_TOOL_CURSOR_XBM(rotateIcon_bits, rotateMask_bits), 0, NULL, NULL, pcb_tool_rotate_notify_mode, Index: tool_std.c =================================================================== --- tool_std.c (revision 31018) +++ tool_std.c (revision 31019) @@ -54,7 +54,7 @@ void pplg_uninit_tool_std(void) { - pcb_tool_unreg_by_cookie(pcb_tool_std_cookie); + rnd_tool_unreg_by_cookie(pcb_tool_std_cookie); } int pplg_init_tool_std(void) @@ -61,22 +61,22 @@ { RND_API_CHK_VER; - pcb_crosshair.tool_arc = pcb_tool_reg(&pcb_tool_arc, pcb_tool_std_cookie); - pcb_crosshair.tool_arrow = pcb_tool_reg(&pcb_tool_arrow, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_buffer, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_copy, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_insert, pcb_tool_std_cookie); - pcb_crosshair.tool_line = pcb_tool_reg(&pcb_tool_line, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_lock, pcb_tool_std_cookie); - pcb_crosshair.tool_move = pcb_tool_reg(&pcb_tool_move, pcb_tool_std_cookie); - pcb_crosshair.tool_poly = pcb_tool_reg(&pcb_tool_poly, pcb_tool_std_cookie); - pcb_crosshair.tool_poly_hole = pcb_tool_reg(&pcb_tool_polyhole, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_rectangle, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_remove, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_rotate, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_text, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_thermal, pcb_tool_std_cookie); - pcb_tool_reg(&pcb_tool_via, pcb_tool_std_cookie); + pcb_crosshair.tool_arc = rnd_tool_reg(&pcb_tool_arc, pcb_tool_std_cookie); + pcb_crosshair.tool_arrow = rnd_tool_reg(&pcb_tool_arrow, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_buffer, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_copy, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_insert, pcb_tool_std_cookie); + pcb_crosshair.tool_line = rnd_tool_reg(&pcb_tool_line, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_lock, pcb_tool_std_cookie); + pcb_crosshair.tool_move = rnd_tool_reg(&pcb_tool_move, pcb_tool_std_cookie); + pcb_crosshair.tool_poly = rnd_tool_reg(&pcb_tool_poly, pcb_tool_std_cookie); + pcb_crosshair.tool_poly_hole = rnd_tool_reg(&pcb_tool_polyhole, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_rectangle, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_remove, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_rotate, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_text, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_thermal, pcb_tool_std_cookie); + rnd_tool_reg(&pcb_tool_via, pcb_tool_std_cookie); return 0; } Index: tool_text.c =================================================================== --- tool_text.c (revision 31018) +++ tool_text.c (revision 31019) @@ -125,7 +125,7 @@ }; pcb_tool_t pcb_tool_text = { - "text", NULL, NULL, 100, text_icon, PCB_TOOL_CURSOR_NAMED("xterm"), 0, + "text", NULL, NULL, 100, text_icon, RND_TOOL_CURSOR_NAMED("xterm"), 0, NULL, NULL, pcb_tool_text_notify_mode, Index: tool_thermal.c =================================================================== --- tool_thermal.c (revision 31018) +++ tool_thermal.c (revision 31019) @@ -133,7 +133,7 @@ }; pcb_tool_t pcb_tool_thermal = { - "thermal", NULL, NULL, 100, thrm_icon, PCB_TOOL_CURSOR_NAMED("iron_cross"), 0, + "thermal", NULL, NULL, 100, thrm_icon, RND_TOOL_CURSOR_NAMED("iron_cross"), 0, NULL, NULL, pcb_tool_thermal_notify_mode, Index: tool_via.c =================================================================== --- tool_via.c (revision 31018) +++ tool_via.c (revision 31019) @@ -136,7 +136,7 @@ }; pcb_tool_t pcb_tool_via = { - "via", NULL, NULL, 100, via_icon, PCB_TOOL_CURSOR_NAMED(NULL), 0, + "via", NULL, NULL, 100, via_icon, RND_TOOL_CURSOR_NAMED(NULL), 0, NULL, NULL, pcb_tool_via_notify_mode,