summaryrefslogtreecommitdiff
path: root/src/data-device.c
diff options
context:
space:
mode:
authorGiulio Camuffo <giuliocamuffo@gmail.com>2014-07-09 22:12:56 +0300
committerJason Ekstrand <jason.ekstrand@intel.com>2014-07-23 12:34:33 -0700
commit412e6a59eb90da5b29226e0b32f4a1a8e21c6500 (patch)
tree656c515d17dcc9308bc6100719a320a60c55b5ac /src/data-device.c
parentcfff3122046b346f0b47b6f7dfbbdf62352cfe61 (diff)
downloadweston-412e6a59eb90da5b29226e0b32f4a1a8e21c6500.tar.gz
compositor: keep track of the weston_layer a weston_view is in
This introduces a new struct, weston_layer_entry, which is now used in place of wl_list to keep the link for the layer list in weston_view and the head of the list in weston_layer. weston_layer_entry also has a weston_layer*, which points to the layer the view is in or, in the case the entry it's the head of the list, to the layer itself.
Diffstat (limited to 'src/data-device.c')
-rw-r--r--src/data-device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data-device.c b/src/data-device.c
index a069b3c0..75fc60cb 100644
--- a/src/data-device.c
+++ b/src/data-device.c
@@ -180,7 +180,7 @@ drag_surface_configure(struct weston_drag *drag,
struct weston_surface *es,
int32_t sx, int32_t sy)
{
- struct wl_list *list;
+ struct weston_layer_entry *list;
float fx, fy;
assert((pointer != NULL && touch == NULL) ||
@@ -193,8 +193,8 @@ drag_surface_configure(struct weston_drag *drag,
else
list = &es->compositor->cursor_layer.view_list;
- wl_list_remove(&drag->icon->layer_link);
- wl_list_insert(list, &drag->icon->layer_link);
+ weston_layer_entry_remove(&drag->icon->layer_link);
+ weston_layer_entry_insert(list, &drag->icon->layer_link);
weston_view_update_transform(drag->icon);
pixman_region32_clear(&es->pending.input);
}