Fix selection: selscroll
This commit is contained in:
		
				
					committed by
					
						
						Hiltjo Posthuma
					
				
			
			
				
	
			
			
			
						parent
						
							9c30066e73
						
					
				
				
					commit
					045a0fab4f
				
			
							
								
								
									
										26
									
								
								st.c
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								st.c
									
									
									
									
									
								
							@@ -1106,27 +1106,17 @@ selscroll(int orig, int n)
 | 
			
		||||
	if (sel.ob.x == -1)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
 | 
			
		||||
		if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
 | 
			
		||||
	if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
 | 
			
		||||
		selclear();
 | 
			
		||||
	} else if (BETWEEN(sel.nb.y, orig, term.bot)) {
 | 
			
		||||
		sel.ob.y += n;
 | 
			
		||||
		sel.oe.y += n;
 | 
			
		||||
		if (sel.ob.y < term.top || sel.ob.y > term.bot ||
 | 
			
		||||
		    sel.oe.y < term.top || sel.oe.y > term.bot) {
 | 
			
		||||
			selclear();
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
		if (sel.type == SEL_RECTANGULAR) {
 | 
			
		||||
			if (sel.ob.y < term.top)
 | 
			
		||||
				sel.ob.y = term.top;
 | 
			
		||||
			if (sel.oe.y > term.bot)
 | 
			
		||||
				sel.oe.y = term.bot;
 | 
			
		||||
		} else {
 | 
			
		||||
			if (sel.ob.y < term.top) {
 | 
			
		||||
				sel.ob.y = term.top;
 | 
			
		||||
				sel.ob.x = 0;
 | 
			
		||||
			}
 | 
			
		||||
			if (sel.oe.y > term.bot) {
 | 
			
		||||
				sel.oe.y = term.bot;
 | 
			
		||||
				sel.oe.x = term.col;
 | 
			
		||||
			}
 | 
			
		||||
			selnormalize();
 | 
			
		||||
		}
 | 
			
		||||
		selnormalize();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user