commit 7bade72

Style

 1@@ -129,6 +129,7 @@ static const struct view_impl view_impl = {
 2     .attach = &attach,
 3     .move = &move,
 4 };
 5+
 6 static inline void update_cursor(struct pointer * pointer)
 7 {
 8     view_move(&pointer->cursor.view,
 9@@ -255,9 +256,6 @@ void pointer_finalize(struct pointer * pointer)
10     pixman_region32_fini(&pointer->region);
11 }
12 
13-/**
14- * Sets the focus of the pointer to the specified surface.
15- */
16 void pointer_set_focus(struct pointer * pointer, struct swc_surface * surface)
17 {
18     input_focus_set(&pointer->focus, surface);

 1@@ -58,7 +58,7 @@ static void state_initialize(struct swc_surface_state * state)
 2     wl_list_init(&state->frame_callbacks);
 3 }
 4 
 5-static void state_finish(struct swc_surface_state * state)
 6+static void state_finalize(struct swc_surface_state * state)
 7 {
 8     struct wl_resource * resource, * tmp;
 9 
10@@ -252,7 +252,7 @@ static void commit(struct wl_client * client, struct wl_resource * resource)
11     if (surface->view)
12     {
13         if (surface->pending.commit & SWC_SURFACE_COMMIT_ATTACH)
14-            view_attach(surface->view, surface->state.buffer);
15+            view_attach(surface->view, buffer);
16         view_update(surface->view);
17     }
18 
19@@ -287,9 +287,8 @@ static void surface_destroy(struct wl_resource * resource)
20 {
21     struct swc_surface * surface = wl_resource_get_user_data(resource);
22 
23-    /* Finish the surface. */
24-    state_finish(&surface->state);
25-    state_finish(&surface->pending.state);
26+    state_finalize(&surface->state);
27+    state_finalize(&surface->pending.state);
28 
29     if (surface->view)
30         wl_list_remove(&surface->view_listener.link);
31@@ -404,7 +403,7 @@ void swc_surface_set_view(struct swc_surface * surface, struct view * view)
32     {
33         wl_signal_add(&view->event_signal, &surface->view_listener);
34         view_attach(view, surface->state.buffer);
35-        view_update(surface->view);
36+        view_update(view);
37     }
38 }
39