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

Resolve conflicts and merge.

This commit is contained in:
Chayan Deb 2025-03-18 13:54:19 +05:30
parent 0f9d201f0a d430ce9867
commit f6a2c2adf0
2 changed files with 7 additions and 6 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.c
src/parselabel.h src/parselabel.h
# Config file for C/C++ code formatter (clang-format)
.clang-format
# Executables # Executables
*.exe *.exe
src/rawtovcd src/rawtovcd

10
src/callback.c
View File

@ -2609,7 +2609,6 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
int cadence_compat, int wire_draw_active, int snap_cursor) int cadence_compat, int wire_draw_active, int snap_cursor)
{ {
char str[PATH_MAX + 100]; char str[PATH_MAX + 100];
int dr_gr;
switch (key) { switch (key) {
case '0': case '0':
case '1': case '1':
@ -3747,7 +3746,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
else if(rstate==ControlMask) { /* zoom out */ else if(rstate==ControlMask) { /* zoom out */
view_unzoom(0.0); view_unzoom(0.0);
} }
else if(EQUAL_MODMASK && cadence_compat) { /* toggle snap-cursor option */ else if(EQUAL_MODMASK) { /* toggle snap-cursor option */
if(tclgetboolvar("snap_cursor")) { if(tclgetboolvar("snap_cursor")) {
tclsetvar("snap_cursor", "0"); tclsetvar("snap_cursor", "0");
draw_snap_cursor(1); draw_snap_cursor(1);
@ -3804,6 +3803,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
break; break;
case '%': /* toggle draw grid */ case '%': /* toggle draw grid */
int dr_gr;
dr_gr = tclgetboolvar("draw_grid"); dr_gr = tclgetboolvar("draw_grid");
dr_gr =!dr_gr; dr_gr =!dr_gr;
if(dr_gr) { if(dr_gr) {
@ -4509,10 +4509,8 @@ static void handle_double_click(int event, int state, KeySym key, int button,
edit_property(0); edit_property(0);
} else { } else {
if(xctx->ui_state & STARTWIRE) { if(xctx->ui_state & STARTWIRE) {
if( cadence_compat ) { redraw_w_a_l_r_p_z_rubbers(1);
redraw_w_a_l_r_p_z_rubbers(1); start_wire(mx, my);
start_wire(mx, my);
}
xctx->ui_state &= ~STARTWIRE; xctx->ui_state &= ~STARTWIRE;
} }
if(xctx->ui_state & STARTLINE) { if(xctx->ui_state & STARTLINE) {