From e01ea6523445c49fe440ebceeaeed1293f268b5f Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 17:40:51 +0200
Subject: added option 'mouse_enabled'

---
 ranger/defaults/options.py |  3 +++
 ranger/gui/ui.py           | 33 +++++++++++++++++++++------------
 ranger/shared/settings.py  |  1 +
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ranger/defaults/options.py b/ranger/defaults/options.py
index 6b2a0dc9..d96955b7 100644
--- a/ranger/defaults/options.py
+++ b/ranger/defaults/options.py
@@ -61,6 +61,9 @@ draw_bookmark_borders = True
 # How many columns are there, and what are their relative widths?
 column_ratios = (1, 1, 4, 3)
 
+# Enable the mouse support?
+mouse_enabled = True
+
 # Display the file size in the main column or status bar?
 display_size_in_main_column = True
 display_size_in_status_bar = False
diff --git a/ranger/gui/ui.py b/ranger/gui/ui.py
index 68285718..cdaf6cde 100644
--- a/ranger/gui/ui.py
+++ b/ranger/gui/ui.py
@@ -27,9 +27,25 @@ TERMINALS_WITH_TITLE = ("xterm", "xterm-256color", "rxvt",
 		"rxvt-256color", "rxvt-unicode", "aterm", "Eterm",
 		"screen", "screen-256color")
 
+MOUSEMASK = curses.ALL_MOUSE_EVENTS | curses.REPORT_MOUSE_POSITION
+
+def _setup_mouse(signal):
+	if signal['value']:
+		curses.mousemask(MOUSEMASK)
+		curses.mouseinterval(0)
+
+		## this line solves this problem:
+		## If an action, following a mouse click, includes the
+		## suspension and re-initializion of the ui (e.g. running a
+		## file by clicking on its preview) and the next key is another
+		## mouse click, the bstate of this mouse event will be invalid.
+		## (atm, invalid bstates are recognized as scroll-down)
+		curses.ungetmouse(0,0,0,0,0)
+	else:
+		curses.mousemask(0)
+
 class UI(DisplayableContainer):
 	is_set_up = False
-	mousemask = curses.ALL_MOUSE_EVENTS | curses.REPORT_MOUSE_POSITION
 	load_mode = False
 	def __init__(self, commandlist=None, env=None, fm=None):
 		self._draw_title = os.environ["TERM"] in TERMINALS_WITH_TITLE
@@ -66,16 +82,8 @@ class UI(DisplayableContainer):
 		curses.start_color()
 		curses.use_default_colors()
 
-		curses.mousemask(self.mousemask)
-		curses.mouseinterval(0)
-
-		## this line solves this problem:
-		## If an action, following a mouse click, includes the
-		## suspension and re-initializion of the ui (e.g. running a
-		## file by clicking on its preview) and the next key is another
-		## mouse click, the bstate of this mouse event will be invalid.
-		## (atm, invalid bstates are recognized as scroll-down)
-		curses.ungetmouse(0,0,0,0,0)
+		self.settings.signal_bind('setopt.mouse_enabled', _setup_mouse)
+		_setup_mouse(dict(value=self.settings.mouse_enabled))
 
 		if not self.is_set_up:
 			self.is_set_up = True
@@ -91,7 +99,8 @@ class UI(DisplayableContainer):
 			curses.curs_set(1)
 		except:
 			pass
-		curses.mousemask(0)
+		if self.settings.mouse_enabled:
+			_setup_mouse(dict(value=False))
 		curses.endwin()
 
 	def set_load_mode(self, boolean):
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index a4a58e6e..6933957a 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -39,6 +39,7 @@ ALLOWED_SETTINGS = {
 	'scroll_offset': int,
 	'preview_files': bool,
 	'preview_directories': bool,
+	'mouse_enabled': bool,
 	'flushinput': bool,
 	'colorscheme': str,
 	'colorscheme_overlay': (type(None), type(lambda:0)),
-- 
cgit 1.4.1-2-gfad0


From e4e9ef4a93eb8d95f29848b2447968c6b9eef129 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 18:09:56 +0200
Subject: Fixed multiple signal bindings of the same function

---
 ranger/shared/settings.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 6933957a..c533205b 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -58,6 +58,9 @@ class SettingObject(SignalDispatcher):
 		SignalDispatcher.__init__(self)
 		self.__dict__['_settings'] = dict()
 		self.__dict__['_setting_sources'] = list()
+		for name in ALLOWED_SETTINGS:
+			self.signal_bind('setopt.'+name,
+					self._raw_set_with_signal, priority=0.2)
 
 	def __setattr__(self, name, value):
 		if name[0] == '_':
@@ -67,8 +70,6 @@ class SettingObject(SignalDispatcher):
 			assert self._check_type(name, value)
 			kws = dict(setting=name, value=value,
 					previous=self._settings[name])
-			self.signal_bind('setopt.'+name,
-					self._raw_set_with_signal, priority=0.2)
 			self.signal_emit('setopt', **kws)
 			self.signal_emit('setopt.'+name, **kws)
 
-- 
cgit 1.4.1-2-gfad0


From 1c09037cb7484bdd101c07f8373e2ea6fc9f91fd Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 18:10:33 +0200
Subject: shared.settings: allow to iterate over settings

---
 ranger/shared/settings.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index c533205b..9a8a0000 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -91,6 +91,10 @@ class SettingObject(SignalDispatcher):
 			self.__setattr__(name, value)
 			return self._settings[name]
 
+	def __iter__(self):
+		for x in self._settings:
+			yield x
+
 	def _check_type(self, name, value):
 		from inspect import isfunction
 		typ = ALLOWED_SETTINGS[name]
-- 
cgit 1.4.1-2-gfad0


From e8faa101b6e59239e5bea2d52eba7b1d2ed707b0 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 18:49:34 +0200
Subject: added :set <name>=<value> command

---
 ranger/defaults/commands.py  | 33 +++++++++++++++++++++++++++++++++
 ranger/ext/command_parser.py | 16 ++++++++++++++++
 ranger/shared/settings.py    | 12 ++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index c0e1ccf1..c364fda0 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -236,6 +236,39 @@ class find(Command):
 		return self.count == 1
 
 
+class set(Command):
+	"""
+	:set <option name>=<python expression>
+
+	Gives an option a new value.
+	"""
+	def execute(self):
+		line = parse(self.line)
+		name = line.chunk(1)
+		try:
+			value = eval(line.rest(2))
+		except:
+			return
+		self.fm.settings[name] = value
+
+	def tab(self):
+		line = parse(self.line)
+		name, value, name_done = line.parse_setting_line()
+		settings = self.fm.settings
+		if not name:
+			return (line + setting for setting in settings)
+		if not value and not name_done:
+			return (line + setting for setting in settings \
+					if setting.startswith(name))
+		if not value:
+			return line + repr(settings[name])
+		if bool in settings.types_of(name):
+			if 'true'.startswith(value.lower()):
+				return line + 'True'
+			if 'false'.startswith(value.lower()):
+				return line + 'False'
+
+
 class quit(Command):
 	"""
 	:quit
diff --git a/ranger/ext/command_parser.py b/ranger/ext/command_parser.py
index a6971631..3a676e8f 100644
--- a/ranger/ext/command_parser.py
+++ b/ranger/ext/command_parser.py
@@ -13,12 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
+SETTINGS_RE = re.compile(r'^([^\s]+?)=(.*)$')
+
 class LazyParser(object):
 	"""Parse commands and extract information"""
 	def __init__(self, line):
 		self.line = line
 		self._chunks = None
 		self._rests = None
+		self._setting_line = None
 		self._rests_loaded = 0
 		self._rests_gen_instance = None
 
@@ -62,5 +66,17 @@ class LazyParser(object):
 				lastrest = lastrest[n:]
 				n = 0
 
+	def parse_setting_line(self):
+		if self._setting_line is not None:
+			return self._setting_line
+		match = SETTINGS_RE.match(self.rest(1))
+		if match:
+			self.firstpart += match.group(1) + '='
+			result = [match.group(1), match.group(2), True]
+		else:
+			result = [self.chunk(1), self.rest(2), ' ' in self.rest(1)]
+		self._setting_line = result
+		return result
+
 	def __add__(self, newpart):
 		return self.firstpart + newpart
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 9a8a0000..c5544a47 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -95,6 +95,18 @@ class SettingObject(SignalDispatcher):
 		for x in self._settings:
 			yield x
 
+	def types_of(self, name):
+		try:
+			typ = ALLOWED_SETTINGS[name]
+		except KeyError:
+			return tuple()
+		else:
+			if isinstance(typ, tuple):
+				return typ
+			else:
+				return (typ, )
+
+
 	def _check_type(self, name, value):
 		from inspect import isfunction
 		typ = ALLOWED_SETTINGS[name]
-- 
cgit 1.4.1-2-gfad0


From b8b7363781ff8c92ff2a0aa813cdee0b1c5ac034 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 18:57:52 +0200
Subject: changed {/}/[/] keys

---
 ranger/defaults/keys.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index 623cd53f..6f50635e 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -74,8 +74,18 @@ def initialize_commands(map):
 	map(ctrl('d'), 'J', fm.move_pointer_by_pages(0.5))
 	map(ctrl('u'), 'K', fm.move_pointer_by_pages(-0.5))
 
-	map(']', fm.traverse())
-	map('[', fm.history_go(-1))
+	def move_parent(n):
+		def fnc(arg):
+			arg.fm.move_left()
+			arg.fm.move_pointer(n)
+			if arg.fm.env.cf.is_directory:
+				arg.fm.move_right()
+		return fnc
+
+	map(']', move_parent(1))
+	map('[', move_parent(-1))
+	map('}', fm.traverse())
+	map('{', fm.history_go(-1))
 
 	# --------------------------------------------------------- history
 	map('H', fm.history_go(-1))
-- 
cgit 1.4.1-2-gfad0


From f677745aaaafd4784526d0969183a4a683148a72 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 19:02:40 +0200
Subject: Fixed "=" seperator in set command

---
 ranger/defaults/commands.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index c364fda0..f894f23d 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -245,14 +245,18 @@ class set(Command):
 	def execute(self):
 		line = parse(self.line)
 		name = line.chunk(1)
-		try:
-			value = eval(line.rest(2))
-		except:
-			return
-		self.fm.settings[name] = value
+		name, value, _ = line.parse_setting_line()
+		if name and value:
+			try:
+				value = eval(value)
+			except:
+				pass
+			self.fm.settings[name] = value
 
 	def tab(self):
 		line = parse(self.line)
+		from ranger import log
+		log(line.parse_setting_line())
 		name, value, name_done = line.parse_setting_line()
 		settings = self.fm.settings
 		if not name:
-- 
cgit 1.4.1-2-gfad0


From 9ea99e21402824ab670d81dc376cb58696edf9a4 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 19:03:39 +0200
Subject: defaults.commands: better comment

---
 ranger/defaults/commands.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py
index f894f23d..4b2d1c8f 100644
--- a/ranger/defaults/commands.py
+++ b/ranger/defaults/commands.py
@@ -58,7 +58,7 @@ class Command(FileManagerAware):
 		rel_dirname = dirname(rel_dest)
 
 		try:
-			# are we after a directory?
+			# are we at the end of a directory?
 			if rel_dest.endswith('/') or rel_dest == '':
 				_, dirnames, _ = os.walk(abs_dest).next()
 
@@ -107,7 +107,7 @@ class Command(FileManagerAware):
 		rel_dirname = dirname(rel_dest)
 
 		try:
-			# are we after a directory?
+			# are we at the end of a directory?
 			if rel_dest.endswith('/') or rel_dest == '':
 				_, dirnames, filenames = os.walk(abs_dest).next()
 				names = dirnames + filenames
-- 
cgit 1.4.1-2-gfad0


From feea0c6ddb81321d932aa3761edfb6f96bab9eb8 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Thu, 8 Apr 2010 19:24:40 +0200
Subject: added doc/print_keys.py

---
 doc/print_keys.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/print_keys.py

diff --git a/doc/print_keys.py b/doc/print_keys.py
new file mode 100644
index 00000000..0790acab
--- /dev/null
+++ b/doc/print_keys.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+"""
+You can use this tool to find out values of keypresses
+"""
+
+from curses import *
+
+sep = '; '
+
+@wrapper
+def main(w):
+	while True:
+		w.addstr(str(w.getch()) + sep)
+
-- 
cgit 1.4.1-2-gfad0


From 7e48a475869781751d20606cf8b4115364fafe84 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Fri, 9 Apr 2010 00:42:59 +0200
Subject: removed debugging code

---
 ranger/api/keys.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ranger/api/keys.py b/ranger/api/keys.py
index 87186378..5b833c34 100644
--- a/ranger/api/keys.py
+++ b/ranger/api/keys.py
@@ -75,7 +75,6 @@ def narg(number_, function_, *args_, **keywords_):
 	narg(50, foo, 123) == foo(123, narg=50)
 	"""
 	args, keywords = replace_narg(number_, function_, args_, keywords_)
-	print(args, keywords)
 	return function_(*args, **keywords)
 
 def replace_narg(number, function, args, keywords):
-- 
cgit 1.4.1-2-gfad0


From 5249464c9969a878ccb5d5b628fdd23ec1ef53e8 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Fri, 9 Apr 2010 02:06:31 +0200
Subject: ext.shutil_generatorized: silently ignore permission exceptions

---
 ranger/ext/shutil_generatorized.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ranger/ext/shutil_generatorized.py b/ranger/ext/shutil_generatorized.py
index 8bf07ace..ca6be426 100644
--- a/ranger/ext/shutil_generatorized.py
+++ b/ranger/ext/shutil_generatorized.py
@@ -83,18 +83,22 @@ def copymode(src, dst):
     if hasattr(os, 'chmod'):
         st = os.stat(src)
         mode = stat.S_IMODE(st.st_mode)
-        os.chmod(dst, mode)
+        try: os.chmod(dst, mode)
+        except: pass
 
 def copystat(src, dst):
     """Copy all stat info (mode bits, atime, mtime, flags) from src to dst"""
     st = os.stat(src)
     mode = stat.S_IMODE(st.st_mode)
     if hasattr(os, 'utime'):
-        os.utime(dst, (st.st_atime, st.st_mtime))
+        try: os.utime(dst, (st.st_atime, st.st_mtime))
+        except: pass
     if hasattr(os, 'chmod'):
-        os.chmod(dst, mode)
+        try: os.chmod(dst, mode)
+        except: pass
     if hasattr(os, 'chflags') and hasattr(st, 'st_flags'):
-        os.chflags(dst, st.st_flags)
+        try: os.chflags(dst, st.st_flags)
+        except: pass
 
 
 def copy(src, dst, overwrite=False):
-- 
cgit 1.4.1-2-gfad0


From 035a39a8a468ba842fd69a2370aba8ac3c1f3d39 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Fri, 9 Apr 2010 04:07:21 +0200
Subject: defaults.apps: edit xml files with editor

---
 ranger/defaults/apps.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index 9543badb..b3500c0d 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -58,9 +58,11 @@ class CustomApplications(Applications):
 		f = c.file
 
 		if f.extension is not None:
-			if f.extension in ('pdf'):
+			if f.extension in ('pdf' ):
 				c.flags += 'd'
 				return self.either(c, 'evince', 'zathura', 'apvlv')
+			if f.extension in ('xml', ):
+				return self.app_editor(c)
 			if f.extension in ('html', 'htm', 'xhtml', 'swf'):
 				return self.either(c, 'firefox', 'opera', 'elinks')
 			if f.extension in ('swc', 'smc'):
-- 
cgit 1.4.1-2-gfad0