Add touch support for wl_shell_surface_move

dev
Rusty Lynch 11 years ago committed by Kristian Høgsberg
parent d224bb9218
commit 1084da506e
  1. 4
      clients/calibrator.c
  2. 9
      clients/desktop-shell.c
  3. 11
      clients/flower.c
  4. 12
      clients/fullscreen.c
  5. 50
      clients/simple-egl.c
  6. 4
      clients/smoke.c
  7. 12
      clients/transformed.c
  8. 50
      clients/window.c
  9. 11
      clients/window.h
  10. 126
      src/shell.c

@ -163,8 +163,8 @@ button_handler(struct widget *widget,
} }
static void static void
touch_handler(struct widget *widget, uint32_t serial, uint32_t time, touch_handler(struct widget *widget, struct input *input, uint32_t serial,
int32_t id, float x, float y, void *data) uint32_t time, int32_t id, float x, float y, void *data)
{ {
struct calibrator *calibrator = data; struct calibrator *calibrator = data;

@ -322,8 +322,8 @@ panel_launcher_button_handler(struct widget *widget,
} }
static void static void
panel_launcher_touch_down_handler(struct widget *widget, uint32_t serial, panel_launcher_touch_down_handler(struct widget *widget, struct input *input,
uint32_t time, int32_t id, uint32_t serial, uint32_t time, int32_t id,
float x, float y, void *data) float x, float y, void *data)
{ {
struct panel_launcher *launcher; struct panel_launcher *launcher;
@ -334,8 +334,9 @@ panel_launcher_touch_down_handler(struct widget *widget, uint32_t serial,
} }
static void static void
panel_launcher_touch_up_handler(struct widget *widget, uint32_t serial, panel_launcher_touch_up_handler(struct widget *widget, struct input *input,
uint32_t time, int32_t id, void *data) uint32_t serial, uint32_t time, int32_t id,
void *data)
{ {
struct panel_launcher *launcher; struct panel_launcher *launcher;

@ -152,6 +152,16 @@ button_handler(struct widget *widget,
} }
} }
static void
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 flower *flower = data;
window_touch_move(flower->window, input,
display_get_serial(flower->display));
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct flower flower; struct flower flower;
@ -178,6 +188,7 @@ int main(int argc, char *argv[])
widget_set_redraw_handler(flower.widget, redraw_handler); widget_set_redraw_handler(flower.widget, redraw_handler);
widget_set_button_handler(flower.widget, button_handler); widget_set_button_handler(flower.widget, button_handler);
widget_set_default_cursor(flower.widget, CURSOR_HAND1); widget_set_default_cursor(flower.widget, CURSOR_HAND1);
widget_set_touch_down_handler(flower.widget, touch_down_handler);
window_schedule_resize(flower.window, flower.width, flower.height); window_schedule_resize(flower.window, flower.width, flower.height);

@ -277,6 +277,16 @@ button_handler(struct widget *widget,
} }
} }
static void
touch_handler(struct widget *widget, struct input *input,
uint32_t serial, uint32_t time, int32_t id,
float x, float y, void *data)
{
struct fullscreen *fullscreen = data;
window_touch_move(fullscreen->window, input,
display_get_serial(fullscreen->display));
}
static void static void
usage(int error_code) usage(int error_code)
{ {
@ -340,6 +350,8 @@ int main(int argc, char *argv[])
widget_set_button_handler(fullscreen.widget, button_handler); widget_set_button_handler(fullscreen.widget, button_handler);
widget_set_motion_handler(fullscreen.widget, motion_handler); widget_set_motion_handler(fullscreen.widget, motion_handler);
widget_set_touch_down_handler(fullscreen.widget, touch_handler);
window_set_key_handler(fullscreen.window, key_handler); window_set_key_handler(fullscreen.window, key_handler);
window_set_fullscreen_handler(fullscreen.window, fullscreen_handler); window_set_fullscreen_handler(fullscreen.window, fullscreen_handler);

@ -55,6 +55,7 @@ struct display {
struct wl_shell *shell; struct wl_shell *shell;
struct wl_seat *seat; struct wl_seat *seat;
struct wl_pointer *pointer; struct wl_pointer *pointer;
struct wl_touch *touch;
struct wl_keyboard *keyboard; struct wl_keyboard *keyboard;
struct wl_shm *shm; struct wl_shm *shm;
struct wl_cursor_theme *cursor_theme; struct wl_cursor_theme *cursor_theme;
@ -528,6 +529,46 @@ static const struct wl_pointer_listener pointer_listener = {
pointer_handle_axis, pointer_handle_axis,
}; };
static void
touch_handle_down(void *data, struct wl_touch *wl_touch,
uint32_t serial, uint32_t time, struct wl_surface *surface,
int32_t id, wl_fixed_t x_w, wl_fixed_t y_w)
{
struct display *d = (struct display *)data;
wl_shell_surface_move(d->window->shell_surface, d->seat, serial);
}
static void
touch_handle_up(void *data, struct wl_touch *wl_touch,
uint32_t serial, uint32_t time, int32_t id)
{
}
static void
touch_handle_motion(void *data, struct wl_touch *wl_touch,
uint32_t time, int32_t id, wl_fixed_t x_w, wl_fixed_t y_w)
{
}
static void
touch_handle_frame(void *data, struct wl_touch *wl_touch)
{
}
static void
touch_handle_cancel(void *data, struct wl_touch *wl_touch)
{
}
static const struct wl_touch_listener touch_listener = {
touch_handle_down,
touch_handle_up,
touch_handle_motion,
touch_handle_frame,
touch_handle_cancel,
};
static void static void
keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard, keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
uint32_t format, int fd, uint32_t size) uint32_t format, int fd, uint32_t size)
@ -597,6 +638,15 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
wl_keyboard_destroy(d->keyboard); wl_keyboard_destroy(d->keyboard);
d->keyboard = NULL; d->keyboard = NULL;
} }
if ((caps & WL_SEAT_CAPABILITY_TOUCH) && !d->touch) {
d->touch = wl_seat_get_touch(seat);
wl_touch_set_user_data(d->touch, d);
wl_touch_add_listener(d->touch, &touch_listener, d);
} else if (!(caps & WL_SEAT_CAPABILITY_TOUCH) && d->touch) {
wl_touch_destroy(d->touch);
d->touch = NULL;
}
} }
static const struct wl_seat_listener seat_listener = { static const struct wl_seat_listener seat_listener = {

@ -267,8 +267,8 @@ mouse_motion_handler(struct widget *widget, struct input *input,
} }
static void static void
touch_motion_handler(struct widget *widget, uint32_t time, touch_motion_handler(struct widget *widget, struct input *input,
int32_t id, float x, float y, void *data) uint32_t time, int32_t id, float x, float y, void *data)
{ {
smoke_motion_handler(data, x, y); smoke_motion_handler(data, x, y);
} }

@ -221,6 +221,16 @@ button_handler(struct widget *widget,
} }
} }
static void
touch_handler(struct widget *widget, struct input *input,
uint32_t serial, uint32_t time, int32_t id,
float x, float y, void *data)
{
struct transformed *transformed = data;
window_touch_move(transformed->window, input,
display_get_serial(transformed->display));
}
static void static void
usage(int error_code) usage(int error_code)
{ {
@ -287,6 +297,8 @@ int main(int argc, char *argv[])
widget_set_redraw_handler(transformed.widget, redraw_handler); widget_set_redraw_handler(transformed.widget, redraw_handler);
widget_set_button_handler(transformed.widget, button_handler); widget_set_button_handler(transformed.widget, button_handler);
widget_set_touch_down_handler(transformed.widget, touch_handler);
window_set_key_handler(transformed.window, key_handler); window_set_key_handler(transformed.window, key_handler);
window_set_fullscreen_handler(transformed.window, fullscreen_handler); window_set_fullscreen_handler(transformed.window, fullscreen_handler);
window_set_output_handler(transformed.window, output_handler); window_set_output_handler(transformed.window, output_handler);

@ -1553,6 +1553,8 @@ window_destroy(struct window *window)
wl_list_remove(&window->redraw_task.link); wl_list_remove(&window->redraw_task.link);
wl_list_for_each(input, &display->input_list, link) { wl_list_for_each(input, &display->input_list, link) {
if (input->touch_focus == window)
input->touch_focus = NULL;
if (input->pointer_focus == window) if (input->pointer_focus == window)
input->pointer_focus = NULL; input->pointer_focus = NULL;
if (input->keyboard_focus == window) if (input->keyboard_focus == window)
@ -2353,8 +2355,8 @@ frame_button_button_handler(struct widget *widget,
} }
static void static void
frame_button_touch_down_handler(struct widget *widget, uint32_t serial, frame_button_touch_down_handler(struct widget *widget, struct input *input,
uint32_t time, int32_t id, uint32_t serial, uint32_t time, int32_t id,
float x, float y, void *data) float x, float y, void *data)
{ {
struct frame_button *frame_button = data; struct frame_button *frame_button = data;
@ -2692,6 +2694,19 @@ frame_button_handler(struct widget *widget,
} }
} }
static void
frame_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 window *window = widget->window;
struct display *display = window->display;
wl_shell_surface_move(window->shell_surface,
input_get_seat(input),
display->serial);
}
struct widget * struct widget *
frame_create(struct window *window, void *data) frame_create(struct window *window, void *data)
{ {
@ -2706,6 +2721,7 @@ frame_create(struct window *window, void *data)
widget_set_enter_handler(frame->widget, frame_enter_handler); widget_set_enter_handler(frame->widget, frame_enter_handler);
widget_set_motion_handler(frame->widget, frame_motion_handler); widget_set_motion_handler(frame->widget, frame_motion_handler);
widget_set_button_handler(frame->widget, frame_button_handler); widget_set_button_handler(frame->widget, frame_button_handler);
widget_set_touch_down_handler(frame->widget, frame_touch_down_handler);
/* Create empty list for frame buttons */ /* Create empty list for frame buttons */
wl_list_init(&frame->buttons_list); wl_list_init(&frame->buttons_list);
@ -3207,8 +3223,7 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
float sx = wl_fixed_to_double(x_w); float sx = wl_fixed_to_double(x_w);
float sy = wl_fixed_to_double(y_w); float sy = wl_fixed_to_double(y_w);
DBG("touch_handle_down: %i %i\n", id, wl_list_length(&input->touch_point_list)); input->display->serial = serial;
input->touch_focus = wl_surface_get_user_data(surface); input->touch_focus = wl_surface_get_user_data(surface);
if (!input->touch_focus) { if (!input->touch_focus) {
DBG("Failed to find to touch focus for surface %p\n", surface); DBG("Failed to find to touch focus for surface %p\n", surface);
@ -3226,8 +3241,8 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
wl_list_insert(&input->touch_point_list, &tp->link); wl_list_insert(&input->touch_point_list, &tp->link);
if (widget->touch_down_handler) if (widget->touch_down_handler)
(*widget->touch_down_handler)(widget, serial, (*widget->touch_down_handler)(widget, input,
time, id, serial, time, id,
sx, sy, sx, sy,
widget->user_data); widget->user_data);
} }
@ -3241,8 +3256,6 @@ touch_handle_up(void *data, struct wl_touch *wl_touch,
struct input *input = data; struct input *input = data;
struct touch_point *tp, *tmp; struct touch_point *tp, *tmp;
DBG("touch_handle_up: %i %i\n", id, wl_list_length(&input->touch_point_list));
if (!input->touch_focus) { if (!input->touch_focus) {
DBG("No touch focus found for touch up event!\n"); DBG("No touch focus found for touch up event!\n");
return; return;
@ -3253,7 +3266,7 @@ touch_handle_up(void *data, struct wl_touch *wl_touch,
continue; continue;
if (tp->widget->touch_up_handler) if (tp->widget->touch_up_handler)
(*tp->widget->touch_up_handler)(tp->widget, serial, (*tp->widget->touch_up_handler)(tp->widget, input, serial,
time, id, time, id,
tp->widget->user_data); tp->widget->user_data);
@ -3285,7 +3298,7 @@ touch_handle_motion(void *data, struct wl_touch *wl_touch,
continue; continue;
if (tp->widget->touch_motion_handler) if (tp->widget->touch_motion_handler)
(*tp->widget->touch_motion_handler)(tp->widget, time, (*tp->widget->touch_motion_handler)(tp->widget, input, time,
id, sx, sy, id, sx, sy,
tp->widget->user_data); tp->widget->user_data);
return; return;
@ -3307,7 +3320,8 @@ touch_handle_frame(void *data, struct wl_touch *wl_touch)
wl_list_for_each_safe(tp, tmp, &input->touch_point_list, link) { wl_list_for_each_safe(tp, tmp, &input->touch_point_list, link) {
if (tp->widget->touch_frame_handler) if (tp->widget->touch_frame_handler)
(*tp->widget->touch_frame_handler)(tp->widget, tp->widget->user_data); (*tp->widget->touch_frame_handler)(tp->widget, input,
tp->widget->user_data);
wl_list_remove(&tp->link); wl_list_remove(&tp->link);
free(tp); free(tp);
@ -3329,7 +3343,8 @@ touch_handle_cancel(void *data, struct wl_touch *wl_touch)
wl_list_for_each_safe(tp, tmp, &input->touch_point_list, link) { wl_list_for_each_safe(tp, tmp, &input->touch_point_list, link) {
if (tp->widget->touch_cancel_handler) if (tp->widget->touch_cancel_handler)
(*tp->widget->touch_cancel_handler)(tp->widget, tp->widget->user_data); (*tp->widget->touch_cancel_handler)(tp->widget, input,
tp->widget->user_data);
wl_list_remove(&tp->link); wl_list_remove(&tp->link);
free(tp); free(tp);
@ -3813,6 +3828,16 @@ window_move(struct window *window, struct input *input, uint32_t serial)
wl_shell_surface_move(window->shell_surface, input->seat, serial); wl_shell_surface_move(window->shell_surface, input->seat, serial);
} }
void
window_touch_move(struct window *window, struct input *input, uint32_t serial)
{
if (!window->shell_surface)
return;
wl_shell_surface_move(window->shell_surface, input->seat,
window->display->serial);
}
static void static void
surface_set_synchronized(struct surface *surface) surface_set_synchronized(struct surface *surface)
{ {
@ -4920,6 +4945,7 @@ display_add_input(struct display *d, uint32_t id)
input = xzalloc(sizeof *input); input = xzalloc(sizeof *input);
input->display = d; input->display = d;
input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 1); input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 1);
input->touch_focus = NULL;
input->pointer_focus = NULL; input->pointer_focus = NULL;
input->keyboard_focus = NULL; input->keyboard_focus = NULL;
wl_list_init(&input->touch_point_list); wl_list_init(&input->touch_point_list);

@ -236,6 +236,7 @@ typedef void (*widget_button_handler_t)(struct widget *widget,
enum wl_pointer_button_state state, enum wl_pointer_button_state state,
void *data); void *data);
typedef void (*widget_touch_down_handler_t)(struct widget *widget, typedef void (*widget_touch_down_handler_t)(struct widget *widget,
struct input *input,
uint32_t serial, uint32_t serial,
uint32_t time, uint32_t time,
int32_t id, int32_t id,
@ -243,18 +244,22 @@ typedef void (*widget_touch_down_handler_t)(struct widget *widget,
float y, float y,
void *data); void *data);
typedef void (*widget_touch_up_handler_t)(struct widget *widget, typedef void (*widget_touch_up_handler_t)(struct widget *widget,
struct input *input,
uint32_t serial, uint32_t serial,
uint32_t time, uint32_t time,
int32_t id, int32_t id,
void *data); void *data);
typedef void (*widget_touch_motion_handler_t)(struct widget *widget, typedef void (*widget_touch_motion_handler_t)(struct widget *widget,
struct input *input,
uint32_t time, uint32_t time,
int32_t id, int32_t id,
float x, float x,
float y, float y,
void *data); void *data);
typedef void (*widget_touch_frame_handler_t)(struct widget *widget,void *data); typedef void (*widget_touch_frame_handler_t)(struct widget *widget,
typedef void (*widget_touch_cancel_handler_t)(struct widget *widget, void *data); struct input *input, void *data);
typedef void (*widget_touch_cancel_handler_t)(struct widget *widget,
struct input *input, void *data);
typedef void (*widget_axis_handler_t)(struct widget *widget, typedef void (*widget_axis_handler_t)(struct widget *widget,
struct input *input, uint32_t time, struct input *input, uint32_t time,
uint32_t axis, uint32_t axis,
@ -324,6 +329,8 @@ window_get_display(struct window *window);
void void
window_move(struct window *window, struct input *input, uint32_t time); window_move(struct window *window, struct input *input, uint32_t time);
void void
window_touch_move(struct window *window, struct input *input, uint32_t time);
void
window_get_allocation(struct window *window, struct rectangle *allocation); window_get_allocation(struct window *window, struct rectangle *allocation);
void void
window_schedule_redraw(struct window *window); window_schedule_redraw(struct window *window);

@ -237,11 +237,23 @@ struct shell_grab {
struct wl_listener shsurf_destroy_listener; struct wl_listener shsurf_destroy_listener;
}; };
struct shell_touch_grab {
struct weston_touch_grab grab;
struct shell_surface *shsurf;
struct wl_listener shsurf_destroy_listener;
struct weston_touch *touch;
};
struct weston_move_grab { struct weston_move_grab {
struct shell_grab base; struct shell_grab base;
wl_fixed_t dx, dy; wl_fixed_t dx, dy;
}; };
struct weston_touch_move_grab {
struct shell_touch_grab base;
wl_fixed_t dx, dy;
};
struct rotate_grab { struct rotate_grab {
struct shell_grab base; struct shell_grab base;
struct weston_matrix rotation; struct weston_matrix rotation;
@ -349,6 +361,36 @@ shell_grab_end(struct shell_grab *grab)
weston_pointer_end_grab(grab->grab.pointer); weston_pointer_end_grab(grab->grab.pointer);
} }
static void
shell_touch_grab_start(struct shell_touch_grab *grab,
const struct weston_touch_grab_interface *interface,
struct shell_surface *shsurf,
struct weston_touch *touch)
{
struct desktop_shell *shell = shsurf->shell;
grab->grab.interface = interface;
grab->shsurf = shsurf;
grab->shsurf_destroy_listener.notify = destroy_shell_grab_shsurf;
wl_signal_add(&shsurf->destroy_signal,
&grab->shsurf_destroy_listener);
grab->touch = touch;
weston_touch_start_grab(touch, &grab->grab);
if (shell->child.desktop_shell)
weston_touch_set_focus(touch->seat, shell->grab_surface);
}
static void
shell_touch_grab_end(struct shell_touch_grab *grab)
{
if (grab->shsurf)
wl_list_remove(&grab->shsurf_destroy_listener.link);
weston_touch_end_grab(grab->touch);
}
static void static void
center_on_output(struct weston_surface *surface, center_on_output(struct weston_surface *surface,
struct weston_output *output); struct weston_output *output);
@ -1034,6 +1076,74 @@ bind_workspace_manager(struct wl_client *client,
shell->workspaces.num); shell->workspaces.num);
} }
static void
touch_move_grab_down(struct weston_touch_grab *grab, uint32_t time,
int touch_id, wl_fixed_t sx, wl_fixed_t sy)
{
}
static void
touch_move_grab_up(struct weston_touch_grab *grab, uint32_t time, int touch_id)
{
struct shell_touch_grab *shell_grab = container_of(grab,
struct shell_touch_grab,
grab);
shell_touch_grab_end(shell_grab);
}
static void
touch_move_grab_motion(struct weston_touch_grab *grab, uint32_t time,
int touch_id, wl_fixed_t sx, wl_fixed_t sy)
{
struct weston_touch_move_grab *move = (struct weston_touch_move_grab *) grab;
struct shell_surface *shsurf = move->base.shsurf;
struct weston_surface *es;
int dx = wl_fixed_to_int(grab->touch->grab_x + move->dx);
int dy = wl_fixed_to_int(grab->touch->grab_y + move->dy);
if (!shsurf)
return;
es = shsurf->surface;
weston_surface_configure(es, dx, dy,
es->geometry.width, es->geometry.height);
weston_compositor_schedule_repaint(es->compositor);
}
static const struct weston_touch_grab_interface touch_move_grab_interface = {
touch_move_grab_down,
touch_move_grab_up,
touch_move_grab_motion,
};
static int
surface_touch_move(struct shell_surface *shsurf, struct weston_seat *seat)
{
struct weston_touch_move_grab *move;
if (!shsurf)
return -1;
if (shsurf->type == SHELL_SURFACE_FULLSCREEN)
return 0;
move = malloc(sizeof *move);
if (!move)
return -1;
move->dx = wl_fixed_from_double(shsurf->surface->geometry.x) -
seat->touch->grab_x;
move->dy = wl_fixed_from_double(shsurf->surface->geometry.y) -
seat->touch->grab_y;
shell_touch_grab_start(&move->base, &touch_move_grab_interface, shsurf,
seat->touch);
return 0;
}
static void static void
noop_grab_focus(struct weston_pointer_grab *grab) noop_grab_focus(struct weston_pointer_grab *grab)
{ {
@ -1117,13 +1227,17 @@ shell_surface_move(struct wl_client *client, struct wl_resource *resource,
struct weston_surface *surface; struct weston_surface *surface;
surface = weston_surface_get_main_surface(seat->pointer->focus); surface = weston_surface_get_main_surface(seat->pointer->focus);
if (seat->pointer->button_count == 0 || if (seat->pointer->button_count > 0 && seat->pointer->grab_serial == serial) {
seat->pointer->grab_serial != serial || surface = weston_surface_get_main_surface(seat->pointer->focus);
surface != shsurf->surface) if ((surface == shsurf->surface) &&
return; (surface_move(shsurf, seat) < 0))
if (surface_move(shsurf, seat) < 0)
wl_resource_post_no_memory(resource); wl_resource_post_no_memory(resource);
} else if (seat->touch->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->touch->focus);
if ((surface == shsurf->surface) &&
(surface_touch_move(shsurf, seat) < 0))
wl_resource_post_no_memory(resource);
}
} }
struct weston_resize_grab { struct weston_resize_grab {

Loading…
Cancel
Save