1 files changed, 54 insertions, 21 deletions

diff --git a/src/wallpaper.c b/src/wallpaper.c
index 2d3d3bc..db14a8c 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -1,7 +1,7 @@
 /* wallpaper.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
-Copyright (C) 2010-2011 Daniel Friesel.
+Copyright (C) 2010-2018 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -453,36 +453,69 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
 			if (home) {
 				FILE *fp;
 				char *path;
+				char *absolute_path;
 				struct stat s;
+				gib_list *filelist_pos = filelist;
 				path = estrjoin("/", home, ".fehbg", NULL);
 				if ((fp = fopen(path, "w")) == NULL) {
 					weprintf("Can't write to %s", path);
 				} else {
 					fputs("#!/bin/sh\n", fp);
+					fputs(cmdargv[0], fp);
+					fputs(" --bg-", fp);
+					if (centered)
+						fputs("center", fp);
+					else if (scaled)
+						fputs("scale", fp);
+					else if (filled == 1)
+						fputs("fill", fp);
+					else if (filled == 2)
+						fputs("max", fp);
+					else
+						fputs("tile", fp);
+					if (opt.image_bg) {
+						fputs(" --image-bg ", fp);
+						fputs(shell_escape(opt.image_bg), fp);
+					}
+#ifdef HAVE_LIBXINERAMA
+					if (opt.xinerama) {
+						if (opt.xinerama_index >= 0) {
+							fprintf(fp, " --xinerama-index %d", opt.xinerama_index);
+						}
+					}
+					else {
+						fputs(" --no-xinerama", fp);
+					}
+#endif			/* HAVE_LIBXINERAMA */
+					if (opt.geom_flags & XValue) {
+						fprintf(fp, " --geometry %c%d",
+								opt.geom_flags & XNegative ? '-' : '+',
+								opt.geom_flags & XNegative ? abs(opt.geom_x) : opt.geom_x);
+						if (opt.geom_flags & YValue) {
+							fprintf(fp, "%c%d",
+									opt.geom_flags & YNegative ? '-' : '+',
+									opt.geom_flags & YNegative ? abs(opt.geom_y) : opt.geom_y);
+						}
+					}
+					if (opt.force_aliasing) {
+						fputs(" --force-aliasing", fp);
+					}
+					fputc(' ', fp);
 					if (use_filelist) {
 						for (int i = 0; i < cmdargc; i++) {
-							fputs(shell_escape(cmdargv[i]), fp);
-							fputc(' ', fp);
+							if (filelist_pos && !strcmp(FEH_FILE(filelist_pos->data)->filename, cmdargv[i])) {
+								/* argument is a file */
+								absolute_path = feh_absolute_path(cmdargv[i]);
+								fputs(shell_escape(absolute_path), fp);
+								filelist_pos = filelist_pos->next;
+								free(absolute_path);
+								fputc(' ', fp);
+							}
 						}
 					} else if (fil) {
-						fputs("feh --bg-", fp);
-						if (centered)
-							fputs("center", fp);
-						else if (scaled)
-							fputs("scale", fp);
-						else if (filled)
-							fputs("fill", fp);
-						else
-							fputs("tile", fp);
-
-						if (opt.force_aliasing)
-							fputs(" --force-aliasing", fp);
-#ifdef HAVE_LIBXINERAMA
-						if (!opt.xinerama)
-							fputs(" --no-xinerama", fp);
-#endif
-						fputc(' ', fp);
-						fputs(shell_escape(fil), fp);
+						absolute_path = feh_absolute_path(fil);
+						fputs(shell_escape(absolute_path), fp);
+						free(absolute_path);
 					}
 					fputc('\n', fp);
 					fclose(fp);