summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-19 00:39:11 +0200
committerhut <hut@lavabit.com>2010-04-19 00:39:11 +0200
commitf61767b148f274a06e6a14644978904548a4abda (patch)
treea8865531f20cc710da35096d36bfd01ca2805adf
parent13c70addb0a571b16ad2351b8a833283c70a1d39 (diff)
downloadranger-f61767b148f274a06e6a14644978904548a4abda.tar.gz
defaults.apps: run ff/opera detached, dont open swf in elinks
-rw-r--r--ranger/defaults/apps.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index cc0fbec6..62dbb68c 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -64,7 +64,9 @@ class CustomApplications(Applications):
 				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'):
+			if f.extension in ('html', 'htm', 'xhtml'):
+				return self.either(c, 'firefox', 'opera')
+			if f.extension in ('swf', ):
 				return self.either(c, 'firefox', 'opera', 'elinks')
 			if f.extension in ('swc', 'smc'):
 				return self.app_zsnes(c)
@@ -200,10 +202,12 @@ class CustomApplications(Applications):
 
 	@depends_on('opera')
 	def app_opera(self, c):
+		c.flags += 'd'
 		return tup('opera', *c)
 
 	@depends_on('firefox')
 	def app_firefox(self, c):
+		c.flags += 'd'
 		return tup("firefox", *c)
 
 	@depends_on('javac')
t { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
c{0: 0 (((1 integer) (raw)) <- ((copy)) ((2 integer) (space global))) -- nil
c{1: 0 ✓ (((1 integer) (raw)) <- ((copy)) ((2 integer) (space global)))
c{0: 0 (((default-space space-address)) <- ((new)) ((space literal)) ((5 literal))) -- nil
c{0: 1 (((2 integer)) <- ((copy)) ((4 literal))) -- nil
c{0: 2 (((fork)) ((f1 fn)) ((default-space space-address) (globals)) ((nil literal) (limit))) -- nil
c{1: 0 ✓ (((default-space space-address)) <- ((new)) ((space literal)) ((5 literal)))
c{1: 1 ✓ (((2 integer)) <- ((copy)) ((4 literal)))
c{1: 2 ✓ (((fork)) ((f1 fn)) ((default-space space-address) (globals)) ((nil literal) (limit)))
cn0: convert-names in f1
cn0: (((1 integer) (raw)) <- ((copy)) ((2 integer) (space global))) nil nil
cn0: checking arg ((2 integer) (space global))
maybe-add: ((2 integer) (space global))
cn0: checking oarg ((1 integer) (raw))
maybe-add: ((1 integer) (raw))
cn0: convert-names in main
cn0: (((default-space space-address)) <- ((new)) ((space literal)) ((5 literal))) nil nil
cn0: checking arg ((space literal))
cn0: checking arg ((5 literal))
cn0: checking oarg ((default-space space-address))
maybe-add: ((default-space space-address))
cn0: (((2 integer)) <- ((copy)) ((4 literal))) nil nil
cn0: checking arg ((4 literal))
cn0: checking oarg ((2 integer))
maybe-add: ((2 integer))
cn0: (((fork)) ((f1 fn)) ((default-space space-address) (globals)) ((nil literal) (limit))) nil nil
cn0: checking arg ((f1 fn))
cn0: checking arg ((default-space space-address) (globals))
maybe-add: ((default-space space-address) (globals))
cn0: checking arg ((nil literal) (limit))
cn1: (((1 integer) (raw)) <- ((copy)) ((2 integer) (space global)))
cn1: (((default-space space-address)) <- ((new)) ((space literal)) ((5 literal)))
cn1: (((2 integer)) <- ((copy)) ((4 literal)))
cn1: (((fork)) ((f1 fn)) ((default-space space-address) (globals)) ((nil literal) (limit)))
schedule: main
run: main 0: (((default-space space-address)) <- ((new)) ((space literal)) ((5 literal)))
run: main 0: 1000 => ((default-space space-address))
run: main 1: (((2 integer)) <- ((copy)) ((4 literal)))
run: main 1: 4 => ((2 integer))
mem: ((2 integer)): 1003 <= 4
run: main 2: (((fork)) ((f1 fn)) ((default-space space-address) (globals)) ((nil literal) (limit)))
schedule: done with routine nil
schedule: f1
run: f1 0: (((1 integer) (raw)) <- ((copy)) ((2 integer) (space global)))
mem: ((2 integer) (space global)) => 4
run: f1 0: 4 => ((1 integer) (raw))
mem: ((1 integer) (raw)): 1 <= 4
schedule: done with routine nil