summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/defaults/apps.py30
1 files changed, 23 insertions, 7 deletions
diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py
index ffa828c0..d4cf1b73 100644
--- a/ranger/defaults/apps.py
+++ b/ranger/defaults/apps.py
@@ -96,7 +96,10 @@ class CustomApplications(Applications):
 			return self.either(c, 'mplayer', 'smplayer', 'vlc', 'totem')
 
 		if f.image:
-			return self.either(c, 'feh', 'eog', 'mirage')
+			if c.mode in (11, 12, 13, 14):
+				return self.either(c, 'set_bg_with_feh')
+			else:
+				return self.either(c, 'sxiv', 'feh', 'eog', 'mirage')
 
 		if f.document or f.filetype.startswith('text') or f.size == 0:
 			return self.either(c, 'editor')
@@ -147,18 +150,31 @@ class CustomApplications(Applications):
 			return tup('mplayer', *c)
 
 	@depends_on('feh')
-	def app_feh(self, c):
-		arg = {1: '--bg-scale', 2: '--bg-tile', 3: '--bg-center'}
-
+	def app_set_bg_with_feh(self, c):
 		c.flags += 'd'
-
-		if c.mode in arg: # mode 1, 2 and 3 will set the image as the background
+		arg = {11: '--bg-scale', 12: '--bg-tile', 13: '--bg-center',
+				14: '--bg-fill'}
+		if c.mode in arg:
 			return tup('feh', arg[c.mode], c.file.path)
-		if c.mode is 11 and len(c.files) is 1: # view all files in the cwd
+		return tup('feh', arg[11], c.file.path)
+
+	@depends_on('feh')
+	def app_feh(self, c):
+		c.flags += 'd'
+		if c.mode is 0 and len(c.files) is 1: # view all files in the cwd
 			images = (f.basename for f in self.fm.env.cwd.files if f.image)
 			return tup('feh', '--start-at', c.file.basename, *images)
 		return tup('feh', *c)
 
+	@depends_on('sxiv')
+	def app_sxiv(self, c):
+		c.flags = 'd' + c.flags
+		if len(c.files) is 1:
+			images = [f.basename for f in self.fm.env.cwd.files if f.image]
+			position = images.index(c.file.basename) + 1
+			return tup('sxiv', '-n', str(position), *images)
+		return tup('sxiv', *c)
+
 	@depends_on('aunpack')
 	def app_aunpack(self, c):
 		if c.mode is 0:
'#n155'>155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216