Index: tool_arc.c =================================================================== --- tool_arc.c (revision 31010) +++ tool_arc.c (revision 31011) @@ -51,7 +51,7 @@ void pcb_tool_arc_init(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + 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) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; @@ -59,19 +59,19 @@ pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y; pcb_tool_adjust_attached(NULL); } - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } void pcb_tool_arc_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_added_lines = 0; if (pcb_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, pcb_false); + pcb_crosshair_set_local_ref(0, 0, rnd_false); } - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl) @@ -105,7 +105,7 @@ dir = (RND_SGNZ(wx) == RND_SGNZ(wy)) ? -90 : 90; wy = wx; } - if (coord_abs(wy) > 0 && (arc = pcb_arc_new(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), pcb_true), + if (coord_abs(wy) > 0 && (arc = pcb_arc_new(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), rnd_true), pcb_crosshair.AttachedBox.Point2.X, pcb_crosshair.AttachedBox.Point2.Y, coord_abs(wy), @@ -114,7 +114,7 @@ dir, conf_core.design.line_thickness, 2 * conf_core.design.clearance, - pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0), pcb_true))) { + pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0), rnd_true))) { pcb_obj_add_attribs((pcb_any_obj_t *)arc, pcb->pen_attr, NULL); pcb_arc_get_end(arc, 1, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y); pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X; @@ -175,8 +175,8 @@ { if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); - return pcb_false; + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); + return rnd_false; } if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) { void *ptr1, *ptr2, *ptr3; @@ -190,7 +190,7 @@ if (--pcb_added_lines == 0) pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; } - return pcb_true; + return rnd_true; } void pcb_tool_arc_escape(rnd_hidlib_t *hl) Index: tool_arrow.c =================================================================== --- tool_arrow.c (revision 31010) +++ tool_arrow.c (revision 31011) @@ -52,11 +52,11 @@ void pcb_tool_arrow_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } /* Called some time after the click if there was a release but no second click @@ -68,26 +68,26 @@ pcb_board_t *pcb = hv.ptr; if (hl->tool_click) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); - hl->tool_click = pcb_false; + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); + hl->tool_click = rnd_false; if (pcb_crosshair_note.Moving && !rnd_gui->shift_is_pressed(rnd_gui)) { - hl->tool_grabbed.status = pcb_true; + hl->tool_grabbed.status = rnd_true; pcb_crosshair_note.Buffer = conf_core.editor.buffer_number; pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(pcb, PCB_PASTEBUFFER); - pcb_buffer_add_selected(pcb, PCB_PASTEBUFFER, hl->tool_x, hl->tool_y, pcb_true, pcb_true); + pcb_buffer_add_selected(pcb, PCB_PASTEBUFFER, hl->tool_x, hl->tool_y, rnd_true, rnd_true); pcb_undo_save_serial(); - pcb_remove_selected(pcb_false); + pcb_remove_selected(rnd_false); pcb_tool_save(hl); - pcb_tool_is_saved = pcb_true; + pcb_tool_is_saved = rnd_true; pcb_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 = pcb_true; + hl->tool_grabbed.status = rnd_true; pcb_tool_save(hl); - pcb_tool_is_saved = pcb_true; + pcb_tool_is_saved = rnd_true; pcb_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; @@ -106,13 +106,13 @@ box.Y2 = hl->tool_y - PCB_SLOP * rnd_pixel_slop; pcb_crosshair.drags = pcb_list_block(pcb, &box, &pcb_crosshair.drags_len); pcb_crosshair.drags_current = 0; - pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_true); + pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, rnd_true); } else { rnd_rnd_box_t box; hl->tool_hit = 0; - pcb_crosshair_note.Moving = pcb_false; + pcb_crosshair_note.Moving = rnd_false; pcb_undo_save_serial(); box.X1 = -RND_MAX_COORD; box.Y1 = -RND_MAX_COORD; @@ -119,13 +119,13 @@ box.X2 = RND_MAX_COORD; box.Y2 = RND_MAX_COORD; /* unselect first if shift key not down */ - if (!rnd_gui->shift_is_pressed(rnd_gui) && pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false)) - pcb_board_set_changed_flag(pcb_true); + if (!rnd_gui->shift_is_pressed(rnd_gui) && pcb_select_block(pcb, &box, rnd_false, rnd_false, rnd_false)) + pcb_board_set_changed_flag(rnd_true); pcb_tool_notify_block(); pcb_crosshair.AttachedBox.Point1.X = hl->tool_x; pcb_crosshair.AttachedBox.Point1.Y = hl->tool_y; } - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } if (pcb_crosshair.extobj_edit != NULL) { @@ -141,7 +141,7 @@ int test; rnd_hidval_t hv; - hl->tool_click = pcb_true; + hl->tool_click = rnd_true; /* do something after click time */ hv.ptr = hl; rnd_gui->add_timer(rnd_gui, click_timer_cb, conf_core.editor.click_time, hv); @@ -167,7 +167,7 @@ pcb_crosshair.AttachedObject.ty = hl->tool_y; } if (!pcb_crosshair_note.Moving && (type & (PCB_SELECT_TYPES | PCB_LOOSE_SUBC(PCB))) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_any_obj_t *) ptr2)) { - pcb_crosshair_note.Moving = pcb_true; + pcb_crosshair_note.Moving = rnd_true; /* remember where the user clicked to start this op */ pcb_crosshair.AttachedObject.tx = pcb_crosshair.AttachedObject.X = hl->tool_x; pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y = hl->tool_y; @@ -190,12 +190,12 @@ box.X2 = RND_MAX_COORD; box.Y2 = RND_MAX_COORD; - hl->tool_click = pcb_false; /* inhibit timer action */ + hl->tool_click = rnd_false; /* inhibit timer action */ pcb_undo_save_serial(); /* unselect first if shift key not down */ if (!rnd_gui->shift_is_pressed(rnd_gui)) { - if (pcb_select_block(pcb, &box, pcb_false, pcb_false, pcb_false)) - pcb_board_set_changed_flag(pcb_true); + if (pcb_select_block(pcb, &box, rnd_false, rnd_false, rnd_false)) + pcb_board_set_changed_flag(rnd_true); if (pcb_crosshair_note.Moving) { pcb_crosshair_note.Moving = 0; hl->tool_hit = 0; @@ -206,7 +206,7 @@ gets the same SN. */ pcb_undo_restore_serial(); if (pcb_select_object(PCB)) - pcb_board_set_changed_flag(pcb_true); + pcb_board_set_changed_flag(rnd_true); else pcb_undo_inc_serial(); /* We didn't select anything new, so, the deselection should get its own SN. */ hl->tool_hit = 0; @@ -219,8 +219,8 @@ box.Y2 = pcb_crosshair.AttachedBox.Point2.Y; pcb_undo_restore_serial(); - if (pcb_select_block(pcb, &box, pcb_true, pcb_true, pcb_false)) { - pcb_board_set_changed_flag(pcb_true); + if (pcb_select_block(pcb, &box, rnd_true, rnd_true, rnd_false)) { + pcb_board_set_changed_flag(rnd_true); pcb_undo_inc_serial(); } else if (pcb_bumped) Index: tool_buffer.c =================================================================== --- tool_buffer.c (revision 31010) +++ tool_buffer.c (revision 31011) @@ -63,7 +63,7 @@ } if (pcb_buffer_copy_to_layout(pcb, pcb_crosshair.AttachedObject.tx, pcb_crosshair.AttachedObject.ty, keep_ids)) { - pcb_board_set_changed_flag(pcb_true); + pcb_board_set_changed_flag(rnd_true); rnd_gui->invalidate_all(rnd_gui); } } @@ -70,7 +70,7 @@ void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl) { - pcb_tool_buffer_notify_mode_(hl, pcb_false); + pcb_tool_buffer_notify_mode_(hl, rnd_false); } void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl) @@ -79,10 +79,10 @@ if (pcb_crosshair_note.Moving) { pcb_undo_restore_serial(); - pcb_tool_buffer_notify_mode_(hl, pcb_true); + pcb_tool_buffer_notify_mode_(hl, rnd_true); pcb_buffer_clear(pcb, PCB_PASTEBUFFER); pcb_buffer_set_number(pcb_crosshair_note.Buffer); - pcb_crosshair_note.Moving = pcb_false; + pcb_crosshair_note.Moving = rnd_false; hl->tool_hit = 0; } } Index: tool_copy.c =================================================================== --- tool_copy.c (revision 31010) +++ tool_copy.c (revision 31011) @@ -43,10 +43,10 @@ void pcb_tool_copy_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); pcb_crosshair.extobj_edit = NULL; } @@ -64,7 +64,7 @@ pcb_search_screen(hl->tool_x, hl->tool_y, types, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { - pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_false); + pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, rnd_false); } break; } @@ -81,7 +81,7 @@ pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, pcb_crosshair.AttachedObject.tx - pcb_crosshair.AttachedObject.X, pcb_crosshair.AttachedObject.ty - pcb_crosshair.AttachedObject.Y); pcb_subc_as_board_update(PCB); - pcb_board_set_changed_flag(pcb_true); + pcb_board_set_changed_flag(rnd_true); } /* reset identifiers */ @@ -115,8 +115,8 @@ { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) - return pcb_false; - return pcb_true; + return rnd_false; + return rnd_true; } pcb_tool_t pcb_tool_copy = { Index: tool_insert.c =================================================================== --- tool_insert.c (revision 31010) +++ tool_insert.c (revision 31011) @@ -54,11 +54,11 @@ void pcb_tool_insert_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.extobj_edit = NULL; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl) @@ -90,16 +90,16 @@ } if (!(pcb_brave & PCB_BRAVE_OLDINSERT)) { InsertedPoint = *pcb_adjust_insert_point(); - pcb_crosshair_set_local_ref(InsertedPoint.X, InsertedPoint.Y, pcb_true); + pcb_crosshair_set_local_ref(InsertedPoint.X, InsertedPoint.Y, rnd_true); if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY) pcb_insert_point_in_object(PCB_OBJ_POLY, pcb_crosshair.AttachedObject.Ptr1, fake.poly, - &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); + &polyIndex, InsertedPoint.X, InsertedPoint.Y, rnd_false, rnd_false); else pcb_insert_point_in_object(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, - pcb_crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); - pcb_board_set_changed_flag(pcb_true); + pcb_crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, rnd_false, rnd_false); + pcb_board_set_changed_flag(rnd_true); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; @@ -118,12 +118,12 @@ if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY) pcb_insert_point_in_object(PCB_OBJ_POLY, pcb_crosshair.AttachedObject.Ptr1, fake.poly, - &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); + &polyIndex, InsertedPoint.X, InsertedPoint.Y, rnd_false, rnd_false); else pcb_insert_point_in_object(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, - pcb_crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); - pcb_board_set_changed_flag(pcb_true); + pcb_crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, rnd_false, rnd_false); + pcb_board_set_changed_flag(rnd_true); /* reset identifiers */ pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; @@ -150,8 +150,8 @@ { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) - return pcb_false; - return pcb_true; + return rnd_false; + return rnd_true; } /* XPM */ Index: tool_line.c =================================================================== --- tool_line.c (revision 31010) +++ tool_line.c (revision 31011) @@ -64,7 +64,7 @@ void pcb_tool_line_init(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + 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) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; @@ -80,20 +80,20 @@ } } } - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } void pcb_tool_line_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + 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) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; if (!pcb_marked.user_placed) - pcb_crosshair_set_local_ref(0, 0, pcb_false); + pcb_crosshair_set_local_ref(0, 0, rnd_false); } - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } /* creates points of a line (when clicked) */ @@ -104,7 +104,7 @@ pcb_board_t *pcb = (pcb_board_t *)hl; if ((!pcb_marked.status || conf_core.editor.local_ref) && !pcb_marked.user_placed) - pcb_crosshair_set_local_ref(pcb_crosshair.X, pcb_crosshair.Y, pcb_true); + pcb_crosshair_set_local_ref(pcb_crosshair.X, pcb_crosshair.Y, rnd_true); switch (pcb_crosshair.AttachedLine.State) { case PCB_CH_STATE_FIRST: /* first point */ TODO("subc: this should work on heavy terminals too!") @@ -198,7 +198,7 @@ pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, - 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) { + 0, PCB_PSTK_COMPAT_ROUND, rnd_true)) != NULL)) { pcb_obj_add_attribs((pcb_any_obj_t *)ps, pcb->pen_attr, NULL); pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); } @@ -220,7 +220,7 @@ /* set the mark to the new starting point so ortho works as expected and we can draw a perpendicular line from here */ hl->tool_grabbed.X = pcb_crosshair.Route.end_point.X; hl->tool_grabbed.Y = pcb_crosshair.Route.end_point.Y; - hl->tool_grabbed.status = pcb_true; + hl->tool_grabbed.status = rnd_true; } if (ps) @@ -258,7 +258,7 @@ if ((pcb_crosshair.AttachedLine.Point1.X != pcb_crosshair.AttachedLine.Point2.X || pcb_crosshair.AttachedLine.Point1.Y != pcb_crosshair.AttachedLine.Point2.Y) && (line = - pcb_line_new_merge(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), pcb_true), + pcb_line_new_merge(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), rnd_true), pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, @@ -290,7 +290,7 @@ pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, - 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) { + 0, PCB_PSTK_COMPAT_ROUND, rnd_true)) != NULL)) { pcb_obj_add_attribs((pcb_any_obj_t *)ps, pcb->pen_attr, NULL); pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); pcb_pstk_invalidate_draw(ps); @@ -304,7 +304,7 @@ } if (conf_core.editor.line_refraction && (hl->tool_x != pcb_crosshair.AttachedLine.Point2.X || hl->tool_y != pcb_crosshair.AttachedLine.Point2.Y) && (line = - pcb_line_new_merge(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), pcb_true), + pcb_line_new_merge(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), rnd_true), pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, hl->tool_x, hl->tool_y, @@ -342,10 +342,10 @@ { /* don't draw outline when ctrl key is pressed */ if (rnd_gui->control_is_pressed(rnd_gui)) { - pcb_crosshair.AttachedLine.draw = pcb_false; + pcb_crosshair.AttachedLine.draw = rnd_false; } else { - pcb_crosshair.AttachedLine.draw = pcb_true; + pcb_crosshair.AttachedLine.draw = rnd_true; pcb_line_adjust_attached(); } } @@ -395,12 +395,12 @@ if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) { if (conf_core.editor.auto_drc) - pcb_undo(pcb_true); /* undo the connection find */ + pcb_undo(rnd_true); /* undo the connection find */ pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_route_reset(&pcb_crosshair.Route); if (!pcb_marked.user_placed) - pcb_crosshair_set_local_ref(0, 0, pcb_false); - return pcb_false; + pcb_crosshair_set_local_ref(0, 0, rnd_false); + return rnd_false; } if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD) { int type; @@ -415,14 +415,14 @@ /* save both ends of line */ pcb_crosshair.AttachedLine.Point2.X = ptr2->Point1.X; pcb_crosshair.AttachedLine.Point2.Y = ptr2->Point1.Y; - if ((type = pcb_undo(pcb_true)) == 0) - pcb_board_set_changed_flag(pcb_true); + if ((type = pcb_undo(rnd_true)) == 0) + pcb_board_set_changed_flag(rnd_true); /* check that the undo was of the right type */ if ((type & PCB_UNDO_CREATE) == 0) { /* wrong undo type, restore anchor points */ pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.AttachedLine.Point1.X; pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y; - return pcb_false; + return rnd_false; } /* move to new anchor */ pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X; @@ -452,9 +452,9 @@ ptr2 = (pcb_line_t *) ptrtmp; last_layer = (pcb_layer_t *) ptr1; } - return pcb_false; + return rnd_false; } - return pcb_true; + return rnd_true; } rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl) @@ -462,9 +462,9 @@ pcb_board_t *pcb = (pcb_board_t *)hl; if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) - return pcb_false; - if (pcb_redo(pcb_true)) { - pcb_board_set_changed_flag(pcb_true); + return rnd_false; + if (pcb_redo(rnd_true)) { + pcb_board_set_changed_flag(rnd_true); if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) { pcb_line_t *line = linelist_last(&PCB_CURRLAYER(pcb)->Line); pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = line->Point2.X; @@ -472,7 +472,7 @@ pcb_added_lines++; } } - return pcb_false; + return rnd_false; } void pcb_tool_line_escape(rnd_hidlib_t *hl) Index: tool_move.c =================================================================== --- tool_move.c (revision 31010) +++ tool_move.c (revision 31011) @@ -45,10 +45,10 @@ void pcb_tool_move_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); pcb_crosshair.extobj_edit = NULL; } @@ -73,7 +73,7 @@ pcb_crosshair.extobj_edit = NULL; } else - pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_true); + pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, rnd_true); } break; } @@ -86,9 +86,9 @@ pcb_any_obj_t *newo = pcb_move_obj_and_rubberband(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, dx, dy); pcb_extobj_float_geo(newo); if (!pcb_marked.user_placed) - pcb_crosshair_set_local_ref(0, 0, pcb_false); + pcb_crosshair_set_local_ref(0, 0, rnd_false); pcb_subc_as_board_update(PCB); - pcb_board_set_changed_flag(pcb_true); + pcb_board_set_changed_flag(rnd_true); } else if (pcb_crosshair.extobj_edit != NULL) pcb_extobj_float_geo(pcb_crosshair.extobj_edit); @@ -124,8 +124,8 @@ { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) - return pcb_false; - return pcb_true; + return rnd_false; + return rnd_true; } pcb_tool_t pcb_tool_move = { Index: tool_poly.c =================================================================== --- tool_poly.c (revision 31010) +++ tool_poly.c (revision 31011) @@ -44,10 +44,10 @@ void pcb_tool_poly_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedPolygon.PointN = 0; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } TODO("remove this when pcb_tool_poly_notify_mode() loses PCB") @@ -94,7 +94,7 @@ /* set the mark to the new starting point so ortho works */ hl->tool_grabbed.X = hl->tool_x; hl->tool_grabbed.Y = hl->tool_y; - hl->tool_grabbed.status = pcb_true; + hl->tool_grabbed.status = rnd_true; } } @@ -103,11 +103,11 @@ pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; if (rnd_gui->control_is_pressed(rnd_gui)) { - line->draw = pcb_false; + line->draw = rnd_false; return; } else - line->draw = pcb_true; + line->draw = rnd_true; if (conf_core.editor.all_direction_lines) { line->Point2.X = pcb_crosshair.X; line->Point2.Y = pcb_crosshair.Y; @@ -135,9 +135,9 @@ { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_prev_point(); - return pcb_false; + return rnd_false; } - return pcb_true; + return rnd_true; } rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl) @@ -144,10 +144,10 @@ { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_next_point(); - return pcb_false; + return rnd_false; } else - return pcb_true; + return rnd_true; } void pcb_tool_poly_escape(rnd_hidlib_t *hl) Index: tool_polyhole.c =================================================================== --- tool_polyhole.c (revision 31010) +++ tool_polyhole.c (revision 31011) @@ -45,10 +45,10 @@ void pcb_tool_polyhole_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedPolygon.PointN = 0; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } TODO("remove this when pcb_tool_polyhole_notify_mode() loses PCB") @@ -96,7 +96,7 @@ /* set the mark to the new starting point so ortho works */ hl->tool_grabbed.X = hl->tool_x; hl->tool_grabbed.Y = hl->tool_y; - hl->tool_grabbed.status = pcb_true; + hl->tool_grabbed.status = rnd_true; } /* check if this is the last point of a polygon */ @@ -133,11 +133,11 @@ pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; if (rnd_gui->control_is_pressed(rnd_gui)) { - line->draw = pcb_false; + line->draw = rnd_false; return; } else - line->draw = pcb_true; + line->draw = rnd_true; if (conf_core.editor.all_direction_lines) { line->Point2.X = pcb_crosshair.X; line->Point2.Y = pcb_crosshair.Y; @@ -165,9 +165,9 @@ { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_prev_point(); - return pcb_false; + return rnd_false; } - return pcb_true; + return rnd_true; } rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl) @@ -174,10 +174,10 @@ { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_next_point(); - return pcb_false; + return rnd_false; } else - return pcb_true; + return rnd_true; } void pcb_tool_polyhole_escape(rnd_hidlib_t *hl) Index: tool_rectangle.c =================================================================== --- tool_rectangle.c (revision 31010) +++ tool_rectangle.c (revision 31011) @@ -48,9 +48,9 @@ void pcb_tool_rectangle_uninit(void) { - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_false); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_false); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; - rnd_hid_notify_crosshair_change(&PCB->hidlib, pcb_true); + rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl) @@ -67,7 +67,7 @@ pcb_crosshair.AttachedBox.Point1.X != pcb_crosshair.AttachedBox.Point2.X && pcb_crosshair.AttachedBox.Point1.Y != pcb_crosshair.AttachedBox.Point2.Y) { pcb_poly_t *polygon; - pcb_layer_t *layer = pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), pcb_true); + pcb_layer_t *layer = pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), rnd_true); int flags = PCB_FLAG_CLEARPOLY; if (conf_core.editor.full_poly) @@ -111,8 +111,8 @@ { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) - return pcb_false; - return pcb_true; + return rnd_false; + return rnd_true; } void pcb_tool_rectangle_escape(rnd_hidlib_t *hl) Index: tool_remove.c =================================================================== --- tool_remove.c (revision 31010) +++ tool_remove.c (revision 31011) @@ -81,7 +81,7 @@ pcb_remove_object(type, ptr1, ptr2, ptr3); pcb_undo_inc_serial(); pcb_subc_as_board_update(PCB); - pcb_board_set_changed_flag(pcb_true); + pcb_board_set_changed_flag(rnd_true); } } Index: tool_text.c =================================================================== --- tool_text.c (revision 31010) +++ tool_text.c (revision 31011) @@ -57,7 +57,7 @@ if (pcb_layer_flags(pcb, PCB_CURRLID(pcb)) & PCB_LYT_BOTTOM) flag |= PCB_FLAG_ONSOLDER; - if ((text = pcb_text_new(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), pcb_true), pcb_font(pcb, conf_core.design.text_font_id, 1), hl->tool_x, + if ((text = pcb_text_new(pcb_loose_subc_layer(pcb, PCB_CURRLAYER(pcb), rnd_true), pcb_font(pcb, conf_core.design.text_font_id, 1), hl->tool_x, hl->tool_y, 0, conf_core.design.text_scale, conf_core.design.text_thickness, string, pcb_flag_make(flag))) != NULL) { pcb_undo_add_obj_to_create(PCB_OBJ_TEXT, PCB_CURRLAYER(pcb), text, text); pcb_undo_inc_serial(); Index: tool_via.c =================================================================== --- tool_via.c (revision 31010) +++ tool_via.c (revision 31011) @@ -69,7 +69,7 @@ { pcb_pstk_t *ps = pcb_pstk_new_compat_via(pcb->Data, -1, hl->tool_x, hl->tool_y, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, - 0, PCB_PSTK_COMPAT_ROUND, pcb_true); + 0, PCB_PSTK_COMPAT_ROUND, rnd_true); if (ps == NULL) return;