xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

zuke: fix middle-click restarting playback if held while mouse pointer is moving

Browse source
This commit is contained in:
Sigrid 2021-04-23 11:20:30 +02:00
parent 1919e9183b
commit 83277da309
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/src/cmd/audio/zuke/zuke.c
View file

@ -1145,7 +1145,7 @@ threadmain(int argc, char **argv)
} }
redraw(1); redraw(1);
oldbuttons = 0; m.buttons = 0;
scrolling = 0; scrolling = 0;
proccreate(plumbaudio, kctl->c, 4096); proccreate(plumbaudio, kctl->c, 4096);
@ -1157,6 +1157,7 @@ threadmain(int argc, char **argv)
redraw(0); redraw(0);
} }
oldbuttons = m.buttons;
switch(alt(a)){ switch(alt(a)){
case Emouse: case Emouse:
if(ptinrect(m.xy, seekbar)){ if(ptinrect(m.xy, seekbar)){
@ -1182,16 +1183,9 @@ threadmain(int argc, char **argv)
break; break;
} }
if(oldbuttons == 0 && !scrolling && ptinrect(m.xy, insetrect(seekbar, -4))){
if(ptinrect(m.xy, seekbar))
seekrel(playercurr, seekoff/1000.0 - byteswritten/Bps);
break;
}
n = (m.xy.y - screen->r.min.y)/f->height; n = (m.xy.y - screen->r.min.y)/f->height;
if(oldbuttons == 0 && m.xy.x <= screen->r.min.x+Scrollwidth){ if(m.xy.x <= screen->r.min.x+Scrollwidth){
if(m.buttons == 1){ if(m.buttons == 1){
scroll = MAX(0, scroll-n-1); scroll = MAX(0, scroll-n-1);
redraw(1); redraw(1);
@ -1205,6 +1199,12 @@ threadmain(int argc, char **argv)
} }
} }
if(!scrolling && ptinrect(m.xy, insetrect(seekbar, -4))){
if(ptinrect(m.xy, seekbar))
seekrel(playercurr, seekoff/1000.0 - byteswritten/Bps);
break;
}
if(scrolling){ if(scrolling){
if(scrollsz >= pl->n) if(scrollsz >= pl->n)
break; break;
@ -1215,7 +1215,7 @@ threadmain(int argc, char **argv)
n += scroll; n += scroll;
if(n < pl->n){ if(n < pl->n){
pcur = n; pcur = n;
if(m.buttons == 2){ if(m.buttons == 2 && oldbuttons == 0){
stop(playercurr); stop(playercurr);
playercurr = newplayer(pcur, 1); playercurr = newplayer(pcur, 1);
start(playercurr); start(playercurr);