Removed hacky scrolling code. - sam - An updated version of the sam text editor.
(HTM) git clone git://vernunftzentrum.de/sam.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit d8d972951595b12f68a1ef9707f71c3a93e7f04b
(DIR) parent e0e3937486336db54c747161aebed1628656d3af
(HTM) Author: Rob King <jking@deadpixi.com>
Date: Thu, 1 Sep 2016 11:06:54 -0500
Removed hacky scrolling code.
This is no longer needed with the better mouse chording support.
Diffstat:
samterm/scroll.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/samterm/scroll.c b/samterm/scroll.c
@@ -95,16 +95,16 @@ scroll(Flayer *l, int pbut, int but)
in = abs(x-mouse.xy.x)<=FLSCROLLWID/2;
if(oin != in)
scrflip(l, r);
- if(in || but > 3){
+ if(in){
oy = y;
my = mouse.xy.y;
if(my < s.min.y)
my = s.min.y;
if(my >= s.max.y)
my = s.max.y;
- if(!eqpt(mouse.xy, Pt(x, my)) && but <= 3)
+ if(!eqpt(mouse.xy, Pt(x, my)))
cursorset(Pt(x, my));
- if(but == 1 || but == 4){
+ if(but == 1){
p0 = l->origin-frcharofpt(&l->f, Pt(s.max.x, my));
rt = scrpos(l->scroll, p0, p0+l->f.nchars, tot);
y = rt.min.y;
@@ -112,7 +112,7 @@ scroll(Flayer *l, int pbut, int but)
y = my;
if(y > s.max.y-2)
y = s.max.y-2;
- }else if(but == 3 || but == 5){
+ }else if(but == 3){
p0 = l->origin+frcharofpt(&l->f, Pt(s.max.x, my));
rt = scrpos(l->scroll, p0, p0+l->f.nchars, tot);
y = rt.min.y;
@@ -124,18 +124,18 @@ scroll(Flayer *l, int pbut, int but)
}
}
}while(button(pbut));
- if(in || but > 3){
+ if(in){
h = s.max.y-s.min.y;
scrflip(l, r);
p0 = 0;
- if(but == 1 || but == 4)
+ if(but == 1)
p0 = (long)(my-s.min.y)/l->f.fheight+1;
else if(but == 2){
if(tot > 1024L*1024L)
p0 = ((tot>>10)*(y-s.min.y)/h)<<10;
else
p0 = tot*(y-s.min.y)/h;
- }else if(but == 3 || but == 5){
+ }else if(but == 3){
p0 = l->origin+frcharofpt(&l->f, Pt(s.max.x, my));
if(p0 > tot)
p0 = tot;