blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rootston: remove old cursor implementation

This commit is contained in:
Tony Crisci 2017-11-08 20:25:02 -05:00
parent 79f5bd6ef8
commit c680ace5e8
3 changed files with 173 additions and 778 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

582
rootston/cursor.c
View File

@ -1,152 +1,98 @@
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include <math.h> #include <math.h>
#include <assert.h>
#ifdef __linux__ #ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__ #elif __FreeBSD__
#include <dev/evdev/input-event-codes.h> #include <dev/evdev/input-event-codes.h>
#endif #endif
#include <wayland-server.h>
#include <wlr/types/wlr_cursor.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/types/wlr_data_device.h> #include "rootston/xcursor.h"
#include "rootston/config.h" #include "rootston/cursor.h"
#include "rootston/input.h"
#include "rootston/desktop.h"
#include "rootston/view.h"
#include "rootston/keyboard.h"
#include "rootston/seat.h"
const struct roots_input_event *get_input_event(struct roots_input *input, struct roots_cursor *roots_cursor_create(struct roots_seat *seat) {
uint32_t serial) { struct roots_cursor *cursor = calloc(1, sizeof(struct roots_cursor));
size_t len = sizeof(input->input_events) / sizeof(*input->input_events); if (!cursor) {
for (size_t i = 0; i < len; ++i) { return NULL;
if (input->input_events[i].cursor
&& input->input_events[i].serial == serial) {
return &input->input_events[i];
}
} }
return NULL; cursor->cursor = wlr_cursor_create();
if (!cursor->cursor) {
return NULL;
}
return cursor;
} }
static void cursor_set_xcursor_image(struct roots_input *input, void roots_cursor_destroy(struct roots_cursor *cursor) {
// TODO
}
static void cursor_set_xcursor_image(struct roots_cursor *cursor,
struct wlr_xcursor_image *image) { struct wlr_xcursor_image *image) {
wlr_cursor_set_image(input->cursor, image->buffer, image->width, wlr_cursor_set_image(cursor->cursor, image->buffer, image->width,
image->width, image->height, image->hotspot_x, image->hotspot_y); image->width, image->height, image->hotspot_x, image->hotspot_y);
} }
void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor, static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t time) {
struct roots_view *view) { struct roots_desktop *desktop = cursor->seat->input->server->desktop;
input->mode = ROOTS_CURSOR_MOVE; struct roots_seat *seat = cursor->seat;
input->offs_x = cursor->x;
input->offs_y = cursor->y;
input->view_x = view->x;
input->view_y = view->y;
wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_move_xcursor(input->xcursor_theme);
if (xcursor != NULL) {
cursor_set_xcursor_image(input, xcursor->images[0]);
}
}
void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view, uint32_t edges) {
input->mode = ROOTS_CURSOR_RESIZE;
input->offs_x = cursor->x;
input->offs_y = cursor->y;
input->view_x = view->x;
input->view_y = view->y;
struct wlr_box size;
view_get_size(view, &size);
input->view_width = size.width;
input->view_height = size.height;
input->resize_edges = edges;
wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_resize_xcursor(input->xcursor_theme, edges);
if (xcursor != NULL) {
cursor_set_xcursor_image(input, xcursor->images[0]);
}
}
void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view) {
input->mode = ROOTS_CURSOR_ROTATE;
input->offs_x = cursor->x;
input->offs_y = cursor->y;
input->view_rotation = view->rotation;
wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_rotate_xcursor(input->xcursor_theme);
if (xcursor != NULL) {
cursor_set_xcursor_image(input, xcursor->images[0]);
}
}
void cursor_update_position(struct roots_input *input, uint32_t time) {
struct roots_desktop *desktop = input->server->desktop;
struct roots_view *view; struct roots_view *view;
struct wlr_surface *surface; struct wlr_surface *surface;
double sx, sy; double sx, sy;
switch (input->mode) { switch (cursor->mode) {
case ROOTS_CURSOR_PASSTHROUGH: case ROOTS_CURSOR_PASSTHROUGH:
view = view_at(desktop, input->cursor->x, input->cursor->y, view = view_at(desktop, cursor->cursor->x, cursor->cursor->y,
&surface, &sx, &sy); &surface, &sx, &sy);
bool set_compositor_cursor = !view && input->cursor_client; bool set_compositor_cursor = !view && cursor->cursor_client;
if (view) { if (view) {
struct wl_client *view_client = struct wl_client *view_client =
wl_resource_get_client(view->wlr_surface->resource); wl_resource_get_client(view->wlr_surface->resource);
set_compositor_cursor = view_client != input->cursor_client; set_compositor_cursor = view_client != cursor->cursor_client;
} }
if (set_compositor_cursor) { if (set_compositor_cursor) {
struct wlr_xcursor *xcursor = get_default_xcursor(input->xcursor_theme); struct wlr_xcursor *xcursor = get_default_xcursor(cursor->xcursor_theme);
cursor_set_xcursor_image(input, xcursor->images[0]); cursor_set_xcursor_image(cursor, xcursor->images[0]);
input->cursor_client = NULL; cursor->cursor_client = NULL;
} }
if (view) { if (view) {
wlr_seat_pointer_notify_enter(input->wl_seat, surface, sx, sy); wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy);
wlr_seat_pointer_notify_motion(input->wl_seat, time, sx, sy); wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy);
} else { } else {
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(seat->seat);
} }
break; break;
case ROOTS_CURSOR_MOVE: case ROOTS_CURSOR_MOVE:
if (input->active_view) { if (seat->focus) {
double dx = input->cursor->x - input->offs_x; double dx = cursor->cursor->x - cursor->offs_x;
double dy = input->cursor->y - input->offs_y; double dy = cursor->cursor->y - cursor->offs_y;
view_move(input->active_view, input->view_x + dx, view_move(seat->focus, cursor->view_x + dx,
input->view_y + dy); cursor->view_y + dy);
} }
break; break;
case ROOTS_CURSOR_RESIZE: case ROOTS_CURSOR_RESIZE:
if (input->active_view) { if (seat->focus) {
double dx = input->cursor->x - input->offs_x; double dx = cursor->cursor->x - cursor->offs_x;
double dy = input->cursor->y - input->offs_y; double dy = cursor->cursor->y - cursor->offs_y;
double active_x = input->active_view->x; double active_x = seat->focus->x;
double active_y = input->active_view->y; double active_y = seat->focus->y;
int width = input->view_width; int width = cursor->view_width;
int height = input->view_height; int height = cursor->view_height;
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) { if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
active_y = input->view_y + dy; active_y = cursor->view_y + dy;
height -= dy; height -= dy;
if (height < 0) { if (height < 0) {
active_y += height; active_y += height;
} }
} else if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) { } else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
height += dy; height += dy;
} }
if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) { if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
active_x = input->view_x + dx; active_x = cursor->view_x + dx;
width -= dx; width -= dx;
if (width < 0) { if (width < 0) {
active_x += width; active_x += width;
} }
} else if (input->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) { } else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
width += dx; width += dx;
} }
@ -157,132 +103,51 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
height = 0; height = 0;
} }
if (active_x != input->active_view->x || if (active_x != seat->focus->x ||
active_y != input->active_view->y) { active_y != seat->focus->y) {
view_move_resize(input->active_view, active_x, active_y, view_move_resize(seat->focus, active_x, active_y,
width, height); width, height);
} else { } else {
view_resize(input->active_view, width, height); view_resize(seat->focus, width, height);
} }
} }
break; break;
case ROOTS_CURSOR_ROTATE: case ROOTS_CURSOR_ROTATE:
if (input->active_view) { if (seat->focus) {
struct roots_view *view = input->active_view; struct roots_view *view = seat->focus;
int ox = view->x + view->wlr_surface->current->width/2, int ox = view->x + view->wlr_surface->current->width/2,
oy = view->y + view->wlr_surface->current->height/2; oy = view->y + view->wlr_surface->current->height/2;
int ux = input->offs_x - ox, int ux = cursor->offs_x - ox,
uy = input->offs_y - oy; uy = cursor->offs_y - oy;
int vx = input->cursor->x - ox, int vx = cursor->cursor->x - ox,
vy = input->cursor->y - oy; vy = cursor->cursor->y - oy;
float angle = atan2(vx*uy - vy*ux, vx*ux + vy*uy); float angle = atan2(vx*uy - vy*ux, vx*ux + vy*uy);
int steps = 12; int steps = 12;
angle = round(angle/M_PI*steps) / (steps/M_PI); angle = round(angle/M_PI*steps) / (steps/M_PI);
view->rotation = input->view_rotation + angle; view->rotation = cursor->view_rotation + angle;
} }
break; break;
} }
} }
void set_view_focus(struct roots_input *input, struct roots_desktop *desktop, static void roots_cursor_press_button(struct roots_cursor *cursor,
struct roots_view *view) { struct wlr_input_device *device, uint32_t time, uint32_t button,
if (input->active_view == view) { uint32_t state) {
return; struct roots_seat *seat = cursor->seat;
} struct roots_desktop *desktop = seat->input->server->desktop;
input->active_view = view;
input->mode = ROOTS_CURSOR_PASSTHROUGH;
if (!view) {
return;
}
if (view->type == ROOTS_XWAYLAND_VIEW &&
view->xwayland_surface->override_redirect) {
return;
}
size_t index = 0;
for (size_t i = 0; i < desktop->views->length; ++i) {
struct roots_view *_view = desktop->views->items[i];
if (_view != view) {
view_activate(_view, false);
} else {
index = i;
}
}
view_activate(view, true);
// TODO: list_swap
wlr_list_del(desktop->views, index);
wlr_list_add(desktop->views, view);
wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
}
static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct roots_input *input = wl_container_of(listener, input, cursor_motion);
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(input->cursor, event->device,
event->delta_x, event->delta_y);
cursor_update_position(input, event->time_msec);
}
static void handle_cursor_motion_absolute(struct wl_listener *listener,
void *data) {
struct roots_input *input = wl_container_of(listener,
input, cursor_motion_absolute);
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(input->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
cursor_update_position(input, event->time_msec);
}
static void handle_cursor_axis(struct wl_listener *listener, void *data) {
struct roots_input *input =
wl_container_of(listener, input, cursor_axis);
struct wlr_event_pointer_axis *event = data;
wlr_seat_pointer_notify_axis(input->wl_seat, event->time_msec,
event->orientation, event->delta);
}
static bool is_meta_pressed(struct roots_input *input,
struct wlr_input_device *device) {
uint32_t meta_key = 0;
struct keyboard_config *config;
if ((config = config_get_keyboard(input->server->config, device))) {
meta_key = config->meta_key;
} else if (!meta_key && (config = config_get_keyboard(input->server->config,
NULL))) {
meta_key = config->meta_key;
}
if (meta_key == 0) {
return false;
}
struct roots_keyboard *keyboard;
wl_list_for_each(keyboard, &input->keyboards, link) {
uint32_t modifiers =
wlr_keyboard_get_modifiers(keyboard->device->keyboard);
if ((modifiers ^ meta_key) == 0) {
return true;
}
}
return false;
}
static void do_cursor_button_press(struct roots_input *input,
struct wlr_cursor *cursor, struct wlr_input_device *device,
uint32_t time, uint32_t button, uint32_t state) {
struct roots_desktop *desktop = input->server->desktop;
struct wlr_surface *surface; struct wlr_surface *surface;
double sx, sy; double sx, sy;
struct roots_view *view = view_at(desktop, struct roots_view *view = view_at(desktop,
input->cursor->x, input->cursor->y, &surface, &sx, &sy); cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (state == WLR_BUTTON_PRESSED && view && is_meta_pressed(input, device)) { if (state == WLR_BUTTON_PRESSED && view && roots_seat_has_meta_pressed(seat)) {
set_view_focus(input, desktop, view); roots_seat_focus_view(seat, view);
uint32_t edges; uint32_t edges;
switch (button) { switch (button) {
case BTN_LEFT: case BTN_LEFT:
view_begin_move(input, cursor, view); roots_seat_begin_move(seat, view);
break; break;
case BTN_RIGHT: case BTN_RIGHT:
edges = 0; edges = 0;
@ -296,110 +161,155 @@ static void do_cursor_button_press(struct roots_input *input,
} else { } else {
edges |= ROOTS_CURSOR_RESIZE_EDGE_BOTTOM; edges |= ROOTS_CURSOR_RESIZE_EDGE_BOTTOM;
} }
view_begin_resize(input, cursor, view, edges); roots_seat_begin_resize(seat, view, edges);
break; break;
case BTN_MIDDLE: case BTN_MIDDLE:
view_begin_rotate(input, cursor, view); roots_seat_begin_rotate(seat, view);
break; break;
} }
return; return;
} }
uint32_t serial = wlr_seat_pointer_notify_button(input->wl_seat, time, button, uint32_t serial =
state); wlr_seat_pointer_notify_button(seat->seat, time, button, state);
int i; int i;
switch (state) { switch (state) {
case WLR_BUTTON_RELEASED: case WLR_BUTTON_RELEASED:
set_view_focus(input, desktop, NULL); seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
cursor_update_position(input, time); roots_cursor_update_position(cursor, time);
break; break;
case WLR_BUTTON_PRESSED: case WLR_BUTTON_PRESSED:
i = input->input_events_idx; i = cursor->input_events_idx;
input->input_events[i].serial = serial; cursor->input_events[i].serial = serial;
input->input_events[i].cursor = cursor; cursor->input_events[i].cursor = cursor->cursor;
input->input_events[i].device = device; cursor->input_events[i].device = device;
input->input_events_idx = (i + 1) cursor->input_events_idx = (i + 1)
% (sizeof(input->input_events) / sizeof(input->input_events[0])); % (sizeof(cursor->input_events) / sizeof(cursor->input_events[0]));
set_view_focus(input, desktop, view); roots_seat_focus_view(seat, view);
break; break;
} }
} }
static void handle_cursor_button(struct wl_listener *listener, void *data) { void roots_cursor_handle_motion(struct roots_cursor *cursor,
struct roots_input *input = wl_container_of(listener, input, cursor_button); struct wlr_event_pointer_motion *event) {
struct wlr_event_pointer_button *event = data; wlr_cursor_move(cursor->cursor, event->device,
do_cursor_button_press(input, input->cursor, event->device, event->delta_x, event->delta_y);
event->time_msec, event->button, event->state); roots_cursor_update_position(cursor, event->time_msec);
} }
static void handle_touch_down(struct wl_listener *listener, void *data) { void roots_cursor_handle_motion_absolute(struct roots_cursor *cursor,
struct wlr_event_touch_down *event = data; struct wlr_event_pointer_motion_absolute *event) {
struct roots_input *input = wlr_cursor_warp_absolute(cursor->cursor, event->device,
wl_container_of(listener, input, cursor_touch_down); event->x_mm / event->width_mm, event->y_mm / event->height_mm);
roots_cursor_update_position(cursor, event->time_msec);
}
void roots_cursor_handle_button(struct roots_cursor *cursor,
struct wlr_event_pointer_button *event) {
roots_cursor_press_button(cursor, event->device, event->time_msec,
event->button, event->state);
}
void roots_cursor_handle_axis(struct roots_cursor *cursor,
struct wlr_event_pointer_axis *event) {
wlr_seat_pointer_notify_axis(cursor->seat->seat, event->time_msec,
event->orientation, event->delta);
}
void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
struct wlr_event_touch_down *event) {
struct roots_touch_point *point = struct roots_touch_point *point =
calloc(1, sizeof(struct roots_touch_point)); calloc(1, sizeof(struct roots_touch_point));
if (!point) {
wlr_log(L_ERROR, "could not allocate memory for touch point");
return;
}
point->device = event->device->data; point->device = event->device->data;
point->slot = event->slot; point->slot = event->slot;
point->x = event->x_mm / event->width_mm; point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm; point->y = event->y_mm / event->height_mm;
wlr_cursor_warp_absolute(input->cursor, event->device, point->x, point->y); wlr_cursor_warp_absolute(cursor->cursor, event->device, point->x, point->y);
cursor_update_position(input, event->time_msec); roots_cursor_update_position(cursor, event->time_msec);
wl_list_insert(&input->touch_points, &point->link); wl_list_insert(&cursor->touch_points, &point->link);
do_cursor_button_press(input, input->cursor, event->device, roots_cursor_press_button(cursor, event->device,
event->time_msec, BTN_LEFT, 1); event->time_msec, BTN_LEFT, 1);
} }
static void handle_touch_up(struct wl_listener *listener, void *data) { void roots_cursor_handle_touch_up(struct roots_cursor *cursor,
struct wlr_event_touch_up *event = data; struct wlr_event_touch_up *event) {
struct roots_input *input =
wl_container_of(listener, input, cursor_touch_up);
struct roots_touch_point *point; struct roots_touch_point *point;
wl_list_for_each(point, &input->touch_points, link) { wl_list_for_each(point, &cursor->touch_points, link) {
if (point->slot == event->slot) { if (point->slot == event->slot) {
wl_list_remove(&point->link); wl_list_remove(&point->link);
free(point);
break; break;
} }
} }
do_cursor_button_press(input, input->cursor, event->device, roots_cursor_press_button(cursor, event->device,
event->time_msec, BTN_LEFT, 0); event->time_msec, BTN_LEFT, 0);
} }
static void handle_touch_motion(struct wl_listener *listener, void *data) { void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
struct wlr_event_touch_motion *event = data; struct wlr_event_touch_motion *event) {
struct roots_input *input =
wl_container_of(listener, input, cursor_touch_motion);
struct roots_touch_point *point; struct roots_touch_point *point;
wl_list_for_each(point, &input->touch_points, link) { wl_list_for_each(point, &cursor->touch_points, link) {
if (point->slot == event->slot) { if (point->slot == event->slot) {
point->x = event->x_mm / event->width_mm; point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm; point->y = event->y_mm / event->height_mm;
wlr_cursor_warp_absolute(input->cursor, event->device, wlr_cursor_warp_absolute(cursor->cursor, event->device,
point->x, point->y); point->x, point->y);
cursor_update_position(input, event->time_msec); roots_cursor_update_position(cursor, event->time_msec);
break; break;
} }
} }
} }
static void handle_tool_axis(struct wl_listener *listener, void *data) { void roots_cursor_handle_tool_axis(struct roots_cursor *cursor,
struct roots_input *input = wl_container_of(listener, input, cursor_tool_axis); struct wlr_event_tablet_tool_axis *event) {
struct wlr_event_tablet_tool_axis *event = data;
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) && if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) { (event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(input->cursor, event->device, wlr_cursor_warp_absolute(cursor->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm); event->x_mm / event->width_mm, event->y_mm / event->height_mm);
cursor_update_position(input, event->time_msec); roots_cursor_update_position(cursor, event->time_msec);
} }
} }
static void handle_tool_tip(struct wl_listener *listener, void *data) { void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
struct roots_input *input = wl_container_of(listener, input, cursor_tool_tip); struct wlr_event_tablet_tool_tip *event) {
struct wlr_event_tablet_tool_tip *event = data; roots_cursor_press_button(cursor, event->device,
do_cursor_button_press(input, input->cursor, event->device,
event->time_msec, BTN_LEFT, event->state); event->time_msec, BTN_LEFT, event->state);
} }
void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
struct wlr_seat_pointer_request_set_cursor_event *event) {
struct wlr_surface *focused_surface =
event->seat_client->seat->pointer_state.focused_surface;
bool has_focused = focused_surface != NULL && focused_surface->resource != NULL;
struct wl_client *focused_client = NULL;
if (has_focused) {
focused_client = wl_resource_get_client(focused_surface->resource);
}
if (event->seat_client->client != focused_client ||
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client");
return;
}
wlr_log(L_DEBUG, "Setting client cursor");
wlr_cursor_set_surface(cursor->cursor, event->surface, event->hotspot_x,
event->hotspot_y);
cursor->cursor_client = event->seat_client->client;
}
static void handle_drag_icon_commit(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon =
wl_container_of(listener, drag_icon, surface_commit);
drag_icon->sx += drag_icon->surface->current->sx;
drag_icon->sy += drag_icon->surface->current->sy;
}
static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) { static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon = struct roots_drag_icon *drag_icon =
wl_container_of(listener, drag_icon, surface_destroy); wl_container_of(listener, drag_icon, surface_destroy);
@ -409,24 +319,14 @@ static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
free(drag_icon); free(drag_icon);
} }
static void handle_drag_icon_commit(struct wl_listener *listener, void *data) { void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
struct roots_drag_icon *drag_icon = struct wlr_seat_pointer_grab *grab) {
wl_container_of(listener, drag_icon, surface_commit); struct roots_seat *seat = cursor->seat;
drag_icon->sx += drag_icon->surface->current->sx;
drag_icon->sy += drag_icon->surface->current->sy;
}
static void handle_pointer_grab_begin(struct wl_listener *listener,
void *data) {
struct roots_input *input =
wl_container_of(listener, input, pointer_grab_begin);
struct wlr_seat_pointer_grab *grab = data;
if (grab->interface == &wlr_data_device_pointer_drag_interface) { if (grab->interface == &wlr_data_device_pointer_drag_interface) {
struct wlr_drag *drag = grab->data; struct wlr_drag *drag = grab->data;
if (drag->icon) { if (drag->icon) {
struct roots_drag_icon *iter_icon; struct roots_drag_icon *iter_icon;
wl_list_for_each(iter_icon, &input->drag_icons, link) { wl_list_for_each(iter_icon, &seat->drag_icons, link) {
if (iter_icon->surface == drag->icon) { if (iter_icon->surface == drag->icon) {
// already in the list // already in the list
return; return;
@ -437,7 +337,7 @@ static void handle_pointer_grab_begin(struct wl_listener *listener,
calloc(1, sizeof(struct roots_drag_icon)); calloc(1, sizeof(struct roots_drag_icon));
drag_icon->mapped = true; drag_icon->mapped = true;
drag_icon->surface = drag->icon; drag_icon->surface = drag->icon;
wl_list_insert(&input->drag_icons, &drag_icon->link); wl_list_insert(&seat->drag_icons, &drag_icon->link);
wl_signal_add(&drag->icon->events.destroy, wl_signal_add(&drag->icon->events.destroy,
&drag_icon->surface_destroy); &drag_icon->surface_destroy);
@ -450,155 +350,17 @@ static void handle_pointer_grab_begin(struct wl_listener *listener,
} }
} }
static void handle_pointer_grab_end(struct wl_listener *listener, void *data) { void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
struct roots_input *input = struct wlr_seat_pointer_grab *grab) {
wl_container_of(listener, input, pointer_grab_end);
struct wlr_seat_pointer_grab *grab = data;
if (grab->interface == &wlr_data_device_pointer_drag_interface) { if (grab->interface == &wlr_data_device_pointer_drag_interface) {
struct wlr_drag *drag = grab->data; struct wlr_drag *drag = grab->data;
struct roots_drag_icon *icon; struct roots_drag_icon *icon;
wl_list_for_each(icon, &input->drag_icons, link) { wl_list_for_each(icon, &cursor->seat->drag_icons, link) {
if (icon->surface == drag->icon) { if (icon->surface == drag->icon) {
icon->mapped = false; icon->mapped = false;
} }
} }
} }
cursor_update_position(input, 0); roots_cursor_update_position(cursor, 0);
}
static void handle_request_set_cursor(struct wl_listener *listener,
void *data) {
struct roots_input *input = wl_container_of(listener, input,
request_set_cursor);
struct wlr_seat_pointer_request_set_cursor_event *event = data;
struct wlr_surface *focused_surface =
event->seat_client->seat->pointer_state.focused_surface;
bool ok = focused_surface != NULL && focused_surface->resource != NULL;
if (ok) {
struct wl_client *focused_client =
wl_resource_get_client(focused_surface->resource);
ok = event->seat_client->client == focused_client;
}
if (!ok || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client");
return;
}
wlr_log(L_DEBUG, "Setting client cursor");
wlr_cursor_set_surface(input->cursor, event->surface, event->hotspot_x,
event->hotspot_y);
input->cursor_client = event->seat_client->client;
}
void cursor_initialize(struct roots_input *input) {
struct wlr_cursor *cursor = input->cursor;
// TODO: Does this belong here
wl_list_init(&input->touch_points);
wl_signal_add(&cursor->events.motion, &input->cursor_motion);
input->cursor_motion.notify = handle_cursor_motion;
wl_signal_add(&cursor->events.motion_absolute,
&input->cursor_motion_absolute);
input->cursor_motion_absolute.notify = handle_cursor_motion_absolute;
wl_signal_add(&cursor->events.button, &input->cursor_button);
input->cursor_button.notify = handle_cursor_button;
wl_signal_add(&cursor->events.axis, &input->cursor_axis);
input->cursor_axis.notify = handle_cursor_axis;
wl_signal_add(&cursor->events.touch_down, &input->cursor_touch_down);
input->cursor_touch_down.notify = handle_touch_down;
wl_signal_add(&cursor->events.touch_up, &input->cursor_touch_up);
input->cursor_touch_up.notify = handle_touch_up;
wl_signal_add(&cursor->events.touch_motion, &input->cursor_touch_motion);
input->cursor_touch_motion.notify = handle_touch_motion;
wl_signal_add(&cursor->events.tablet_tool_axis, &input->cursor_tool_axis);
input->cursor_tool_axis.notify = handle_tool_axis;
wl_signal_add(&cursor->events.tablet_tool_tip, &input->cursor_tool_tip);
input->cursor_tool_tip.notify = handle_tool_tip;
wl_signal_add(&input->wl_seat->events.pointer_grab_end, &input->pointer_grab_end);
input->pointer_grab_end.notify = handle_pointer_grab_end;
wl_signal_add(&input->wl_seat->events.pointer_grab_begin, &input->pointer_grab_begin);
input->pointer_grab_begin.notify = handle_pointer_grab_begin;
wl_list_init(&input->request_set_cursor.link);
wl_signal_add(&input->wl_seat->events.request_set_cursor,
&input->request_set_cursor);
input->request_set_cursor.notify = handle_request_set_cursor;
}
static void reset_device_mappings(struct roots_config *config,
struct wlr_cursor *cursor, struct wlr_input_device *device) {
wlr_cursor_map_input_to_output(cursor, device, NULL);
struct device_config *dconfig;
if ((dconfig = config_get_device(config, device))) {
wlr_cursor_map_input_to_region(cursor, device, dconfig->mapped_box);
}
}
static void set_device_output_mappings(struct roots_config *config,
struct wlr_cursor *cursor, struct wlr_output *output,
struct wlr_input_device *device) {
struct device_config *dconfig;
dconfig = config_get_device(config, device);
if (dconfig && dconfig->mapped_output &&
strcmp(dconfig->mapped_output, output->name) == 0) {
wlr_cursor_map_input_to_output(cursor, device, output);
}
}
void cursor_load_config(struct roots_config *config,
struct wlr_cursor *cursor,
struct roots_input *input,
struct roots_desktop *desktop) {
struct roots_pointer *pointer;
struct roots_touch *touch;
struct roots_tablet_tool *tablet_tool;
struct roots_output *output;
// reset mappings
wlr_cursor_map_to_output(cursor, NULL);
wl_list_for_each(pointer, &input->pointers, link) {
reset_device_mappings(config, cursor, pointer->device);
}
wl_list_for_each(touch, &input->touch, link) {
reset_device_mappings(config, cursor, touch->device);
}
wl_list_for_each(tablet_tool, &input->tablet_tools, link) {
reset_device_mappings(config, cursor, tablet_tool->device);
}
// configure device to output mappings
const char *mapped_output = config->cursor.mapped_output;
wl_list_for_each(output, &desktop->outputs, link) {
if (mapped_output && strcmp(mapped_output, output->wlr_output->name) == 0) {
wlr_cursor_map_to_output(cursor, output->wlr_output);
}
wl_list_for_each(pointer, &input->pointers, link) {
set_device_output_mappings(config, cursor, output->wlr_output,
pointer->device);
}
wl_list_for_each(tablet_tool, &input->tablet_tools, link) {
set_device_output_mappings(config, cursor, output->wlr_output,
tablet_tool->device);
}
wl_list_for_each(touch, &input->touch, link) {
set_device_output_mappings(config, cursor, output->wlr_output,
touch->device);
}
}
} }

3
rootston/meson.build
View File

@ -1,7 +1,6 @@
sources = [ sources = [
'config.c', 'config.c',
#'cursor.c', 'cursor.c',
'roots_cursor.c',
'desktop.c', 'desktop.c',
'ini.c', 'ini.c',
'input.c', 'input.c',

366
rootston/roots_cursor.c
View File

@ -1,366 +0,0 @@
#define _XOPEN_SOURCE 700
#include <stdlib.h>
#include <math.h>
#ifdef __linux__
#include <linux/input-event-codes.h>
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#include <wlr/util/log.h>
#include "rootston/xcursor.h"
#include "rootston/cursor.h"
struct roots_cursor *roots_cursor_create(struct roots_seat *seat) {
struct roots_cursor *cursor = calloc(1, sizeof(struct roots_cursor));
if (!cursor) {
return NULL;
}
cursor->cursor = wlr_cursor_create();
if (!cursor->cursor) {
return NULL;
}
return cursor;
}
void roots_cursor_destroy(struct roots_cursor *cursor) {
// TODO
}
static void cursor_set_xcursor_image(struct roots_cursor *cursor,
struct wlr_xcursor_image *image) {
wlr_cursor_set_image(cursor->cursor, image->buffer, image->width,
image->width, image->height, image->hotspot_x, image->hotspot_y);
}
static void roots_cursor_update_position(struct roots_cursor *cursor, uint32_t time) {
struct roots_desktop *desktop = cursor->seat->input->server->desktop;
struct roots_seat *seat = cursor->seat;
struct roots_view *view;
struct wlr_surface *surface;
double sx, sy;
switch (cursor->mode) {
case ROOTS_CURSOR_PASSTHROUGH:
view = view_at(desktop, cursor->cursor->x, cursor->cursor->y,
&surface, &sx, &sy);
bool set_compositor_cursor = !view && cursor->cursor_client;
if (view) {
struct wl_client *view_client =
wl_resource_get_client(view->wlr_surface->resource);
set_compositor_cursor = view_client != cursor->cursor_client;
}
if (set_compositor_cursor) {
struct wlr_xcursor *xcursor = get_default_xcursor(cursor->xcursor_theme);
cursor_set_xcursor_image(cursor, xcursor->images[0]);
cursor->cursor_client = NULL;
}
if (view) {
wlr_seat_pointer_notify_enter(seat->seat, surface, sx, sy);
wlr_seat_pointer_notify_motion(seat->seat, time, sx, sy);
} else {
wlr_seat_pointer_clear_focus(seat->seat);
}
break;
case ROOTS_CURSOR_MOVE:
if (seat->focus) {
double dx = cursor->cursor->x - cursor->offs_x;
double dy = cursor->cursor->y - cursor->offs_y;
view_move(seat->focus, cursor->view_x + dx,
cursor->view_y + dy);
}
break;
case ROOTS_CURSOR_RESIZE:
if (seat->focus) {
double dx = cursor->cursor->x - cursor->offs_x;
double dy = cursor->cursor->y - cursor->offs_y;
double active_x = seat->focus->x;
double active_y = seat->focus->y;
int width = cursor->view_width;
int height = cursor->view_height;
if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
active_y = cursor->view_y + dy;
height -= dy;
if (height < 0) {
active_y += height;
}
} else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
height += dy;
}
if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
active_x = cursor->view_x + dx;
width -= dx;
if (width < 0) {
active_x += width;
}
} else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
width += dx;
}
if (width < 0) {
width = 0;
}
if (height < 0) {
height = 0;
}
if (active_x != seat->focus->x ||
active_y != seat->focus->y) {
view_move_resize(seat->focus, active_x, active_y,
width, height);
} else {
view_resize(seat->focus, width, height);
}
}
break;
case ROOTS_CURSOR_ROTATE:
if (seat->focus) {
struct roots_view *view = seat->focus;
int ox = view->x + view->wlr_surface->current->width/2,
oy = view->y + view->wlr_surface->current->height/2;
int ux = cursor->offs_x - ox,
uy = cursor->offs_y - oy;
int vx = cursor->cursor->x - ox,
vy = cursor->cursor->y - oy;
float angle = atan2(vx*uy - vy*ux, vx*ux + vy*uy);
int steps = 12;
angle = round(angle/M_PI*steps) / (steps/M_PI);
view->rotation = cursor->view_rotation + angle;
}
break;
}
}
static void roots_cursor_press_button(struct roots_cursor *cursor,
struct wlr_input_device *device, uint32_t time, uint32_t button,
uint32_t state) {
struct roots_seat *seat = cursor->seat;
struct roots_desktop *desktop = seat->input->server->desktop;
struct wlr_surface *surface;
double sx, sy;
struct roots_view *view = view_at(desktop,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
if (state == WLR_BUTTON_PRESSED && view && roots_seat_has_meta_pressed(seat)) {
roots_seat_focus_view(seat, view);
uint32_t edges;
switch (button) {
case BTN_LEFT:
roots_seat_begin_move(seat, view);
break;
case BTN_RIGHT:
edges = 0;
if (sx < view->wlr_surface->current->width/2) {
edges |= ROOTS_CURSOR_RESIZE_EDGE_LEFT;
} else {
edges |= ROOTS_CURSOR_RESIZE_EDGE_RIGHT;
}
if (sy < view->wlr_surface->current->height/2) {
edges |= ROOTS_CURSOR_RESIZE_EDGE_TOP;
} else {
edges |= ROOTS_CURSOR_RESIZE_EDGE_BOTTOM;
}
roots_seat_begin_resize(seat, view, edges);
break;
case BTN_MIDDLE:
roots_seat_begin_rotate(seat, view);
break;
}
return;
}
uint32_t serial =
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
int i;
switch (state) {
case WLR_BUTTON_RELEASED:
seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
roots_cursor_update_position(cursor, time);
break;
case WLR_BUTTON_PRESSED:
i = cursor->input_events_idx;
cursor->input_events[i].serial = serial;
cursor->input_events[i].cursor = cursor->cursor;
cursor->input_events[i].device = device;
cursor->input_events_idx = (i + 1)
% (sizeof(cursor->input_events) / sizeof(cursor->input_events[0]));
roots_seat_focus_view(seat, view);
break;
}
}
void roots_cursor_handle_motion(struct roots_cursor *cursor,
struct wlr_event_pointer_motion *event) {
wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y);
roots_cursor_update_position(cursor, event->time_msec);
}
void roots_cursor_handle_motion_absolute(struct roots_cursor *cursor,
struct wlr_event_pointer_motion_absolute *event) {
wlr_cursor_warp_absolute(cursor->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
roots_cursor_update_position(cursor, event->time_msec);
}
void roots_cursor_handle_button(struct roots_cursor *cursor,
struct wlr_event_pointer_button *event) {
roots_cursor_press_button(cursor, event->device, event->time_msec,
event->button, event->state);
}
void roots_cursor_handle_axis(struct roots_cursor *cursor,
struct wlr_event_pointer_axis *event) {
wlr_seat_pointer_notify_axis(cursor->seat->seat, event->time_msec,
event->orientation, event->delta);
}
void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
struct wlr_event_touch_down *event) {
struct roots_touch_point *point =
calloc(1, sizeof(struct roots_touch_point));
if (!point) {
wlr_log(L_ERROR, "could not allocate memory for touch point");
return;
}
point->device = event->device->data;
point->slot = event->slot;
point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm;
wlr_cursor_warp_absolute(cursor->cursor, event->device, point->x, point->y);
roots_cursor_update_position(cursor, event->time_msec);
wl_list_insert(&cursor->touch_points, &point->link);
roots_cursor_press_button(cursor, event->device,
event->time_msec, BTN_LEFT, 1);
}
void roots_cursor_handle_touch_up(struct roots_cursor *cursor,
struct wlr_event_touch_up *event) {
struct roots_touch_point *point;
wl_list_for_each(point, &cursor->touch_points, link) {
if (point->slot == event->slot) {
wl_list_remove(&point->link);
free(point);
break;
}
}
roots_cursor_press_button(cursor, event->device,
event->time_msec, BTN_LEFT, 0);
}
void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
struct wlr_event_touch_motion *event) {
struct roots_touch_point *point;
wl_list_for_each(point, &cursor->touch_points, link) {
if (point->slot == event->slot) {
point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm;
wlr_cursor_warp_absolute(cursor->cursor, event->device,
point->x, point->y);
roots_cursor_update_position(cursor, event->time_msec);
break;
}
}
}
void roots_cursor_handle_tool_axis(struct roots_cursor *cursor,
struct wlr_event_tablet_tool_axis *event) {
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(cursor->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
roots_cursor_update_position(cursor, event->time_msec);
}
}
void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
struct wlr_event_tablet_tool_tip *event) {
roots_cursor_press_button(cursor, event->device,
event->time_msec, BTN_LEFT, event->state);
}
void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
struct wlr_seat_pointer_request_set_cursor_event *event) {
struct wlr_surface *focused_surface =
event->seat_client->seat->pointer_state.focused_surface;
bool has_focused = focused_surface != NULL && focused_surface->resource != NULL;
struct wl_client *focused_client = NULL;
if (has_focused) {
focused_client = wl_resource_get_client(focused_surface->resource);
}
if (event->seat_client->client != focused_client ||
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client");
return;
}
wlr_log(L_DEBUG, "Setting client cursor");
wlr_cursor_set_surface(cursor->cursor, event->surface, event->hotspot_x,
event->hotspot_y);
cursor->cursor_client = event->seat_client->client;
}
static void handle_drag_icon_commit(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon =
wl_container_of(listener, drag_icon, surface_commit);
drag_icon->sx += drag_icon->surface->current->sx;
drag_icon->sy += drag_icon->surface->current->sy;
}
static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon =
wl_container_of(listener, drag_icon, surface_destroy);
wl_list_remove(&drag_icon->link);
wl_list_remove(&drag_icon->surface_destroy.link);
wl_list_remove(&drag_icon->surface_commit.link);
free(drag_icon);
}
void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
struct wlr_seat_pointer_grab *grab) {
struct roots_seat *seat = cursor->seat;
if (grab->interface == &wlr_data_device_pointer_drag_interface) {
struct wlr_drag *drag = grab->data;
if (drag->icon) {
struct roots_drag_icon *iter_icon;
wl_list_for_each(iter_icon, &seat->drag_icons, link) {
if (iter_icon->surface == drag->icon) {
// already in the list
return;
}
}
struct roots_drag_icon *drag_icon =
calloc(1, sizeof(struct roots_drag_icon));
drag_icon->mapped = true;
drag_icon->surface = drag->icon;
wl_list_insert(&seat->drag_icons, &drag_icon->link);
wl_signal_add(&drag->icon->events.destroy,
&drag_icon->surface_destroy);
drag_icon->surface_destroy.notify = handle_drag_icon_destroy;
wl_signal_add(&drag->icon->events.commit,
&drag_icon->surface_commit);
drag_icon->surface_commit.notify = handle_drag_icon_commit;
}
}
}
void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
struct wlr_seat_pointer_grab *grab) {
if (grab->interface == &wlr_data_device_pointer_drag_interface) {
struct wlr_drag *drag = grab->data;
struct roots_drag_icon *icon;
wl_list_for_each(icon, &cursor->seat->drag_icons, link) {
if (icon->surface == drag->icon) {
icon->mapped = false;
}
}
}
roots_cursor_update_position(cursor, 0);
}