Commit 73c11d8a authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'no-inplace-edit' of https://github.com/ulteq/feh into ulteq-no-inplace-edit

parents bc8f6d80 4eb72706

src/imlib.c

+16 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,22 @@ void feh_edit_inplace(winwidget w, int op) 
	if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)

		return;



	if (opt.no_inplace_edit) {

		imlib_context_set_image(w->im);

		if (op == INPLACE_EDIT_FLIP)

			imlib_image_flip_vertical();

		else if (op == INPLACE_EDIT_MIRROR)

			imlib_image_flip_horizontal();

		else {

			imlib_image_orientate(op);

			tmp = w->im_w;

			FEH_FILE(w->file->data)->info->width = w->im_w = w->im_h;

			FEH_FILE(w->file->data)->info->height = w->im_h = tmp;

		}

		winwidget_render_image(w, 1, 0);

		return;

	}



	if (!strcmp(gib_imlib_image_format(w->im), "jpeg") &&

			!path_is_url(FEH_FILE(w->file->data)->filename)) {

		feh_edit_inplace_lossless(w, op);

src/options.c

+4 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
		{"conversion-timeout" , 1, 0, 245},

		{"version-sort"  , 0, 0, 246},

		{"offset"        , 1, 0, 247},

		{"no-inplace-edit", 0, 0, 248},

		{0, 0, 0, 0}

	};

	int optch = 0, cmdx = 0;
@@ -805,6 +806,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
			opt.offset_flags = XParseGeometry(optarg, &opt.offset_x,

					&opt.offset_y, (unsigned int *)&discard, (unsigned int *)&discard);

			break;

		case 248:

			opt.no_inplace_edit = 1;

			break;

		default:

			break;

		}

src/options.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct __fehoptions { 
	double reload;

	int sort;

	int version_sort;

	int no_inplace_edit;

	int debug;

	int geom_enabled;

	int geom_flags;