Merge remote-tracking branch 'original/master'

1 files changed, 70 insertions, 4 deletions

diff --git a/src/imlib.c b/src/imlib.c
index f41cdcd..4d2f2fa 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "feh.h"
 #include "filelist.h"
+#include "signals.h"
 #include "winwidget.h"
 #include "options.h"
 
@@ -294,10 +295,22 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
 	}
 	file->ed = exifData;
 
-	if (orientation == 3)
+	if (orientation == 2)
+		gib_imlib_image_flip_horizontal(*im);
+	else if (orientation == 3)
 		gib_imlib_image_orientate(*im, 2);
+	else if (orientation == 4)
+		gib_imlib_image_flip_vertical(*im);
+	else if (orientation == 5) {
+		gib_imlib_image_orientate(*im, 3);
+		gib_imlib_image_flip_vertical(*im);
+	}
 	else if (orientation == 6)
 		gib_imlib_image_orientate(*im, 1);
+	else if (orientation == 7) {
+		gib_imlib_image_orientate(*im, 3);
+		gib_imlib_image_flip_horizontal(*im);
+	}
 	else if (orientation == 8)
 		gib_imlib_image_orientate(*im, 3);
 #endif
@@ -529,6 +542,24 @@ static char *feh_magick_load_image(char *filename)
 
 #ifdef HAVE_LIBCURL
 
+static int curl_quit_function(void *clientp,  curl_off_t dltotal,  curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+{
+	// ignore "unused parameter" warnings
+	(void)clientp;
+	(void)dltotal;
+	(void)dlnow;
+	(void)ultotal;
+	(void)ulnow;
+	if (sig_exit) {
+		/*
+		 * The user wants to quit feh. Tell libcurl to abort the transfer and
+		 * return control to the main loop, where we can quit gracefully.
+		 */
+		return 1;
+	}
+	return 0;
+}
+
 static char *feh_http_load_image(char *url)
 {
 	CURL *curl;
@@ -571,12 +602,21 @@ static char *feh_http_load_image(char *url)
 #ifdef DEBUG
 			curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
 #endif
+			/*
+			 * Do not allow requests to take longer than 30 minutes.
+			 * This should be sufficiently high to accomodate use cases with
+			 * unusually high latencies, while at the sime time avoiding
+			 * feh hanging indefinitely in unattended slideshows.
+			 */
+			curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1800);
 			curl_easy_setopt(curl, CURLOPT_URL, url);
 			curl_easy_setopt(curl, CURLOPT_WRITEDATA, sfp);
 			ebuff = emalloc(CURL_ERROR_SIZE);
 			curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ebuff);
 			curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L);
 			curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+			curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, curl_quit_function);
+			curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
 			if (opt.insecure_ssl) {
 				curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
 				curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
@@ -589,7 +629,9 @@ static char *feh_http_load_image(char *url)
 			res = curl_easy_perform(curl);
 			curl_easy_cleanup(curl);
 			if (res != CURLE_OK) {
-				weprintf("open url: %s", ebuff);
+				if (res != CURLE_ABORTED_BY_CALLBACK) {
+					weprintf("open url: %s", ebuff);
+				}
 				unlink(sfn);
 				close(fd);
 				free(sfn);
@@ -1192,6 +1234,26 @@ void feh_edit_inplace(winwidget w, int op)
 	if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)
 		return;
 
+	if (!opt.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;
+			w->im_w = w->im_h;
+			w->im_h = tmp;
+			if (FEH_FILE(w->file->data)->info) {
+				FEH_FILE(w->file->data)->info->width = w->im_w;
+				FEH_FILE(w->file->data)->info->height = w->im_h;
+			}
+		}
+		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);
@@ -1229,8 +1291,12 @@ void feh_edit_inplace(winwidget w, int op)
 		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;
+			w->im_w = w->im_h;
+			w->im_h = tmp;
+			if (FEH_FILE(w->file->data)->info) {
+				FEH_FILE(w->file->data)->info->width = w->im_w;
+				FEH_FILE(w->file->data)->info->height = w->im_h;
+			}
 		}
 		im_weprintf(w, "unable to edit in place. Changes have not been saved.");
 		winwidget_render_image(w, 1, 0);