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

Small changes to allow build with tcl-tk 9.0

This commit is contained in:
stefan schippers 2024-11-12 01:16:43 +01:00
parent 127a2a0221
commit aa95f0ff9d
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scconfig/src/scripts/find_tcl.c
View File

@ -23,7 +23,7 @@
#include "scripts.h" #include "scripts.h"
#include <unistd.h> #include <unistd.h>
static int all_vers[] = { 86, 85, 84, 0, -1 }; static int all_vers[] = { 90, 86, 85, 84, 0, -1 };
int find_script_tcl_(const char *name, int logdepth, int fatal, int *vers, int fallback) int find_script_tcl_(const char *name, int logdepth, int fatal, int *vers, int fallback)
{ {
@ -32,9 +32,11 @@ int find_script_tcl_(const char *name, int logdepth, int fatal, int *vers, int f
char *tclshs[] = { char *tclshs[] = {
"tclsh", "tclsh",
"tclsh90",
"tclsh86", "tclsh86",
"tclsh85", "tclsh85",
"tclsh84", "tclsh84",
"tclsh9.0",
"tclsh8.6", "tclsh8.6",
"tclsh8.5", "tclsh8.5",
"tclsh8.4", "tclsh8.4",
@ -280,6 +282,9 @@ int find_script_tk(const char *name, int logdepth, int fatal)
sprintf(lfl, "-ltk%d.%d", major, minor); sprintf(lfl, "-ltk%d.%d", major, minor);
if (try_icl_tk(logdepth, "libs/script/tk", test_c, NULL, NULL, lfl, *v)) return 0; if (try_icl_tk(logdepth, "libs/script/tk", test_c, NULL, NULL, lfl, *v)) return 0;
sprintf(lfl, "-ltcl%dtk%d.%d", major, major, minor);
if (try_icl_tk(logdepth, "libs/script/tk", test_c, NULL, NULL, lfl, *v)) return 0;
} }
return try_fail(logdepth, "libs/script/tk"); return try_fail(logdepth, "libs/script/tk");

14
src/xschem.tcl
View File

@ -3383,7 +3383,7 @@ namespace eval c_toolbar {
variable c_t variable c_t
variable i variable i
set c_t(w) .load.l.recent set c_t(w) .load.l.recent
set c_t(hash) [xschem hash_string $XSCHEM_LIBRARY_PATH] set c_t(hash) [xschem hash_string $::XSCHEM_LIBRARY_PATH]
set c_t(n) 25 set c_t(n) 25
set c_t(top) 0 set c_t(top) 0
for {set i 0} {$i < $c_t(n)} {incr i} { for {set i 0} {$i < $c_t(n)} {incr i} {
@ -7217,6 +7217,18 @@ global env has_x OS autofocus_mainwindow
# $topwin configure -cursor {} # $topwin configure -cursor {}
" "
bind $topwin <Expose> "xschem callback %W %T %x %y 0 %w %h %s" bind $topwin <Expose> "xschem callback %W %T %x %y 0 %w %h %s"
# transform mousewheel events into button4/5 events
if {[info tclversion] > 8.7} {
bind $topwin <MouseWheel> {
if {%D > 0} {
xschem callback %W 4 %x %y 0 4 0 %s
} else {
xschem callback %W 4 %x %y 0 5 0 %s
}
}
}
bind $topwin <Double-Button-1> "xschem callback %W -3 %x %y 0 %b 0 %s" bind $topwin <Double-Button-1> "xschem callback %W -3 %x %y 0 %b 0 %s"
bind $topwin <Double-Button-2> "xschem callback %W -3 %x %y 0 %b 0 %s" bind $topwin <Double-Button-2> "xschem callback %W -3 %x %y 0 %b 0 %s"
bind $topwin <Double-Button-3> "xschem callback %W -3 %x %y 0 %b 0 %s" bind $topwin <Double-Button-3> "xschem callback %W -3 %x %y 0 %b 0 %s"