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

vt: allow scrolling with the mouse.

Browse source
This commit is contained in:
Ori Bernstein 2021-06-26 17:39:13 +00:00
parent b68b3a6e19
commit 819bec22cc
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/vt/cons.h
View file

@ -54,7 +54,7 @@ extern void ringbell(void);
extern int number(Rune *, int *); extern int number(Rune *, int *);
extern void shift(int,int,int,int); extern void shift(int,int,int,int);
extern void scroll(int,int,int,int); extern void scroll(int,int,int,int);
extern int backup(int); extern void backup(int);
extern void sendnchars(int, char *); extern void sendnchars(int, char *);
extern Point pt(int, int); extern Point pt(int, int);
extern Point pos(Point); extern Point pos(Point);

24
sys/src/cmd/vt/main.c
View file

@ -134,9 +134,7 @@ Point ftsize;
Rune kbdchar; Rune kbdchar;
#define button1() ((mc->buttons & 07)==1) #define button(num) (mc->buttons == (1<<((num)-1)))
#define button2() ((mc->buttons & 07)==2)
#define button3() ((mc->buttons & 07)==4)
Mousectl *mc; Mousectl *mc;
Keyboardctl *kc; Keyboardctl *kc;
@ -835,10 +833,14 @@ Next:
flushimage(display, 1); flushimage(display, 1);
switch(alt(a)){ switch(alt(a)){
case AMOUSE: case AMOUSE:
if(button1() || chording) if(button(1) || chording)
selecting(); selecting();
else if(button2() || button3()) else if(button(2) || button(3))
readmenu(); readmenu();
else if(button(4))
backup(backc+1);
else if(button(5) && backc > 0)
backup(--backc);
else if(resize_flag == 0) else if(resize_flag == 0)
goto Next; goto Next;
break; break;
@ -1130,7 +1132,7 @@ selecting(void)
select(p, q, mode); select(p, q, mode);
drawscreen(); drawscreen();
readmouse(mc); readmouse(mc);
} while(button1()); } while(button(1));
} }
if(mc->buttons != chording){ if(mc->buttons != chording){
switch(mc->buttons & 0x7){ switch(mc->buttons & 0x7){
@ -1169,7 +1171,7 @@ readmenu(void)
Point p; Point p;
p = pos(mc->xy); p = pos(mc->xy);
if(button3()) { if(button(3)) {
menu3.item[1] = ttystate[cs->raw].crnl ? "cr" : "crnl"; menu3.item[1] = ttystate[cs->raw].crnl ? "cr" : "crnl";
menu3.item[2] = ttystate[cs->raw].nlcr ? "nl" : "nlcr"; menu3.item[2] = ttystate[cs->raw].nlcr ? "nl" : "nlcr";
menu3.item[3] = cs->raw ? "cooked" : "raw"; menu3.item[3] = cs->raw ? "cooked" : "raw";
@ -1203,8 +1205,7 @@ readmenu(void)
switch(menuhit(2, mc, &menu2, nil)) { switch(menuhit(2, mc, &menu2, nil)) {
case Mbackup: /* back up */ case Mbackup: /* back up */
if(backup(backc+1)) backup(backc+1);
backc++;
return; return;
case Mforward: /* move forward */ case Mforward: /* move forward */
@ -1239,7 +1240,7 @@ readmenu(void)
} }
} }
int void
backup(int count) backup(int count)
{ {
Rune *cp; Rune *cp;
@ -1272,7 +1273,8 @@ backup(int count)
if(cp >= &hist[HISTSIZ]) if(cp >= &hist[HISTSIZ])
cp = hist; cp = hist;
backp = cp; backp = cp;
return left; if(left)
backc = count;
} }
Point Point