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

preview_window() : allow up to 10 simultaneous preview windows open

This commit is contained in:
stefan schippers 2024-04-19 19:05:38 +02:00
parent 372b21ae07
commit 34a06d964d
3 changed files with 82 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scheduler.c
View File

@ -3374,17 +3374,18 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
*/
else if(!strcmp(argv[1], "preview_window"))
{
int res = 0;
if(!xctx) {Tcl_SetResult(interp, not_avail, TCL_STATIC); return TCL_ERROR;}
if(argc == 3) preview_window(argv[2], "", NULL);
else if(argc == 4) preview_window(argv[2], argv[3], NULL);
if(argc == 3) res = preview_window(argv[2], "", NULL);
else if(argc == 4) res = preview_window(argv[2], argv[3], NULL);
else if(argc == 5) {
char f[PATH_MAX + 100];
my_snprintf(f, S(f),"regsub {^~/} {%s} {%s/}", argv[4], home_dir);
tcleval(f);
my_strncpy(f, tclresult(), S(f));
preview_window(argv[2], argv[3], f);
res = preview_window(argv[2], argv[3], f);
}
Tcl_ResetResult(interp);
Tcl_SetResult(interp, my_itoa(res), TCL_VOLATILE);
}

123
src/xinit.c
View File

@ -1180,74 +1180,103 @@ static int source_tcl_file(char *s)
return TCL_OK;
}
void preview_window(const char *what, const char *win_path, const char *fname)
int preview_window(const char *what, const char *win_path, const char *fname)
{
static char *current_file = NULL;
Xschem_ctx *save_xctx = NULL; /* save pointer to current schematic context structure */
static Xschem_ctx *preview_xctx = NULL; /* save pointer to current schematic context structure */
static Tk_Window tkpre_window = NULL;
int result = 0;
static int last_preview = 0;
static char *current_file[10] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
/* save pointer to current schematic context structure */
Xschem_ctx *save_xctx = NULL;
/* save pointer to current schematic context structure */
static Xschem_ctx *preview_xctx[10] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static Tk_Window tkpre_window[10] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static int semaphore=0;
/* avoid reentrant calls for example if an alert box is displayed while loading file to preview,
* and an Expose event calls another preview draw */
if(semaphore) return;
if(semaphore) return 0;
++semaphore;
dbg(1, "------\n");
tclvareval("save_ctx ", xctx->current_win_path, NULL);
if(!strcmp(what, "create")) {
if(!strcmp(what, "create") && last_preview < 4) {
int i;
dbg(1, "preview_window() create, save ctx, win_path=%s\n", win_path);
tkpre_window = Tk_NameToWindow(interp, win_path, mainwindow);
if(tkpre_window) {
Tk_MakeWindowExist(tkpre_window);
for(i = 0; i < 10; i++) {
if(tkpre_window[i] == NULL) break;
}
if(i < 10) {
tkpre_window[i] = Tk_NameToWindow(interp, win_path, mainwindow);
if(tkpre_window[i]) {
Tk_MakeWindowExist(tkpre_window[i]);
result = 1;
last_preview++;
}
}
}
else if(tkpre_window && !strcmp(what, "draw") ) {
else if(!strcmp(what, "draw") ) {
int i;
dbg(1, "preview_window() draw\n");
save_xctx = xctx; /* save current schematic */
xctx = preview_xctx;
if(fname && fname[0] && (!current_file || strcmp(fname, current_file)) ) {
if(current_file) {
delete_schematic_data(1);
}
my_strdup(_ALLOC_ID_, &current_file, fname);
xctx = NULL; /* reset for preview */
alloc_xschem_data(".dialog", ".dialog.drw"); /* alloc data into xctx */
init_pixdata(); /* populate xctx->fill_type array that is used in create_gc() to set fill styles */
preview_xctx = xctx;
preview_xctx->window = Tk_WindowId(tkpre_window);
create_gc();
enable_layers();
build_colors(0.0, 0.0);
resetwin(1, 0, 1, 0, 0); /* create preview pixmap. resetwin(create_pixmap, clear_pixmap, force) */
dbg(1, "preview_window() draw, load schematic\n");
load_schematic(1,fname, 0, 1);
} else {
resetwin(1, 1, 0, 0, 0); /* resetwin(create_pixmap, clear_pixmap, force) */
for(i = 0; i < 10; i++) {
if(Tk_NameToWindow(interp, win_path, mainwindow) == tkpre_window[i]) break;
}
if(i < 10) {
save_xctx = xctx; /* save current schematic */
xctx = preview_xctx[i];
if(fname && fname[0] && (!current_file[i] || strcmp(fname, current_file[i])) ) {
if(current_file[i]) {
delete_schematic_data(1);
}
my_strdup(_ALLOC_ID_, &current_file[i], fname);
xctx = NULL; /* reset for preview */
alloc_xschem_data(".dialog", ".dialog.drw"); /* alloc data into xctx */
init_pixdata(); /* populate xctx->fill_type array that is used in create_gc() to set fill styles */
preview_xctx[i] = xctx;
preview_xctx[i]->window = Tk_WindowId(tkpre_window[i]);
create_gc();
enable_layers();
build_colors(0.0, 0.0);
resetwin(1, 0, 1, 0, 0); /* create preview pixmap. resetwin(create_pixmap, clear_pixmap, force) */
dbg(1, "preview_window() draw, load schematic\n");
load_schematic(1,fname, 0, 1);
} else {
resetwin(1, 1, 0, 0, 0); /* resetwin(create_pixmap, clear_pixmap, force) */
}
zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97); /* draw */
xctx = save_xctx;
result = 1;
}
zoom_full(1, 0, 1 + 2 * tclgetboolvar("zoom_full_center"), 0.97); /* draw */
xctx = save_xctx;
}
else if(!strcmp(what, "destroy") || !strcmp(what, "close")) {
int i;
dbg(1, "preview_window(): %s\n", what);
if(preview_xctx) {
save_xctx = xctx; /* save current schematic */
xctx = preview_xctx;
if(current_file) {
delete_schematic_data(1);
preview_xctx = NULL;
}
my_free(_ALLOC_ID_, &current_file);
xctx = save_xctx; /* restore schematic */
save_xctx = NULL;
set_modify(-1);
for(i = 0; i < 10; i++) {
if(Tk_NameToWindow(interp, win_path, mainwindow) == tkpre_window[i]) break;
}
if(!strcmp(what, "destroy")) {
Tk_DestroyWindow(tkpre_window);
tkpre_window = NULL;
if(i < 10) {
if(preview_xctx[i]) {
save_xctx = xctx; /* save current schematic */
xctx = preview_xctx[i];
if(current_file[i]) {
delete_schematic_data(1);
preview_xctx[i] = NULL;
}
my_free(_ALLOC_ID_, &current_file[i]);
tkpre_window[i] = NULL;
xctx = save_xctx; /* restore schematic */
save_xctx = NULL;
set_modify(-1);
result = 1;
if(!strcmp(what, "destroy")) {
Tk_DestroyWindow(tkpre_window[i]);
}
last_preview--;
}
}
}
tclvareval("restore_ctx ", xctx->current_win_path, NULL);
semaphore--;
return result;
}

2
src/xschem.h
View File

@ -1720,7 +1720,7 @@ extern void list_hilights(int all);
extern void change_layer();
extern void launcher();
extern void windowid(const char *winpath);
extern void preview_window(const char *what, const char *tk_win_path, const char *fname);
extern int preview_window(const char *what, const char *tk_win_path, const char *fname);
extern int new_schematic(const char *what, const char *win_path, const char *fname, int dr);
extern void toggle_fullscreen(const char *topwin);
extern void toggle_only_probes();