summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-12-04 06:26:55 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-12-04 06:26:55 +0100
commitfb53f24b4f0e4e6da4cefd9d72aa54a5fb0135ee (patch)
tree5b45c871b8d69408f4fa531d73dbe96588ca5787
parentf9609945e76eef4ce36be9926e18b2383fbb67f3 (diff)
--bg-max: Respect --image-bg setting
-rw-r--r--ChangeLog1
-rw-r--r--src/wallpaper.c9
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9645aaf..0d59278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ git HEAD
* Do not apply --scale-down to the thumbnail window. It will be applied
to windows opened from this, though.
* Patch by Rob Cornish: Respect --image-bg when setting a wallpaper
+ * Fix --bg-max not respecting --image-bg setting (thanks, 12qu)
Tue, 16 Oct 2012 06:29:58 +0200 Daniel Friesel <derf+feh@finalrewind.org>
diff --git a/src/wallpaper.c b/src/wallpaper.c
index df78303..30c3925 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -190,6 +190,9 @@ static void feh_wm_set_bg_maxed(Pixmap pmap, Imlib_Image im, int use_filelist,
void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
int filled, int desktop, int use_filelist)
{
+ XGCValues gcvalues;
+ XGCValues gcval;
+ GC gc;
char bgname[20];
int num = (int) rand();
char bgfil[4096];
@@ -264,8 +267,6 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
Display *disp2;
Window root2;
int depth2;
- XGCValues gcvalues;
- GC gc;
int in, out, w, h;
if (opt.xinerama)
@@ -322,8 +323,6 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
0, 0, scr->width, scr->height);
fehbg = estrjoin(" ", "feh", fehbg_xinerama, "--bg-scale", filbuf, NULL);
} else if (centered) {
- XGCValues gcval;
- GC gc;
D(("centering\n"));
@@ -368,14 +367,12 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
fehbg = estrjoin(" ", "feh", fehbg_xinerama, "--bg-fill", filbuf, NULL);
} else if (filled == 2) {
- XGCValues gcval;
pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth);
if (opt.image_bg == IMAGE_BG_WHITE)
gcval.foreground = WhitePixel(disp, DefaultScreen(disp));
else
gcval.foreground = BlackPixel(disp, DefaultScreen(disp));
- gcval.foreground = BlackPixel(disp, DefaultScreen(disp));
gc = XCreateGC(disp, root, GCForeground, &gcval);
XFillRectangle(disp, pmap_d1, gc, 0, 0, scr->width, scr->height);