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

samterm: cleanup

Browse source
This commit is contained in:
stanley lieber 2012-04-24 19:53:05 -05:00
parent 4f1575a44e
commit caa6d7701d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/samterm/main.c
View file

@ -75,7 +75,8 @@ threadmain(int argc, char *argv[])
continue; continue;
} }
nwhich = flwhich(mousep->xy); nwhich = flwhich(mousep->xy);
scr = which && ptinrect(mousep->xy, which->scroll); scr = which && (ptinrect(mousep->xy, which->scroll) ||
mousep->buttons&(8|16));
if(mousep->buttons) if(mousep->buttons)
flushtyping(1); flushtyping(1);
if((mousep->buttons&1)==0) if((mousep->buttons&1)==0)
@ -94,11 +95,11 @@ threadmain(int argc, char *argv[])
chord &= ~4; chord &= ~4;
} }
} }
} else if(mousep->buttons&1 || mousep->buttons&8){ }else if(mousep->buttons&(1|8)){
if(nwhich){ if(nwhich){
if(nwhich!=which) if(nwhich!=which)
current(nwhich); current(nwhich);
else if(scr || mousep->buttons&8) else if(scr)
scroll(which, 1); scroll(which, 1);
else{ else{
t=(Text *)which->user1; t=(Text *)which->user1;
@ -116,8 +117,8 @@ threadmain(int argc, char *argv[])
scroll(which, 2); scroll(which, 2);
else else
menu2hit(); menu2hit();
}else if((mousep->buttons&4 || mousep->buttons&16)){ }else if(mousep->buttons&(4|16)){
if(scr || mousep->buttons&16) if(scr)
scroll(which, 3); scroll(which, 3);
else else
menu3hit(); menu3hit();