mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-22 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into cmd-swap

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-28 00:14:22 +10:00 • committed by GitHub
commit 8fda41dab5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 185 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/pool-buffer.h
View file

@ -12,6 +12,8 @@ struct pool_buffer {
cairo_t *cairo;
PangoContext *pango;
uint32_t width, height;
void *data;
size_t size;
bool busy;
};

1
include/sway/criteria.h
View file

@ -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;

2
include/sway/tree/view.h
View file

@ -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);

3
include/swaylock/swaylock.h
View file

@ -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