Commit f1d41ee7 authored by Daniel Friesel's avatar Daniel Friesel
Browse files

Merge branch 'Ferada-x11-properties'

parents e0e3deac 84014485

man/feh.pre

+9 −2
Original line number Diff line number Diff line
@@ -303,6 +303,13 @@ zero causes 
to try indefinitely.

Negative values restore the default by disabling conversion altogether.

.

.It Cm --class Ar class

.

Set the X11 class hint to

.Ar class .

.

Default: feh

.

.It Cm -L , --customlist Ar format

.

Don't display images, print image info according to
@@ -330,7 +337,7 @@ Draw the file name at the top-left of the image. 
.

Show overlay texts

.Pq as created by Cm --draw-filename No et al

on a semi-transparent background to improve their readability

on a semi-transparent background to improve their readability.

.

.It Cm --edit

.

src/options.c

+4 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
#ifdef HAVE_INOTIFY

		{"auto-reload"   , 0, 0, 248},

#endif

		{"class"         , 1, 0, 249},

		{0, 0, 0, 0}

	};

	int optch = 0, cmdx = 0;
@@ -823,6 +824,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
			opt.auto_reload = 1;

			break;

#endif

		case 249:

			opt.x11_class = estrdup(optarg);

			break;

		default:

			break;

		}

src/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ struct __fehoptions { 
	int zoom_mode;

	unsigned char adjust_reload;

	int xinerama_index;

	char *x11_class;



	/* signed in case someone wants to invert scrolling real quick */

	int scroll_step;

src/winwidget.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ void winwidget_create_window(winwidget ret, int w, int h) 
	winwidget_update_title(ret);

	xch = XAllocClassHint();

	xch->res_name = "feh";

	xch->res_class = "feh";

	xch->res_class = opt.x11_class ? opt.x11_class : "feh";

	XSetClassHint(disp, ret->win, xch);

	XFree(xch);