Trim trailing white spaces.
[geeqie.git] / src / img-view.c
index f769b16..06368d4 100644 (file)
 /*
- * GQview image viewer
- * (C)2000 John Ellis
+ * Geeqie
+ * (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
  */
 
-#include "gqview.h"
+
+#include "main.h"
+#include "img-view.h"
+
+#include "collect.h"
+#include "collect-io.h"
+#include "dnd.h"
+#include "editors.h"
+#include "filedata.h"
+#include "fullscreen.h"
 #include "image.h"
+#include "image-overlay.h"
+#include "layout.h"
+#include "layout_image.h"
+#include "menu.h"
+#include "misc.h"
+#include "pixbuf_util.h"
+#include "pixbuf-renderer.h"
+#include "print.h"
+#include "slideshow.h"
+#include "ui_fileops.h"
+#include "ui_menu.h"
+#include "uri_utils.h"
+#include "utilops.h"
+#include "window.h"
+
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
+
+typedef struct _ViewWindow ViewWindow;
+struct _ViewWindow
+{
+       GtkWidget *window;
+       ImageWindow *imd;
+       FullScreenData *fs;
+       SlideShowData *ss;
+
+       GList *list;
+       GList *list_pointer;
+};
+
+
+static GList *view_window_list = NULL;
+
+
+static GtkWidget *view_popup_menu(ViewWindow *vw);
+static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off);
+static void view_overlay_toggle(ViewWindow *vw);
+
+static void view_slideshow_next(ViewWindow *vw);
+static void view_slideshow_prev(ViewWindow *vw);
+static void view_slideshow_start(ViewWindow *vw);
+static void view_slideshow_stop(ViewWindow *vw);
+
+static void view_window_close(ViewWindow *vw);
+
+static void view_window_dnd_init(ViewWindow *vw);
+
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data);
+
+/*
+ *-----------------------------------------------------------------------------
+ * misc
+ *-----------------------------------------------------------------------------
+ */
+
+static ImageWindow *view_window_active_image(ViewWindow *vw)
+{
+       if (vw->fs) return vw->fs->imd;
+
+       return vw->imd;
+}
+
+static void view_window_set_list(ViewWindow *vw, GList *list)
+{
+
+       filelist_free(vw->list);
+       vw->list = NULL;
+       vw->list_pointer = NULL;
+
+       vw->list = filelist_copy(list);
+}
+
+static gboolean view_window_contains_collection(ViewWindow *vw)
+{
+       CollectionData *cd;
+       CollectInfo *info;
+
+       cd = image_get_collection(view_window_active_image(vw), &info);
+
+       return (cd && info);
+}
+
+static void view_collection_step(ViewWindow *vw, gboolean next)
+{
+       ImageWindow *imd = view_window_active_image(vw);
+       CollectionData *cd;
+       CollectInfo *info;
+       CollectInfo *read_ahead_info = NULL;
+
+       cd = image_get_collection(imd, &info);
+
+       if (!cd || !info) return;
+
+       if (next)
+               {
+               info = collection_next_by_info(cd, info);
+               if (options->image.enable_read_ahead)
+                       {
+                       read_ahead_info = collection_next_by_info(cd, info);
+                       if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info);
+                       }
+               }
+       else
+               {
+               info = collection_prev_by_info(cd, info);
+               if (options->image.enable_read_ahead)
+                       {
+                       read_ahead_info = collection_prev_by_info(cd, info);
+                       if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info);
+                       }
+               }
+
+       if (info)
+               {
+               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
+
+               if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
+               }
+
+}
+
+static void view_collection_step_to_end(ViewWindow *vw, gboolean last)
+{
+       ImageWindow *imd = view_window_active_image(vw);
+       CollectionData *cd;
+       CollectInfo *info;
+       CollectInfo *read_ahead_info = NULL;
+
+       cd = image_get_collection(imd, &info);
+
+       if (!cd || !info) return;
+
+       if (last)
+               {
+               info = collection_get_last(cd);
+               if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
+               }
+       else
+               {
+               info = collection_get_first(cd);
+               if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
+               }
+
+       if (info)
+               {
+               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
+               if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
+               }
+}
+
+static void view_list_step(ViewWindow *vw, gboolean next)
+{
+       ImageWindow *imd = view_window_active_image(vw);
+       FileData *fd;
+       GList *work;
+       GList *work_ahead;
+
+       if (!vw->list) return;
+
+       fd = image_get_fd(imd);
+       if (!fd) return;
+
+       if (g_list_position(vw->list, vw->list_pointer) >= 0)
+               {
+               work = vw->list_pointer;
+               }
+       else
+               {
+               gboolean found = FALSE;
+
+               work = vw->list;
+               while (work && !found)
+                       {
+                       FileData *temp;
+
+                       temp = work->data;
+
+                       if (fd == temp)
+                               {
+                               found = TRUE;
+                               }
+                       else
+                               {
+                               work = work->next;
+                               }
+                       }
+               }
+       if (!work) return;
+
+       work_ahead = NULL;
+       if (next)
+               {
+               work = work->next;
+               if (work) work_ahead = work->next;
+               }
+       else
+               {
+               work = work->prev;
+               if (work) work_ahead = work->prev;
+               }
+
+       if (!work) return;
+
+       vw->list_pointer = work;
+       fd = work->data;
+       image_change_fd(imd, fd, image_zoom_get_default(imd));
+
+       if (options->image.enable_read_ahead && work_ahead)
+               {
+               FileData *next_fd = work_ahead->data;
+               image_prebuffer_set(imd, next_fd);
+               }
+}
+
+static void view_list_step_to_end(ViewWindow *vw, gboolean last)
+{
+       ImageWindow *imd = view_window_active_image(vw);
+       FileData *fd;
+       GList *work;
+       GList *work_ahead;
+
+       if (!vw->list) return;
+
+       if (last)
+               {
+               work = g_list_last(vw->list);
+               work_ahead = work->prev;
+               }
+       else
+               {
+               work = vw->list;
+               work_ahead = work->next;
+               }
+
+       vw->list_pointer = work;
+       fd = work->data;
+       image_change_fd(imd, fd, image_zoom_get_default(imd));
+
+       if (options->image.enable_read_ahead && work_ahead)
+               {
+               FileData *next_fd = work_ahead->data;
+               image_prebuffer_set(imd, next_fd);
+               }
+}
+
+static void view_step_next(ViewWindow *vw)
+{
+       if (vw->ss)
+               {
+               view_slideshow_next(vw);
+               }
+       else if (vw->list)
+               {
+               view_list_step(vw, TRUE);
+               }
+       else
+               {
+               view_collection_step(vw, TRUE);
+               }
+}
+
+static void view_step_prev(ViewWindow *vw)
+{
+       if (vw->ss)
+               {
+               view_slideshow_prev(vw);
+               }
+       else if (vw->list)
+               {
+               view_list_step(vw, FALSE);
+               }
+       else
+               {
+               view_collection_step(vw, FALSE);
+               }
+}
+
+static void view_step_to_end(ViewWindow *vw, gboolean last)
+{
+       if (vw->list)
+               {
+               view_list_step_to_end(vw, last);
+               }
+       else
+               {
+               view_collection_step_to_end(vw, last);
+               }
+}
+
 /*
  *-----------------------------------------------------------------------------
  * view window keyboard
  *-----------------------------------------------------------------------------
  */
 
-static gint view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
 {
-       ImageWindow *imd = data;
-       gint stop_signal = FALSE;
+       ViewWindow *vw = data;
+       ImageWindow *imd;
+
+       imd = view_window_active_image(vw);
+       gdk_window_get_origin(gtk_widget_get_window(imd->pr), x, y);
+       popup_menu_position_clamp(menu, x, y, 0);
+}
+
+static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
+       gint stop_signal;
+       GtkWidget *menu;
        gint x = 0;
        gint y = 0;
 
+       imd = view_window_active_image(vw);
+
+       stop_signal = TRUE;
        switch (event->keyval)
                {
-               case GDK_Left:
+               case GDK_KEY_Left: case GDK_KEY_KP_Left:
                        x -= 1;
-                       stop_signal = TRUE;
                        break;
-               case GDK_Right:
+               case GDK_KEY_Right: case GDK_KEY_KP_Right:
                        x += 1;
-                       stop_signal = TRUE;
                        break;
-               case GDK_Up:
+               case GDK_KEY_Up: case GDK_KEY_KP_Up:
                        y -= 1;
-                       stop_signal = TRUE;
                        break;
-               case GDK_Down:
+               case GDK_KEY_Down: case GDK_KEY_KP_Down:
                        y += 1;
-                       stop_signal = TRUE;
-                       break;
-               case '+': case '=':
-                       image_area_adjust_zoom(imd, 1);
-                       break;
-               case '-':
-                       image_area_adjust_zoom(imd, -1);
                        break;
-               case 'x':
-                       image_area_set_zoom(imd, 0);
-                       break;
-               case 'z':
-                       image_area_set_zoom(imd, 1);
-                       break;
-               case GDK_Delete:
-                       file_util_delete(image_area_get_path(imd), NULL);
-                       stop_signal = TRUE;
-                       break;
-               case GDK_Escape:
-                       gtk_widget_destroy(imd->top_window);
-                       stop_signal = TRUE;
+               default:
+                       stop_signal = FALSE;
                        break;
                }
 
+       if (x != 0 || y!= 0)
+               {
+               if (event->state & GDK_SHIFT_MASK)
+                       {
+                       x *= 3;
+                       y *= 3;
+                       }
+
+               keyboard_scroll_calc(&x, &y, event);
+               image_scroll(imd, x, y);
+               }
+
+       if (stop_signal) return stop_signal;
+
        if (event->state & GDK_CONTROL_MASK)
                {
-               gint n = -1;
+               stop_signal = TRUE;
                switch (event->keyval)
                        {
                        case '1':
-                               n = 0;
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case '0':
+                               break;
+                       case 'C': case 'c':
+                               file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
+                               break;
+                       case 'M': case 'm':
+                               file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
+                               break;
+                       case 'R': case 'r':
+                               file_util_rename(image_get_fd(imd), NULL, imd->widget);
+                               break;
+                       case 'D': case 'd':
+                               file_util_delete(image_get_fd(imd), NULL, imd->widget);
+                               break;
+                       case 'W': case 'w':
+                               view_window_close(vw);
+                               break;
+                       default:
+                               stop_signal = FALSE;
+                               break;
+                       }
+               }
+       else if (event->state & GDK_SHIFT_MASK)
+               {
+               stop_signal = TRUE;
+               switch (event->keyval)
+                       {
+                       case 'R': case 'r':
+                               image_alter_orientation(imd, ALTER_ROTATE_180);
+                               break;
+                       case 'M': case 'm':
+                               image_alter_orientation(imd, ALTER_MIRROR);
+                               break;
+                       case 'F': case 'f':
+                               image_alter_orientation(imd, ALTER_FLIP);
+                               break;
+                       case 'G': case 'g':
+                               image_set_desaturate(imd, !image_get_desaturate(imd));
+                               break;
+                       case 'P': case 'p':
+                               {
+                               FileData *fd;
+
+                               view_fullscreen_toggle(vw, TRUE);
+                               imd = view_window_active_image(vw);
+                               fd = image_get_fd(imd);
+                               print_window_new(fd,
+                                                fd ? g_list_append(NULL, file_data_ref(fd)) : NULL,
+                                                filelist_copy(vw->list), vw->window);
+                               }
+                               break;
+                       default:
+                               stop_signal = FALSE;
+                               break;
+                       }
+               }
+       else
+               {
+               stop_signal = TRUE;
+               switch (event->keyval)
+                       {
+                       case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+                       case GDK_KEY_BackSpace:
+                       case 'B': case 'b':
+                               view_step_prev(vw);
+                               break;
+                       case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+                       case GDK_KEY_space:
+                       case 'N': case 'n':
+                               view_step_next(vw);
+                               break;
+                       case GDK_KEY_Home: case GDK_KEY_KP_Home:
+                               view_step_to_end(vw, FALSE);
+                               break;
+                       case GDK_KEY_End: case GDK_KEY_KP_End:
+                               view_step_to_end(vw, TRUE);
+                               break;
+                       case '+': case '=': case GDK_KEY_KP_Add:
+                               image_zoom_adjust(imd, get_zoom_increment());
+                               break;
+                       case '-': case GDK_KEY_KP_Subtract:
+                               image_zoom_adjust(imd, -get_zoom_increment());
+                               break;
+                       case 'X': case 'x': case GDK_KEY_KP_Multiply:
+                               image_zoom_set(imd, 0.0);
+                               break;
+                       case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
+                               image_zoom_set(imd, 1.0);
                                break;
                        case '2':
-                               n = 1;
+                               image_zoom_set(imd, 2.0);
                                break;
                        case '3':
-                               n = 2;
+                               image_zoom_set(imd, 3.0);
                                break;
                        case '4':
-                               n = 3;
-                               break;
-                       case '5':
-                               n = 4;
-                               break;
-                       case '6':
-                               n = 5;
+                               image_zoom_set(imd, 4.0);
                                break;
                        case '7':
-                               n = 6;
+                               image_zoom_set(imd, -4.0);
                                break;
                        case '8':
-                               n = 7;
+                               image_zoom_set(imd, -3.0);
+                               break;
+                       case '9':
+                               image_zoom_set(imd, -2.0);
+                               break;
+                       case 'W': case 'w':
+                               image_zoom_set_fill_geometry(imd, FALSE);
+                               break;
+                       case 'H': case 'h':
+                               image_zoom_set_fill_geometry(imd, TRUE);
+                               break;
+                       case 'R': case 'r':
+                               image_reload(imd);
+                               break;
+                       case 'S': case 's':
+                               if (vw->ss)
+                                       {
+                                       view_slideshow_stop(vw);
+                                       }
+                               else
+                                       {
+                                       view_slideshow_start(vw);
+                                       }
+                               break;
+                       case 'P': case 'p':
+                               slideshow_pause_toggle(vw->ss);
+                               break;
+                       case 'F': case 'f':
+                       case 'V': case 'v':
+                       case GDK_KEY_F11:
+                               view_fullscreen_toggle(vw, FALSE);
+                               break;
+                       case 'I': case 'i':
+                               view_overlay_toggle(vw);
                                break;
+                       case ']':
+                               image_alter_orientation(imd, ALTER_ROTATE_90);
+                               break;
+                       case '[':
+                               image_alter_orientation(imd, ALTER_ROTATE_90_CC);
+                               break;
+                       case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
+                               if (options->file_ops.enable_delete_key)
+                                       {
+                                       file_util_delete(image_get_fd(imd), NULL, imd->widget);
+                                       }
+                               break;
+                       case GDK_KEY_Escape:
+                               if (vw->fs)
+                                       {
+                                       view_fullscreen_toggle(vw, TRUE);
+                                       }
+                               else
+                                       {
+                                       view_window_close(vw);
+                                       }
+                               break;
+                       case GDK_KEY_Menu:
+                       case GDK_KEY_F10:
+                               menu = view_popup_menu(vw);
+                               gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
+                                              view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);
+                               break;
+                       default:
+                               stop_signal = FALSE;
+                               break;
+                       }
+               }
+
+       return stop_signal;
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ * view window main routines
+ *-----------------------------------------------------------------------------
+ */
+static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
+{
+       ViewWindow *vw = data;
+       GtkWidget *menu;
+
+       switch (event->button)
+               {
+               case MOUSE_BUTTON_LEFT:
+                       view_step_next(vw);
+                       break;
+               case MOUSE_BUTTON_MIDDLE:
+                       view_step_prev(vw);
+                       break;
+               case MOUSE_BUTTON_RIGHT:
+                       menu = view_popup_menu(vw);
+                       gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
+                       break;
+               default:
+                       break;
+               }
+}
+
+static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
+{
+       ViewWindow *vw = data;
+
+       if (event->state & GDK_CONTROL_MASK)
+               {
+               switch (event->direction)
+                       {
+                       case GDK_SCROLL_UP:
+                               image_zoom_adjust_at_point(imd, get_zoom_increment(), event->x, event->y);
+                               break;
+                       case GDK_SCROLL_DOWN:
+                               image_zoom_adjust_at_point(imd, -get_zoom_increment(), event->x, event->y);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       else if ( (event->state & GDK_SHIFT_MASK) != (guint) (options->mousewheel_scrolls))
+               {
+               switch (event->direction)
+                       {
+                       case GDK_SCROLL_UP:
+                               image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);
+                               break;
+                       case GDK_SCROLL_DOWN:
+                               image_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE);
+                               break;
+                       case GDK_SCROLL_LEFT:
+                               image_scroll(imd, -MOUSEWHEEL_SCROLL_SIZE, 0);
+                               break;
+                       case GDK_SCROLL_RIGHT:
+                               image_scroll(imd, MOUSEWHEEL_SCROLL_SIZE, 0);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       else
+               {
+               switch (event->direction)
+                       {
+                       case GDK_SCROLL_UP:
+                               view_step_prev(vw);
+                               break;
+                       case GDK_SCROLL_DOWN:
+                               view_step_next(vw);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+}
+
+static void view_image_set_buttons(ViewWindow *vw, ImageWindow *imd)
+{
+       image_set_button_func(imd, button_cb, vw);
+       image_set_scroll_func(imd, scroll_cb, vw);
+}
+
+static void view_fullscreen_stop_func(FullScreenData *fs, gpointer data)
+{
+       ViewWindow *vw = data;
+
+       vw->fs = NULL;
+
+       if (vw->ss) vw->ss->imd = vw->imd;
+}
+
+static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off)
+{
+       if (force_off && !vw->fs) return;
+
+       if (vw->fs)
+               {
+               if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
+                       image_osd_set(vw->imd, image_osd_get(vw->fs->imd));
+               
+               fullscreen_stop(vw->fs);
+               }
+       else
+               {
+               vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw);
+
+               view_image_set_buttons(vw, vw->fs->imd);
+               g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
+                                G_CALLBACK(view_window_key_press_cb), vw);
+
+               if (vw->ss) vw->ss->imd = vw->fs->imd;
+
+               if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
+                       {
+                       image_osd_set(vw->fs->imd, image_osd_get(vw->imd));
+                       image_osd_set(vw->imd, OSD_SHOW_NOTHING);
+                       }
+               }
+}
+
+static void view_overlay_toggle(ViewWindow *vw)
+{
+       ImageWindow *imd;
+
+       imd = view_window_active_image(vw);
+       
+       image_osd_toggle(imd);
+}
+
+static void view_slideshow_next(ViewWindow *vw)
+{
+       if (vw->ss) slideshow_next(vw->ss);
+}
+
+static void view_slideshow_prev(ViewWindow *vw)
+{
+       if (vw->ss) slideshow_prev(vw->ss);
+}
+
+static void view_slideshow_stop_func(SlideShowData *fs, gpointer data)
+{
+       ViewWindow *vw = data;
+       GList *work;
+       FileData *fd;
+
+       vw->ss = NULL;
+
+       work = vw->list;
+       fd = image_get_fd(view_window_active_image(vw));
+       while (work)
+               {
+               FileData *temp;
+
+               temp = work->data;
+               if (fd == temp)
+                       {
+                       vw->list_pointer = work;
+                       work = NULL;
+                       }
+               else
+                       {
+                       work = work->next;
+                       }
+               }
+}
+
+static void view_slideshow_start(ViewWindow *vw)
+{
+       if (!vw->ss)
+               {
+               CollectionData *cd;
+               CollectInfo *info;
+
+               if (vw->list)
+                       {
+                       vw->ss = slideshow_start_from_filelist(NULL, view_window_active_image(vw),
+                                                               filelist_copy(vw->list),
+                                                               view_slideshow_stop_func, vw);
+                       vw->list_pointer = NULL;
+                       return;
                        }
-               if (n != -1)
+
+               cd = image_get_collection(view_window_active_image(vw), &info);
+               if (cd && info)
                        {
-                       start_editor_from_file(n, image_area_get_path(imd));
+                       vw->ss = slideshow_start_from_collection(NULL, view_window_active_image(vw), cd,
+                                                                view_slideshow_stop_func, vw, info);
                        }
                }
+}
+
+static void view_slideshow_stop(ViewWindow *vw)
+{
+       if (vw->ss) slideshow_free(vw->ss);
+}
+
+static void view_window_destroy_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+
+       view_window_list = g_list_remove(view_window_list, vw);
+
+       view_slideshow_stop(vw);
+       fullscreen_stop(vw->fs);
+
+       filelist_free(vw->list);
+
+       file_data_unregister_notify_func(view_window_notify_cb, vw);
+
+       g_free(vw);
+}
+
+static void view_window_close(ViewWindow *vw)
+{
+       view_slideshow_stop(vw);
+       view_fullscreen_toggle(vw, TRUE);
+       gtk_widget_destroy(vw->window);
+}
+
+static gboolean view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+{
+       ViewWindow *vw = data;
+
+       view_window_close(vw);
+       return TRUE;
+}
+
+static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionData *cd, CollectInfo *info)
+{
+       ViewWindow *vw;
+       GtkAllocation req_size;
+       GdkGeometry geometry;
+       gint w, h;
+
+       if (!fd && !list && (!cd || !info)) return NULL;
+
+       vw = g_new0(ViewWindow, 1);
+
+       vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL);
+
+       geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
+       geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
+       gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
+
+       gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE);
+       gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
+
+       vw->imd = image_new(FALSE);
+       image_color_profile_set(vw->imd,
+                               options->color_profile.input_type,
+                               options->color_profile.use_image);
+       image_color_profile_set_use(vw->imd, options->color_profile.enabled);
+
+       image_background_set_color_from_options(vw->imd, FALSE);
+
+       image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE);
+
+       image_auto_refresh_enable(vw->imd, TRUE);
+       image_top_window_set_sync(vw->imd, TRUE);
+
+       gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget);
+       gtk_widget_show(vw->imd->widget);
+
+       view_window_dnd_init(vw);
+
+       view_image_set_buttons(vw, vw->imd);
+
+       g_signal_connect(G_OBJECT(vw->window), "destroy",
+                        G_CALLBACK(view_window_destroy_cb), vw);
+       g_signal_connect(G_OBJECT(vw->window), "delete_event",
+                        G_CALLBACK(view_window_delete_cb), vw);
+       g_signal_connect(G_OBJECT(vw->window), "key_press_event",
+                        G_CALLBACK(view_window_key_press_cb), vw);
+       if (cd && info)
+               {
+               image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
+               if (options->image.enable_read_ahead)
+                       {
+                       CollectInfo * r_info = collection_next_by_info(cd, info);
+                       if (!r_info) r_info = collection_prev_by_info(cd, info);
+                       if (r_info) image_prebuffer_set(vw->imd, r_info->fd);
+                       }
+               }
+       else if (list)
+               {
+               view_window_set_list(vw, list);
+               vw->list_pointer = vw->list;
+               image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
+
+               if (options->image.enable_read_ahead)
+                       {
+                       GList *work = vw->list->next;
+                       if (work) image_prebuffer_set(vw->imd, (FileData *)work->data);
+                       }
+               }
+       else
+               {
+               image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
+               }
+
+       /* Wait until image is loaded otherwise size is not defined */
+       int count;
+       for (count = 10; count && !w && !h; count++)
+               {
+               image_get_image_size(vw->imd, &w, &h);
+               usleep(100000);
+               }
+
+       if (image_zoom_get(vw->imd) == 0.0)
+               {
+               image_get_image_size(vw->imd, &w, &h);
+               }
+       else
+               {
+               pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
+               }
+       if (options->image.limit_window_size)
+               {
+               gint mw = gdk_screen_width() * options->image.max_window_size / 100;
+               gint mh = gdk_screen_height() * options->image.max_window_size / 100;
+
+               if (w > mw) w = mw;
+               if (h > mh) h = mh;
+               }
+
+       gtk_window_set_default_size(GTK_WINDOW(vw->window), w, h);
+       req_size.x = req_size.y = 0;
+       req_size.width = w;
+       req_size.height = h;
+       gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
+
+       gtk_widget_set_size_request(vw->imd->pr, w, h);
+
+       gtk_widget_show(vw->window);
+
+       view_window_list = g_list_append(view_window_list, vw);
+
+       file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW);
+
+       return vw;
+}
+
+static void view_window_collection_unref_cb(GtkWidget *widget, gpointer data)
+{
+       CollectionData *cd = data;
+
+       collection_unref(cd);
+}
+
+void view_window_new(FileData *fd)
+{
+       GList *list;
+
+       if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
+               {
+               ViewWindow *vw;
+               CollectionData *cd;
+               CollectInfo *info;
+
+               cd = collection_new(fd->path);
+               if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
+                       {
+                       info = collection_get_first(cd);
+                       }
+               else
+                       {
+                       collection_unref(cd);
+                       cd = NULL;
+                       info = NULL;
+                       }
+               vw = real_view_window_new(NULL, NULL, cd, info);
+               if (vw && cd)
+                       {
+                       g_signal_connect(G_OBJECT(vw->window), "destroy",
+                                        G_CALLBACK(view_window_collection_unref_cb), cd);
+                       }
+               }
+       else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
+               {
+               list = filelist_sort_path(list);
+               list = filelist_filter(list, FALSE);
+               real_view_window_new(NULL, list, NULL, NULL);
+               filelist_free(list);
+               }
+       else
+               {
+               real_view_window_new(fd, NULL, NULL, NULL);
+               }
+}
+
+void view_window_new_from_list(GList *list)
+{
+       real_view_window_new(NULL, list, NULL, NULL);
+}
+
+void view_window_new_from_collection(CollectionData *cd, CollectInfo *info)
+{
+       real_view_window_new(NULL, NULL, cd, info);
+}
 
-       if (event->state & GDK_SHIFT_MASK)
+/*
+ *-----------------------------------------------------------------------------
+ * public
+ *-----------------------------------------------------------------------------
+ */
+
+void view_window_colors_update(void)
+{
+       GList *work;
+
+       work = view_window_list;
+       while (work)
                {
-               x *= 3;
-               y *= 3;
+               ViewWindow *vw = work->data;
+               work = work->next;
+               
+               image_background_set_color_from_options(vw->imd, !!vw->fs);
                }
+}
 
-       if (x != 0 || y!= 0)
+gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total)
+{
+       GList *work;
+
+       work = view_window_list;
+       while (work)
                {
-               keyboard_scroll_calc(&x, &y, event);
-               image_area_scroll(imd, x, y);
+               ViewWindow *vw = work->data;
+               work = work->next;
+
+               if (vw->imd == imd ||
+                   (vw->fs && vw->fs->imd == imd))
+                       {
+                       if (vw->ss)
+                               {
+                               gint n;
+                               gint t;
+
+                               n = g_list_length(vw->ss->list_done);
+                               t = n + g_list_length(vw->ss->list);
+                               if (n == 0) n = t;
+                               if (index) *index = n - 1;
+                               if (total) *total = t;
+                               }
+                       else
+                               {
+                               if (index) *index = g_list_position(vw->list, vw->list_pointer);
+                               if (total) *total = g_list_length(vw->list);
+                               }
+                       return TRUE;
+                       }
                }
 
-       return stop_signal;
+       return FALSE;
 }
 
 /*
  *-----------------------------------------------------------------------------
- * view window main routines
+ * view window menu routines and callbacks
  *-----------------------------------------------------------------------------
- */ 
+ */
+
+static void view_new_window_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+       CollectionData *cd;
+       CollectInfo *info;
+
+       cd = image_get_collection(vw->imd, &info);
+
+       if (cd && info)
+               {
+               view_window_new_from_collection(cd, info);
+               }
+       else
+               {
+               view_window_new(image_get_fd(vw->imd));
+               }
+}
+
+static void view_edit_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw;
+       ImageWindow *imd;
+       const gchar *key = data;
+
+       vw = submenu_item_get_data(widget);
+       if (!vw) return;
+
+       if (!editor_window_flag_set(key))
+               {
+               view_fullscreen_toggle(vw, TRUE);
+               }
+
+       imd = view_window_active_image(vw);
+       file_util_start_editor_from_file(key, image_get_fd(imd), imd->widget);
+}
 
-static void button3_cb(ImageWindow *imd, GdkEventButton *bevent, gpointer data)
+static void view_alter_cb(GtkWidget *widget, gpointer data)
 {
-       gtk_object_set_data(GTK_OBJECT(menu_window_view), "view_active", imd);
-       gtk_menu_popup (GTK_MENU(menu_window_view), NULL, NULL, NULL, NULL,
-               bevent->button, bevent->time);
+       ViewWindow *vw;
+       AlterType type;
+
+       vw = submenu_item_get_data(widget);
+       type = GPOINTER_TO_INT(data);
+
+       if (!vw) return;
+       image_alter_orientation(vw->imd, type);
 }
 
-static void button4_cb(ImageWindow *imd, GdkEventButton *bevent, gpointer data)
+static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
 {
-       if (mousewheel_scrolls)
-               image_area_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);
+       ViewWindow *vw = data;
+       ImageWindow *imd;
+
+       imd = view_window_active_image(vw);
+       image_to_root_window(imd, (image_zoom_get(imd) == 0.0));
 }
 
-static void button5_cb(ImageWindow *imd, GdkEventButton *bevent, gpointer data)
+static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
 {
-       if (mousewheel_scrolls)
-               image_area_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE);
+       ViewWindow *vw = data;
+
+       image_zoom_adjust(view_window_active_image(vw), get_zoom_increment());
 }
 
-static gint view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static void view_zoom_out_cb(GtkWidget *widget, gpointer data)
 {
-       gtk_widget_destroy(w);
-       return TRUE;
+       ViewWindow *vw = data;
+
+       image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment());
 }
 
-static gint view_window_destroy_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = data;
-       image_area_free(imd);
-       return FALSE;
+       ViewWindow *vw = data;
+
+       image_zoom_set(view_window_active_image(vw), 1.0);
 }
 
-void view_window_new(gchar *path)
+static void view_zoom_fit_cb(GtkWidget *widget, gpointer data)
 {
-       GtkWidget *window;
+       ViewWindow *vw = data;
+
+       image_zoom_set(view_window_active_image(vw), 0.0);
+}
+
+static void view_copy_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
        ImageWindow *imd;
-       GtkAllocation req_size;
-       gint w, h;
-       if (!path) return;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
-       gtk_window_set_title (GTK_WINDOW (window), "GQview");
-        gtk_window_set_wmclass(GTK_WINDOW (window), "view", "GQview");
-        gtk_container_border_width (GTK_CONTAINER (window), 0);
+       imd = view_window_active_image(vw);
+       file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
+}
+
+static void view_move_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
 
-       imd = image_area_new(NULL);
-       image_area_set_topwindow(imd, window, NULL, TRUE);
-       gtk_container_add(GTK_CONTAINER(window), imd->eventbox);
-       gtk_viewport_set_shadow_type (GTK_VIEWPORT(imd->viewport), GTK_SHADOW_NONE);
-        gtk_container_border_width (GTK_CONTAINER (imd->viewport), 0);
-       gtk_widget_show_all(imd->eventbox);
+       imd = view_window_active_image(vw);
+       file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
+}
 
-       image_dnd_init(imd);
+static void view_rename_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
 
-       image_area_set_button(imd, 3, button3_cb, NULL);
-       /* for wheel mice */
-       image_area_set_button(imd, 4, button4_cb, NULL);
-       image_area_set_button(imd, 5, button5_cb, NULL);
+       imd = view_window_active_image(vw);
+       file_util_rename(image_get_fd(imd), NULL, imd->widget);
+}
 
+static void view_delete_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event", (GtkSignalFunc) view_window_delete_cb, NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "destroy_event", (GtkSignalFunc) view_window_destroy_cb, imd);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event", GTK_SIGNAL_FUNC(view_window_key_press_cb), imd);
+       imd = view_window_active_image(vw);
+       file_util_delete(image_get_fd(imd), NULL, imd->widget);
+}
 
-       image_area_set_image(imd, path, get_default_zoom(NULL));
+static void view_copy_path_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
 
-       w = imd->width;
-       h = imd->height;
-       if (limit_window_size)
-               {
-               gint mw = gdk_screen_width() * max_window_size / 100;
-               gint mh = gdk_screen_height() * max_window_size / 100;
+       imd = view_window_active_image(vw);
+       file_util_copy_path_to_clipboard(image_get_fd(imd));
+}
 
-               if (w > mw) w = mw;
-               if (h > mh) h = mh;
-               }
+static void view_fullscreen_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
 
-       gtk_window_set_default_size (GTK_WINDOW(window), w, h);
-       req_size.x = req_size.y = 0;
-       req_size.width = w;
-       req_size.height = h;
-       gtk_widget_size_allocate(GTK_WIDGET(window), &req_size);
+       view_fullscreen_toggle(vw, FALSE);
+}
 
-       gtk_widget_set_usize(imd->eventbox, w, h);
+static void view_slideshow_start_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
 
-       gtk_widget_show(window);
+       view_slideshow_start(vw);
 }
 
-/*
- *-----------------------------------------------------------------------------
- * view window menu routines and callbacks
- *-----------------------------------------------------------------------------
- */ 
+static void view_slideshow_stop_cb(GtkWidget *widget, gpointer data)
+{
+       ViewWindow *vw = data;
 
-static ImageWindow *view_window_get_active()
+       view_slideshow_stop(vw);
+}
+
+static void view_slideshow_pause_cb(GtkWidget *widget, gpointer data)
 {
-       return gtk_object_get_data(GTK_OBJECT(menu_window_view), "view_active");
+       ViewWindow *vw = data;
+
+       slideshow_pause_toggle(vw->ss);
 }
 
-void view_window_active_edit(gint n)
+static void view_close_cb(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       start_editor_from_file(n, image_area_get_path(imd));
+       ViewWindow *vw = data;
+
+       view_window_close(vw);
 }
 
-void view_window_active_to_root(gint n)
+static LayoutWindow *view_new_layout_with_fd(FileData *fd)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       image_area_to_root(imd, (image_area_get_zoom(imd) == 0));
+       LayoutWindow *nw;
+
+       nw = layout_new(NULL, NULL);
+       layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending);
+       layout_set_fd(nw, fd);
+       return nw;
 }
 
-static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
+
+static void view_set_layout_path_cb(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       image_area_adjust_zoom(imd, 1);
+       ViewWindow *vw = data;
+       LayoutWindow *lw;
+       ImageWindow *imd;
+
+       imd = view_window_active_image(vw);
+
+       if (!imd || !imd->image_fd) return;
+
+       lw = layout_find_by_image_fd(imd);
+       if (lw)
+               layout_set_fd(lw, imd->image_fd);
+       else
+               view_new_layout_with_fd(imd->image_fd);
+       view_window_close(vw);
 }
 
-static void view_zoom_out_cb(GtkWidget *widget, gpointer data)
+static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       image_area_adjust_zoom(imd, -1);
+       GList *editmenu_fd_list = data;
+
+       filelist_free(editmenu_fd_list);
 }
 
-static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data)
+static GList *view_window_get_fd_list(ViewWindow *vw)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       image_area_set_zoom(imd, 1);
+       GList *list = NULL;
+       ImageWindow *imd = view_window_active_image(vw);
+
+       if (imd)
+               {
+               FileData *fd = image_get_fd(imd);
+               if (fd) list = g_list_append(NULL, file_data_ref(fd));
+               }
+       
+       return list;
 }
 
-static void view_zoom_fit_cb(GtkWidget *widget, gpointer data)
+static GtkWidget *view_popup_menu(ViewWindow *vw)
+{
+       GtkWidget *menu;
+       GtkWidget *item;
+       GList *editmenu_fd_list;
+
+       menu = popup_menu_short_lived();
+
+
+       menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw);
+       menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw);
+       menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw);
+       menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw);
+       menu_item_add_divider(menu);
+
+       editmenu_fd_list = view_window_get_fd_list(vw);
+       g_signal_connect(G_OBJECT(menu), "destroy",
+                        G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list);
+       item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list);
+       menu_item_add_divider(item);
+       menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
+
+       submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
+
+       menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
+       item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw);
+
+       menu_item_add_divider(menu);
+       menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw);
+       menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
+       menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
+       menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
+       menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
+
+       menu_item_add_divider(menu);
+
+       if (vw->ss)
+               {
+               menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw);
+               if (slideshow_paused(vw->ss))
+                       {
+                       item = menu_item_add(menu, _("Continue slides_how"),
+                                            G_CALLBACK(view_slideshow_pause_cb), vw);
+                       }
+               else
+                       {
+                       item = menu_item_add(menu, _("Pause slides_how"),
+                                            G_CALLBACK(view_slideshow_pause_cb), vw);
+                       }
+               }
+       else
+               {
+               item = menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(view_slideshow_start_cb), vw);
+               gtk_widget_set_sensitive(item, (vw->list != NULL) || view_window_contains_collection(vw));
+               item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(view_slideshow_pause_cb), vw);
+               gtk_widget_set_sensitive(item, FALSE);
+               }
+
+       if (vw->fs)
+               {
+               menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(view_fullscreen_cb), vw);
+               }
+       else
+               {
+               menu_item_add(menu, _("_Full screen"), G_CALLBACK(view_fullscreen_cb), vw);
+               }
+
+       menu_item_add_divider(menu);
+       menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(view_close_cb), vw);
+
+       return menu;
+}
+
+/*
+ *-------------------------------------------------------------------
+ * dnd confirm dir
+ *-------------------------------------------------------------------
+ */
+
+typedef struct {
+       ViewWindow *vw;
+       GList *list;
+} CViewConfirmD;
+
+static void view_dir_list_cancel(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       image_area_set_zoom(imd, 0);
+       /* do nothing */
 }
 
-static void view_copy_cb(GtkWidget *widget, gpointer data)
+static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolean recurse)
+{
+       GList *work;
+
+       view_window_set_list(vw, NULL);
+
+       work = list;
+       while (work)
+               {
+               FileData *fd = work->data;
+               work = work->next;
+
+               if (isdir(fd->path))
+                       {
+                       if (!skip)
+                               {
+                               GList *list = NULL;
+
+                               if (recurse)
+                                       {
+                                       list = filelist_recursive(fd);
+                                       }
+                               else
+                                       { /*FIXME */
+                                       filelist_read(fd, &list, NULL);
+                                       list = filelist_sort_path(list);
+                                       list = filelist_filter(list, FALSE);
+                                       }
+                               if (list) vw->list = g_list_concat(vw->list, list);
+                               }
+                       }
+               else
+                       {
+                       /* FIXME: no filtering here */
+                       vw->list = g_list_append(vw->list, file_data_ref(fd));
+                       }
+               }
+
+       if (vw->list)
+               {
+               FileData *fd;
+
+               vw->list_pointer = vw->list;
+               fd = vw->list->data;
+               image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
+
+               work = vw->list->next;
+               if (options->image.enable_read_ahead && work)
+                       {
+                       fd = work->data;
+                       image_prebuffer_set(vw->imd, fd);
+                       }
+               }
+       else
+               {
+               image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
+               }
+}
+
+static void view_dir_list_add(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       file_util_copy(image_area_get_path(imd), NULL, current_path);
+       CViewConfirmD *d = data;
+       view_dir_list_do(d->vw, d->list, FALSE, FALSE);
 }
 
-static void view_move_cb(GtkWidget *widget, gpointer data)
+static void view_dir_list_recurse(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       file_util_move(image_area_get_path(imd), NULL, current_path);
+       CViewConfirmD *d = data;
+       view_dir_list_do(d->vw, d->list, FALSE, TRUE);
 }
 
-static void view_rename_cb(GtkWidget *widget, gpointer data)
+static void view_dir_list_skip(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       file_util_rename(image_area_get_path(imd), NULL);
+       CViewConfirmD *d = data;
+       view_dir_list_do(d->vw, d->list, TRUE, FALSE);
 }
 
-static void view_delete_cb(GtkWidget *widget, gpointer data)
+static void view_dir_list_destroy(GtkWidget *widget, gpointer data)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       file_util_delete(image_area_get_path(imd), NULL);
+       CViewConfirmD *d = data;
+       filelist_free(d->list);
+       g_free(d);
 }
 
-static void view_close_cb(GtkWidget *widget, gpointer data)
+static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list)
+{
+       GtkWidget *menu;
+       CViewConfirmD *d;
+
+       d = g_new(CViewConfirmD, 1);
+       d->vw = vw;
+       d->list = list;
+
+       menu = popup_menu_short_lived();
+       g_signal_connect(G_OBJECT(menu), "destroy",
+                        G_CALLBACK(view_dir_list_destroy), d);
+
+       menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, NULL, NULL);
+       menu_item_add_divider(menu);
+       menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(view_dir_list_add), d);
+       menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(view_dir_list_recurse), d);
+       menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(view_dir_list_skip), d);
+       menu_item_add_divider(menu);
+       menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(view_dir_list_cancel), d);
+
+       return menu;
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ * image drag and drop routines
+ *-----------------------------------------------------------------------------
+ */
+
+static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
+                                    gint x, gint y,
+                                    GtkSelectionData *selection_data, guint info,
+                                    guint time, gpointer data)
+{
+       ViewWindow *vw = data;
+       ImageWindow *imd;
+
+       if (gtk_drag_get_source_widget(context) == vw->imd->pr) return;
+
+       imd = vw->imd;
+
+       if (info == TARGET_URI_LIST || info == TARGET_APP_COLLECTION_MEMBER)
+               {
+               CollectionData *source;
+               GList *list;
+               GList *info_list;
+
+               if (info == TARGET_URI_LIST)
+                       {
+                       GList *work;
+
+                       list = uri_filelist_from_gtk_selection_data(selection_data);
+
+                       work = list;
+                       while (work)
+                               {
+                               FileData *fd = work->data;
+                               if (isdir(fd->path))
+                                       {
+                                       GtkWidget *menu;
+                                       menu = view_confirm_dir_list(vw, list);
+                                       gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, time);
+                                       return;
+                                       }
+                               work = work->next;
+                               }
+
+                       list = filelist_filter(list, FALSE);
+
+                       source = NULL;
+                       info_list = NULL;
+                       }
+               else
+                       {
+                       source = collection_from_dnd_data((gchar *)gtk_selection_data_get_data(selection_data), &list, &info_list);
+                       }
+
+               if (list)
+                       {
+                       FileData *fd;
+
+                       fd = list->data;
+                       if (isfile(fd->path))
+                               {
+                               view_slideshow_stop(vw);
+                               view_window_set_list(vw, NULL);
+
+                               if (source && info_list)
+                                       {
+                                       image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
+                                       }
+                               else
+                                       {
+                                       if (list->next)
+                                               {
+                                               vw->list = list;
+                                               list = NULL;
+
+                                               vw->list_pointer = vw->list;
+                                               }
+                                       image_change_fd(imd, fd, image_zoom_get_default(imd));
+                                       }
+                               }
+                       }
+               filelist_free(list);
+               g_list_free(info_list);
+               }
+}
+
+static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
+                                    GtkSelectionData *selection_data, guint info,
+                                    guint time, gpointer data)
+{
+       ViewWindow *vw = data;
+       FileData *fd;
+
+       fd = image_get_fd(vw->imd);
+
+       if (fd)
+               {
+               GList *list;
+
+               list = g_list_append(NULL, fd);
+               uri_selection_data_set_uris_from_filelist(selection_data, list);
+               g_list_free(list);
+               }
+       else
+               {
+               gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
+                                      8, NULL, 0);
+               }
+}
+
+static void view_window_dnd_init(ViewWindow *vw)
 {
-       ImageWindow *imd = view_window_get_active();
-       if (!imd) return;
-       gtk_widget_destroy(imd->top_window);
+       ImageWindow *imd;
+
+       imd = vw->imd;
+
+       gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK,
+                           dnd_file_drag_types, dnd_file_drag_types_count,
+                           GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+       g_signal_connect(G_OBJECT(imd->pr), "drag_data_get",
+                        G_CALLBACK(view_window_set_dnd_data), vw);
+
+       gtk_drag_dest_set(imd->pr,
+                         GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+                         dnd_file_drop_types, dnd_file_drop_types_count,
+                         GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+       g_signal_connect(G_OBJECT(imd->pr), "drag_data_received",
+                        G_CALLBACK(view_window_get_dnd_data), vw);
 }
 
-void create_menu_view_popup()
+/*
+ *-----------------------------------------------------------------------------
+ * maintenance (for rename, move, remove)
+ *-----------------------------------------------------------------------------
+ */
+
+static void view_real_removed(ViewWindow *vw, FileData *fd)
 {
-       menu_window_view = gtk_menu_new();
-       add_menu_popup_item(menu_window_view, _("Zoom in"), view_zoom_in_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Zoom out"), view_zoom_out_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Zoom 1:1"), view_zoom_1_1_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Fit image to window"), view_zoom_fit_cb, NULL);
-       add_menu_divider(menu_window_view);
+       ImageWindow *imd;
+       FileData *image_fd;
+
+       imd = view_window_active_image(vw);
+       image_fd = image_get_fd(imd);
+
+       if (image_fd && image_fd == fd)
+               {
+               if (vw->list)
+                       {
+                       view_list_step(vw, TRUE);
+                       if (image_get_fd(imd) == image_fd)
+                               {
+                               view_list_step(vw, FALSE);
+                               }
+                       }
+               else if (view_window_contains_collection(vw))
+                       {
+                       view_collection_step(vw, TRUE);
+                       if (image_get_fd(imd) == image_fd)
+                               {
+                               view_collection_step(vw, FALSE);
+                               }
+                       }
+               if (image_get_fd(imd) == image_fd)
+                       {
+                       image_change_fd(imd, NULL, image_zoom_get_default(imd));
+                       }
+               }
+
+       if (vw->list)
+               {
+               GList *work;
+               GList *old;
+
+               old = vw->list_pointer;
+
+               work = vw->list;
+               while (work)
+                       {
+                       FileData *chk_fd;
+                       GList *chk_link;
 
-       menu_window_view_edit = gtk_menu_item_new_with_label(_("Edit"));
-       gtk_menu_append(GTK_MENU(menu_window_view), menu_window_view_edit);
-       gtk_widget_show(menu_window_view_edit);
+                       chk_fd = work->data;
+                       chk_link = work;
+                       work = work->next;
 
-       add_menu_divider(menu_window_view);
-       add_menu_popup_item(menu_window_view, _("Copy..."), view_copy_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Move..."), view_move_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Rename..."), view_rename_cb, NULL);
-       add_menu_popup_item(menu_window_view, _("Delete..."), view_delete_cb, NULL);
+                       if (chk_fd == fd)
+                               {
+                               if (vw->list_pointer == chk_link)
+                                       {
+                                       vw->list_pointer = (chk_link->next) ? chk_link->next : chk_link->prev;
+                                       }
+                               vw->list = g_list_remove(vw->list, chk_fd);
+                               file_data_unref(chk_fd);
+                               }
+                       }
+
+               /* handles stepping correctly when same image is in the list more than once */
+               if (old && old != vw->list_pointer)
+                       {
+                       FileData *fd;
+
+                       if (vw->list_pointer)
+                               {
+                               fd = vw->list_pointer->data;
+                               }
+                       else
+                               {
+                               fd = NULL;
+                               }
 
-       add_menu_divider(menu_window_view);
-       add_menu_popup_item(menu_window_view, _("Close window"), view_close_cb, NULL);
+                       image_change_fd(imd, fd, image_zoom_get_default(imd));
+                       }
+               }
+
+       image_osd_update(imd);
 }
 
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
+{
+       ViewWindow *vw = data;
+
+       if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+       
+       DEBUG_1("Notify view_window: %s %04x", fd->path, type);
 
+       switch (fd->change->type)
+               {
+               case FILEDATA_CHANGE_MOVE:
+               case FILEDATA_CHANGE_RENAME:
+                       break;
+               case FILEDATA_CHANGE_COPY:
+                       break;
+               case FILEDATA_CHANGE_DELETE:
+                       view_real_removed(vw, fd);
+                       break;
+               case FILEDATA_CHANGE_UNSPECIFIED:
+               case FILEDATA_CHANGE_WRITE_METADATA:
+                       break;
+               }
+}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */