diff options
author | 2018-05-20 09:37:49 -0400 | |
---|---|---|
committer | 2018-05-20 09:37:49 -0400 | |
commit | aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe (patch) | |
tree | 561bce67d6264278683ec481ba9c9979d0754735 /include/swaylock/swaylock.h | |
parent | Pre-multiply alpha for non-textures (diff) | |
parent | Merge pull request #1821 from RyanDwyer/swaylock-multiple-images (diff) | |
download | sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.tar.gz sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.tar.zst sway-aacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe.zip |
Merge branch 'master' into premultiply-alpha
Diffstat (limited to 'include/swaylock/swaylock.h')
-rw-r--r-- | include/swaylock/swaylock.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 07b908d7..e161ada9 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -37,23 +37,35 @@ struct swaylock_state { | |||
37 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; | 37 | struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; |
38 | struct wl_shm *shm; | 38 | struct wl_shm *shm; |
39 | struct wl_list surfaces; | 39 | struct wl_list surfaces; |
40 | struct wl_list images; | ||
40 | struct swaylock_args args; | 41 | struct swaylock_args args; |
41 | struct swaylock_password password; | 42 | struct swaylock_password password; |
42 | struct swaylock_xkb xkb; | 43 | struct swaylock_xkb xkb; |
43 | enum auth_state auth_state; | 44 | enum auth_state auth_state; |
44 | bool run_display; | 45 | bool run_display; |
46 | struct zxdg_output_manager_v1 *zxdg_output_manager; | ||
45 | }; | 47 | }; |
46 | 48 | ||
47 | struct swaylock_surface { | 49 | struct swaylock_surface { |
48 | cairo_surface_t *image; | 50 | cairo_surface_t *image; |
49 | struct swaylock_state *state; | 51 | struct swaylock_state *state; |
50 | struct wl_output *output; | 52 | struct wl_output *output; |
53 | struct zxdg_output_v1 *xdg_output; | ||
51 | struct wl_surface *surface; | 54 | struct wl_surface *surface; |
52 | struct zwlr_layer_surface_v1 *layer_surface; | 55 | struct zwlr_layer_surface_v1 *layer_surface; |
53 | struct pool_buffer buffers[2]; | 56 | struct pool_buffer buffers[2]; |
54 | struct pool_buffer *current_buffer; | 57 | struct pool_buffer *current_buffer; |
55 | uint32_t width, height; | 58 | uint32_t width, height; |
56 | int32_t scale; | 59 | int32_t scale; |
60 | char *output_name; | ||
61 | struct wl_list link; | ||
62 | }; | ||
63 | |||
64 | // There is exactly one swaylock_image for each -i argument | ||
65 | struct swaylock_image { | ||
66 | char *path; | ||
67 | char *output_name; | ||
68 | cairo_surface_t *cairo_surface; | ||
57 | struct wl_list link; | 69 | struct wl_list link; |
58 | }; | 70 | }; |
59 | 71 | ||