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

various enhancements / fixes in file_chooser; removed new_file_browser_paths

This commit is contained in:
stefan schippers 2025-10-05 12:38:24 +02:00
parent bbfe350e3f
commit 136a61b4fc
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/callback.c
View File

@ -2933,7 +2933,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
}
else if(rstate == ControlMask) { /* insert sym */
if(tclgetboolvar("new_file_browser")) {
tcleval("file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext");
tcleval("file_chooser $new_file_browser_depth $new_file_browser_ext");
} else {
tcleval("load_file_dialog {Insert symbol} *.\\{sym,tcl\\} INITIALINSTDIR 2");
}
@ -2950,7 +2950,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
if(rstate == 0) { /* insert sym */
if(xctx->semaphore >= 2) break;
if(tclgetboolvar("new_file_browser")) {
tcleval("file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext");
tcleval("file_chooser $new_file_browser_depth $new_file_browser_ext");
} else {
start_place_symbol();
}
@ -3208,7 +3208,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
if(xctx->semaphore >= 2) break;
if(tclgetboolvar("new_file_browser")) {
tcleval(
"file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext"
"file_chooser $new_file_browser_depth $new_file_browser_ext"
);
} else {
xctx->semaphore--;
@ -3956,7 +3956,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
case XK_Insert:
if(state == ShiftMask) { /* insert sym */
if(tclgetboolvar("new_file_browser")) {
tcleval("file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext");
tcleval("file_chooser $new_file_browser_depth $new_file_browser_ext");
} else {
tcleval("load_file_dialog {Insert symbol} *.\\{sym,tcl\\} INITIALINSTDIR 2");
}
@ -3964,7 +3964,7 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
else {
if(xctx->semaphore >= 2) break;
if(tclgetboolvar("new_file_browser")) {
tcleval("file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext");
tcleval("file_chooser new_file_browser_depth $new_file_browser_ext");
} else {
start_place_symbol();
}

2
src/scheduler.c
View File

@ -3040,7 +3040,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
if(argc==first && !(lastclosed || lastopened)) {
if(tclgetboolvar("new_file_browser")) {
tcleval(
"file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext"
"file_chooser $new_file_browser_depth $new_file_browser_ext"
);
} else {
ask_new_file(0, NULL);

32
src/xschem.tcl
View File

@ -5075,12 +5075,11 @@ proc file_chooser_dirlist {} {
if {$dark_gui_colorscheme} { set col {cyan} } else { set col {blue} }
# regenerate list of dirs
set file_chooser(dirs) [
get_list_of_dirs_with_files $file_chooser(paths) $file_chooser(maxdepth) $file_chooser(ext)
get_list_of_dirs_with_files {} $file_chooser(maxdepth) $file_chooser(ext)
]
set file_chooser(dirtails) {}
set path_l $file_chooser(paths)
if {$path_l eq {}} { set path_l $pathlist}
set path_l $pathlist
foreach i $file_chooser(dirs) {
set found 0
foreach p $path_l {
@ -5198,7 +5197,7 @@ proc file_chooser_search {} {
set f {}
if {$file_chooser(dirs) ne {} } {
set allfiles [
match_file $file_chooser(regex) $file_chooser(paths) $file_chooser(maxdepth) $file_chooser(fullpath)
match_file $file_chooser(regex) {} $file_chooser(maxdepth) $file_chooser(fullpath)
]
foreach i $allfiles {
set err [catch {regexp $file_chooser(ext) $i} type]
@ -5262,7 +5261,7 @@ proc file_chooser_browsedir {} {
}
proc file_chooser_edit_paths {} {
global pathlist XSCHEM_LIBRARY_PATH dark_gui_colorscheme
global pathlist XSCHEM_LIBRARY_PATH dark_gui_colorscheme file_chooser
if {$dark_gui_colorscheme} { set col {cyan} } else { set col {blue} }
set tctx::rcode 0
toplevel .editpaths
@ -5300,7 +5299,9 @@ proc file_chooser_edit_paths {} {
regsub -all {:} $paths \n paths
.editpaths.center.paths delete 1.0 end
.editpaths.center.paths insert 1.0 $paths
tkwait window .editpaths
if {$tctx::rcode == 1} {
set paths $tctx::retval
regsub -all -line {^[ \t]*\n} $paths {} paths ;# remove blank lines
@ -5310,13 +5311,12 @@ proc file_chooser_edit_paths {} {
}
#### maxdepth: how many levels to descend for each $paths directory (-1: no limit)
proc file_chooser {{paths {}} {maxdepth -1} {ext {.*}} } {
proc file_chooser { {maxdepth -1} {ext {.*}} } {
global file_chooser
set file_chooser(action) load
set_ne file_chooser(fullpath) 0
set_ne file_chooser(ontop) 1
set file_chooser(maxdepth) $maxdepth
set file_chooser(paths) [cleanup_paths $paths] ;# remove ~ and other strange path combinations
# xschem set semaphore [expr {[xschem get semaphore] +1}]
set file_chooser(ext) $ext
if {[winfo exists .ins]} {
@ -5551,6 +5551,8 @@ proc file_chooser {{paths {}} {maxdepth -1} {ext {.*}} } {
# wm geometry .ins 800x300
}
update
.ins.center paneconfigure .ins.center.leftdir -minsize [winfo reqwidth .ins.center.leftdir]
.ins.center paneconfigure .ins.center.left -minsize [winfo reqwidth .ins.center.left]
if { [info exists file_chooser(sp0)]} {
.ins.center sash place 0 $file_chooser(sp0) 1
}
@ -9590,7 +9592,7 @@ proc build_widgets { {topwin {} } } {
$topwin.menubar.file add command -label "Component browser" -accelerator {Shift-Ins, Ctrl-I} \
-command {
if {$new_file_browser} {
file_chooser $new_file_browser_paths $new_file_browser_depth $new_file_browser_ext
file_chooser $new_file_browser_depth $new_file_browser_ext
} else {
load_file_dialog {Insert symbol} *.sym INITIALINSTDIR 2
}
@ -10245,7 +10247,7 @@ proc trace_set_paths {varname idxname op} {
}
proc cleanup_paths {paths} {
global env
set pathlist {}
set path_l {}
foreach i $paths {
regsub {^~$} $i ${env(HOME)} i
regsub {^~/} $i ${env(HOME)}/ i
@ -10257,10 +10259,10 @@ proc cleanup_paths {paths} {
set i [file normalize $i]
}
if { [file exists $i] } {
lappend pathlist $i
lappend path_l $i
}
}
return $pathlist
return $path_l
}
# when XSCHEM_LIBRARY_PATH is changed call this function to refresh and cache
@ -10270,18 +10272,18 @@ proc set_paths {} {
# puts stderr "caching search paths"
if { [info exists XSCHEM_LIBRARY_PATH] } {
if {$OS == "Windows"} {
set pathlist_orig [split $XSCHEM_LIBRARY_PATH \;]
set path_l_orig [split $XSCHEM_LIBRARY_PATH \;]
if {$add_all_windows_drives} {
set win_vol [file volumes]
foreach disk $win_vol {
lappend pathlist_orig $disk
lappend path_l_orig $disk
}
}
} else {
set pathlist_orig [split $XSCHEM_LIBRARY_PATH :]
set path_l_orig [split $XSCHEM_LIBRARY_PATH :]
}
set pathlist [cleanup_paths $pathlist_orig]
set pathlist [cleanup_paths $path_l_orig]
}
if {$pathlist eq {}} { set pathlist [pwd] }
set_initial_dirs

3
src/xschemrc
View File

@ -629,9 +629,6 @@
###########################################################################
#### uses a new file browser widget. Default: not enabled (0)
# set new_file_browser 1
#### defines a list of paths to search for. If empty uses all xschem
#### XSCHEM_LIBRARY_PATH paths. Default: empty
# set new_file_browser_paths {... ... ...}
#### defines the depth to descend into each path. default: 0
# set new_file_browser_depth 1
#### defines the extensions to search for. Default: {\.(sch|sym|tcl)$}