mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into cursor-scale

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
rootston/seat.c
View file

@ -1,11 +1,9 @@
#include <wayland-server.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <wayland-server.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/log.h>
#include "rootston/xcursor.h"
#include "rootston/input.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;
wl_signal_add(&keyboard->device->keyboard->events.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) {