shithub: riscv

Info  •  Files  •  Log  •  Branches

acme: include delimiter-pair when extending selection

--- a/sys/src/cmd/acme/dat.h

+++ b/sys/src/cmd/acme/dat.h

@@ -204,7 +204,7 @@

 void		textcommit(Text*, int);

 void		textconstrain(Text*, uint, uint, uint*, uint*);

 void		textdelete(Text*, uint, uint, int);

-void		textstretchsel(Text*, uint, uint*, uint*, int);

+void		textstretchsel(Text*, uint*, uint*, int);

 void		textfill(Text*);

 void		textframescroll(Text*, int);

 void		textinit(Text*, File*, Rectangle, Reffont*, Image**);

--- a/sys/src/cmd/acme/text.c

+++ b/sys/src/cmd/acme/text.c

@@ -944,7 +944,7 @@

 	if(mouse->msec-clickmsec >= 500 || selecttext != t || clickcount > 3 || dx > 3 || dy > 3)

 		clickcount = 0;

 	if(clickcount >= 1 && selecttext==t && mouse->msec-clickmsec < 500){

-		textstretchsel(t, selectq, &q0, &q1, clickcount);

+		textstretchsel(t, &q0, &q1, clickcount);

 		textsetselect(t, q0, q1);

 		flushimage(display, 1);

 		x = mouse->xy.x;

@@ -983,7 +983,7 @@

 	}

 	if(q0 == q1){

 		if(q0==t->q0 && mouse->msec-clickmsec<500)

-			textstretchsel(t, selectq, &q0, &q1, clickcount);

+			textstretchsel(t, &q0, &q1, clickcount);

 		else

 			clicktext = t;

 		clickmsec = mouse->msec;

@@ -1316,14 +1316,30 @@

 }

 void

-textstretchsel(Text *t, uint mp, uint *q0, uint *q1, int mode)

+textstretchsel(Text *t, uint *q0, uint *q1, int mode)

 {

-	int c, i;

-	Rune *r, *l, *p;

+	int c, i, lc, rc;

+	Rune *r, *l, *p, *x;

 	uint q;

-	*q0 = mp;

-	*q1 = mp;

+	*q0 = t->q0;

+	*q1 = t->q1;

+

+	if(mode){

+		lc = *q0 > 0    	? textreadc(t, *q0-1) : '\n';

+		rc = *q1 < t->file->nc	? textreadc(t, *q1) : '\n';

+		for(i=0; left[i]; i++){

+			l = left[i];

+			r = right[i];

+			x = runestrchr(l, lc);

+			if(x && r[x-l] == rc){

+				(*q0) -= lc != '\n';

+				(*q1)++;

+				return;

+			}

+		}

+	}

+

 	for(i=0; left[i]!=nil; i++){

 		q = *q0;

 		l = left[i];

-- 

⑨