Commit acada1a7 authored by ulteq's avatar ulteq
Browse files

Allow empty string as --geometry argument 

Passing an empty string to the --geometry option will enable fixed geometry mode without having to specify anything else
parent 9779f11f

src/options.c

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
				opt.filelistfile = estrdup(optarg);

			break;

		case 'g':

			opt.geom_enabled = 1;

			opt.geom_flags = XParseGeometry(optarg, &opt.geom_x,

					&opt.geom_y, &opt.geom_w, &opt.geom_h);

			break;

src/options.h

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

	int version_sort;

	int debug;

	int geom_enabled;

	int geom_flags;

	int geom_x;

	int geom_y;

src/winwidget.c

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



	/* do not scale down a thumbnail list window, only those created from it */

	if (opt.scale_down && (ret->type != WIN_TYPE_THUMBNAIL)) {

	if (opt.geom_enabled && (ret->type != WIN_TYPE_THUMBNAIL)) {

		opt.geom_w = w;

		opt.geom_h = h;

		opt.geom_flags |= WidthValue | HeightValue;