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

"xschem load -nofullzoom file1 file2 ...": apply -nofullzoom also to additional file2 ... windows/tabs

This commit is contained in:
stefan schippers 2026-05-14 07:55:09 +02:00
parent eeb25a8c73
commit 0b4e5dbfea
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scheduler.c
View File

@ -3174,7 +3174,8 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
dbg(1, "scheduler: undo_reset=%d\n", undo_reset);
if(first_loaded) {
ret = new_schematic("create", "noconfirm", f, 1);
int dr = nofullzoom ? 3 : 1;
ret = new_schematic("create", "noconfirm", f, dr);
if(undo_reset) {
tclvareval("update_recent_file {", f, "}", NULL);
}

16
src/xinit.c
View File

@ -1629,6 +1629,9 @@ static int switch_tab(int *window_count, const char *win_path, int dr)
}
/* non NULL and not empty win_path is used to avoid warning for duplicated filenames */
/* dr: 1 : draw
3 : draw without doing a fullzoom
*/
static void create_new_window(int *window_count, const char *win_path, const char *fname, int dr)
{
double save_lw = xctx->lw;
@ -1720,7 +1723,7 @@ static void create_new_window(int *window_count, const char *win_path, const cha
enable_layers();
build_colors(0.0, 0.0);
resetwin(1, 0, 1, 0, 0); /* resetwin(create_pixmap, clear_pixmap, force, w, h) */
if(!loaded) {
if(!loaded && !(dr & 3)) {
xctx->zoom = CADINITIALZOOM;
xctx->mooz = 1 / CADINITIALZOOM;
xctx->xorigin = CADINITIALX;
@ -1732,7 +1735,7 @@ static void create_new_window(int *window_count, const char *win_path, const cha
xctx->yorigin =old_xctx->yorigin;
}
load_schematic(1, fname, 1, confirm);
if(!loaded && dr) xctx->pending_fullzoom=1;
if(!loaded && (dr & 1) && !(dr & 3) ) xctx->pending_fullzoom=1;
tclvareval("set_bindings ", window_path[n], NULL);
if(has_x) {
tclvareval("set_geom ", toppath, " [xschem get current_name]", NULL);
@ -1751,6 +1754,9 @@ static void create_new_window(int *window_count, const char *win_path, const cha
}
/* non NULL and not empty noconfirm is used to avoid warning for duplicated filenames */
/* dr: 1 : draw
3 : draw without doing a fullzoom
*/
static void create_new_tab(int *window_count, const char *noconfirm, const char *fname, int dr)
{
char open_path[WINDOW_PATH_SIZE];
@ -1847,7 +1853,7 @@ static void create_new_tab(int *window_count, const char *noconfirm, const char
build_colors(0.0, 0.0);
resetwin(1, 0, 1, 0, 0); /* resetwin(create_pixmap, clear_pixmap, force, w, h) */
tclvareval("housekeeping_ctx", NULL);
if(!loaded) {
if(!loaded && !(dr & 3)) {
xctx->zoom = CADINITIALZOOM;
xctx->mooz = 1 / CADINITIALZOOM;
xctx->xorigin = CADINITIALX;
@ -1859,8 +1865,8 @@ static void create_new_tab(int *window_count, const char *noconfirm, const char
xctx->yorigin =old_xctx->yorigin;
}
load_schematic(1,fname, 1, confirm);
if(dr) {
if(!loaded) zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97); /* draw */
if(dr & 1) {
if(!loaded && !(dr & 3) ) zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97); /* draw */
else draw();
}
tcleval("tab_queue STORE");