mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-01 22:58:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set pointer image only in response to 'target' event

Browse source
This commit is contained in:
Kristian Høgsberg 2010-08-25 16:34:05 -04:00
parent 8a40871645
commit 1d7ffd32f8
7 changed files with 43 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

31
clients/dnd.c
View file

@ -44,6 +44,9 @@ struct dnd {
struct display *display;
uint32_t key;
struct item *items[16];
struct wl_buffer *buffer;
int hotspot_x, hotspot_y;
};
struct item {
@ -249,7 +252,16 @@ static void
drag_target(void *data,
struct wl_drag *drag, const char *mime_type)
{
struct dnd *dnd = data;
struct input *input;
struct wl_input_device *device;
fprintf(stderr, "target %s\n", mime_type);
input = wl_drag_get_user_data(drag);
device = input_get_input_device(input);
wl_input_device_attach(device, dnd->buffer,
dnd->hotspot_x, dnd->hotspot_y);
}
static void
@ -269,7 +281,7 @@ static void
drag_data(void *data,
struct wl_drag *drag, struct wl_array *contents)
{
fprintf(stderr, "drag drop, data %s\n", contents->data);
fprintf(stderr, "drag drop, data %s\n", (char *) contents->data);
}
static const struct wl_drag_listener drag_listener = {
@ -291,7 +303,6 @@ dnd_button_handler(struct window *window,
int32_t x, y, hotspot_x, hotspot_y, pointer_width, pointer_height;
struct rectangle rectangle;
struct item *item;
struct wl_buffer *buffer;
cairo_surface_t *surface, *pointer;
cairo_t *cr;
@ -334,12 +345,12 @@ dnd_button_handler(struct window *window,
cairo_paint(cr);
cairo_destroy(cr);
buffer = display_get_buffer_for_surface(dnd->display,
surface);
window_start_drag(window, input, time,
buffer,
pointer_width + x - item->x,
pointer_height + y - item->y);
dnd->buffer = display_get_buffer_for_surface(dnd->display,
surface);
dnd->hotspot_x = pointer_width + x - item->x;
dnd->hotspot_y = pointer_height + y - item->y;
window_start_drag(window, input, time);
/* FIXME: We leak the surface because we can't free it
* until the server has referenced it. */
@ -407,6 +418,8 @@ dnd_create(struct display *display)
rectangle.height = 4 * (item_height + item_padding) + item_padding;
window_set_child_size(dnd->window, &rectangle);
display_add_drag_listener(display, &drag_listener, dnd);
dnd_draw(dnd);
return dnd;
@ -428,8 +441,6 @@ main(int argc, char *argv[])
d = display_create(&argc, &argv, option_entries);
display_add_drag_listener(d, &drag_listener, d);
dnd = dnd_create (d);
display_run(d);

18
clients/window.c
View file

@ -561,9 +561,10 @@ window_handle_motion(void *data, struct wl_input_device *input_device,
set_pointer_image(input, pointer);
}
static void window_handle_button(void *data,
struct wl_input_device *input_device,
uint32_t time, uint32_t button, uint32_t state)
static void
window_handle_button(void *data,
struct wl_input_device *input_device,
uint32_t time, uint32_t button, uint32_t state)
{
struct input *input = data;
struct window *window = input->pointer_focus;
@ -717,6 +718,12 @@ input_get_position(struct input *input, int32_t *x, int32_t *y)
*y = input->sy;
}
struct wl_input_device *
input_get_input_device(struct input *input)
{
return input->input_device;
}
void
display_add_drag_listener(struct display *display,
const struct wl_drag_listener *drag_listener,
@ -729,12 +736,11 @@ display_add_drag_listener(struct display *display,
}
void
window_start_drag(struct window *window, struct input *input, uint32_t time,
struct wl_buffer *buffer, int32_t x, int32_t y)
window_start_drag(struct window *window, struct input *input, uint32_t time)
{
cairo_device_flush (window->display->device);
wl_drag_prepare(input->drag, window->surface, time, buffer, x, y);
wl_drag_prepare(input->drag, window->surface, time);
wl_drag_offer(input->drag, "text/plain");
wl_drag_activate(input->drag);
}

6
clients/window.h
View file

@ -188,10 +188,12 @@ window_set_frame_handler(struct window *window,
window_frame_handler_t handler);
void
window_start_drag(struct window *window, struct input *input, uint32_t time,
struct wl_buffer *buffer, int32_t x, int32_t y);
window_start_drag(struct window *window, struct input *input, uint32_t time);
void
input_get_position(struct input *input, int32_t *x, int32_t *y);
struct wl_input_device *
input_get_input_device(struct input *input);
#endif