Blame

Date:
Message:
acme: check file content before declaring file "modified since last read" Bad remote file systems can change mtime unexpectedly, and then there is the problem that git rebase and similar operations like to change the files and then change them back, modifying the mtimes but not the content. Avoid spurious Put errors on both of those by checking file content. (False positive "modified since last read" make the real ones difficult to notice.)
Actions:
History | Blob | Raw File
  1 b3994ec5 2003-12-11 devnull #include <u.h>

  2 b3994ec5 2003-12-11 devnull #include <libc.h>

  3 b3994ec5 2003-12-11 devnull #include <draw.h>

  4 b3994ec5 2003-12-11 devnull #include <thread.h>

  5 b3994ec5 2003-12-11 devnull #include <cursor.h>

  6 b3994ec5 2003-12-11 devnull #include <mouse.h>

  7 b3994ec5 2003-12-11 devnull #include <keyboard.h>

  8 b3994ec5 2003-12-11 devnull #include <frame.h>

  9 b3994ec5 2003-12-11 devnull #include <fcall.h>

 10 b3994ec5 2003-12-11 devnull #include <plumb.h>

 11 67dbeee5 2017-10-10 rsc #include <libsec.h>

 12 b3994ec5 2003-12-11 devnull #include "dat.h"

 13 b3994ec5 2003-12-11 devnull #include "fns.h"

 14 b3994ec5 2003-12-11 devnull 

 15 b3994ec5 2003-12-11 devnull static Image *scrtmp;

 16 b3994ec5 2003-12-11 devnull 

 17 b3994ec5 2003-12-11 devnull static

 18 b3994ec5 2003-12-11 devnull Rectangle

 19 b3994ec5 2003-12-11 devnull scrpos(Rectangle r, uint p0, uint p1, uint tot)

 20 b3994ec5 2003-12-11 devnull {

 21 b3994ec5 2003-12-11 devnull 	Rectangle q;

 22 b3994ec5 2003-12-11 devnull 	int h;

 23 b3994ec5 2003-12-11 devnull 

 24 b3994ec5 2003-12-11 devnull 	q = r;

 25 b3994ec5 2003-12-11 devnull 	h = q.max.y-q.min.y;

 26 b3994ec5 2003-12-11 devnull 	if(tot == 0)

 27 b3994ec5 2003-12-11 devnull 		return q;

 28 b3994ec5 2003-12-11 devnull 	if(tot > 1024*1024){

 29 b3994ec5 2003-12-11 devnull 		tot>>=10;

 30 b3994ec5 2003-12-11 devnull 		p0>>=10;

 31 b3994ec5 2003-12-11 devnull 		p1>>=10;

 32 b3994ec5 2003-12-11 devnull 	}

 33 b3994ec5 2003-12-11 devnull 	if(p0 > 0)

 34 b3994ec5 2003-12-11 devnull 		q.min.y += h*p0/tot;

 35 b3994ec5 2003-12-11 devnull 	if(p1 < tot)

 36 b3994ec5 2003-12-11 devnull 		q.max.y -= h*(tot-p1)/tot;

 37 b3994ec5 2003-12-11 devnull 	if(q.max.y < q.min.y+2){

 38 b3994ec5 2003-12-11 devnull 		if(q.min.y+2 <= r.max.y)

 39 b3994ec5 2003-12-11 devnull 			q.max.y = q.min.y+2;

 40 b3994ec5 2003-12-11 devnull 		else

 41 b3994ec5 2003-12-11 devnull 			q.min.y = q.max.y-2;

 42 b3994ec5 2003-12-11 devnull 	}

 43 b3994ec5 2003-12-11 devnull 	return q;

 44 b3994ec5 2003-12-11 devnull }

 45 b3994ec5 2003-12-11 devnull 

 46 b3994ec5 2003-12-11 devnull void

 47 b3994ec5 2003-12-11 devnull scrlresize(void)

 48 b3994ec5 2003-12-11 devnull {

 49 b3994ec5 2003-12-11 devnull 	freeimage(scrtmp);

 50 b3994ec5 2003-12-11 devnull 	scrtmp = allocimage(display, Rect(0, 0, 32, screen->r.max.y), screen->chan, 0, DNofill);

 51 b3994ec5 2003-12-11 devnull 	if(scrtmp == nil)

 52 b3994ec5 2003-12-11 devnull 		error("scroll alloc");

 53 b3994ec5 2003-12-11 devnull }

 54 b3994ec5 2003-12-11 devnull 

 55 b3994ec5 2003-12-11 devnull void

 56 b3994ec5 2003-12-11 devnull textscrdraw(Text *t)

 57 b3994ec5 2003-12-11 devnull {

 58 b3994ec5 2003-12-11 devnull 	Rectangle r, r1, r2;

 59 b3994ec5 2003-12-11 devnull 	Image *b;

 60 b3994ec5 2003-12-11 devnull 

 61 b3994ec5 2003-12-11 devnull 	if(t->w==nil || t!=&t->w->body)

 62 b3994ec5 2003-12-11 devnull 		return;

 63 b3994ec5 2003-12-11 devnull 	if(scrtmp == nil)

 64 b3994ec5 2003-12-11 devnull 		scrlresize();

 65 b3994ec5 2003-12-11 devnull 	r = t->scrollr;

 66 b3994ec5 2003-12-11 devnull 	b = scrtmp;

 67 b3994ec5 2003-12-11 devnull 	r1 = r;

 68 b3994ec5 2003-12-11 devnull 	r1.min.x = 0;

 69 b3994ec5 2003-12-11 devnull 	r1.max.x = Dx(r);

 70 b3994ec5 2003-12-11 devnull 	r2 = scrpos(r1, t->org, t->org+t->fr.nchars, t->file->b.nc);

 71 b3994ec5 2003-12-11 devnull 	if(!eqrect(r2, t->lastsr)){

 72 b3994ec5 2003-12-11 devnull 		t->lastsr = r2;

 73 b3994ec5 2003-12-11 devnull 		draw(b, r1, t->fr.cols[BORD], nil, ZP);

 74 b3994ec5 2003-12-11 devnull 		draw(b, r2, t->fr.cols[BACK], nil, ZP);

 75 b3994ec5 2003-12-11 devnull 		r2.min.x = r2.max.x-1;

 76 b3994ec5 2003-12-11 devnull 		draw(b, r2, t->fr.cols[BORD], nil, ZP);

 77 b3994ec5 2003-12-11 devnull 		draw(t->fr.b, r, b, nil, Pt(0, r1.min.y));

 78 cbeb0b26 2006-04-01 devnull /*flushimage(display, 1); // BUG? */

 79 b3994ec5 2003-12-11 devnull 	}

 80 b3994ec5 2003-12-11 devnull }

 81 b3994ec5 2003-12-11 devnull 

 82 b3994ec5 2003-12-11 devnull void

 83 b3994ec5 2003-12-11 devnull scrsleep(uint dt)

 84 b3994ec5 2003-12-11 devnull {

 85 b3994ec5 2003-12-11 devnull 	Timer	*timer;

 86 b3994ec5 2003-12-11 devnull 	static Alt alts[3];

 87 b3994ec5 2003-12-11 devnull 

 88 b3994ec5 2003-12-11 devnull 	timer = timerstart(dt);

 89 b3994ec5 2003-12-11 devnull 	alts[0].c = timer->c;

 90 b3994ec5 2003-12-11 devnull 	alts[0].v = nil;

 91 b3994ec5 2003-12-11 devnull 	alts[0].op = CHANRCV;

 92 b3994ec5 2003-12-11 devnull 	alts[1].c = mousectl->c;

 93 b3994ec5 2003-12-11 devnull 	alts[1].v = &mousectl->m;

 94 b3994ec5 2003-12-11 devnull 	alts[1].op = CHANRCV;

 95 b3994ec5 2003-12-11 devnull 	alts[2].op = CHANEND;

 96 b3994ec5 2003-12-11 devnull 	for(;;)

 97 b3994ec5 2003-12-11 devnull 		switch(alt(alts)){

 98 b3994ec5 2003-12-11 devnull 		case 0:

 99 b3994ec5 2003-12-11 devnull 			timerstop(timer);

100 b3994ec5 2003-12-11 devnull 			return;

101 b3994ec5 2003-12-11 devnull 		case 1:

102 b3994ec5 2003-12-11 devnull 			timercancel(timer);

103 b3994ec5 2003-12-11 devnull 			return;

104 b3994ec5 2003-12-11 devnull 		}

105 b3994ec5 2003-12-11 devnull }

106 b3994ec5 2003-12-11 devnull 

107 b3994ec5 2003-12-11 devnull void

108 b3994ec5 2003-12-11 devnull textscroll(Text *t, int but)

109 b3994ec5 2003-12-11 devnull {

110 b3994ec5 2003-12-11 devnull 	uint p0, oldp0;

111 b3994ec5 2003-12-11 devnull 	Rectangle s;

112 b3994ec5 2003-12-11 devnull 	int x, y, my, h, first;

113 b3994ec5 2003-12-11 devnull 

114 b3994ec5 2003-12-11 devnull 	s = insetrect(t->scrollr, 1);

115 b3994ec5 2003-12-11 devnull 	h = s.max.y-s.min.y;

116 b3994ec5 2003-12-11 devnull 	x = (s.min.x+s.max.x)/2;

117 b3994ec5 2003-12-11 devnull 	oldp0 = ~0;

118 b3994ec5 2003-12-11 devnull 	first = TRUE;

119 b3994ec5 2003-12-11 devnull 	do{

120 b3994ec5 2003-12-11 devnull 		flushimage(display, 1);

121 f334d756 2005-03-18 devnull 		my = mouse->xy.y;

122 f334d756 2005-03-18 devnull 		if(my < s.min.y)

123 f334d756 2005-03-18 devnull 			my = s.min.y;

124 f334d756 2005-03-18 devnull 		if(my >= s.max.y)

125 f334d756 2005-03-18 devnull 			my = s.max.y;

126 f334d756 2005-03-18 devnull 		if(!eqpt(mouse->xy, Pt(x, my))){

127 f334d756 2005-03-18 devnull 			moveto(mousectl, Pt(x, my));

128 f334d756 2005-03-18 devnull 			readmouse(mousectl);		/* absorb event generated by moveto() */

129 f334d756 2005-03-18 devnull 		}

130 f334d756 2005-03-18 devnull 		if(but == 2){

131 f334d756 2005-03-18 devnull 			y = my;

132 f334d756 2005-03-18 devnull 			p0 = (vlong)t->file->b.nc*(y-s.min.y)/h;

133 f334d756 2005-03-18 devnull 			if(p0 >= t->q1)

134 f334d756 2005-03-18 devnull 				p0 = textbacknl(t, p0, 2);

135 b3994ec5 2003-12-11 devnull 			if(oldp0 != p0)

136 f334d756 2005-03-18 devnull 				textsetorigin(t, p0, FALSE);

137 b3994ec5 2003-12-11 devnull 			oldp0 = p0;

138 f334d756 2005-03-18 devnull 			readmouse(mousectl);

139 f334d756 2005-03-18 devnull 			continue;

140 b3994ec5 2003-12-11 devnull 		}

141 f334d756 2005-03-18 devnull 		if(but == 1)

142 f334d756 2005-03-18 devnull 			p0 = textbacknl(t, t->org, (my-s.min.y)/t->fr.font->height);

143 f334d756 2005-03-18 devnull 		else

144 f334d756 2005-03-18 devnull 			p0 = t->org+frcharofpt(&t->fr, Pt(s.max.x, my));

145 f334d756 2005-03-18 devnull 		if(oldp0 != p0)

146 f334d756 2005-03-18 devnull 			textsetorigin(t, p0, TRUE);

147 f334d756 2005-03-18 devnull 		oldp0 = p0;

148 f334d756 2005-03-18 devnull 		/* debounce */

149 f334d756 2005-03-18 devnull 		if(first){

150 f334d756 2005-03-18 devnull 			flushimage(display, 1);

151 f334d756 2005-03-18 devnull 			sleep(200);

152 f334d756 2005-03-18 devnull 			nbrecv(mousectl->c, &mousectl->m);

153 f334d756 2005-03-18 devnull 			first = FALSE;

154 f334d756 2005-03-18 devnull 		}

155 f334d756 2005-03-18 devnull 		scrsleep(80);

156 b3994ec5 2003-12-11 devnull 	}while(mouse->buttons & (1<<(but-1)));

157 b3994ec5 2003-12-11 devnull 	while(mouse->buttons)

158 b3994ec5 2003-12-11 devnull 		readmouse(mousectl);

159 b3994ec5 2003-12-11 devnull }