rootston: handle request_move

This commit is contained in:
emersion 2017-09-28 00:29:37 +02:00
parent d6c6b7c506
commit 63f277f3b9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 42 additions and 1 deletions

View file

@ -10,7 +10,10 @@ struct roots_wl_shell_surface {
// TODO: Maybe destroy listener should go in roots_view // TODO: Maybe destroy listener should go in roots_view
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener ping_timeout; struct wl_listener ping_timeout;
// TODO: other stuff struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_set_fullscreen;
struct wl_listener request_set_maximized;
}; };
struct roots_xdg_surface_v6 { struct roots_xdg_surface_v6 {

View file

@ -10,11 +10,41 @@
#include "rootston/server.h" #include "rootston/server.h"
#include "rootston/input.h" #include "rootston/input.h"
static void handle_move(struct wl_listener *listener, void *data) {
struct roots_wl_shell_surface *roots_surface =
wl_container_of(listener, roots_surface, request_move);
struct roots_view *view = roots_surface->view;
struct roots_input *input = view->desktop->server->input;
struct wlr_wl_shell_surface_move_event *e = data;
// TODO: Some of this might want to live in cursor.c I guess
struct roots_input_event *event = NULL;
size_t len = sizeof(input->input_events) / sizeof(*input->input_events);
for (size_t i = 0; i < len; ++i) {
if (input->input_events[i].cursor
&& input->input_events[i].serial == e->serial) {
event = &input->input_events[i];
break;
}
}
if (!event || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
return;
}
input->mode = ROOTS_CURSOR_MOVE;
input->offs_x = input->cursor->x - view->x;
input->offs_y = input->cursor->y - view->y;
wlr_seat_pointer_clear_focus(input->wl_seat);
}
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
struct roots_wl_shell_surface *roots_surface = struct roots_wl_shell_surface *roots_surface =
wl_container_of(listener, roots_surface, destroy); wl_container_of(listener, roots_surface, destroy);
wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->destroy.link);
wl_list_remove(&roots_surface->ping_timeout.link); wl_list_remove(&roots_surface->ping_timeout.link);
wl_list_remove(&roots_surface->request_move.link);
wl_list_remove(&roots_surface->request_resize.link);
wl_list_remove(&roots_surface->request_set_fullscreen.link);
wl_list_remove(&roots_surface->request_set_maximized.link);
view_destroy(roots_surface->view); view_destroy(roots_surface->view);
free(roots_surface); free(roots_surface);
} }
@ -33,7 +63,14 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
// TODO: all of the trimmings // TODO: all of the trimmings
wl_list_init(&roots_surface->destroy.link); wl_list_init(&roots_surface->destroy.link);
roots_surface->destroy.notify = handle_destroy; roots_surface->destroy.notify = handle_destroy;
wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
wl_list_init(&roots_surface->ping_timeout.link); wl_list_init(&roots_surface->ping_timeout.link);
wl_list_init(&roots_surface->request_move.link);
roots_surface->request_move.notify = handle_move;
wl_signal_add(&surface->events.request_move, &roots_surface->request_move);
wl_list_init(&roots_surface->request_resize.link);
wl_list_init(&roots_surface->request_set_fullscreen.link);
wl_list_init(&roots_surface->request_set_maximized.link);
struct roots_view *view = calloc(1, sizeof(struct roots_view)); struct roots_view *view = calloc(1, sizeof(struct roots_view));
view->type = ROOTS_WL_SHELL_VIEW; view->type = ROOTS_WL_SHELL_VIEW;
@ -41,6 +78,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
view->wl_shell_surface = surface; view->wl_shell_surface = surface;
view->roots_wl_shell_surface = roots_surface; view->roots_wl_shell_surface = roots_surface;
view->wlr_surface = surface->surface; view->wlr_surface = surface->surface;
// TODO
//view->get_input_bounds = get_input_bounds; //view->get_input_bounds = get_input_bounds;
//view->activate = activate; //view->activate = activate;
view->desktop = desktop; view->desktop = desktop;