diff options
| author | emersion <contact@emersion.fr> | 2018-06-20 22:35:59 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-07-04 19:12:16 +0100 |
| commit | 3ee86b6105d72e9b0965fd1d0dc546c204552686 (patch) | |
| tree | de1d17ddfcde4fe3f0c80677f4e49c18e2597cb4 /include/wlr | |
| parent | 5d1c5ff80b4e50db68fc4e918d0dc3c171a043ae (diff) | |
surface: rename invalid state
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 46588f0a..2ea4e35a 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -8,18 +8,21 @@ #include <wayland-server.h> #include <wlr/types/wlr_output.h> -#define WLR_SURFACE_INVALID_BUFFER 1 -#define WLR_SURFACE_INVALID_SURFACE_DAMAGE 2 -#define WLR_SURFACE_INVALID_BUFFER_DAMAGE 4 -#define WLR_SURFACE_INVALID_OPAQUE_REGION 8 -#define WLR_SURFACE_INVALID_INPUT_REGION 16 -#define WLR_SURFACE_INVALID_TRANSFORM 32 -#define WLR_SURFACE_INVALID_SCALE 64 -#define WLR_SURFACE_INVALID_SUBSURFACE_POSITION 128 -#define WLR_SURFACE_INVALID_FRAME_CALLBACK_LIST 256 +enum wlr_surface_state_field { + WLR_SURFACE_STATE_BUFFER = 1, + WLR_SURFACE_STATE_SURFACE_DAMAGE = 2, + WLR_SURFACE_STATE_BUFFER_DAMAGE = 2, + WLR_SURFACE_STATE_OPAQUE_REGION = 8, + WLR_SURFACE_STATE_INPUT_REGION = 16, + WLR_SURFACE_STATE_TRANSFORM = 32, + WLR_SURFACE_STATE_SCALE = 64, + WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 128, + WLR_SURFACE_STATE_SUBSURFACE_POSITION = 256, +}; struct wlr_surface_state { - uint32_t invalid; + uint32_t committed; // enum wlr_surface_state_field + struct wl_resource *buffer; struct wl_listener buffer_destroy_listener; int32_t sx, sy; @@ -27,14 +30,14 @@ struct wlr_surface_state { pixman_region32_t opaque, input; enum wl_output_transform transform; int32_t scale; - int width, height; - int buffer_width, buffer_height; + struct wl_list frame_callback_list; // wl_resource struct { int32_t x, y; } subsurface_position; - struct wl_list frame_callback_list; // wl_surface.frame + int width, height; // in surface-local coordinates + int buffer_width, buffer_height; }; struct wlr_subsurface { |