aboutsummaryrefslogtreecommitdiff
path: root/include/rootston
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2017-11-18 22:18:25 +0100
committeremersion <contact@emersion.fr>2017-11-18 22:18:25 +0100
commit72d877658aaf309eb066e3b9825c5f59177b15c3 (patch)
tree2f7123b9cc9f6a99c1d8351272d69572b7d1e811 /include/rootston
parent1523082d5d74ca40f468bec04c23ed47049bb4d7 (diff)
parentfa36ac90f70787176a5cfdb6fa6835aa1226f697 (diff)
Merge branch 'master' into seat-views
Diffstat (limited to 'include/rootston')
-rw-r--r--include/rootston/config.h28
-rw-r--r--include/rootston/cursor.h10
-rw-r--r--include/rootston/seat.h14
3 files changed, 37 insertions, 15 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h
index 71ee61c7..de20fb8e 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -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
diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index f49b6439..f0c9be89 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -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
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index a8397d89..ec0608e7 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -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;