Merge branch 'master' into cmd-swap

4 files changed, 7 insertions, 1 deletions

diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 856f7c8c..54f5be06 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -12,6 +12,8 @@ struct pool_buffer {
         cairo_t *cairo;
         PangoContext *pango;
         uint32_t width, height;
+        void *data;
+        size_t size;
         bool busy;
 };
 
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 74da132c..bd3ca0ac 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -18,6 +18,7 @@ struct criteria {
         char *target; // workspace or output name for `assign` criteria
 
         pcre *title;
+        pcre *shell;
         pcre *app_id;
         pcre *class;
         pcre *instance;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 0fb8f1b3..a8bf4955 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view);
 
 uint32_t view_get_window_type(struct sway_view *view);
 
-const char *view_get_type(struct sway_view *view);
+const char *view_get_shell(struct sway_view *view);
 
 void view_configure(struct sway_view *view, double ox, double oy, int width,
         int height);
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h
index dae823b8..2931fd61 100644
--- a/include/swaylock/swaylock.h
+++ b/include/swaylock/swaylock.h
@@ -56,6 +56,7 @@ struct swaylock_surface {
         struct zwlr_layer_surface_v1 *layer_surface;
         struct pool_buffer buffers[2];
         struct pool_buffer *current_buffer;
+        bool frame_pending, dirty;
         uint32_t width, height;
         int32_t scale;
         char *output_name;
@@ -74,5 +75,7 @@ void swaylock_handle_key(struct swaylock_state *state,
                 xkb_keysym_t keysym, uint32_t codepoint);
 void render_frame(struct swaylock_surface *surface);
 void render_frames(struct swaylock_state *state);
+void damage_surface(struct swaylock_surface *surface);
+void damage_state(struct swaylock_state *state);
 
 #endif