mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-17 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into seat-views

Browse source
This commit is contained in:
emersion 2017-11-18 22:18:25 +01:00
commit 72d877658a
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
24 changed files with 1049 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

28
include/rootston/config.h
View file

@ -3,6 +3,8 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_input_device.h>
#define ROOTS_CONFIG_DEFAULT_SEAT_NAME "seat0"
struct roots_output_config {
char *name;
enum wl_output_transform transform;
@ -17,9 +19,9 @@ struct roots_output_config {
struct roots_device_config {
char *name;
char *seat;
char *mapped_output;
struct wlr_box *mapped_box;
char *seat;
struct wl_list link;
};
@ -33,6 +35,7 @@ struct roots_binding_config {
struct roots_keyboard_config {
char *name;
char *seat;
uint32_t meta_key;
char *rules;
char *model;
@ -42,18 +45,22 @@ struct roots_keyboard_config {
struct wl_list link;
};
struct roots_cursor_config {
char *seat;
char *mapped_output;
struct wlr_box *mapped_box;
char *theme;
struct wl_list link;
};
struct roots_config {
bool xwayland;
struct {
char *mapped_output;
struct wlr_box *mapped_box;
} cursor;
struct wl_list outputs;
struct wl_list devices;
struct wl_list bindings;
struct wl_list keyboards;
struct wl_list cursors;
char *config_path;
char *startup_cmd;
};
@ -89,6 +96,13 @@ struct roots_device_config *roots_config_get_device(struct roots_config *config,
* returns NULL. A NULL device returns the default config for keyboards.
*/
struct roots_keyboard_config *roots_config_get_keyboard(
struct roots_config *config, struct wlr_input_device *device);
struct roots_config *config, struct wlr_input_device *device);
/**
* Get configuration for the cursor. If the cursor is not configured, returns
* NULL. A NULL seat_name returns the default config for cursors.
*/
struct roots_cursor_config *roots_config_get_cursor(struct roots_config *config,
const char *seat_name);
#endif

10
include/rootston/cursor.h
View file

@ -39,7 +39,6 @@ struct roots_cursor {
uint32_t resize_edges;
// Ring buffer of input events that could trigger move/resize/rotate
int input_events_idx;
struct wl_list touch_points;
struct roots_input_event input_events[16];
struct wl_listener motion;
@ -57,6 +56,9 @@ struct roots_cursor {
struct wl_listener pointer_grab_begin;
struct wl_listener pointer_grab_end;
struct wl_listener touch_grab_begin;
struct wl_listener touch_grab_end;
struct wl_listener request_set_cursor;
};
@ -100,4 +102,10 @@ void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
struct wlr_seat_pointer_grab *grab);
void roots_cursor_handle_touch_grab_begin(struct roots_cursor *cursor,
struct wlr_seat_touch_grab *grab);
void roots_cursor_handle_touch_grab_end(struct roots_cursor *cursor,
struct wlr_seat_touch_grab *grab);
#endif

14
include/rootston/seat.h
View file

@ -9,6 +9,9 @@ struct roots_drag_icon {
struct wl_list link; // roots_seat::drag_icons
bool mapped;
bool is_pointer;
int32_t touch_id;
int32_t sx, sy;
struct wl_listener surface_destroy;
@ -22,6 +25,10 @@ struct roots_seat {
struct wl_list drag_icons;
struct wl_list link;
// coordinates of the first touch point if it exists
int32_t touch_id;
double touch_x, touch_y;
struct wl_list views; // roots_seat_view::link
struct roots_seat_view *focus;
@ -51,13 +58,6 @@ struct roots_touch {
struct wl_list link;
};
struct roots_touch_point {
struct roots_touch *device;
int32_t slot;
double x, y;
struct wl_list link;
};
struct roots_tablet_tool {
struct roots_seat *seat;
struct wlr_input_device *device;