aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-01-23 13:37:58 +0100
committeremersion <contact@emersion.fr>2018-01-23 20:01:40 +0100
commit2ad7df868097d557ed3cc41dfa60e0637f8a08e8 (patch)
tree783b97e6793e7ed1d88f786b582a45492b3b6bee /include
parent415a2b7c569457ebf85d7ae066cc19bee196d22e (diff)
rootston: damage tracking for drag icons
Diffstat (limited to 'include')
-rw-r--r--include/rootston/output.h5
-rw-r--r--include/rootston/seat.h21
-rw-r--r--include/wlr/types/wlr_data_device.h4
-rw-r--r--include/wlr/types/wlr_seat.h2
4 files changed, 29 insertions, 3 deletions
diff --git a/include/rootston/output.h b/include/rootston/output.h
index 89fe1d82..81f20788 100644
--- a/include/rootston/output.h
+++ b/include/rootston/output.h
@@ -37,9 +37,14 @@ struct roots_output {
void output_add_notify(struct wl_listener *listener, void *data);
void output_remove_notify(struct wl_listener *listener, void *data);
+struct roots_view;
+struct roots_drag_icon;
+
void output_damage_whole_view(struct roots_output *output,
struct roots_view *view);
void output_damage_from_view(struct roots_output *output,
struct roots_view *view);
+void output_damage_whole_drag_icon(struct roots_output *output,
+ struct roots_drag_icon *icon);
#endif
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index cf5dd3b2..4dec582e 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -17,12 +17,15 @@ struct roots_seat {
struct wl_list views; // roots_seat_view::link
bool has_focus;
+ struct wl_list drag_icons; // roots_drag_icon::link
+
struct wl_list keyboards;
struct wl_list pointers;
struct wl_list touch;
struct wl_list tablet_tools;
- struct wl_listener seat_destroy;
+ struct wl_listener new_drag_icon;
+ struct wl_listener destroy;
};
struct roots_seat_view {
@@ -33,6 +36,18 @@ struct roots_seat_view {
struct wl_listener view_destroy;
};
+struct roots_drag_icon {
+ struct roots_seat *seat;
+ struct wlr_drag_icon *wlr_drag_icon;
+ struct wl_list link;
+
+ double x, y;
+
+ struct wl_listener surface_commit;
+ struct wl_listener map;
+ struct wl_listener destroy;
+};
+
struct roots_pointer {
struct roots_seat *seat;
struct wlr_input_device *device;
@@ -84,4 +99,8 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view);
+void roots_drag_icon_update_position(struct roots_drag_icon *icon);
+
+void roots_drag_icon_damage_whole(struct roots_drag_icon *icon);
+
#endif
diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h
index 54514b4c..ff4a0f7e 100644
--- a/include/wlr/types/wlr_data_device.h
+++ b/include/wlr/types/wlr_data_device.h
@@ -71,10 +71,10 @@ struct wlr_drag_icon {
bool is_pointer;
int32_t touch_id;
- int32_t sx;
- int32_t sy;
+ int32_t sx, sy;
struct {
+ struct wl_signal map; // emitted when mapped or unmapped
struct wl_signal destroy;
} events;
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index c2a89f33..ffdabd98 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -209,6 +209,8 @@ struct wlr_seat {
struct wl_signal selection;
struct wl_signal primary_selection;
+ struct wl_signal new_drag_icon;
+
struct wl_signal destroy;
} events;