diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-01-08 15:39:17 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-08 21:33:19 -0800 |
| commit | b0420aeb3d05b36308cc9cfc8bf1bf0aa5a2b5ad (patch) | |
| tree | 69207b873e8e388608839e6ac25ae8999e119a0c /src/compositor.h | |
| parent | 73e9f86e2c4c163d8260c62fe42d73b51f8998cc (diff) | |
| download | weston-b0420aeb3d05b36308cc9cfc8bf1bf0aa5a2b5ad.tar.gz | |
protocol: rename wl_surface_scaler to wl_viewport
This seems like a better name, and will not conflict if someone later
extends wl_surface with a request scaler_set (yeah, unlikely).
This code was written by Jonny Lamb, I just diffed his branches and made
a patch for Weston.
Cc: Jonny Lamb <jonny.lamb@collabora.co.uk>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'src/compositor.h')
| -rw-r--r-- | src/compositor.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor.h b/src/compositor.h index 9da1e3c8..22a485fc 100644 --- a/src/compositor.h +++ b/src/compositor.h @@ -660,10 +660,10 @@ struct weston_buffer_viewport { /* wl_surface.set_scaling_factor */ int32_t scale; - /* bool for whether wl_surface_scaler.set has been + /* bool for whether wl_viewport.set has been * called yet (before this is called there is no * cropping or scaling on the surface) */ - int scaler_set; /* bool */ + int viewport_set; /* bool */ wl_fixed_t src_x, src_y; wl_fixed_t src_width, src_height; @@ -861,8 +861,8 @@ struct weston_surface { struct weston_buffer_viewport buffer_viewport; int keep_buffer; /* bool for backends to prevent early release */ - /* wl_surface_scaler resource for this surface */ - struct wl_resource *surface_scaler_resource; + /* wl_viewport resource for this surface */ + struct wl_resource *viewport_resource; /* All the pending state, that wl_surface.commit will apply. */ struct { @@ -887,7 +887,7 @@ struct weston_surface { /* wl_surface.set_buffer_transform */ /* wl_surface.set_scaling_factor */ - /* wl_surface_scaler.set */ + /* wl_viewport.set */ struct weston_buffer_viewport buffer_viewport; } pending; |