Merge branch 'StefanSchippers:master' into master
This commit is contained in:
commit
3081714ebf
|
|
@ -614,6 +614,7 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
|
||||||
/* Numerically set cursor position *** DO NOT PUT AN `else if` BELOW *** */
|
/* Numerically set cursor position *** DO NOT PUT AN `else if` BELOW *** */
|
||||||
if(xctx->graph_flags & 4) {
|
if(xctx->graph_flags & 4) {
|
||||||
double logcursor, cursor;
|
double logcursor, cursor;
|
||||||
|
int floaters = there_are_floaters();
|
||||||
if(r->flags & 4) { /* private_cursor */
|
if(r->flags & 4) { /* private_cursor */
|
||||||
const char *s = get_tok_value(r->prop_ptr, "cursor2_x", 0);
|
const char *s = get_tok_value(r->prop_ptr, "cursor2_x", 0);
|
||||||
if(s[0]) {
|
if(s[0]) {
|
||||||
|
|
@ -638,7 +639,13 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
|
||||||
}
|
}
|
||||||
event = 0; button = 0; /* avoid further processing ButtonPress that might set GRAPHPAN */
|
event = 0; button = 0; /* avoid further processing ButtonPress that might set GRAPHPAN */
|
||||||
}
|
}
|
||||||
need_fullredraw = 1;
|
if(tclgetboolvar("live_cursor2_backannotate")) {
|
||||||
|
backannotate_at_cursor_b_pos(r, gr);
|
||||||
|
if(floaters) set_modify(-2); /* update floater caches to reflect actual backannotation */
|
||||||
|
need_fullredraw = 1;
|
||||||
|
} else {
|
||||||
|
need_all_redraw = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* Numerically set hcursor position *** DO NOT PUT AN `else if` BELOW *** */
|
/* Numerically set hcursor position *** DO NOT PUT AN `else if` BELOW *** */
|
||||||
if(xctx->graph_flags & 128) {
|
if(xctx->graph_flags & 128) {
|
||||||
|
|
|
||||||
1208
src/save.c
1208
src/save.c
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,6 @@
|
||||||
v {xschem version=2.9.7 file_version=1.2}
|
v {xschem version=3.4.6 file_version=1.2}
|
||||||
G {type=lcc_iopin
|
G {}
|
||||||
|
K {type=lcc_iopin
|
||||||
format="*.iopin @lab"
|
format="*.iopin @lab"
|
||||||
template="name=p1 lab=xxx"
|
template="name=p1 lab=xxx"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
v {xschem version=2.9.7 file_version=1.2}
|
v {xschem version=3.4.6 file_version=1.2}
|
||||||
G {type=lcc_ipin
|
G {}
|
||||||
|
K {type=lcc_ipin
|
||||||
format="*.ipin @lab"
|
format="*.ipin @lab"
|
||||||
template="name=p1 lab=xxx"
|
template="name=p1 lab=xxx"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
v {xschem version=2.9.7 file_version=1.2}
|
v {xschem version=3.4.6 file_version=1.2}
|
||||||
G {type=lcc_opin
|
G {}
|
||||||
|
K {type=lcc_opin
|
||||||
format="*.opin @lab"
|
format="*.opin @lab"
|
||||||
template="name=p1 lab=xxx"
|
template="name=p1 lab=xxx"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue