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

resolve a race condition in context menu (mouse click and immediately destroy menu by exiting the area)

This commit is contained in:
Stefan Frederik 2022-01-03 01:38:15 +01:00
parent 66152c33a5
commit 2c09982e5a
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/callback.c
View File

@ -855,7 +855,6 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key,
switch(event) switch(event)
{ {
case EnterNotify: case EnterNotify:
/* tcleval("catch {destroy .ctxmenu}"); */
if(!xctx->sel_or_clip[0]) my_snprintf(xctx->sel_or_clip, S(xctx->sel_or_clip), "%s/%s", if(!xctx->sel_or_clip[0]) my_snprintf(xctx->sel_or_clip, S(xctx->sel_or_clip), "%s/%s",
user_conf_dir, ".selection.sch"); user_conf_dir, ".selection.sch");
@ -2168,9 +2167,13 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key,
} }
else if(button == Button3 && state == 0 && xctx->semaphore <2) { else if(button == Button3 && state == 0 && xctx->semaphore <2) {
int ret; int ret;
const char *status;
int prev_state; int prev_state;
tcleval("context_menu"); xctx->semaphore++;
ret = atoi(tclresult()); status = tcleval("context_menu");
xctx->semaphore--;
if(!status) break;
ret = atoi(status);
switch(ret) { switch(ret) {
case 1: case 1:
start_place_symbol(mx, my); start_place_symbol(mx, my);

16
src/xschem.tcl
View File

@ -3434,13 +3434,8 @@ proc context_menu { } {
set font fixed set font fixed
} }
set selection [expr {[xschem get lastsel] eq {1}}] set selection [expr {[xschem get lastsel] eq {1}}]
xschem set semaphore [expr {[xschem get semaphore] +1}]
toplevel .ctxmenu toplevel .ctxmenu
wm overrideredirect .ctxmenu 1 wm overrideredirect .ctxmenu 1
if { 0} {
set x [expr {[winfo pointerx .ctxmenu] - 10}] set x [expr {[winfo pointerx .ctxmenu] - 10}]
set y [expr {[winfo pointery .ctxmenu] - 10}] set y [expr {[winfo pointery .ctxmenu] - 10}]
if { !$selection} { if { !$selection} {
@ -3533,11 +3528,11 @@ if { 0} {
if {!$selection} { if {!$selection} {
pack .ctxmenu.b8 -fill x -expand true pack .ctxmenu.b8 -fill x -expand true
} }
}
wm geometry .ctxmenu "+$x+$y" wm geometry .ctxmenu "+$x+$y"
update update
# if window has been destroyed (by mouse pointer exiting) do nothing
if { ![winfo exists .ctxmenu] } { return 0 }
set wx [winfo width .ctxmenu] set wx [winfo width .ctxmenu]
set wy [winfo height .ctxmenu] set wy [winfo height .ctxmenu]
set sx [winfo screenwidth .] set sx [winfo screenwidth .]
@ -3549,9 +3544,8 @@ if { 0} {
set x [expr {$x - ( $x + $wx - $sx )} ] set x [expr {$x - ( $x + $wx - $sx )} ]
} }
wm geometry .ctxmenu "+$x+$y";# move away from screen edges wm geometry .ctxmenu "+$x+$y";# move away from screen edges
bind .ctxmenu <Leave> {if { {%W} eq {.ctxmenu} } {destroy .ctxmenu} } bind .ctxmenu <Leave> {if { {%W} eq {.ctxmenu} } {destroy .ctxmenu}}
tkwait window .ctxmenu tkwait window .ctxmenu
xschem set semaphore [expr {[xschem get semaphore] -1}]
return $retval return $retval
} }
@ -3949,7 +3943,7 @@ global env has_x OS
bind $topwin <KeyPress> "xschem callback %W %T %x %y %N 0 0 %s" bind $topwin <KeyPress> "xschem callback %W %T %x %y %N 0 0 %s"
bind $topwin <KeyRelease> "xschem callback %W %T %x %y %N 0 0 %s" bind $topwin <KeyRelease> "xschem callback %W %T %x %y %N 0 0 %s"
bind $topwin <Motion> "focus $topwin; xschem callback %W %T %x %y 0 0 0 %s" bind $topwin <Motion> "focus $topwin; xschem callback %W %T %x %y 0 0 0 %s"
bind $topwin <Enter> "focus $topwin; xschem callback %W %T %x %y 0 0 0 0" bind $topwin <Enter> "destroy .ctxmenu; focus $topwin; xschem callback %W %T %x %y 0 0 0 0"
bind $topwin <Unmap> " wm withdraw .infotext; set show_infowindow 0 " bind $topwin <Unmap> " wm withdraw .infotext; set show_infowindow 0 "
bind $topwin "?" {textwindow "${XSCHEM_SHAREDIR}/xschem.help"} bind $topwin "?" {textwindow "${XSCHEM_SHAREDIR}/xschem.help"}