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

Merge branch 'master' into wayland-backend

Browse source
This commit is contained in:
nyorain 2017-06-19 21:22:42 +02:00
commit e65ca967f9
17 changed files with 353 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

62
include/wlr/types.h
View file

@ -53,18 +53,28 @@ void wlr_output_destroy(struct wlr_output *output);
void wlr_output_effective_resolution(struct wlr_output *output,
int *width, int *height);
enum WLR_KEYBOARD_LED {
WLR_LED_NUM_LOCK = 1,
WLR_LED_CAPS_LOCK = 2,
WLR_LED_SCROLL_LOCK = 4,
WLR_LED_LAST
};
struct wlr_keyboard_state;
struct wlr_keyboard_impl;
struct wlr_keyboard {
struct wlr_keyboard_state *state;
struct wlr_keyboard_impl *impl;
uint32_t leds;
struct {
struct wl_signal key;
} events;
};
void wlr_keyboard_led_update(struct wlr_keyboard *keyboard, uint32_t leds);
enum wlr_key_state {
WLR_KEY_RELEASED,
WLR_KEY_PRESSED,
@ -254,8 +264,55 @@ struct wlr_tablet_tool_button {
enum wlr_button_state state;
};
// TODO: tablet pad
// TODO: switch
// NOTE: the wlr tablet pad implementation does not currently support tablets
// with more than one mode. I don't own any such hardware so I cannot test it
// and it is too complicated to make a meaningful implementation of blindly.
struct wlr_tablet_pad_impl;
struct wlr_tablet_pad_state;
struct wlr_tablet_pad {
struct wlr_tablet_pad_impl *impl;
struct wlr_tablet_pad_state *state;
struct {
struct wl_signal button;
struct wl_signal ring;
struct wl_signal strip;
} events;
};
struct wlr_tablet_pad_button {
uint32_t time_sec;
uint64_t time_usec;
uint32_t button;
enum wlr_button_state state;
};
enum wlr_tablet_pad_ring_source {
WLR_TABLET_PAD_RING_SOURCE_UNKNOWN,
WLR_TABLET_PAD_RING_SOURCE_FINGER,
};
struct wlr_tablet_pad_ring {
uint32_t time_sec;
uint64_t time_usec;
enum wlr_tablet_pad_ring_source source;
uint32_t ring;
double position;
};
enum wlr_tablet_pad_strip_source {
WLR_TABLET_PAD_STRIP_SOURCE_UNKNOWN,
WLR_TABLET_PAD_STRIP_SOURCE_FINGER,
};
struct wlr_tablet_pad_strip {
uint32_t time_sec;
uint64_t time_usec;
enum wlr_tablet_pad_strip_source source;
uint32_t strip;
double position;
};
enum wlr_input_device_type {
WLR_INPUT_DEVICE_KEYBOARD,
@ -284,6 +341,7 @@ struct wlr_input_device {
struct wlr_pointer *pointer;
struct wlr_touch *touch;
struct wlr_tablet_tool *tablet_tool;
struct wlr_tablet_pad *tablet_pad;
};
};