From d494f0195e5eccc97fd9a135046ff028dec14ae7 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Tue, 1 Dec 2009 22:33:03 +0100
Subject: scrolling

---
 ranger/fm.py            |  6 +++++-
 ranger/gui/defaultui.py |  4 ++++
 ranger/gui/ui.py        |  9 +++++++++
 ranger/gui/wdisplay.py  | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/ranger/fm.py b/ranger/fm.py
index e88ff964..55fd64f3 100644
--- a/ranger/fm.py
+++ b/ranger/fm.py
@@ -64,10 +64,14 @@ class FM():
 	def move_pointer(self, relative = 0, absolute = None):
 		self.env.cf = self.env.pwd.move_pointer(relative, absolute)
 
-	def move_pointer_by_pages(self, relative = 0):
+	def move_pointer_by_pages(self, relative):
 		self.env.cf = self.env.pwd.move_pointer(
 				relative = int(relative * self.env.termsize[0]))
 
+	def scroll(self, relative):
+		self.ui.scroll(relative)
+		self.env.cf = self.env.pwd.pointed_file
+
 	def redraw(self):
 		self.ui.redraw()
 
diff --git a/ranger/gui/defaultui.py b/ranger/gui/defaultui.py
index 419d8a4f..d4d89047 100644
--- a/ranger/gui/defaultui.py
+++ b/ranger/gui/defaultui.py
@@ -14,11 +14,15 @@ class DefaultUI(SuperClass):
 				WDisplay(self.win, self.colorscheme, -1),
 				WDisplay(self.win, self.colorscheme, 0),
 				WDisplay(self.win, self.colorscheme, 1) ]
+		self.main_display = self.displays[2]
 		self.displays[2].display_infostring = True
 		self.displays[2].main_display = True
 		for disp in self.displays:
 			self.add_widget(disp)
 	
+	def scroll(self, relative):
+		self.main_display.scroll(relative)
+
 	def resize(self):
 		SuperClass.resize(self)
 		y, x = self.win.getmaxyx()
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py
index 78adde28..fb6e9193 100644
--- a/ranger/gui/ui.py
+++ b/ranger/gui/ui.py
@@ -41,9 +41,18 @@ class UI():
 					widg.click(event, fm)
 					break
 
+		if event.pressed(4) or event.pressed(2) or event.bstate & 134217728:
+			if event.pressed(4):
+				fm.scroll(relative = -3)
+			else:
+				fm.scroll(relative = 3)
+
 	def setup(self):
 		pass
 
+	def scroll(self, relative):
+		pass
+
 	def resize(self):
 		self.env.termsize = self.win.getmaxyx()
 
diff --git a/ranger/gui/wdisplay.py b/ranger/gui/wdisplay.py
index 2aba3a61..1379c24e 100644
--- a/ranger/gui/wdisplay.py
+++ b/ranger/gui/wdisplay.py
@@ -151,6 +151,9 @@ class WDisplay(SuperClass):
 		upper_limit = winsize - 1 - offset
 		lower_limit = offset
 
+		if original < 0:
+			return 0
+
 		if dirsize < winsize:
 			return 0
 
@@ -178,3 +181,16 @@ class WDisplay(SuperClass):
 		self.scroll_begin = self.get_scroll_begin()
 		self.target.scroll_begin = self.scroll_begin
 
+	# TODO: does not work if options.scroll_offset is high,
+	# relative > 1 and you scroll from scroll_begin = 1 to 0
+	def scroll(self, relative):
+		self.set_scroll_begin()
+		old_value = self.target.scroll_begin
+		self.target.scroll_begin += relative
+		self.set_scroll_begin()
+
+		if self.target.scroll_begin == old_value:
+			self.target.move_pointer(relative = relative)
+			self.target.scroll_begin += relative
+
+
-- 
cgit 1.4.1-2-gfad0