o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better tick handling

Browse source
This commit is contained in:
rsc 2007-05-10 19:34:04 +00:00
parent 024c9812e4
commit 97e4432344
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cmd/acme/text.c
View file

@ -1122,7 +1122,7 @@ selrestore(Frame *f, Point pt0, uint p0, uint p1)
void void
textsetselect(Text *t, uint q0, uint q1) textsetselect(Text *t, uint q0, uint q1)
{ {
int p0, p1; int p0, p1, ticked;
/* t->fr.p0 and t->fr.p1 are always right; t->q0 and t->q1 may be off */ /* t->fr.p0 and t->fr.p1 are always right; t->q0 and t->q1 may be off */
t->q0 = q0; t->q0 = q0;
@ -1130,20 +1130,29 @@ textsetselect(Text *t, uint q0, uint q1)
/* compute desired p0,p1 from q0,q1 */ /* compute desired p0,p1 from q0,q1 */
p0 = q0-t->org; p0 = q0-t->org;
p1 = q1-t->org; p1 = q1-t->org;
if(p0 < 0) ticked = 1;
if(p0 < 0){
ticked = 0;
p0 = 0; p0 = 0;
}
if(p1 < 0) if(p1 < 0)
p1 = 0; p1 = 0;
if(p0 > t->fr.nchars) if(p0 > t->fr.nchars)
p0 = t->fr.nchars; p0 = t->fr.nchars;
if(p1 > t->fr.nchars) if(p1 > t->fr.nchars){
ticked = 0;
p1 = t->fr.nchars; p1 = t->fr.nchars;
if(p0==t->fr.p0 && p1==t->fr.p1) }
if(p0==t->fr.p0 && p1==t->fr.p1){
if(p0 == p1 && ticked != t->fr.ticked)
frtick(&t->fr, frptofchar(&t->fr, p0), ticked);
return; return;
}
/* screen disagrees with desired selection */ /* screen disagrees with desired selection */
if(t->fr.p1<=p0 || p1<=t->fr.p0 || p0==p1 || t->fr.p1==t->fr.p0){ if(t->fr.p1<=p0 || p1<=t->fr.p0 || p0==p1 || t->fr.p1==t->fr.p0){
/* no overlap or too easy to bother trying */ /* no overlap or too easy to bother trying */
frdrawsel(&t->fr, frptofchar(&t->fr, t->fr.p0), t->fr.p0, t->fr.p1, 0); frdrawsel(&t->fr, frptofchar(&t->fr, t->fr.p0), t->fr.p0, t->fr.p1, 0);
if(p0 != p1 || ticked)
frdrawsel(&t->fr, frptofchar(&t->fr, p0), p0, p1, 1); frdrawsel(&t->fr, frptofchar(&t->fr, p0), p0, p1, 1);
goto Return; goto Return;
} }