commit b8a7269

Use resource accessor methods

 1@@ -192,7 +192,7 @@ static void handle_drm_event(struct wl_listener * listener, void * data)
 2 static void handle_surface_destroy(struct wl_listener * listener, void * data)
 3 {
 4     struct wl_resource * resource = data;
 5-    struct swc_surface * surface = resource->data;
 6+    struct swc_surface * surface = wl_resource_get_user_data(resource);
 7 
 8     wl_list_remove(&surface->link);
 9 
10@@ -218,7 +218,7 @@ static void handle_switch_vt(uint32_t time, uint32_t value, void * data)
11 static void create_surface(struct wl_client * client,
12                            struct wl_resource * resource, uint32_t id)
13 {
14-    struct swc_compositor * compositor = resource->data;
15+    struct swc_compositor * compositor = wl_resource_get_user_data(resource);
16     struct swc_surface * surface;
17     struct swc_output * output;
18 

1@@ -12,7 +12,7 @@ static void get_data_device(struct wl_client * client,
2                             struct wl_resource * resource, uint32_t id,
3                             struct wl_resource * seat_resource)
4 {
5-    struct swc_seat * seat = seat_resource->data;
6+    struct swc_seat * seat = wl_resource_get_user_data(seat_resource);
7 
8     printf("get_data_device\n");
9 

1@@ -75,7 +75,7 @@ struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
2     client_resource = wl_client_add_object(client, &wl_keyboard_interface,
3                                            NULL, id, NULL);
4     wl_resource_set_destructor(client_resource, &swc_unbind_resource);
5-    wl_list_insert(&keyboard->resources, &client_resource->link);
6+    wl_list_insert(&keyboard->resources, wl_resource_get_link(client_resource));
7 
8     printf("keyboard: adding client %p, resource: %p\n", client, client_resource);
9 

 1@@ -20,8 +20,8 @@ static void bind_output(struct wl_client * client, void * data,
 2 
 3     resource = wl_client_add_object(client, &wl_output_interface, NULL, id,
 4                                     output);
 5-    wl_list_insert(&output->resource_list, &resource->link);
 6-    resource->destroy = &swc_unbind_resource;
 7+    wl_list_insert(&output->resource_list, wl_resource_get_link(resource));
 8+    wl_resource_set_destructor(resource, &swc_unbind_resource);
 9 
10     wl_output_send_geometry(resource, output->x, output->y,
11         output->physical_width, output->physical_height, 0, "unknown",

 1@@ -78,8 +78,8 @@ static void set_cursor(struct wl_client * client,
 2                        struct wl_resource * surface_resource,
 3                        int32_t hotspot_x, int32_t hotspot_y)
 4 {
 5-    struct swc_pointer * pointer = resource->data;
 6-    struct swc_surface * surface = surface_resource->data;
 7+    struct swc_pointer * pointer = wl_resource_get_user_data(resource);
 8+    struct swc_surface * surface = wl_resource_get_user_data(surface_resource);
 9     struct swc_event event;
10 
11     printf("set_cursor\n");
12@@ -108,7 +108,8 @@ struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
13     client_resource = wl_client_add_object(client, &wl_pointer_interface,
14                                            &pointer_implementation, id, pointer);
15     wl_resource_set_destructor(client_resource, &swc_unbind_resource);
16-    wl_list_insert(&pointer->resources, &client_resource->link);
17+    wl_list_insert(&pointer->resources,
18+                   wl_resource_get_user_data(client_resource));
19 
20     return client_resource;
21 }

 1@@ -10,7 +10,7 @@ static void destroy(struct wl_client * client, struct wl_resource * resource)
 2 static void add(struct wl_client * client, struct wl_resource * resource,
 3                 int32_t x, int32_t y, int32_t width, int32_t height)
 4 {
 5-    struct swc_region * region = resource->data;
 6+    struct swc_region * region = wl_resource_get_user_data(resource);
 7 
 8     pixman_region32_union_rect(&region->region, &region->region,
 9                                x, y, width, height);
10@@ -19,7 +19,7 @@ static void add(struct wl_client * client, struct wl_resource * resource,
11 static void subtract(struct wl_client * client, struct wl_resource * resource,
12                      int32_t x, int32_t y, int32_t width, int32_t height)
13 {
14-    struct swc_region * region = resource->data;
15+    struct swc_region * region = wl_resource_get_user_data(resource);
16     pixman_region32_t operand;
17 
18     pixman_region32_init_rect(&operand, x, y, width, height);

 1@@ -159,7 +159,7 @@ static void handle_evdev_event(struct wl_listener * listener, void * data)
 2 static void get_pointer(struct wl_client * client, struct wl_resource * resource,
 3                         uint32_t id)
 4 {
 5-    struct swc_seat * seat = resource->data;
 6+    struct swc_seat * seat = wl_resource_get_user_data(resource);
 7     struct swc_pointer * pointer = &seat->pointer;
 8 
 9     swc_pointer_bind(pointer, client, id);
10@@ -210,7 +210,7 @@ static void bind_seat(struct wl_client * client, void * data, uint32_t version,
11 
12     resource = wl_client_add_object(client, &wl_seat_interface,
13                                     &seat_implementation, id, seat);
14-    wl_list_insert(&seat->resources, &resource->link);
15+    wl_list_insert(&seat->resources, wl_resource_get_link(resource));
16     wl_resource_set_destructor(resource, &swc_unbind_resource);
17 
18     wl_seat_send_capabilities(resource, seat->capabilities);

 1@@ -42,14 +42,14 @@ static void destroy(struct wl_client * client, struct wl_resource * resource)
 2 static void attach(struct wl_client * client, struct wl_resource * resource,
 3                    struct wl_resource * buffer_resource, int32_t x, int32_t y)
 4 {
 5-    struct swc_surface * surface = resource->data;
 6+    struct swc_surface * surface = wl_resource_get_user_data(resource);
 7 
 8     surface->pending.x = x;
 9     surface->pending.y = y;
10 
11     if (buffer_resource)
12     {
13-        struct wl_buffer * buffer = buffer_resource->data;
14+        struct wl_buffer * buffer = wl_resource_get_user_data(buffer_resource);
15 
16         surface->pending.state.buffer = buffer;
17         surface->geometry.width = buffer->width;
18@@ -67,7 +67,7 @@ static void attach(struct wl_client * client, struct wl_resource * resource,
19 static void damage(struct wl_client * client, struct wl_resource * resource,
20                    int32_t x, int32_t y, int32_t width, int32_t height)
21 {
22-    struct swc_surface * surface = resource->data;
23+    struct swc_surface * surface = wl_resource_get_user_data(resource);
24 
25     pixman_region32_union_rect(&surface->pending.state.damage,
26                                &surface->pending.state.damage,
27@@ -77,26 +77,26 @@ static void damage(struct wl_client * client, struct wl_resource * resource,
28 static void frame(struct wl_client * client, struct wl_resource * resource,
29                   uint32_t id)
30 {
31-    struct swc_surface * surface = resource->data;
32+    struct swc_surface * surface = wl_resource_get_user_data(resource);
33     struct wl_resource * callback_resource;
34 
35     callback_resource = wl_client_add_object(client, &wl_callback_interface,
36                                              NULL, id, NULL);
37     wl_list_insert(surface->pending.state.frame_callbacks.prev,
38-                   &callback_resource->link);
39+                   wl_resource_get_link(callback_resource));
40 }
41 
42 static void set_opaque_region(struct wl_client * client,
43                               struct wl_resource * resource,
44                               struct wl_resource * region_resource)
45 {
46-    struct swc_surface * surface = resource->data;
47+    struct swc_surface * surface = wl_resource_get_user_data(resource);
48 
49     //printf("surface_set_opaque_region\n");
50 
51     if (region_resource)
52     {
53-        struct swc_region * region = region_resource->data;
54+        struct swc_region * region = wl_resource_get_user_data(region_resource);
55 
56         pixman_region32_copy(&surface->pending.state.opaque, &region->region);
57     }
58@@ -108,13 +108,13 @@ static void set_input_region(struct wl_client * client,
59                              struct wl_resource * resource,
60                              struct wl_resource * region_resource)
61 {
62-    struct swc_surface * surface = resource->data;
63+    struct swc_surface * surface = wl_resource_get_user_data(resource);
64 
65     printf("surface.set_input_region\n");
66 
67     if (region_resource)
68     {
69-        struct swc_region * region = region_resource->data;
70+        struct swc_region * region = wl_resource_get_user_data(region_resource);
71 
72         pixman_region32_copy(&surface->pending.state.input, &region->region);
73     }
74@@ -124,7 +124,7 @@ static void set_input_region(struct wl_client * client,
75 
76 static void commit(struct wl_client * client, struct wl_resource * resource)
77 {
78-    struct swc_surface * surface = resource->data;
79+    struct swc_surface * surface = wl_resource_get_user_data(resource);
80     struct swc_event event;
81 
82     event.data = surface;

1@@ -5,7 +5,7 @@
2 
3 void swc_unbind_resource(struct wl_resource * resource)
4 {
5-    wl_list_remove(&resource->link);
6+    wl_list_remove(wl_resource_get_link(resource));
7     free(resource);
8 }
9