Commit 89aeb953 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'custom-background-color' of https://github.com/ulteq/feh into... 

Merge branch 'custom-background-color' of https://github.com/ulteq/feh into ulteq-custom-background-color
parents 4b01c259 5965739a

man/feh.pre

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ Hide the pointer 
.It Cm -B , --image-bg Ar style

.

Use style as background for transparent image parts and the like.

Accepted values: checks, white, black.

Accepted values: default, checks, or a XColor (eg. #428bdd).

.

The default for windowed mode is checks, while fullscreen defaults to black.

.

src/feh.h

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ enum slide_change { SLIDE_NEXT, SLIDE_PREV, SLIDE_RAND, SLIDE_FIRST, SLIDE_LAST, 
	SLIDE_JUMP_PREV_DIR

};



enum image_bg { IMAGE_BG_CHECKS = 1, IMAGE_BG_BLACK, IMAGE_BG_WHITE };



#define INPLACE_EDIT_FLIP   -1

#define INPLACE_EDIT_MIRROR -2

src/help.raw

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ OPTIONS 
                           can be used multiple times to add multiple paths.

 -M, --menu-font FONT      Use FONT for the font in menus.

 -B, --image-bg STYLE      Set background for transparent images and the like.

                           Accepted values: white, black, default

                           Accepted values: default, checks, or a XColor (eg. #428bdd)

 -N, --no-menus            Don't load or show any menus.

     --no-xinerama         Disable Xinerama support

     --no-screen-clip      Do not limit window size to screen size

src/options.c

+1 −8
Original line number Diff line number Diff line
@@ -454,14 +454,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
			opt.actions[0] = estrdup(optarg);

			break;

		case 'B':

			if (!strcmp(optarg, "checks"))

				opt.image_bg = IMAGE_BG_CHECKS;

			else if (!strcmp(optarg, "white"))

				opt.image_bg = IMAGE_BG_WHITE;

			else if (!strcmp(optarg, "black"))

				opt.image_bg = IMAGE_BG_BLACK;

			else

				weprintf("Unknown argument to --image-bg: %s", optarg);

			opt.image_bg = estrdup(optarg);

			break;

		case 'C':

			D(("adding fontpath %s\n", optarg));

src/options.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ struct __fehoptions { 
	unsigned char cycle_once;

	unsigned char hold_actions[10];

	unsigned char text_bg;

	unsigned char image_bg;

	unsigned char no_fehbg;

	unsigned char keep_zoom_vp;

	unsigned char insecure_ssl;
@@ -80,6 +79,7 @@ struct __fehoptions { 
	char *output_file;

	char *output_dir;

	char *bg_file;

	char *image_bg;

	char *font;

	char *title_font;

	char *title;