mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-16 06:59:44 -05: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

2
include/rootston/seat.h
View file

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

3
include/wlr/types/wlr_seat.h
View file

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

1
include/wlr/xwayland.h
View file

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