Update snapshot
[profile/ivi/weston.git] / clients / dnd.c
index db794fd..4aad070 100644 (file)
@@ -20,6 +20,7 @@
  * OF THIS SOFTWARE.
  */
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <cairo.h>
 #include <sys/epoll.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <wayland-client.h>
+#include <wayland-cursor.h>
 
 #include "window.h"
-#include "cairo-util.h"
+#include "../shared/cairo-util.h"
+
+struct dnd_drag;
 
 struct dnd {
        struct window *window;
+       struct widget *widget;
        struct display *display;
        uint32_t key;
        struct item *items[16];
+       int self_only;
+       struct dnd_drag *current_drag;
 };
 
 struct dnd_drag {
@@ -53,18 +59,11 @@ struct dnd_drag {
        uint32_t time;
        struct item *item;
        int x_offset, y_offset;
+       int width, height;
        const char *mime_type;
-};
 
-struct dnd_offer {
-       int refcount;
-       struct dnd *dnd;
-       struct wl_array types;
-       struct task io_task;
-       const char *drag_type;
-       uint32_t tag;
-       int x, y;
-       int fd;
+       struct wl_surface *drag_surface;
+       struct wl_data_source *data_source;
 };
 
 struct item {
@@ -112,7 +111,8 @@ item_create(struct display *display, int x, int y, int seed)
 
        rect.width = item_width;
        rect.height = item_height;
-       item->surface = display_create_surface(display, NULL, &rect, 0);
+       item->surface =
+               display_create_surface(display, NULL, &rect, SURFACE_SHM);
 
        item->x = x;
        item->y = y;
@@ -169,50 +169,39 @@ item_create(struct display *display, int x, int y, int seed)
 }
 
 static void
-dnd_draw(struct dnd *dnd)
+dnd_redraw_handler(struct widget *widget, void *data)
 {
+       struct dnd *dnd = data;
        struct rectangle allocation;
        cairo_t *cr;
        cairo_surface_t *surface;
-       int i;
-
-       window_draw(dnd->window);
+       unsigned int i;
 
        surface = window_get_surface(dnd->window);
        cr = cairo_create(surface);
-       window_get_child_allocation(dnd->window, &allocation);
+       widget_get_allocation(dnd->widget, &allocation);
        cairo_rectangle(cr, allocation.x, allocation.y,
                        allocation.width, allocation.height);
-       cairo_clip(cr);
-       cairo_push_group(cr);
 
-       cairo_translate(cr, allocation.x, allocation.y);
        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
        cairo_set_source_rgba(cr, 0, 0, 0, 0.8);
-       cairo_paint(cr);
+       cairo_fill(cr);
 
+       cairo_rectangle(cr, allocation.x, allocation.y,
+                       allocation.width, allocation.height);
+       cairo_clip(cr);
        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
        for (i = 0; i < ARRAY_LENGTH(dnd->items); i++) {
                if (!dnd->items[i])
                        continue;
                cairo_set_source_surface(cr, dnd->items[i]->surface,
-                                        dnd->items[i]->x, dnd->items[i]->y);
+                                        dnd->items[i]->x + allocation.x,
+                                        dnd->items[i]->y + allocation.y);
                cairo_paint(cr);
        }
 
-       cairo_pop_group_to_source(cr);
-       cairo_paint(cr);
        cairo_destroy(cr);
        cairo_surface_destroy(surface);
-       window_flush(dnd->window);
-}
-
-static void
-redraw_handler(struct window *window, void *data)
-{
-       struct dnd *dnd = data;
-
-       dnd_draw(dnd);
 }
 
 static void
@@ -224,20 +213,10 @@ keyboard_focus_handler(struct window *window,
        window_schedule_redraw(dnd->window);
 }
 
-static void 
-dnd_offer_destroy(struct dnd_offer *dnd_offer)
-{
-       dnd_offer->refcount--;
-       if (dnd_offer->refcount == 0) {
-               wl_array_release(&dnd_offer->types);
-               free(dnd_offer);
-       }
-}
-
 static int
 dnd_add_item(struct dnd *dnd, struct item *item)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < ARRAY_LENGTH(dnd->items); i++) {
                if (dnd->items[i] == 0) {
@@ -253,9 +232,9 @@ dnd_get_item(struct dnd *dnd, int32_t x, int32_t y)
 {
        struct item *item;
        struct rectangle allocation;
-       int i;
+       unsigned int i;
 
-       window_get_child_allocation(dnd->window, &allocation);
+       widget_get_allocation(dnd->widget, &allocation);
 
        x -= allocation.x;
        y -= allocation.y;
@@ -272,17 +251,14 @@ dnd_get_item(struct dnd *dnd, int32_t x, int32_t y)
 }
 
 static void
-drag_target(void *data,
-           struct wl_drag *drag, const char *mime_type)
+data_source_target(void *data,
+                  struct wl_data_source *source, const char *mime_type)
 {
        struct dnd_drag *dnd_drag = data;
        struct dnd *dnd = dnd_drag->dnd;
-       struct wl_input_device *device;
        cairo_surface_t *surface;
        struct wl_buffer *buffer;
 
-       fprintf(stderr, "target %s\n", mime_type);
-       device = input_get_input_device(dnd_drag->input);
        dnd_drag->mime_type = mime_type;
        if (mime_type)
                surface = dnd_drag->opaque;
@@ -290,244 +266,83 @@ drag_target(void *data,
                surface = dnd_drag->translucent;
 
        buffer = display_get_buffer_for_surface(dnd->display, surface);
-       wl_input_device_attach(device, dnd_drag->time, buffer,
-                              dnd_drag->hotspot_x, dnd_drag->hotspot_y);
+       wl_surface_attach(dnd_drag->drag_surface, buffer, 0, 0);
+       wl_surface_damage(dnd_drag->drag_surface, 0, 0,
+                         dnd_drag->width, dnd_drag->height);
+       wl_surface_commit(dnd_drag->drag_surface);
 }
 
 static void
-drag_finish(void *data, struct wl_drag *drag, int fd)
+data_source_send(void *data, struct wl_data_source *source,
+                const char *mime_type, int32_t fd)
 {
-       struct dnd_drag *dnd_drag = data;
-
-       if (!dnd_drag->mime_type) {
-               dnd_add_item(dnd_drag->dnd, dnd_drag->item);
-               window_schedule_redraw(dnd_drag->dnd->window);
-               return;
-       }
-       
        struct dnd_flower_message dnd_flower_message;   
-       
+       struct dnd_drag *dnd_drag = data;
        
        dnd_flower_message.seed = dnd_drag->item->seed;
-
        dnd_flower_message.x_offset = dnd_drag->x_offset;
        dnd_flower_message.y_offset = dnd_drag->y_offset;
 
-       fprintf(stderr, "got 'finish', fd %d, sending dnd_flower_message\n", fd);
+       if (write(fd, &dnd_flower_message, sizeof dnd_flower_message) < 0)
+               abort();
 
-       write(fd, &dnd_flower_message, sizeof dnd_flower_message);
        close(fd);
-
-       /* The 'finish' event marks the end of the session on the drag
-        * source side and we need to clean up the drag object created
-        * and the local state. */
-       wl_drag_destroy(drag);
-       
-       /* Destroy the item that has been dragged out */
-       cairo_surface_destroy(dnd_drag->item->surface);
-       free(dnd_drag->item);
-       
-       cairo_surface_destroy(dnd_drag->translucent);
-       cairo_surface_destroy(dnd_drag->opaque);
-       free(dnd_drag);
 }
 
 static void
-drag_reject(void *data, struct wl_drag *drag)
+data_source_cancelled(void *data, struct wl_data_source *source)
 {
        struct dnd_drag *dnd_drag = data;
 
-       dnd_add_item(dnd_drag->dnd, dnd_drag->item);
-       window_schedule_redraw(dnd_drag->dnd->window);
-}
-
-static const struct wl_drag_listener drag_listener = {
-       drag_target,
-       drag_finish,
-       drag_reject
-};
+       /* The 'cancelled' event means that the source is no longer in
+        * use by the drag (or current selection).  We need to clean
+        * up the drag object created and the local state. */
 
-static void
-drag_offer_offer(void *data,
-                struct wl_drag_offer *offer, const char *type)
-{
-       struct dnd_offer *dnd_offer = data;
-       char **p;
-
-       p = wl_array_add(&dnd_offer->types, sizeof *p);
-       if (p)
-               *p = strdup(type);
-}
-
-static void
-drag_offer_pointer_focus(void *data,
-                        struct wl_drag_offer *offer,
-                        uint32_t time, struct wl_surface *surface,
-                        int32_t x, int32_t y,
-                        int32_t surface_x, int32_t surface_y)
-{
-       struct dnd_offer *dnd_offer = data;
-       struct window *window;
-       char **p, **end;
-
-       /* The last event in a dnd session is pointer_focus with a
-        * NULL surface, whether or not we get the drop event.  We
-        * need to clean up the dnd_offer proxy and whatever state we
-        * allocated. */
-       if (!surface) {
-               fprintf(stderr, "pointer focus NULL, session over\n");
-               wl_drag_offer_destroy(offer);
-               dnd_offer_destroy(dnd_offer);
-               return;
-       }
-
-       fprintf(stderr, "drag pointer focus %p\n", surface);
-       fprintf(stderr, "offered types:\n");
-       end = dnd_offer->types.data + dnd_offer->types.size;
-       for (p = dnd_offer->types.data; p < end; p++)
-               fprintf(stderr, "\%s\n", *p);
-
-       window = wl_surface_get_user_data(surface);
-       dnd_offer->dnd = window_get_user_data(window);
-
-       if (!dnd_get_item(dnd_offer->dnd, surface_x, surface_y)) {
-               wl_drag_offer_accept(offer, time, "application/x-wayland-dnd-flower");
-               dnd_offer->drag_type = "application/x-wayland-dnd-flower";
-               dnd_offer->x = surface_x;
-               dnd_offer->y = surface_y;
-       } else {
-               wl_drag_offer_accept(offer, time, NULL);
-               dnd_offer->drag_type = NULL;
-       }
-}
-
-static void
-drag_offer_motion(void *data,
-                 struct wl_drag_offer *offer, uint32_t time,
-                 int32_t x, int32_t y, int32_t surface_x, int32_t surface_y)
-{
-       struct dnd_offer *dnd_offer = data;
-
-       if (!dnd_get_item(dnd_offer->dnd, surface_x, surface_y)) {
-               fprintf(stderr, "drag offer motion %d, %d, accepting\n",
-                       surface_x, surface_y);
-               wl_drag_offer_accept(offer, time, "application/x-wayland-dnd-flower");
-               dnd_offer->drag_type = "application/x-wayland-dnd-flower";
-               dnd_offer->x = surface_x;
-               dnd_offer->y = surface_y;
-       } else {
-               fprintf(stderr, "drag offer motion %d, %d, declining\n",
-                       surface_x, surface_y);
-               wl_drag_offer_accept(offer, time, NULL);
-               dnd_offer->drag_type = NULL;
-       }
-}
-
-static void
-drop_io_func(struct task *task, uint32_t events)
-{
-       struct dnd_offer *dnd_offer =
-               container_of(task, struct dnd_offer, io_task);
-       struct dnd *dnd = dnd_offer->dnd;
-       struct dnd_flower_message dnd_flower_message;
-       unsigned int len;
-       struct item *item;
-
-       len = read(dnd_offer->fd,
-                  &dnd_flower_message, sizeof dnd_flower_message);
-       fprintf(stderr, "read %d bytes\n", len);
-
-       close(dnd_offer->fd);
-
-       item = item_create(dnd->display,
-                          dnd_offer->x - dnd_flower_message.x_offset - 26,
-                          dnd_offer->y - dnd_flower_message.y_offset - 66,
-                          dnd_flower_message.seed);
-
-       dnd_add_item(dnd, item);
-       window_schedule_redraw(dnd->window);
-
-       dnd_offer_destroy(dnd_offer);
-}
-
-static void
-drag_offer_drop(void *data, struct wl_drag_offer *offer)
-{
-       struct dnd_offer *dnd_offer = data;
-       int p[2];
-
-       if (!dnd_offer->drag_type) {
-               fprintf(stderr, "got 'drop', but no target\n");
-               wl_drag_offer_reject(offer);
-               return;
-       }
-
-       fprintf(stderr, "got 'drop', sending write end of pipe\n");
+       wl_data_source_destroy(dnd_drag->data_source);
+       
+       /* Destroy the item that has been dragged out */
+       cairo_surface_destroy(dnd_drag->item->surface);
+       free(dnd_drag->item);
 
-       dnd_offer->refcount++;
-       pipe(p);
-       wl_drag_offer_receive(offer, p[1]);
-       close(p[1]);
+       wl_surface_destroy(dnd_drag->drag_surface);
 
-       dnd_offer->io_task.run = drop_io_func;
-       dnd_offer->fd = p[0];
-       display_watch_fd(dnd_offer->dnd->display,
-                        p[0], EPOLLIN, &dnd_offer->io_task);
+       cairo_surface_destroy(dnd_drag->translucent);
+       cairo_surface_destroy(dnd_drag->opaque);
+       free(dnd_drag);
 }
 
-static const struct wl_drag_offer_listener drag_offer_listener = {
-       drag_offer_offer,
-       drag_offer_pointer_focus,
-       drag_offer_motion,
-       drag_offer_drop,
+static const struct wl_data_source_listener data_source_listener = {
+       data_source_target,
+       data_source_send,
+       data_source_cancelled
 };
 
-static void
-global_handler(struct wl_display *display, uint32_t id,
-              const char *interface, uint32_t version, void *data)
-{
-       struct wl_drag_offer *offer;
-       struct dnd_offer *dnd_offer;
-
-       if (strcmp(interface, "wl_drag_offer") != 0)
-               return;
-
-       offer = wl_display_bind(display, id, &wl_drag_offer_interface);
-
-       dnd_offer = malloc(sizeof *dnd_offer);
-       if (dnd_offer == NULL)
-               return;
-
-       dnd_offer->refcount = 1;
-
-       wl_drag_offer_add_listener(offer, &drag_offer_listener, dnd_offer);
-       wl_array_init(&dnd_offer->types);
-}
-
 static cairo_surface_t *
 create_drag_cursor(struct dnd_drag *dnd_drag,
                   struct item *item, int32_t x, int32_t y, double opacity)
 {
        struct dnd *dnd = dnd_drag->dnd;
-       cairo_surface_t *surface, *pointer;
-       int32_t pointer_width, pointer_height, hotspot_x, hotspot_y;
+       cairo_surface_t *surface;
+       struct wl_cursor_image *pointer;
        struct rectangle rectangle;
        cairo_pattern_t *pattern;
        cairo_t *cr;
 
-       pointer = display_get_pointer_surface(dnd->display,
-                                             POINTER_DRAGGING,
-                                             &pointer_width,
-                                             &pointer_height,
-                                             &hotspot_x,
-                                             &hotspot_y);
+       pointer = display_get_pointer_image(dnd->display, CURSOR_DRAGGING);
+       if (!pointer) {
+               fprintf(stderr, "WARNING: grabbing cursor image not found\n");
+               pointer = display_get_pointer_image(dnd->display,
+                                                   CURSOR_LEFT_PTR);
+               assert(pointer && "no cursor image found");
+       }
 
-       rectangle.width = item_width + 2 * pointer_width;
-       rectangle.height = item_height + 2 * pointer_height;
-       surface = display_create_surface(dnd->display, NULL, &rectangle, 0);
+       rectangle.width = item_width + 2 * pointer->width;
+       rectangle.height = item_height + 2 * pointer->height;
+       surface = display_create_surface(dnd->display, NULL, &rectangle,
+                                        SURFACE_SHM);
 
        cr = cairo_create(surface);
-       cairo_translate(cr, pointer_width, pointer_height);
+       cairo_translate(cr, pointer->width, pointer->height);
 
        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
        cairo_set_source_rgba(cr, 0, 0, 0, 0);
@@ -539,43 +354,43 @@ create_drag_cursor(struct dnd_drag *dnd_drag,
        cairo_mask(cr, pattern);
        cairo_pattern_destroy(pattern);
 
-       cairo_set_source_surface(cr, pointer,
-                                x - item->x - hotspot_x,
-                                y - item->y - hotspot_y);
-       cairo_surface_destroy(pointer);
-       cairo_paint(cr);
        /* FIXME: more cairo-gl brokeness */
        surface_flush_device(surface);
        cairo_destroy(cr);
 
-       dnd_drag->hotspot_x = pointer_width + x - item->x;
-       dnd_drag->hotspot_y = pointer_height + y - item->y;
+       dnd_drag->hotspot_x = pointer->width + x - item->x;
+       dnd_drag->hotspot_y = pointer->height + y - item->y;
+       dnd_drag->width = rectangle.width;
+       dnd_drag->height = rectangle.height;
 
        return surface;
 }
 
 static void
-dnd_button_handler(struct window *window,
+dnd_button_handler(struct widget *widget,
                   struct input *input, uint32_t time,
-                  int button, int state, void *data)
+                  uint32_t button, enum wl_pointer_button_state state,
+                  void *data)
 {
        struct dnd *dnd = data;
        int32_t x, y;
        struct item *item;
        struct rectangle allocation;
        struct dnd_drag *dnd_drag;
-       struct wl_drag *drag;
-       int i;
+       struct display *display;
+       struct wl_compositor *compositor;
+       struct wl_buffer *buffer;
+       unsigned int i;
+       uint32_t serial;
+       cairo_surface_t *icon;
 
-       window_get_child_allocation(dnd->window, &allocation);
+       widget_get_allocation(dnd->widget, &allocation);
        input_get_position(input, &x, &y);
        item = dnd_get_item(dnd, x, y);
        x -= allocation.x;
        y -= allocation.y;
 
-       if (item && state == 1) {
-               fprintf(stderr, "start drag, item %p\n", item);
-
+       if (item && state == WL_POINTER_BUTTON_STATE_PRESSED) {
                dnd_drag = malloc(sizeof *dnd_drag);
                dnd_drag->dnd = dnd;
                dnd_drag->input = input;
@@ -591,57 +406,179 @@ dnd_button_handler(struct window *window,
                        }
                }
 
+               display = window_get_display(dnd->window);
+               compositor = display_get_compositor(display);
+               serial = display_get_serial(display);
+               dnd_drag->drag_surface =
+                       wl_compositor_create_surface(compositor);
+
+               input_ungrab(input);
+
+               if (dnd->self_only) {
+                       dnd_drag->data_source = NULL;
+               } else {
+                       dnd_drag->data_source =
+                               display_create_data_source(dnd->display);
+                       wl_data_source_add_listener(dnd_drag->data_source,
+                                                   &data_source_listener,
+                                                   dnd_drag);
+                       wl_data_source_offer(dnd_drag->data_source,
+                                            "application/x-wayland-dnd-flower");
+                       wl_data_source_offer(dnd_drag->data_source,
+                                            "text/plain; charset=utf-8");
+               }
+
+               wl_data_device_start_drag(input_get_data_device(input),
+                                         dnd_drag->data_source,
+                                         window_get_wl_surface(dnd->window),
+                                         dnd_drag->drag_surface,
+                                         serial);
+
+               input_set_pointer_image(input, CURSOR_DRAGGING);
+
                dnd_drag->opaque =
                        create_drag_cursor(dnd_drag, item, x, y, 1);
                dnd_drag->translucent =
                        create_drag_cursor(dnd_drag, item, x, y, 0.2);
 
-               drag = window_create_drag(window);
-               wl_drag_offer(drag, "application/x-wayland-dnd-flower");
-               window_activate_drag(drag, window, input, time);
-               wl_drag_add_listener(drag, &drag_listener, dnd_drag);
+               if (dnd->self_only)
+                       icon = dnd_drag->opaque;
+               else
+                       icon = dnd_drag->translucent;
+
+               buffer = display_get_buffer_for_surface(dnd->display, icon);
+               wl_surface_attach(dnd_drag->drag_surface, buffer,
+                                 -dnd_drag->hotspot_x, -dnd_drag->hotspot_y);
+               wl_surface_damage(dnd_drag->drag_surface, 0, 0,
+                                 dnd_drag->width, dnd_drag->height);
+               wl_surface_commit(dnd_drag->drag_surface);
+
+               dnd->current_drag = dnd_drag;
                window_schedule_redraw(dnd->window);
        }
 }
 
 static int
-dnd_motion_handler(struct window *window,
+lookup_cursor(struct dnd *dnd, int x, int y)
+{
+       struct item *item;
+
+       item = dnd_get_item(dnd, x, y);
+       if (item)
+               return CURSOR_HAND1;
+       else
+               return CURSOR_LEFT_PTR;
+}
+
+static int
+dnd_enter_handler(struct widget *widget,
+                 struct input *input, float x, float y, void *data)
+{
+       struct dnd *dnd = data;
+
+       dnd->current_drag = NULL;
+
+       return lookup_cursor(dnd, x, y);
+}
+
+static int
+dnd_motion_handler(struct widget *widget,
                   struct input *input, uint32_t time,
-                  int32_t x, int32_t y,
-                  int32_t sx, int32_t sy, void *data)
+                  float x, float y, void *data)
+{
+       return lookup_cursor(data, x, y);
+}
+
+static void
+dnd_data_handler(struct window *window,
+                struct input *input,
+                float x, float y, const char **types, void *data)
 {
        struct dnd *dnd = data;
+
+       if (!types)
+               return;
+
+       if (dnd_get_item(dnd, x, y) || dnd->self_only) {
+               input_accept(input, NULL);
+       } else {
+               input_accept(input, types[0]);
+       }
+}
+
+static void
+dnd_receive_func(void *data, size_t len, int32_t x, int32_t y, void *user_data)
+{
+       struct dnd *dnd = user_data;
+       struct dnd_flower_message *message = data;
        struct item *item;
+       struct rectangle allocation;
 
-       item = dnd_get_item(dnd, sx, sy);
+       if (len == 0) {
+               return;
+       } else if (len != sizeof *message) {
+               fprintf(stderr, "odd message length %zu, expected %zu\n",
+                       len, sizeof *message);
+               return;
+       }
+               
+       widget_get_allocation(dnd->widget, &allocation);
+       item = item_create(dnd->display,
+                          x - message->x_offset - allocation.x,
+                          y - message->y_offset - allocation.y,
+                          message->seed);
 
-       if (item)
-               return POINTER_HAND1;
-       else
-               return POINTER_LEFT_PTR;
+       dnd_add_item(dnd, item);
+       window_schedule_redraw(dnd->window);
+}
+
+static void
+dnd_drop_handler(struct window *window, struct input *input,
+                int32_t x, int32_t y, void *data)
+{
+       struct dnd *dnd = data;
+       struct dnd_flower_message message;
+
+       if (dnd_get_item(dnd, x, y)) {
+               fprintf(stderr, "got 'drop', but no target\n");
+               return;
+       }
+
+       if (!dnd->self_only) {
+               input_receive_drag_data(input,
+                                       "application/x-wayland-dnd-flower",
+                                       dnd_receive_func, dnd);
+       } else if (dnd->current_drag) {
+               message.seed = dnd->current_drag->item->seed;
+               message.x_offset = dnd->current_drag->x_offset;
+               message.y_offset = dnd->current_drag->y_offset;
+               dnd_receive_func(&message, sizeof message, x, y, dnd);
+               dnd->current_drag = NULL;
+       } else {
+               fprintf(stderr, "ignoring drop from another client\n");
+       }
 }
 
 static struct dnd *
 dnd_create(struct display *display)
 {
        struct dnd *dnd;
-       int i, x, y;
+       int x, y;
        int32_t width, height;
+       unsigned int i;
 
        dnd = malloc(sizeof *dnd);
        if (dnd == NULL)
                return dnd;
        memset(dnd, 0, sizeof *dnd);
 
-       dnd->window = window_create(display, 400, 400);
+       dnd->window = window_create(display);
+       dnd->widget = frame_create(dnd->window, dnd);
        window_set_title(dnd->window, "Wayland Drag and Drop Demo");
 
        dnd->display = display;
        dnd->key = 100;
 
-       wl_display_add_global_listener(display_get_display(display),
-                                      global_handler, dnd);
-
        for (i = 0; i < ARRAY_LENGTH(dnd->items); i++) {
                x = (i % 4) * (item_width + item_padding) + item_padding;
                y = (i / 4) * (item_height + item_padding) + item_padding;
@@ -652,40 +589,42 @@ dnd_create(struct display *display)
        }
 
        window_set_user_data(dnd->window, dnd);
-       window_set_redraw_handler(dnd->window, redraw_handler);
        window_set_keyboard_focus_handler(dnd->window,
                                          keyboard_focus_handler);
-       window_set_button_handler(dnd->window,
-                                 dnd_button_handler);
+       window_set_data_handler(dnd->window, dnd_data_handler);
+       window_set_drop_handler(dnd->window, dnd_drop_handler);
 
-       window_set_motion_handler(dnd->window,
-                                 dnd_motion_handler);
+       widget_set_redraw_handler(dnd->widget, dnd_redraw_handler);
+       widget_set_enter_handler(dnd->widget, dnd_enter_handler);
+       widget_set_motion_handler(dnd->widget, dnd_motion_handler);
+       widget_set_button_handler(dnd->widget, dnd_button_handler);
 
        width = 4 * (item_width + item_padding) + item_padding;
        height = 4 * (item_height + item_padding) + item_padding;
-       window_set_child_size(dnd->window, width, height);
 
-       dnd_draw(dnd);
+       frame_set_child_size(dnd->widget, width, height);
 
        return dnd;
 }
 
-static const GOptionEntry option_entries[] = {
-       { NULL }
-};
-
 int
 main(int argc, char *argv[])
 {
        struct display *d;
+       struct dnd *dnd;
+       int i;
 
-       d = display_create(&argc, &argv, option_entries);
+       d = display_create(argc, argv);
        if (d == NULL) {
                fprintf(stderr, "failed to create display: %m\n");
                return -1;
        }
 
-       dnd_create(d);
+       dnd = dnd_create(d);
+
+       for (i = 1; i < argc; i++)
+               if (strcmp("--self-only", argv[i]) == 0)
+                       dnd->self_only = 1;
 
        display_run(d);