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 rootston

Browse source
This commit is contained in:
Drew DeVault 2017-09-25 08:29:35 -04:00
commit f4387b437f
56 changed files with 376 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/backend/drm-properties.h
View file

@ -1,5 +1,5 @@
#ifndef DRM_PROPERTIES_H
#define DRM_PROPERTIES_H
#ifndef BACKEND_DRM_PROPERTIES_H
#define BACKEND_DRM_PROPERTIES_H
#include <stdbool.h>
#include <stdint.h>

4
include/backend/drm-util.h
View file

@ -1,5 +1,5 @@
#ifndef WLR_DRM_UTIL_H
#define WLR_DRM_UTIL_H
#ifndef BACKEND_DRM_UTIL_H
#define BACKEND_DRM_UTIL_H
#include <stdint.h>
#include <xf86drm.h>

4
include/backend/drm.h
View file

@ -1,5 +1,5 @@
#ifndef DRM_BACKEND_H
#define DRM_BACKEND_H
#ifndef BACKEND_DRM_H
#define BACKEND_DRM_H
#include <stdbool.h>
#include <stddef.h>

4
include/backend/libinput.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H
#define _WLR_BACKEND_LIBINPUT_INTERNAL_H
#ifndef BACKEND_LIBINPUT_H
#define BACKEND_LIBINPUT_H
#include <libinput.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_input_device.h>

4
include/backend/multi.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_MULTI_BACKEND_INTERNAL
#define _WLR_MULTI_BACKEND_INTERNAL
#ifndef BACKEND_MULTI_H
#define BACKEND_MULTI_H
#include <wlr/backend/interface.h>
#include <wlr/backend/multi.h>

4
include/backend/session/direct-ipc.h
View file

@ -1,5 +1,5 @@
#ifndef SESSION_DIRECT_IPC
#define SESSION_DIRECT_IPC
#ifndef BACKEND_SESSION_DIRECT_IPC_H
#define BACKEND_SESSION_DIRECT_IPC_H
#include <sys/types.h>

4
include/backend/wayland.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_INTERNAL_BACKEND_WAYLAND_H
#define _WLR_INTERNAL_BACKEND_WAYLAND_H
#ifndef BACKEND_WAYLAND_H
#define BACKEND_WAYLAND_H
#include <stdbool.h>
#include <wayland-client.h>

5
include/render/gles2.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_RENDER_GLES2_INTERNAL_H
#define _WLR_RENDER_GLES2_INTERNAL_H
#ifndef RENDER_GLES2_H
#define RENDER_GLES2_H
#include <stdint.h>
#include <string.h>
#include <stdbool.h>

4
include/wlr/backend.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_BACKEND_H
#define _WLR_BACKEND_H
#ifndef WLR_BACKEND_H
#define WLR_BACKEND_H
#include <wayland-server.h>
#include <wlr/backend/session.h>

4
include/wlr/backend/interface.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_BACKEND_INTERFACE_H
#define _WLR_BACKEND_INTERFACE_H
#ifndef WLR_BACKEND_INTERFACE_H
#define WLR_BACKEND_INTERFACE_H
#include <stdbool.h>
#include <wlr/backend.h>

4
include/wlr/backend/multi.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_BACKEND_MULTI_H
#define _WLR_BACKEND_MULTI_H
#ifndef WLR_BACKEND_MULTI_H
#define WLR_BACKEND_MULTI_H
#include <wlr/backend.h>
#include <wlr/backend/session.h>

4
include/wlr/backend/session.h
View file

@ -1,5 +1,5 @@
#ifndef WLR_SESSION_H
#define WLR_SESSION_H
#ifndef WLR_BACKEND_SESSION_H
#define WLR_BACKEND_SESSION_H
#include <stdbool.h>
#include <wayland-server.h>

4
include/wlr/backend/session/interface.h
View file

@ -1,5 +1,5 @@
#ifndef WLR_SESSION_INTERFACE_H
#define WLR_SESSION_INTERFACE_H
#ifndef WLR_BACKEND_SESSION_INTERFACE_H
#define WLR_BACKEND_SESSION_INTERFACE_H
#include <wlr/backend/session.h>

5
include/wlr/interfaces/wlr_data_source.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_DATA_SOURCE_H
#define _WLR_INTERFACES_DATA_SOURCE_H
#ifndef WLR_INTERFACES_WLR_DATA_SOURCE_H
#define WLR_INTERFACES_WLR_DATA_SOURCE_H
#include <wlr/types/wlr_data_source.h>
struct wlr_data_source_impl {

5
include/wlr/interfaces/wlr_input_device.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_INPUT_DEVICE_H
#define _WLR_INTERFACES_INPUT_DEVICE_H
#ifndef WLR_INTERFACES_WLR_INPUT_DEVICE_H
#define WLR_INTERFACES_WLR_INPUT_DEVICE_H
#include <wlr/types/wlr_input_device.h>
struct wlr_input_device_impl {

5
include/wlr/interfaces/wlr_keyboard.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACE_KEYBOARD_H
#define _WLR_INTERFACE_KEYBOARD_H
#ifndef WLR_INTERFACES_WLR_KEYBOARD_H
#define WLR_INTERFACES_WLR_KEYBOARD_H
#include <wlr/types/wlr_keyboard.h>
#include <stdint.h>

5
include/wlr/interfaces/wlr_output.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACE_OUTPUT_H
#define _WLR_INTERFACE_OUTPUT_H
#ifndef WLR_INTERFACES_WLR_OUTPUT_H
#define WLR_INTERFACES_WLR_OUTPUT_H
#include <wlr/types/wlr_output.h>
#include <stdbool.h>

5
include/wlr/interfaces/wlr_pointer.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_POINTER_H
#define _WLR_INTERFACES_POINTER_H
#ifndef WLR_INTERFACES_WLR_POINTER_H
#define WLR_INTERFACES_WLR_POINTER_H
#include <wlr/types/wlr_pointer.h>
struct wlr_pointer_impl {

5
include/wlr/interfaces/wlr_tablet_pad.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_TABLET_PAD_H
#define _WLR_INTERFACES_TABLET_PAD_H
#ifndef WLR_INTERFACES_WLR_TABLET_PAD_H
#define WLR_INTERFACES_WLR_TABLET_PAD_H
#include <wlr/types/wlr_tablet_pad.h>
struct wlr_tablet_pad_impl {

5
include/wlr/interfaces/wlr_tablet_tool.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_TABLET_TOOL_H
#define _WLR_INTERFACES_TABLET_TOOL_H
#ifndef WLR_INTERFACES_WLR_TABLET_TOOL_H
#define WLR_INTERFACES_WLR_TABLET_TOOL_H
#include <wlr/types/wlr_tablet_tool.h>
struct wlr_tablet_tool_impl {

5
include/wlr/interfaces/wlr_touch.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_INTERFACES_TOUCH_H
#define _WLR_INTERFACES_TOUCH_H
#ifndef WLR_INTERFACES_WLR_TOUCH_H
#define WLR_INTERFACES_WLR_TOUCH_H
#include <wlr/types/wlr_touch.h>
struct wlr_touch_impl {

5
include/wlr/render.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_RENDER_H
#define _WLR_RENDER_H
#ifndef WLR_RENDER_H
#define WLR_RENDER_H
#include <stdint.h>
#include <wayland-server-protocol.h>
#include <wlr/types/wlr_output.h>

5
include/wlr/render/gles2.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_GLES2_RENDERER_H
#define _WLR_GLES2_RENDERER_H
#ifndef WLR_RENDER_GLES2_H
#define WLR_RENDER_GLES2_H
#include <wlr/render.h>
#include <wlr/backend.h>

5
include/wlr/render/interface.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_RENDER_INTERFACE_H
#define _WLR_RENDER_INTERFACE_H
#ifndef WLR_RENDER_INTERFACE_H
#define WLR_RENDER_INTERFACE_H
#include <wayland-server-protocol.h>
#include <stdbool.h>
#include <wlr/render.h>

4
include/wlr/render/matrix.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_RENDER_MATRIX_H
#define _WLR_RENDER_MATRIX_H
#ifndef WLR_RENDER_MATRIX_H
#define WLR_RENDER_MATRIX_H
#include <stdint.h>

5
include/wlr/types/wlr_box.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_GEOMETRY_H
#define _WLR_TYPES_GEOMETRY_H
#ifndef WLR_TYPES_WLR_BOX_H
#define WLR_TYPES_WLR_BOX_H
#include <stdbool.h>
struct wlr_box {

6
include/wlr/types/wlr_compositor.h
View file

@ -1,5 +1,6 @@
#ifndef _EXAMPLE_COMPOSITOR_H
#define _EXAMPLE_COMPOSITOR_H
#ifndef WLR_TYPES_WLR_COMPOSITOR_H
#define WLR_TYPES_WLR_COMPOSITOR_H
#include <wayland-server.h>
#include <wlr/render.h>
@ -22,4 +23,5 @@ struct wlr_compositor *wlr_compositor_create(struct wl_display *display,
struct wlr_surface;
void wl_compositor_surface_destroyed(struct wlr_compositor *wlr_compositor,
struct wlr_surface *surface);
#endif

5
include/wlr/types/wlr_cursor.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_CURSOR_H
#define _WLR_TYPES_CURSOR_H
#ifndef WLR_TYPES_WLR_CURSOR_H
#define WLR_TYPES_WLR_CURSOR_H
#include <wayland-server.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>

4
include/wlr/types/wlr_data_device_manager.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_TYPES_DATA_DEVICE_MANAGER_H
#define _WLR_TYPES_DATA_DEVICE_MANAGER_H
#ifndef WLR_TYPES_WLR_DATA_DEVICE_MANAGER_H
#define WLR_TYPES_WLR_DATA_DEVICE_MANAGER_H
#include <wayland-server.h>

4
include/wlr/types/wlr_data_source.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_TYPES_DATA_SOURCE_H
#define _WLR_TYPES_DATA_SOURCE_H
#ifndef WLR_TYPES_WLR_DATA_SOURCE_H
#define WLR_TYPES_WLR_DATA_SOURCE_H
#include <wayland-server.h>
#include <wlr/util/list.h>

5
include/wlr/types/wlr_gamma_control.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_GAMMA_CONTROL_H
#define _WLR_GAMMA_CONTROL_H
#ifndef WLR_TYPES_WLR_GAMMA_CONTROL_H
#define WLR_TYPES_WLR_GAMMA_CONTROL_H
#include <wayland-server.h>
struct wlr_gamma_control_manager {

4
include/wlr/types/wlr_input_device.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_TYPES_INPUT_H
#define _WLR_TYPES_INPUT_H
#ifndef WLR_TYPES_WLR_INPUT_DEVICE_H
#define WLR_TYPES_WLR_INPUT_DEVICE_H
enum wlr_button_state {
WLR_BUTTON_RELEASED,

6
include/wlr/types/wlr_keyboard.h
View file

@ -1,5 +1,7 @@
#ifndef _WLR_TYPES_KEYBOARD_H
#define _WLR_TYPES_KEYBOARD_H
#ifndef WLR_TYPES_WLR_KEYBOARD_H
#define WLR_TYPES_WLR_KEYBOARD_H
#include <wayland-server.h>
#include <stdint.h>
#include <wayland-server.h>
#include <xkbcommon/xkbcommon.h>

5
include/wlr/types/wlr_output.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_OUTPUT_H
#define _WLR_TYPES_OUTPUT_H
#ifndef WLR_TYPES_WLR_OUTPUT_H
#define WLR_TYPES_WLR_OUTPUT_H
#include <wayland-server.h>
#include <wlr/util/list.h>
#include <stdbool.h>

5
include/wlr/types/wlr_output_layout.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_OUTPUT_LAYOUT_H
#define _WLR_TYPES_OUTPUT_LAYOUT_H
#ifndef WLR_TYPES_WLR_OUTPUT_LAYOUT_H
#define WLR_TYPES_WLR_OUTPUT_LAYOUT_H
#include <wlr/types/wlr_output.h>
#include <wayland-util.h>
#include <stdbool.h>

5
include/wlr/types/wlr_pointer.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_POINTER_H
#define _WLR_TYPES_POINTER_H
#ifndef WLR_TYPES_WLR_POINTER_H
#define WLR_TYPES_WLR_POINTER_H
#include <wlr/types/wlr_input_device.h>
#include <wayland-server.h>
#include <stdint.h>

4
include/wlr/types/wlr_region.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_TYPES_REGION_H
#define _WLR_TYPES_REGION_H
#ifndef WLR_TYPES_WLR_REGION_H
#define WLR_TYPES_WLR_REGION_H
struct wl_resource;

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

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_SEAT_H
#define _WLR_TYPES_SEAT_H
#ifndef WLR_TYPES_WLR_SEAT_H
#define WLR_TYPES_WLR_SEAT_H
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_keyboard.h>
@ -41,6 +42,18 @@ struct wlr_seat_keyboard {
struct wl_list link;
};
struct wlr_seat_keyboard_state {
struct wlr_seat *wlr_seat;
struct wlr_seat_handle *focused_handle;
struct wlr_surface *focused_surface;
int keymap_fd;
size_t keymap_size;
struct wl_listener surface_destroy;
struct wl_listener resource_destroy;
};
struct wlr_seat {
struct wl_global *wl_global;
struct wl_display *display;
@ -51,6 +64,7 @@ struct wlr_seat {
struct wlr_data_device *data_device;
struct wlr_seat_pointer_state pointer_state;
struct wlr_seat_keyboard_state keyboard_state;
struct {
struct wl_signal client_bound;
@ -137,4 +151,19 @@ void wlr_seat_attach_keyboard(struct wlr_seat *seat,
*/
void wlr_seat_detach_keyboard(struct wlr_seat *seat, struct wlr_keyboard *kb);
/**
* Send a keyboard enter event to the given surface and consider it to be the
* focused surface for the keyboard. This will send a leave event to the last
* surface that was entered. Pass an array of currently pressed keys.
*/
void wlr_seat_keyboard_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface);
/**
* Clear the focused surface for the keyboard and leave all entered surfaces.
*/
void wlr_seat_keyboard_clear_focus(struct wlr_seat *wlr_seat);
// TODO: May be useful to be able to simulate keyboard input events
#endif

5
include/wlr/types/wlr_surface.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_WLR_SURFACE_H
#define _WLR_TYPES_WLR_SURFACE_H
#ifndef WLR_TYPES_WLR_SURFACE_H
#define WLR_TYPES_WLR_SURFACE_H
#include <wayland-server.h>
#include <pixman.h>
#include <stdint.h>

5
include/wlr/types/wlr_tablet_pad.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_TABLET_PAD_H
#define _WLR_TYPES_TABLET_PAD_H
#ifndef WLR_TYPES_WLR_TABLET_PAD_H
#define WLR_TYPES_WLR_TABLET_PAD_H
#include <wlr/types/wlr_input_device.h>
#include <wayland-server.h>
#include <stdint.h>

5
include/wlr/types/wlr_tablet_tool.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_TABLET_TOOL_H
#define _WLR_TYPES_TABLET_TOOL_H
#ifndef WLR_TYPES_TABLET_TOOL_H
#define WLR_TYPES_TABLET_TOOL_H
#include <wlr/types/wlr_input_device.h>
#include <wayland-server.h>
#include <stdint.h>

5
include/wlr/types/wlr_touch.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_TYPES_TOUCH_H
#define _WLR_TYPES_TOUCH_H
#ifndef WLR_TYPES_WLR_TOUCH_H
#define WLR_TYPES_WLR_TOUCH_H
#include <wayland-server.h>
#include <stdint.h>

5
include/wlr/types/wlr_wl_shell.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_WL_SHELL_H
#define _WLR_WL_SHELL_H
#ifndef WLR_TYPES_WLR_WL_SHELL_H
#define WLR_TYPES_WLR_WL_SHELL_H
#include <wayland-server.h>
struct wlr_wl_shell {

5
include/wlr/types/wlr_xdg_shell_v6.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_XDG_SHELL_V6_H
#define _WLR_XDG_SHELL_V6_H
#ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H
#define WLR_TYPES_WLR_XDG_SHELL_V6_H
#include <wlr/types/wlr_box.h>
#include <wayland-server.h>

4
include/wlr/util/list.h
View file

@ -1,5 +1,5 @@
#ifndef _WLR_UTIL_LIST_H
#define _WLR_UTIL_LIST_H
#ifndef WLR_UTIL_LIST_H
#define WLR_UTIL_LIST_H
#include <stddef.h>

5
include/wlr/util/log.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_UTIL_LOG_H
#define _WLR_UTIL_LOG_H
#ifndef WLR_UTIL_LOG_H
#define WLR_UTIL_LOG_H
#include <stdbool.h>
#include <stdarg.h>
#include <string.h>

6
include/wlr/xcursor.h
View file

@ -27,8 +27,10 @@
* This is adapted from wayland-cursor, but with the wl_shm client stuff removed
* so we can use it on the compositor, too.
*/
#ifndef _WLR_XCURSOR_H
#define _WLR_XCURSOR_H
#ifndef WLR_XCURSOR_H
#define WLR_XCURSOR_H
#include <stdint.h>
struct wlr_xcursor_image {

5
include/wlr/xwayland.h
View file

@ -1,5 +1,6 @@
#ifndef _WLR_XWAYLAND_H
#define _WLR_XWAYLAND_H
#ifndef WLR_XWAYLAND_H
#define WLR_XWAYLAND_H
#include <time.h>
#include <stdbool.h>
#include <wlr/types/wlr_compositor.h>