* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "image.h"
+#include <config.h>
+
#include "collect-table.h"
#include "color-man.h"
+#include "compat.h"
+#include "debug.h"
#include "exif.h"
-#include "metadata.h"
+#include "filecache.h"
#include "history-list.h"
#include "image-load.h"
-#include "layout.h"
+#include "intl.h"
#include "layout-image.h"
+#include "layout.h"
+#include "metadata.h"
#include "pixbuf-renderer.h"
#include "pixbuf-util.h"
#include "ui-fileops.h"
-#include "filecache.h"
+#include "ui-misc.h"
#include <cmath>
*-------------------------------------------------------------------
*/
-static void image_click_cb(PixbufRenderer *UNUSED(pr), GdkEventButton *event, gpointer data)
+static void image_click_cb(PixbufRenderer *, GdkEventButton *event, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
if (!options->image_lm_click_nav && event->button == MOUSE_BUTTON_MIDDLE)
{
auto imd = static_cast<ImageWindow *>(data);
LayoutWindow *lw;
- gint x_pixel, y_pixel;
+ gint x_pixel;
+ gint y_pixel;
if(options->draw_rectangle)
{
}
}
+static void image_release_cb(PixbufRenderer *, GdkEventButton *event, gpointer data)
+{
+ auto imd = static_cast<ImageWindow *>(data);
+ LayoutWindow *lw;
+
+ lw = layout_find_by_image(imd);
+ if (!lw)
+ {
+ layout_valid(&lw);
+ }
+
+ defined_mouse_buttons(nullptr, event, lw);
+}
+
static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
- gint width, height;
+ gint width;
+ gint height;
gint rect_width;
gint rect_height;
GdkPixbuf *rect_pixbuf;
- gint x_pixel, y_pixel;
- gint image_x_pixel, image_y_pixel;
+ gint x_pixel;
+ gint y_pixel;
+ gint image_x_pixel;
+ gint image_y_pixel;
if (options->draw_rectangle)
{
if (imd->func_complete) imd->func_complete(imd, preload, imd->data_complete);
}
-static void image_render_complete_cb(PixbufRenderer *UNUSED(pr), gpointer data)
+static void image_render_complete_cb(PixbufRenderer *, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
if (imd->func_state) imd->func_state(imd, state, imd->data_state);
}
-static void image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
+static void image_zoom_cb(PixbufRenderer *, gdouble, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
}
-static void image_post_process_tile_color_cb(PixbufRenderer *UNUSED(pr), GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
+static void image_post_process_tile_color_cb(PixbufRenderer *, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
if (imd->cm) color_man_correct_region(static_cast<ColorMan *>(imd->cm), *pixbuf, x, y, w, h);
imd->read_ahead_fd = nullptr;
}
-static void image_read_ahead_done_cb(ImageLoader *UNUSED(il), gpointer data)
+static void image_read_ahead_done_cb(ImageLoader *, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
return cache;
}
-static void image_cache_set(ImageWindow *UNUSED(imd), FileData *fd)
+static void image_cache_set(ImageWindow *, FileData *fd)
{
g_assert(fd->pixbuf);
pixbuf_renderer_area_changed(pr, x, y, w, h);
}
-static void image_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
+static void image_load_done_cb(ImageLoader *, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
if (!image_loader_get_pixbuf(imd->il))
{
- GdkPixbuf *pixbuf;
-
- switch (imd->image_fd->format_class)
- {
- case FORMAT_CLASS_UNKNOWN:
- pixbuf = pixbuf_inline(PIXBUF_INLINE_UNKNOWN);
- break;
- case FORMAT_CLASS_META:
- pixbuf = pixbuf_inline(PIXBUF_INLINE_METADATA);
- 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_DOCUMENT:
- pixbuf = pixbuf_inline(PIXBUF_INLINE_ICON_PDF);
- break;
- case FORMAT_CLASS_ARCHIVE:
- pixbuf = pixbuf_inline(PIXBUF_INLINE_ARCHIVE);
- break;
- default:
- pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
- }
+ GdkPixbuf *pixbuf = pixbuf_fallback(imd->image_fd, 0, 0);
image_change_pixbuf(imd, pixbuf, image_zoom_get(imd), FALSE);
g_object_unref(pixbuf);
image_read_ahead_start(imd);
}
-static void image_load_size_cb(ImageLoader *UNUSED(il), guint width, guint height, gpointer data)
+static void image_load_size_cb(ImageLoader *, guint width, guint height, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
imd->read_ahead_fd = nullptr;
return TRUE;
}
- else if (imd->read_ahead_fd->pixbuf)
+ if (imd->read_ahead_fd->pixbuf)
{
image_change_pixbuf(imd, imd->read_ahead_fd->pixbuf, image_zoom_get(imd), FALSE);
*-------------------------------------------------------------------
*/
-static gboolean image_focus_in_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
+static gboolean image_focus_in_cb(GtkWidget *, GdkEventFocus *, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
return TRUE;
}
-static gboolean image_scroll_cb(GtkWidget *UNUSED(widget), GdkEventScroll *event, gpointer data)
+static gboolean image_scroll_cb(GtkWidget *, GdkEventScroll *event, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
gboolean in_lw = FALSE;
}
return TRUE;
}
- else
- {
- imd->func_scroll(imd, event, imd->data_scroll);
- return TRUE;
- }
+
+ imd->func_scroll(imd, event, imd->data_scroll);
+ return TRUE;
}
return FALSE;
{
PixbufRenderer *pr;
gdouble zoom;
- gint width, height;
+ gint width;
+ gint height;
pr = reinterpret_cast<PixbufRenderer *>(imd->pr);
g_object_set(G_OBJECT(imd->pr), "window_fit", allow_sync, NULL);
}
-void image_background_set_color(ImageWindow *imd, GdkColor *color)
+void image_background_set_color(ImageWindow *imd, GdkRGBA *color)
{
pixbuf_renderer_set_color(reinterpret_cast<PixbufRenderer *>(imd->pr), color);
}
void image_background_set_color_from_options(ImageWindow *imd, gboolean fullscreen)
{
- GdkColor *color = nullptr;
- GdkColor theme_color;
+ GdkRGBA *color = nullptr;
+ GdkRGBA theme_color;
GdkRGBA bg_color;
GtkStyleContext *style_context;
LayoutWindow *lw = nullptr;
style_context = gtk_widget_get_style_context(lw->window);
gtk_style_context_get_background_color(style_context, GTK_STATE_FLAG_NORMAL, &bg_color);
- theme_color.red = bg_color.red * 65535;
- theme_color.green = bg_color.green * 65535;
- theme_color.blue = bg_color.blue * 65535;
+ theme_color.red = bg_color.red * 1;
+ theme_color.green = bg_color.green * 1;
+ theme_color.blue = bg_color.blue * 1;
color = &theme_color;
}
}
}
-void image_to_root_window(ImageWindow *UNUSED(imd), gboolean UNUSED(scaled))
+void image_to_root_window(ImageWindow *, gboolean)
{
}
{
if (!imd->has_frame) return;
- gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
gtk_container_set_border_width(GTK_CONTAINER(imd->frame), selectable ? 4 : 0);
}
g_free(imd);
}
-static void image_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void image_destroy_cb(GtkWidget *, gpointer data)
{
auto imd = static_cast<ImageWindow *>(data);
image_free(imd);
}
-gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer UNUSED(data))
+gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer)
{
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
- gtk_paint_flat_box(gtk_widget_get_style(widget),
- cr,
- gtk_widget_get_state(widget),
- gtk_frame_get_shadow_type(GTK_FRAME(widget)),
- widget,
- nullptr,
- allocation.x + 3, allocation.y + 3,
- allocation.width - 6, allocation.height - 6);
+
+ gtk_render_frame(gtk_widget_get_style_context(widget), cr, allocation.x + 3, allocation.y + 3, allocation.width - 6, allocation.height - 6);
+ gtk_render_background(gtk_widget_get_style_context(widget), cr, allocation.x + 3, allocation.y + 3, allocation.width - 6, allocation.height - 6);
if (gtk_widget_has_focus(widget))
{
- gtk_paint_focus(gtk_widget_get_style(widget), cr, GTK_STATE_ACTIVE,
- widget, "image_window",
- allocation.x, allocation.y,
- allocation.width - 1, allocation.height - 1);
+ gtk_render_focus(gtk_widget_get_style_context(widget), cr, allocation.x, allocation.y, allocation.width - 1, allocation.height - 1);
}
else
{
- gtk_paint_shadow(gtk_widget_get_style(widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_IN,
- widget, "image_window",
- allocation.x, allocation.y,
- allocation.width - 1, allocation.height - 1);
+ gtk_render_frame(gtk_widget_get_style_context(widget), cr, allocation.x, allocation.y, allocation.width - 1, allocation.height - 1);
}
return FALSE;
}
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);
+ gq_gtk_container_add(GTK_WIDGET(imd->frame), imd->pr);
g_object_unref(imd->pr);
gtk_widget_set_can_focus(imd->frame, TRUE);
g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
G_CALLBACK(image_focus_in_cb), imd);
- gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
gtk_widget_show(imd->frame);
}
else
if (imd->frame)
{
gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
- gtk_widget_destroy(imd->frame);
+ g_object_unref(imd->frame);
imd->frame = nullptr;
}
- gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
g_object_unref(imd->pr);
}
G_CALLBACK(image_click_cb), imd);
g_signal_connect(G_OBJECT(imd->pr), "button_press_event",
G_CALLBACK(image_press_cb), imd);
+ g_signal_connect(G_OBJECT(imd->pr), "button_release_event",
+ G_CALLBACK(image_release_cb), imd);
g_signal_connect(G_OBJECT(imd->pr), "scroll_notify",
G_CALLBACK(image_scroll_notify_cb), imd);
projects / geeqie.git / blobdiff