#include "exif.h"
#include "metadata.h"
#include "histogram.h"
+#include "history_list.h"
#include "image-load.h"
#include "image-overlay.h"
#include "layout.h"
static GList *image_list = NULL;
-static void image_update_title(ImageWindow *imd);
+void image_update_title(ImageWindow *imd);
static void image_read_ahead_start(ImageWindow *imd);
static void image_cache_set(ImageWindow *imd, FileData *fd);
pixbuf_start_x = event->x;
pixbuf_start_y = event->y;
- image_start_x = x_pixel;
- image_start_y = y_pixel;
+
+ if (x_pixel == -1)
+ {
+ image_start_x = 0;
+ }
+ else
+ {
+ image_start_x = x_pixel;
+ }
+
+ if (y_pixel == -1)
+ {
+ image_start_y = 0;
+ }
+ else
+ {
+ image_start_y = y_pixel;
+ }
}
if (rect_id)
gint rect_height;
GdkPixbuf *rect_pixbuf;
gint x_pixel, y_pixel;
+ gint image_x_pixel, image_y_pixel;
if (options->draw_rectangle)
{
pixbuf_renderer_get_image_size(pr, &width, &height);
pixbuf_renderer_get_mouse_position(pr, &x_pixel, &y_pixel);
- switch_coords_orientation(imd, x_pixel, y_pixel, width, height);
+ if (x_pixel == -1)
+ {
+ image_x_pixel = width;
+ }
+ else
+ {
+ image_x_pixel = x_pixel;
+ }
+
+ if (y_pixel == -1)
+ {
+ image_y_pixel = height;
+ }
+ else
+ {
+ image_y_pixel = y_pixel;
+ }
+
+ switch_coords_orientation(imd, image_x_pixel, image_y_pixel, width, height);
if (rect_id)
{
pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, rect_id);
*-------------------------------------------------------------------
*/
-static void image_update_title(ImageWindow *imd)
+void image_update_title(ImageWindow *imd)
{
gchar *title = NULL;
gchar *zoom = NULL;
ImageWindow *imd = (ImageWindow *)data;
if (imd->cm) color_man_correct_region(imd->cm, *pixbuf, x, y, w, h);
if (imd->desaturate) pixbuf_desaturate_rect(*pixbuf, x, y, w, h);
-
+ if (imd->overunderexposed) pixbuf_highlight_overunderexposed(*pixbuf, x, y, w, h);
}
void image_alter_orientation(ImageWindow *imd, FileData *fd_n, AlterType type)
void image_set_desaturate(ImageWindow *imd, gboolean desaturate)
{
imd->desaturate = desaturate;
- if (imd->cm || imd->desaturate)
+ if (imd->cm || imd->desaturate || imd->overunderexposed)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
else
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
return imd->desaturate;
}
+void image_set_overunderexposed(ImageWindow *imd, gboolean overunderexposed)
+{
+ imd->overunderexposed = overunderexposed;
+ if (imd->cm || imd->desaturate || imd->overunderexposed)
+ pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
+ else
+ pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
+ pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
+}
+
+gboolean image_get_overunderexposed(ImageWindow *imd)
+{
+ return imd->overunderexposed;
+}
+
+void image_set_ignore_alpha(ImageWindow *imd, gboolean ignore_alpha)
+{
+ pixbuf_renderer_set_ignore_alpha((PixbufRenderer *)imd->pr, ignore_alpha);
+}
+
/*
*-------------------------------------------------------------------
* read ahead (prebuffer)
break;
case FORMAT_CLASS_VIDEO:
pixbuf = pixbuf_inline(PIXBUF_INLINE_VIDEO);
+ break;
case FORMAT_CLASS_COLLECTION:
pixbuf = pixbuf_inline(PIXBUF_INLINE_COLLECTION);
break;
- case FORMAT_CLASS_PDF:
+ case FORMAT_CLASS_DOCUMENT:
pixbuf = pixbuf_inline(PIXBUF_INLINE_ICON_PDF);
break;
default:
static gboolean image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
{
ImageWindow *imd = data;
+ gboolean in_lw = FALSE;
+ gint i = 0;
+ LayoutWindow *lw = NULL;
- if (imd->func_scroll &&
- event && event->type == GDK_SCROLL)
+ if (imd->func_scroll && event && event->type == GDK_SCROLL)
{
- imd->func_scroll(imd, event, imd->data_scroll);
- return TRUE;
+ layout_valid(&lw);
+ /* check if the image is in a layout window */
+ for (i = 0; i < MAX_SPLIT_IMAGES; i++)
+ {
+ if (imd == lw->split_images[i])
+ {
+ in_lw = TRUE;
+ break;
+ }
+ }
+
+ if (in_lw)
+ {
+ if (lw->options.split_pane_sync)
+ {
+ for (i = 0; i < MAX_SPLIT_IMAGES; i++)
+ {
+ if (lw->split_images[i])
+ {
+ layout_image_activate(lw, i, FALSE);
+ imd->func_scroll(lw->split_images[i], event, lw->split_images[i]->data_scroll);
+ }
+ }
+ }
+ else
+ {
+ imd->func_scroll(imd, event, imd->data_scroll);
+ }
+ return TRUE;
+ }
+ else
+ {
+ imd->func_scroll(imd, event, imd->data_scroll);
+ return TRUE;
+ }
}
return FALSE;
void image_attach_window(ImageWindow *imd, GtkWidget *window,
const gchar *title, const gchar *title_right, gboolean show_zoom)
{
+ LayoutWindow *lw;
+
imd->top_window = window;
g_free(imd->title);
imd->title = g_strdup(title);
imd->title_right = g_strdup(title_right);
imd->title_show_zoom = show_zoom;
- if (!options->image.fit_window_to_image) window = NULL;
+ lw = layout_find_by_image(imd);
+
+ if (!(options->image.fit_window_to_image && lw && (lw->options.tools_float || lw->options.tools_hidden))) window = NULL;
pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)window);
void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom, gboolean lazy)
{
+ LayoutWindow *lw;
StereoPixbufData stereo_data = STEREO_PIXBUF_DEFAULT;
/* read_exif and similar functions can actually notice that the file has changed and trigger
a notification that removes the pixbuf from cache and unrefs it. Therefore we must ref it
if (pixbuf) g_object_unref(pixbuf);
- if (imd->color_profile_enable)
+ /* Color correction takes too much time for an animated gif */
+ lw = layout_find_by_image(imd);
+ if (imd->color_profile_enable && lw && !lw->animation)
{
- image_post_process_color(imd, 0, FALSE); /* TODO: error handling */
+ image_post_process_color(imd, 0, FALSE); /** @todo error handling */
}
- if (imd->cm || imd->desaturate)
+ if (imd->cm || imd->desaturate || imd->overunderexposed)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
image_state_set(imd, IMAGE_STATE_IMAGE);
collection_table_unselect_all(cw->table);
collection_table_select(cw->table,info);
}
+
+ if (info->fd)
+ {
+ image_chain_append_end(info->fd->path);
+ }
}
CollectionData *image_get_collection(ImageWindow *imd, CollectInfo **info)
pixbuf_renderer_move(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
- if (imd->cm || imd->desaturate)
+ if (imd->cm || imd->desaturate || imd->overunderexposed)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
else
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
pixbuf_renderer_copy(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
- if (imd->cm || imd->desaturate)
+ if (imd->cm || imd->desaturate || imd->overunderexposed)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
else
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
if ((type & NOTIFY_REREAD) && fd == imd->image_fd)
{
/* there is no need to reload on NOTIFY_CHANGE,
- modified files should be detacted anyway and NOTIFY_REREAD should be recieved
+ modified files should be detacted anyway and NOTIFY_REREAD should be received
or they are removed from the filelist completely on "move" and "delete"
*/
DEBUG_1("Notify image: %s %04x", fd->path, type);
if (frame)
{
imd->frame = gtk_frame_new(NULL);
+ DEBUG_NAME(imd->frame);
g_object_ref(imd->pr);
if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
imd->orientation = 1;
imd->pr = GTK_WIDGET(pixbuf_renderer_new());
+ DEBUG_NAME(imd->pr);
image_options_set(imd);
imd->widget = gtk_vbox_new(0, 0);
+ DEBUG_NAME(imd->widget);
image_set_frame(imd, frame);
projects / geeqie.git / blobdiff