diff --git a/doc/xschem_man/run_xschem.html b/doc/xschem_man/run_xschem.html index e2e08dd3..a308ddff 100644 --- a/doc/xschem_man/run_xschem.html +++ b/doc/xschem_man/run_xschem.html @@ -68,8 +68,6 @@ Options: -s --spice Set netlist type to SPICE. -3 --a3page Set page size for pdf export to A3. -x --no_x Don't use X (only command mode). - --events Do not use tclreadline, empty tcl shell prompt, dump - activity on stdout for remote controlling other software. -z --rainbow Use a raibow-looking layer color table. -W --waves Show simulation waveforms. -f --flat_netlist Set flat netlist (for spice format only). diff --git a/src/actions.c b/src/actions.c index 4c30df0e..b0ebc6ef 100644 --- a/src/actions.c +++ b/src/actions.c @@ -640,11 +640,6 @@ void remove_symbols(void) remove_symbol(j); } dbg(1, "remove_symbols(): done\n"); - if(event_reporting) { - printf("xschem remove_symbols\n"); - fflush(stdout); - } - } void clear_drawing(void) @@ -1735,10 +1730,6 @@ void new_wire(int what, double mx_snap, double my_snap) storeobject(-1, xx1,yy1,xx2,yy2,WIRE,0,0,NULL); drawline(WIRELAYER,NOW, xx1,yy1,xx2,yy2, 0); } - if(event_reporting) { - printf("xschem wire %g %g %g %g %d\n", xx1, yy1, xx2, yy2, -1); - fflush(stdout); - } hash_wire(XINSERT, xctx->wires-1, 1); /* prepared_hash_wires = 0; */ prepared_hilight_structs = 0; diff --git a/src/editprop.c b/src/editprop.c index 03cce71d..f6c5e5c7 100644 --- a/src/editprop.c +++ b/src/editprop.c @@ -1000,15 +1000,6 @@ void update_symbol(const char *result, int x) /* if number of pins is different we must delete these data *before* */ /* changing ysmbol, otherwise i might end up deleting non allocated data. */ my_strdup(82, &xctx->inst[i].name, rel_sym_path(symbol)); - if(event_reporting) { - char n1[PATH_MAX]; - char n2[PATH_MAX]; - printf("xschem replace_symbol %s %s\n", - escape_chars(n1, xctx->inst[i].instname, PATH_MAX), - escape_chars(n2, symbol, PATH_MAX) - ); - fflush(stdout); - } xctx->inst[i].ptr=sym_number; /* update instance to point to new symbol */ } bbox(ADD, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2); @@ -1071,13 +1062,6 @@ void update_symbol(const char *result, int x) if(cond) xctx->inst[i].flags|=2; /* bit 1: flag for different textlayer for pin/labels */ else xctx->inst[i].flags &=~2; } - - if(event_reporting) { - char *ss=NULL; - my_strdup(120, &ss, xctx->inst[i].prop_ptr); - set_different_token(&ss, new_prop, old_prop, ELEMENT, i); - my_free(730, &ss); - } my_strdup2(90, &xctx->inst[i].instname, get_tok_value(xctx->inst[i].prop_ptr, "name",0)); } /* end for(k=0;kcurrsch = 0; my_strncpy(xctx->sch[xctx->currsch], "", S(xctx->sch[xctx->currsch])); - if(event_reporting) { - printf("xschem clear_drawing\n"); - printf("xschem unselect_all\n"); - fflush(stdout); - } } diff --git a/src/globals.c b/src/globals.c index 7312ef4c..91e76a40 100644 --- a/src/globals.c +++ b/src/globals.c @@ -126,7 +126,6 @@ int a3page=-1; int has_x=1; int no_draw=0; int sym_txt=1; -int event_reporting=0; int rainbow_colors=0; int manhattan_lines=0; FILE *errfp; diff --git a/src/hilight.c b/src/hilight.c index 7d8e636a..c9d6fac8 100644 --- a/src/hilight.c +++ b/src/hilight.c @@ -291,10 +291,6 @@ void delete_hilight_net(void) int i; if(!hilight_nets) return; free_hilight_hash(); - if(event_reporting) { - printf("xschem clear_hilights\n"); - fflush(stdout); - } hilight_nets=0; for(i=0;iinstances;i++) { @@ -658,10 +654,6 @@ int search(const char *tok, const char *val, int sub, int sel, int what) #endif draw_window = save_draw; - if(event_reporting) { - printf("xschem search %s %d %s %s\n", (sub ? "exact" : "regex"), sel, tok, val); - fflush(stdout); - } my_free(771, &tmpname); if(found) return 1; else return 0; } @@ -828,11 +820,6 @@ void hilight_net(int to_waveform) switch(selectedgroup[i].type) { case WIRE: - if(event_reporting) { - char s[PATH_MAX]; - printf("xschem search exact %d lab %s\n", 0, escape_chars(s, xctx->wire[n].node, PATH_MAX)); - fflush(stdout); - } hilight_nets=1; if(!bus_hilight_lookup(xctx->wire[n].node, hilight_color, XINSERT)) { if(to_waveform == GAW) send_net_to_gaw(sim_is_xyce, xctx->wire[n].node); @@ -842,22 +829,12 @@ void hilight_net(int to_waveform) case ELEMENT: type = (xctx->inst[n].ptr+ xctx->sym)->type; if( type && xctx->inst[n].node && IS_LABEL_SH_OR_PIN(type) ) { /* instance must have a pin! */ - if(event_reporting) { - char s[PATH_MAX]; - printf("xschem search exact %d lab %s\n", 0, escape_chars(s, xctx->inst[n].node[0], PATH_MAX)); - fflush(stdout); - } if(!bus_hilight_lookup(xctx->inst[n].node[0], hilight_color, XINSERT)) { if(to_waveform == GAW) send_net_to_gaw(sim_is_xyce, xctx->inst[n].node[0]); hilight_nets=1; if(incr_hilight) hilight_color++; } } else { - if(event_reporting) { - char s[PATH_MAX]; - printf("xschem search exact %d name %s\n", 0, escape_chars(s, xctx->inst[n].instname, PATH_MAX)); - fflush(stdout); - } dbg(1, "hilight_net(): setting hilight flag on inst %d\n",n); hilight_nets=1; xctx->inst[n].flags |= 4; @@ -892,30 +869,14 @@ void unhilight_net(void) switch(selectedgroup[i].type) { case WIRE: - if(event_reporting) { - char s[PATH_MAX]; - printf("xschem search exact %d lab %s\n", 1, escape_chars(s, xctx->wire[n].node, PATH_MAX)); - printf("xschem unhilight\n"); - fflush(stdout); - } bus_hilight_lookup(xctx->wire[n].node, hilight_color, XDELETE); break; case ELEMENT: type = (xctx->inst[n].ptr+ xctx->sym)->type; if( type && xctx->inst[n].node && IS_LABEL_SH_OR_PIN(type) ) { /* instance must have a pin! */ - if(event_reporting) { - printf("xschem unhilight\n"); - fflush(stdout); - } bus_hilight_lookup(xctx->inst[n].node[0], hilight_color, XDELETE); } else { - if(event_reporting) { - char s[PATH_MAX]; - printf("xschem search exact %d name %s\n", 1, escape_chars(s, xctx->inst[n].instname, PATH_MAX)); - printf("xschem unhilight\n"); - fflush(stdout); - } } xctx->inst[n].flags &= ~4; break; diff --git a/src/move.c b/src/move.c index f43d7f40..34b06c39 100644 --- a/src/move.c +++ b/src/move.c @@ -1051,11 +1051,6 @@ void move_objects(int what, int merge, double dx, double dy) deltay = dy; } - if(event_reporting) { - printf("xschem move_objects %g %g\n", deltax, deltay); - fflush(stdout); - } - /* calculate moving symbols bboxes before actually doing the move */ firsti = firstw = 1; for(i=0;isch[xctx->currsch]); if(!name[0]) return; - if(event_reporting) { - char n[PATH_MAX]; - printf("xschem load %s\n", escape_chars(n, name, PATH_MAX)); - fflush(stdout); - } if( (fd=fopen(name,fopen_read_mode))== NULL) { fprintf(errfp, "load_schematic(): unable to open file: %s, filename=%s\n", name, filename ? filename : ""); @@ -1234,12 +1229,6 @@ void pop_undo(int redo) update_conn_cues(0, 0); dbg(2, "pop_undo(): returning\n"); - if(event_reporting) { - if(redo) printf("xschem redo\n"); - else printf("xschem undo\n"); - printf("xschem redraw\n"); - fflush(stdout); - } } #endif /* ifndef IN_MEMORY_UNDO */ diff --git a/src/scheduler.c b/src/scheduler.c index 684058ed..9534bdcb 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -1889,12 +1889,6 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg else Tcl_AppendResult(interp, "0",NULL); } - else if(!strcmp(argv[2],"event_reporting")) { - if( event_reporting != 0 ) - Tcl_AppendResult(interp, "1",NULL); - else - Tcl_AppendResult(interp, "0",NULL); - } else if(!strcmp(argv[2],"a3page")) { if( a3page != 0 ) Tcl_AppendResult(interp, "1",NULL); @@ -2194,9 +2188,6 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg else if(!strcmp(argv[2],"only_probes")) { only_probes=atoi(argv[3]); } - else if(!strcmp(argv[2],"event_reporting")) { - event_reporting=atoi(argv[3]); - } else if(!strcmp(argv[2],"draw_grid")) { draw_grid=atoi(argv[3]); } diff --git a/src/select.c b/src/select.c index ca109f4b..b9210a49 100644 --- a/src/select.c +++ b/src/select.c @@ -369,10 +369,6 @@ void delete(void) draw(); bbox(END , 0.0 , 0.0 , 0.0 , 0.0); ui_state &= ~SELECTION; - if(event_reporting) { - printf("xschem delete\n"); - fflush(stdout); - } } @@ -525,11 +521,6 @@ void unselect_all(void) xctx->inst[i].sel = 0; for(c=0;cinst[i].instname, PATH_MAX)); - fflush(stdout); - } } } for(i=0;itexts;i++) @@ -600,10 +591,6 @@ void unselect_all(void) /*\statusmsg("",2); */ my_snprintf(str, S(str), "%s/%s", user_conf_dir, ".selection.sch"); /* 20161115 PWD->HOME */ xunlink(str); - if(event_reporting) { - printf("xschem unselect_all\n"); - fflush(stdout); - } } @@ -653,12 +640,6 @@ void select_element(int i,unsigned short select_mode, int fast, int override_loc if(!strcmp(get_tok_value(xctx->inst[i].prop_ptr, "lock", 0), "true") && select_mode == SELECTED && !override_lock) return; my_strncpy(s,xctx->inst[i].prop_ptr!=NULL?xctx->inst[i].prop_ptr:"",S(s)); - if(event_reporting) { - char n[PATH_MAX]; - printf("xschem search exact %d name %s\n", - select_mode? 1:-1, escape_chars(n, xctx->inst[i].instname, PATH_MAX)); - fflush(stdout); - } if( !fast ) { my_snprintf(str, S(str), "selected element %d: %s properties: %s", i, xctx->inst[i].name,s); diff --git a/src/token.c b/src/token.c index 48130740..7539211c 100644 --- a/src/token.c +++ b/src/token.c @@ -324,17 +324,6 @@ int set_different_token(char **s,const char *new, const char *old, int object, i value[value_pos]='\0'; value_pos=0; if(strcmp(value, get_tok_value(old,token,1))) { - if(event_reporting && object == ELEMENT) { - char n1[PATH_MAX]; - char n2[PATH_MAX]; - char n3[PATH_MAX]; - printf("xschem setprop %s %s %s\n", - escape_chars(n1, xctx->inst[n].instname, PATH_MAX), - escape_chars(n2, token, PATH_MAX), - escape_chars(n3, value, PATH_MAX) - ); - fflush(stdout); - } mod=1; my_strdup(433, s, subst_token(*s, token, value) ); } @@ -369,16 +358,6 @@ int set_different_token(char **s,const char *new, const char *old, int object, i } get_tok_value(new,token,1); if(get_tok_size == 0 ) { - - if(event_reporting && object == ELEMENT) { - char n1[PATH_MAX]; - char n2[PATH_MAX]; - printf("xschem setprop %s %s\n", - escape_chars(n1, xctx->inst[n].instname, PATH_MAX), - escape_chars(n2, token, PATH_MAX) - ); - fflush(stdout); - } mod=1; my_strdup(443, s, subst_token(*s, token, NULL) ); } diff --git a/src/xinit.c b/src/xinit.c index 60365cad..0c039d47 100644 --- a/src/xinit.c +++ b/src/xinit.c @@ -834,7 +834,7 @@ void preview_window(const char *what, const char *tk_win_path, const char *filen else if(!strcmp(what, "draw")) { Xschem_ctx *save_xctx = NULL; /* save pointer to current schematic context structure */ char *saveptr = NULL; - int save_mod, save_ev, save_show_pin; + int save_mod, save_show_pin; Pixmap save_save_pixmap; Window save_window; @@ -847,8 +847,6 @@ void preview_window(const char *what, const char *tk_win_path, const char *filen save_window = window; save_save_pixmap = save_pixmap; save_mod = modified; - save_ev = event_reporting; - event_reporting = 0; save_show_pin = show_pin_net_names; show_pin_net_names = 0; my_strdup(117, &saveptr, tclgetvar("current_dirname")); @@ -892,7 +890,6 @@ void preview_window(const char *what, const char *tk_win_path, const char *filen change_linewidth(-1.); /* not needed: event loop takes care of this and don't need to regenerate save_pixmap. */ /* draw(); */ - event_reporting = save_ev; } else if(!strcmp(what, "destroy")) { Tk_DestroyWindow(tkpre_window); @@ -1489,12 +1486,6 @@ int Tcl_AppInit(Tcl_Interp *inter) /* START PROCESSING USER OPTIONS */ /* */ - if(event_reporting) { - tcleval("set tcl_prompt1 {}"); - tcleval("set tcl_prompt2 {}"); - } - - /* set tcl netlist_dir if netlist_dir given on cmdline */ if(netlist_dir && netlist_dir[0]) tclsetvar("netlist_dir", netlist_dir); diff --git a/src/xschem.h b/src/xschem.h index 392ef113..a2d6f76d 100644 --- a/src/xschem.h +++ b/src/xschem.h @@ -601,7 +601,6 @@ extern int prepared_hash_wires; extern int has_x; extern int no_draw; extern int sym_txt; -extern int event_reporting; extern int rainbow_colors; extern FILE *errfp; extern int no_readline; diff --git a/src/xschem.help b/src/xschem.help index 9308040b..85e275a6 100644 --- a/src/xschem.help +++ b/src/xschem.help @@ -22,8 +22,6 @@ Options: -s --spice Set netlist type to SPICE. -3 --a3page Set page size for pdf export to A3. -x --no_x Don't use X (only command mode). - --events Do not use tclreadline, empty tcl shell prompt, dump - activity on stdout for remote controlling other software. -z --rainbow Use a raibow-looking layer color table. -W --waves Show simulation waveforms. -f --flat_netlist Set flat netlist (for spice format only).