From 484cc189e909e6b8df42e80386e0335d6d317a6e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 May 2018 14:14:46 +1000 Subject: Add shell criteria token Closes #2044. --- include/sway/criteria.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') 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; -- cgit v1.2.3 From d3dd7e5bae374cb890f80836d872229a37ef639f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 May 2018 21:59:38 +1000 Subject: Rename view_get_type to view_get_shell --- include/sway/tree/view.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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); -- cgit v1.2.3 From cc10c7af6528f6006e4fccbbdc2156b957cdd5c9 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 25 May 2018 19:34:36 +0100 Subject: swaylock: implement a proper render loop --- include/swaylock/swaylock.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') 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 -- cgit v1.2.3 From 36d5d4b40f5caf0b7bcccbcc3bfeec3afb23946b Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 25 May 2018 19:42:23 +0100 Subject: client/pool-buffer: munmap in destroy_buffer --- include/pool-buffer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') 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; }; -- cgit v1.2.3