shithub: mez

Info  •  Files  •  Log  •  Branches

more scrolling

--- a/guitest.c

+++ b/guitest.c

@@ -95,7 +95,7 @@

 	scrpos = insetrect(scrpos, 1);

 	draw(screen, scrpos, t->cols[BACK], nil, ZP);

-	frinsert(t, t->text + t->lines[t->origin], t->text + t->textlen, 0);

+	frinsert(t, t->text+t->lines[t->origin], t->text+t->textlen, 0);

 	flushimage(display, 1);

 }

@@ -187,12 +187,6 @@

 }

 void

-textorigin(Text *t, int y)

-{

-	t->origin = min(max(0, y-t->scrollr.min.y)*t->nlines/Dy(t->scrollr), t->nlines-1);

-}

-

-void

 textresize(Text *t)

 {

 	static char s[512];

@@ -207,13 +201,24 @@

 void

 textscroll(Text *t, Mousectl *mc)

 {

+	uint pos, i, diff;

+

 	while(mc->buttons == 2){

-		textorigin(t, mc->xy.y);

+		t->origin = min(max(0, mc->xy.y-t->scrollr.min.y)*t->nlines/Dy(t->scrollr), t->nlines-1);

 		textdraw(t);

 		readmouse(mc);

 	}

 	while(mc->buttons == 1){

-		t->origin = max(0, t->origin-1);

+		pos = frcharofpt(t, (Point){t->bodyr.min.x+1, mc->xy.y});

+		for(i = t->origin; t->lines[t->origin]+pos > t->lines[i]; i++);

+		t->origin -= i-t->origin;

+		textdraw(t);

+		readmouse(mc);

+	}

+	while(mc->buttons == 4){

+		pos = frcharofpt(t, (Point){t->bodyr.min.x+1, mc->xy.y});

+		for(i = t->origin; t->lines[t->origin]+pos > t->lines[i]; i++);

+		t->origin = min(i, t->nlines-1);

 		textdraw(t);

 		readmouse(mc);

 	}