mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client/dnd.c: add dnd support for touch screen in client

Browse Source 
Adding the interface for touch screen event in clients/dnd.c, once
user touch down on this app, it will trigger a touch and drag
operation.

Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
Reviewed-by: Kristian Hogsberg <hoegsberg@gmail.com>
This commit is contained in:
Xiong Zhang 2013-11-25 18:42:50 +08:00 committed by Kristian Høgsberg
parent fd51e7bb57
commit 853a7799d6
2 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
clients/dnd.c
View File

@ -365,14 +365,11 @@ create_drag_icon(struct dnd_drag *dnd_drag,
return surface; return surface;
} }
static void static int
dnd_button_handler(struct widget *widget, create_drag_source(struct dnd *dnd,
struct input *input, uint32_t time, struct input *input, uint32_t time,
uint32_t button, enum wl_pointer_button_state state, int32_t x, int32_t y)
void *data)
{ {
struct dnd *dnd = data;
int32_t x, y;
struct item *item; struct item *item;
struct rectangle allocation; struct rectangle allocation;
struct dnd_drag *dnd_drag; struct dnd_drag *dnd_drag;
@ -384,12 +381,11 @@ dnd_button_handler(struct widget *widget,
cairo_surface_t *icon; cairo_surface_t *icon;
widget_get_allocation(dnd->widget, &allocation); widget_get_allocation(dnd->widget, &allocation);
input_get_position(input, &x, &y);
item = dnd_get_item(dnd, x, y); item = dnd_get_item(dnd, x, y);
x -= allocation.x; x -= allocation.x;
y -= allocation.y; y -= allocation.y;
if (item && state == WL_POINTER_BUTTON_STATE_PRESSED) { if (item) {
dnd_drag = xmalloc(sizeof *dnd_drag); dnd_drag = xmalloc(sizeof *dnd_drag);
dnd_drag->dnd = dnd; dnd_drag->dnd = dnd;
dnd_drag->input = input; dnd_drag->input = input;
@ -411,8 +407,6 @@ dnd_button_handler(struct widget *widget,
dnd_drag->drag_surface = dnd_drag->drag_surface =
wl_compositor_create_surface(compositor); wl_compositor_create_surface(compositor);
input_ungrab(input);
if (dnd->self_only) { if (dnd->self_only) {
dnd_drag->data_source = NULL; dnd_drag->data_source = NULL;
} else { } else {
@ -433,8 +427,6 @@ dnd_button_handler(struct widget *widget,
dnd_drag->drag_surface, dnd_drag->drag_surface,
serial); serial);
input_set_pointer_image(input, CURSOR_DRAGGING);
dnd_drag->opaque = dnd_drag->opaque =
create_drag_icon(dnd_drag, item, x, y, 1); create_drag_icon(dnd_drag, item, x, y, 1);
dnd_drag->translucent = dnd_drag->translucent =
@ -454,9 +446,46 @@ dnd_button_handler(struct widget *widget,
dnd->current_drag = dnd_drag; dnd->current_drag = dnd_drag;
window_schedule_redraw(dnd->window); window_schedule_redraw(dnd->window);
return 0;
} else
return -1;
}
static void
dnd_button_handler(struct widget *widget,
struct input *input, uint32_t time,
uint32_t button, enum wl_pointer_button_state state,
void *data)
{
struct dnd *dnd = data;
int32_t x, y;
input_get_position(input, &x, &y);
if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
input_ungrab(input);
if (create_drag_source(dnd, input, time, x, y) == 0)
input_set_pointer_image(input, CURSOR_DRAGGING);
} }
} }
static void
dnd_touch_down_handler(struct widget *widget,
struct input *input, uint32_t serial,
uint32_t time, int32_t id,
float x, float y, void *data)
{
struct dnd *dnd = data;
int32_t int_x, int_y;
if (id > 0)
return;
int_x = (int32_t)x;
int_y = (int32_t)y;
create_drag_source(dnd, input, time, int_x, int_y);
}
static int static int
lookup_cursor(struct dnd *dnd, int x, int y) lookup_cursor(struct dnd *dnd, int x, int y)
{ {
@ -597,6 +626,7 @@ dnd_create(struct display *display)
widget_set_enter_handler(dnd->widget, dnd_enter_handler); widget_set_enter_handler(dnd->widget, dnd_enter_handler);
widget_set_motion_handler(dnd->widget, dnd_motion_handler); widget_set_motion_handler(dnd->widget, dnd_motion_handler);
widget_set_button_handler(dnd->widget, dnd_button_handler); widget_set_button_handler(dnd->widget, dnd_button_handler);
widget_set_touch_down_handler(dnd->widget, dnd_touch_down_handler);
width = 4 * (item_width + item_padding) + item_padding; width = 4 * (item_width + item_padding) + item_padding;
height = 4 * (item_height + item_padding) + item_padding; height = 4 * (item_height + item_padding) + item_padding;

2
clients/window.c
View File

@ -3248,6 +3248,8 @@ data_device_enter(void *data, struct wl_data_device *data_device,
input->pointer_enter_serial = serial; input->pointer_enter_serial = serial;
window = wl_surface_get_user_data(surface); window = wl_surface_get_user_data(surface);
input->pointer_focus = window; input->pointer_focus = window;
input->sx = x;
input->sy = y;
if (offer) { if (offer) {
input->drag_offer = wl_data_offer_get_user_data(offer); input->drag_offer = wl_data_offer_get_user_data(offer);