luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Resolve Merge Conflicts With Upstream]: Resolved all merge conflicts with upstream branch and updated the forked repo to be compatible with future patches/updates from upstream.

This commit is contained in:
Chayan Deb 2025-03-14 20:35:51 +05:30
parent 08397f7038 333dc91b48
commit 743266eb61
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -23,6 +23,9 @@ src/eval_expr.c
src/parselabel.c
src/parselabel.h
# Config file for C/C++ code formatter (clang-format)
.clang-format
# Executables
*.exe
src/rawtovcd

21
src/callback.c
View File

@ -107,6 +107,7 @@ void redraw_w_a_l_r_p_z_rubbers(int force)
{
double mx = xctx->mousex_snap;
double my = xctx->mousey_snap;
double origin_shifted_x2, origin_shifted_y2;
if(!force && xctx->mousex_snap == xctx->prev_rubberx && xctx->mousey_snap == xctx->prev_rubbery) return;
@ -115,12 +116,11 @@ void redraw_w_a_l_r_p_z_rubbers(int force)
if(xctx->constr_mv == 1) my = xctx->my_double_save;
if(xctx->constr_mv == 2) mx = xctx->mx_double_save;
if(tclgetboolvar("orthogonal_wiring")) {
/* Origin shift the cartesian coordinate p2(x2,y2) w.r.t. p1(x1,y1) */
double origin_shifted_x2 = xctx->nl_x2 - xctx->nl_x1;
double origin_shifted_y2 = xctx->nl_y2 - xctx->nl_y1;
new_wire(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
/* Draw whichever component of the resulting orthogonal-wire is bigger
* (either horizontal or vertical), first */
/* Origin shift the cartesian coordinate p2(x2,y2) w.r.t. p1(x1,y1) */
origin_shifted_x2 = xctx->nl_x2 - xctx->nl_x1;
origin_shifted_y2 = xctx->nl_y2 - xctx->nl_y1;
/* Draw whichever component of the resulting orthogonal-wire is bigger (either horizontal or vertical), first */
if(origin_shifted_x2*origin_shifted_x2 > origin_shifted_y2*origin_shifted_y2){
xctx->manhattan_lines = 1;
} else {
@ -257,7 +257,7 @@ void start_wire(double mx, double my)
xctx->my_double_save=my;
}
new_wire(PLACE,mx, my);
if(tclgetboolvar("orthogonal_wiring") && !tclgetboolvar("constr_mv")) {
if(tclgetboolvar("orthogonal_wiring") && !tclgetboolvar("constr_mv")){
xctx->constr_mv = 0;
}
}
@ -3800,6 +3800,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
break;
case '%': /* toggle draw grid */
int dr_gr;
dr_gr = tclgetboolvar("draw_grid");
dr_gr =!dr_gr;
if(dr_gr) {
@ -4131,9 +4132,9 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
static void handle_button_press(int event, int state, int rstate, KeySym key, int button, int mx, int my,
double c_snap, int draw_xhair, int crosshair_size, int enable_stretch, int aux)
{
dbg(1, "callback(): ButtonPress ui_state=%d state=%d\n",xctx->ui_state,state);
int use_cursor_for_sel = tclgetintvar("use_cursor_for_selection");
int excl = xctx->ui_state & (STARTWIRE | STARTRECT | STARTLINE | STARTPOLYGON | STARTARC);
dbg(1, "callback(): ButtonPress ui_state=%d state=%d\n",xctx->ui_state,state);
if(waves_selected(event, key, state, button)) {
waves_callback(event, mx, my, key, button, aux, state);
return;
@ -4505,10 +4506,8 @@ static void handle_double_click(int event, int state, KeySym key, int button,
edit_property(0);
} else {
if(xctx->ui_state & STARTWIRE) {
if( cadence_compat ) {
redraw_w_a_l_r_p_z_rubbers(1);
start_wire(mx, my);
}
redraw_w_a_l_r_p_z_rubbers(1);
start_wire(mx, my);
xctx->ui_state &= ~STARTWIRE;
}
if(xctx->ui_state & STARTLINE) {

5
src/xschem.tcl
View File

@ -8736,13 +8736,12 @@ proc build_widgets { {topwin {} } } {
-variable intuitive_interface -selectcolor $selectcolor \
-command {xschem set intuitive_interface $intuitive_interface}
$topwin.menubar.option add cascade -label "Crosshair" \
-menu $topwin.menubar.option.crosshair
menu $topwin.menubar.option.crosshair -tearoff 0
$topwin.menubar.option.crosshair add checkbutton -label "Draw snap cursor" -accelerator {Alt-Z} \
-variable snap_cursor -selectcolor $selectcolor
$topwin.menubar.option.crosshair add checkbutton -label "Draw snap cursor" \
-variable snap_cursor -selectcolor $selectcolor -accelerator {Alt-Z}
$topwin.menubar.option.crosshair add checkbutton -label "Draw crosshair" \
-variable draw_crosshair -selectcolor $selectcolor -accelerator {Alt-X}
$topwin.menubar.option.crosshair add command -label "Crosshair size" \