Merge branch 'master' into cursor-scale

This commit is contained in:
emersion 2017-11-12 22:12:50 +01:00
commit f8b43940b1
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
9 changed files with 76 additions and 43 deletions

View File

@ -1,8 +1,6 @@
#ifndef _ROOTSTON_SEAT_H #ifndef _ROOTSTON_SEAT_H
#define _ROOTSTON_SEAT_H #define _ROOTSTON_SEAT_H
#include <wayland-server.h> #include <wayland-server.h>
#include "rootston/input.h" #include "rootston/input.h"
#include "rootston/keyboard.h" #include "rootston/keyboard.h"

View File

@ -1,6 +1,6 @@
#ifndef WLR_TYPES_WLR_SEAT_H #ifndef WLR_TYPES_WLR_SEAT_H
#define WLR_TYPES_WLR_SEAT_H #define WLR_TYPES_WLR_SEAT_H
#include <time.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_keyboard.h>
@ -109,6 +109,7 @@ struct wlr_seat {
struct wl_list clients; struct wl_list clients;
char *name; char *name;
uint32_t capabilities; uint32_t capabilities;
struct timespec last_event;
struct wlr_data_device *data_device; // TODO needed? struct wlr_data_device *data_device; // TODO needed?
struct wlr_data_source *selection_source; struct wlr_data_source *selection_source;

View File

@ -29,6 +29,7 @@ struct wlr_xwayland {
struct wlr_xwayland_cursor *cursor; struct wlr_xwayland_cursor *cursor;
struct { struct {
struct wl_signal ready;
struct wl_signal new_surface; struct wl_signal new_surface;
} events; } events;

View File

@ -167,9 +167,22 @@ bool view_center(struct roots_view *view) {
view_get_box(view, &box); view_get_box(view, &box);
struct roots_desktop *desktop = view->desktop; struct roots_desktop *desktop = view->desktop;
struct roots_input *input = desktop->server->input;
struct roots_seat *seat = NULL, *_seat;
wl_list_for_each(_seat, &input->seats, link) {
if (!seat || (seat->seat->last_event.tv_sec > _seat->seat->last_event.tv_sec &&
seat->seat->last_event.tv_nsec > _seat->seat->last_event.tv_nsec)) {
seat = _seat;
}
}
if (!seat) {
return false;
}
struct wlr_output *output = struct wlr_output *output =
wlr_output_layout_get_center_output(desktop->layout); wlr_output_layout_output_at(desktop->layout,
seat->cursor->cursor->x,
seat->cursor->cursor->y);
if (!output) { if (!output) {
// empty layout // empty layout
return false; return false;
@ -218,7 +231,7 @@ void view_teardown(struct roots_view *view) {
struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly, struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
for (int i = desktop->views->length - 1; i >= 0; --i) { for (ssize_t i = desktop->views->length - 1; i >= 0; --i) {
struct roots_view *view = desktop->views->items[i]; struct roots_view *view = desktop->views->items[i];
if (view->type == ROOTS_WL_SHELL_VIEW && if (view->type == ROOTS_WL_SHELL_VIEW &&
@ -230,11 +243,12 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
double view_sx = lx - view->x; double view_sx = lx - view->x;
double view_sy = ly - view->y; double view_sy = ly - view->y;
struct wlr_surface_state *state = view->wlr_surface->current;
struct wlr_box box = { struct wlr_box box = {
.x = 0, .x = 0,
.y = 0, .y = 0,
.width = view->wlr_surface->current->buffer_width, .width = state->buffer_width / state->scale,
.height = view->wlr_surface->current->buffer_height, .height = state->buffer_height / state->scale,
}; };
if (view->rotation != 0.0) { if (view->rotation != 0.0) {
// Coordinates relative to the center of the view // Coordinates relative to the center of the view
@ -248,7 +262,6 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
} }
if (view->type == ROOTS_XDG_SHELL_V6_VIEW) { if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
// TODO: test if this works with rotated views
double popup_sx, popup_sy; double popup_sx, popup_sy;
struct wlr_xdg_surface_v6 *popup = struct wlr_xdg_surface_v6 *popup =
wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6, wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6,
@ -263,7 +276,6 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
} }
if (view->type == ROOTS_WL_SHELL_VIEW) { if (view->type == ROOTS_WL_SHELL_VIEW) {
// TODO: test if this works with rotated views
double popup_sx, popup_sy; double popup_sx, popup_sy;
struct wlr_wl_shell_surface *popup = struct wlr_wl_shell_surface *popup =
wlr_wl_shell_surface_popup_at(view->wl_shell_surface, wlr_wl_shell_surface_popup_at(view->wl_shell_surface,

View File

@ -12,6 +12,18 @@
struct roots_server server = { 0 }; struct roots_server server = { 0 };
static void ready(struct wl_listener *listener, void *data) {
if (server.config->startup_cmd != NULL) {
const char *cmd = server.config->startup_cmd;
pid_t pid = fork();
if (pid < 0) {
wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
} else if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
}
}
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
assert(server.config = roots_config_create_from_args(argc, argv)); assert(server.config = roots_config_create_from_args(argc, argv));
assert(server.wl_display = wl_display_create()); assert(server.wl_display = wl_display_create());
@ -43,17 +55,12 @@ int main(int argc, char **argv) {
} }
setenv("WAYLAND_DISPLAY", socket, true); setenv("WAYLAND_DISPLAY", socket, true);
#ifndef HAS_XWAYLAND
if (server.config->startup_cmd != NULL) { ready(NULL, NULL);
const char *cmd = server.config->startup_cmd; #else
pid_t pid = fork(); struct wl_listener xwayland_ready = { .notify = ready };
if (pid < 0) { wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
wlr_log(L_ERROR, "cannot execute binding command: fork() failed"); #endif
return 1;
} else if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
}
}
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
wlr_backend_destroy(server.backend); wlr_backend_destroy(server.backend);

View File

@ -21,30 +21,33 @@ static void render_surface(struct wlr_surface *surface,
struct roots_desktop *desktop, struct wlr_output *wlr_output, struct roots_desktop *desktop, struct wlr_output *wlr_output,
struct timespec *when, double lx, double ly, float rotation) { struct timespec *when, double lx, double ly, float rotation) {
if (surface->texture->valid) { if (surface->texture->valid) {
float scale_factor = (float)wlr_output->scale / surface->current->scale; double surface_scale = surface->current->scale;
int width = surface->current->buffer_width * scale_factor; double width = (double)surface->current->buffer_width / surface_scale;
int height = surface->current->buffer_height * scale_factor; double height = (double)surface->current->buffer_height / surface_scale;
int render_width = width * wlr_output->scale;
int render_height = height * wlr_output->scale;
double ox = lx, oy = ly; double ox = lx, oy = ly;
wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy); wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy);
ox *= wlr_output->scale; ox *= wlr_output->scale;
oy *= wlr_output->scale; oy *= wlr_output->scale;
if (wlr_output_layout_intersects(desktop->layout, wlr_output, if (wlr_output_layout_intersects(desktop->layout, wlr_output,
lx, ly, lx + width, ly + height)) { lx, ly, lx + render_width, ly + render_height)) {
float matrix[16]; float matrix[16];
float translate_origin[16]; float translate_origin[16];
wlr_matrix_translate(&translate_origin, wlr_matrix_translate(&translate_origin,
(int)ox + width / 2, (int)oy + height / 2, 0); (int)ox + render_width / 2, (int)oy + render_height / 2, 0);
float rotate[16]; float rotate[16];
wlr_matrix_rotate(&rotate, rotation); wlr_matrix_rotate(&rotate, rotation);
float translate_center[16]; float translate_center[16];
wlr_matrix_translate(&translate_center, -width / 2, -height / 2, 0); wlr_matrix_translate(&translate_center, -render_width / 2,
-render_height / 2, 0);
float scale[16]; float scale[16];
wlr_matrix_scale(&scale, width, height, 1); wlr_matrix_scale(&scale, render_width, render_height, 1);
float transform[16]; float transform[16];
wlr_matrix_mul(&translate_origin, &rotate, &transform); wlr_matrix_mul(&translate_origin, &rotate, &transform);
@ -52,12 +55,12 @@ static void render_surface(struct wlr_surface *surface,
wlr_matrix_mul(&transform, &scale, &transform); wlr_matrix_mul(&transform, &scale, &transform);
wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix); wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix);
wlr_render_with_matrix(desktop->server->renderer, wlr_render_with_matrix(desktop->server->renderer, surface->texture,
surface->texture, &matrix); &matrix);
struct wlr_frame_callback *cb, *cnext; struct wlr_frame_callback *cb, *cnext;
wl_list_for_each_safe(cb, cnext, wl_list_for_each_safe(cb, cnext,
&surface->current->frame_callback_list, link) { &surface->current->frame_callback_list, link) {
wl_callback_send_done(cb->resource, timespec_to_msec(when)); wl_callback_send_done(cb->resource, timespec_to_msec(when));
wl_resource_destroy(cb->resource); wl_resource_destroy(cb->resource);
} }
@ -65,19 +68,20 @@ static void render_surface(struct wlr_surface *surface,
struct wlr_subsurface *subsurface; struct wlr_subsurface *subsurface;
wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) { wl_list_for_each(subsurface, &surface->subsurface_list, parent_link) {
double sx = subsurface->surface->current->subsurface_position.x, struct wlr_surface_state *state = subsurface->surface->current;
sy = subsurface->surface->current->subsurface_position.y; double sx = state->subsurface_position.x;
double sw = subsurface->surface->current->buffer_width, double sy = state->subsurface_position.y;
sh = subsurface->surface->current->buffer_height; double sw = state->buffer_width / state->scale;
double sh = state->buffer_height / state->scale;
if (rotation != 0.0) { if (rotation != 0.0) {
// Coordinates relative to the center of the subsurface // Coordinates relative to the center of the subsurface
double ox = sx - (double)width/2 + sw/2, double ox = sx - width/2 + sw/2,
oy = sy - (double)height/2 + sh/2; oy = sy - height/2 + sh/2;
// Rotated coordinates // Rotated coordinates
double rx = cos(-rotation)*ox - sin(-rotation)*oy, double rx = cos(-rotation)*ox - sin(-rotation)*oy,
ry = cos(-rotation)*oy + sin(-rotation)*ox; ry = cos(-rotation)*oy + sin(-rotation)*ox;
sx = rx + (double)width/2 - sw/2; sx = rx + width/2 - sw/2;
sy = ry + (double)height/2 - sh/2; sy = ry + height/2 - sh/2;
} }
render_surface(subsurface->surface, desktop, wlr_output, when, render_surface(subsurface->surface, desktop, wlr_output, when,
@ -104,7 +108,8 @@ static void render_xdg_v6_popups(struct wlr_xdg_surface_v6 *surface,
popup->popup_state->geometry.y - popup->geometry->y; popup->popup_state->geometry.y - popup->geometry->y;
render_surface(popup->surface, desktop, wlr_output, when, popup_x, render_surface(popup->surface, desktop, wlr_output, when, popup_x,
popup_y, rotation); popup_y, rotation);
render_xdg_v6_popups(popup, desktop, wlr_output, when, popup_x, popup_y, rotation); render_xdg_v6_popups(popup, desktop, wlr_output, when, popup_x, popup_y,
rotation);
} }
} }

View File

@ -1,11 +1,9 @@
#include <wayland-server.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <wayland-server.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "rootston/xcursor.h" #include "rootston/xcursor.h"
#include "rootston/input.h" #include "rootston/input.h"
#include "rootston/seat.h" #include "rootston/seat.h"
@ -298,6 +296,8 @@ static void seat_add_keyboard(struct roots_seat *seat, struct wlr_input_device *
keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers; keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers;
wl_signal_add(&keyboard->device->keyboard->events.modifiers, wl_signal_add(&keyboard->device->keyboard->events.modifiers,
&keyboard->keyboard_modifiers); &keyboard->keyboard_modifiers);
wlr_seat_set_keyboard(seat->seat, device);
} }
static void seat_add_pointer(struct roots_seat *seat, struct wlr_input_device *device) { static void seat_add_pointer(struct roots_seat *seat, struct wlr_input_device *device) {

View File

@ -2,6 +2,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
@ -574,12 +575,14 @@ void wlr_seat_pointer_notify_enter(struct wlr_seat *wlr_seat,
void wlr_seat_pointer_notify_motion(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_notify_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy) { double sx, double sy) {
clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event);
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
grab->interface->motion(grab, time, sx, sy); grab->interface->motion(grab, time, sx, sy);
} }
uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat, uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
uint32_t time, uint32_t button, uint32_t state) { uint32_t time, uint32_t button, uint32_t state) {
clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event);
if (state == WL_POINTER_BUTTON_STATE_PRESSED) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
if (wlr_seat->pointer_state.button_count == 0) { if (wlr_seat->pointer_state.button_count == 0) {
wlr_seat->pointer_state.grab_button = button; wlr_seat->pointer_state.grab_button = button;
@ -602,6 +605,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value) { enum wlr_axis_orientation orientation, double value) {
clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event);
struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab; struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
grab->interface->axis(grab, time, orientation, value); grab->interface->axis(grab, time, orientation, value);
} }
@ -804,12 +808,14 @@ void wlr_seat_keyboard_clear_focus(struct wlr_seat *seat) {
} }
void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat) { void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat) {
clock_gettime(CLOCK_MONOTONIC, &seat->last_event);
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab; struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->modifiers(grab); grab->interface->modifiers(grab);
} }
void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time, void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time,
uint32_t key, uint32_t state) { uint32_t key, uint32_t state) {
clock_gettime(CLOCK_MONOTONIC, &seat->last_event);
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab; struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->key(grab, time, key, state); grab->interface->key(grab, time, key, state);
} }

View File

@ -211,6 +211,8 @@ static int xserver_handle_ready(int signal_number, void *data) {
snprintf(display_name, sizeof(display_name), ":%d", wlr_xwayland->display); snprintf(display_name, sizeof(display_name), ":%d", wlr_xwayland->display);
setenv("DISPLAY", display_name, true); setenv("DISPLAY", display_name, true);
wl_signal_emit(&wlr_xwayland->events.ready, wlr_xwayland);
return 1; /* wayland event loop dispatcher's count */ return 1; /* wayland event loop dispatcher's count */
} }
@ -223,6 +225,7 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1; wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1;
wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1; wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1;
wl_signal_init(&wlr_xwayland->events.new_surface); wl_signal_init(&wlr_xwayland->events.new_surface);
wl_signal_init(&wlr_xwayland->events.ready);
wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd); wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd);
if (wlr_xwayland->display < 0) { if (wlr_xwayland->display < 0) {