mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 13:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybg: add HiDPI support

Browse source
This commit is contained in:
emersion 2018-04-03 16:47:06 -04:00
parent f366ef373e
commit 9b4f8637a9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
swaybg/main.c
View file

@ -47,6 +47,7 @@ struct swaybg_state {
bool run_display; bool run_display;
uint32_t width, height; uint32_t width, height;
int32_t scale;
struct pool_buffer buffers[2]; struct pool_buffer buffers[2];
struct pool_buffer *current_buffer; struct pool_buffer *current_buffer;
}; };
@ -74,8 +75,8 @@ static void render_image(struct swaybg_state *state) {
cairo_surface_t *image = state->context.image; cairo_surface_t *image = state->context.image;
double width = cairo_image_surface_get_width(image); double width = cairo_image_surface_get_width(image);
double height = cairo_image_surface_get_height(image); double height = cairo_image_surface_get_height(image);
int wwidth = state->width; int wwidth = state->width * state->scale;
int wheight = state->height; int wheight = state->height * state->scale;
switch (state->args->mode) { switch (state->args->mode) {
case BACKGROUND_MODE_STRETCH: case BACKGROUND_MODE_STRETCH:
@ -135,8 +136,8 @@ static void render_image(struct swaybg_state *state) {
} }
static void render_frame(struct swaybg_state *state) { static void render_frame(struct swaybg_state *state) {
state->current_buffer = get_next_buffer(state->shm, state->current_buffer = get_next_buffer(state->shm, state->buffers,
state->buffers, state->width, state->height); state->width * state->scale, state->height * state->scale);
cairo_t *cairo = state->current_buffer->cairo; cairo_t *cairo = state->current_buffer->cairo;
switch (state->args->mode) { switch (state->args->mode) {
@ -149,6 +150,7 @@ static void render_frame(struct swaybg_state *state) {
break; break;
} }
wl_surface_set_buffer_scale(state->surface, state->scale);
wl_surface_attach(state->surface, state->current_buffer->buffer, 0, 0); wl_surface_attach(state->surface, state->current_buffer->buffer, 0, 0);
wl_surface_damage(state->surface, 0, 0, state->width, state->height); wl_surface_damage(state->surface, 0, 0, state->width, state->height);
wl_surface_commit(state->surface); wl_surface_commit(state->surface);
@ -212,12 +214,42 @@ struct zwlr_layer_surface_v1_listener layer_surface_listener = {
.closed = layer_surface_closed, .closed = layer_surface_closed,
}; };
static void output_geometry(void *data, struct wl_output *output, int32_t x,
int32_t y, int32_t width_mm, int32_t height_mm, int32_t subpixel,
const char *make, const char *model, int32_t transform) {
// Who cares
}
static void output_mode(void *data, struct wl_output *output, uint32_t flags,
int32_t width, int32_t height, int32_t refresh) {
// Who cares
}
static void output_done(void *data, struct wl_output *output) {
// Who cares
}
static void output_scale(void *data, struct wl_output *output, int32_t factor) {
struct swaybg_state *state = data;
state->scale = factor;
if (state->run_display) {
render_frame(state);
}
}
struct wl_output_listener output_listener = {
.geometry = output_geometry,
.mode = output_mode,
.done = output_done,
.scale = output_scale,
};
static void handle_global(void *data, struct wl_registry *registry, static void handle_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) { uint32_t name, const char *interface, uint32_t version) {
struct swaybg_state *state = data; struct swaybg_state *state = data;
if (strcmp(interface, wl_compositor_interface.name) == 0) { if (strcmp(interface, wl_compositor_interface.name) == 0) {
state->compositor = wl_registry_bind(registry, name, state->compositor = wl_registry_bind(registry, name,
&wl_compositor_interface, 1); &wl_compositor_interface, 3);
} else if (strcmp(interface, wl_shm_interface.name) == 0) { } else if (strcmp(interface, wl_shm_interface.name) == 0) {
state->shm = wl_registry_bind(registry, name, state->shm = wl_registry_bind(registry, name,
&wl_shm_interface, 1); &wl_shm_interface, 1);
@ -225,7 +257,8 @@ static void handle_global(void *data, struct wl_registry *registry,
static int output_idx = 0; static int output_idx = 0;
if (output_idx == state->args->output_idx) { if (output_idx == state->args->output_idx) {
state->output = wl_registry_bind(registry, name, state->output = wl_registry_bind(registry, name,
&wl_output_interface, 1); &wl_output_interface, 3);
wl_output_add_listener(state->output, &output_listener, state);
} }
output_idx++; output_idx++;
} else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
@ -287,6 +320,9 @@ int main(int argc, const char **argv) {
wl_display_roundtrip(state.display); wl_display_roundtrip(state.display);
assert(state.compositor && state.layer_shell && state.output && state.shm); assert(state.compositor && state.layer_shell && state.output && state.shm);
// Second roundtrip to get output properties
wl_display_roundtrip(state.display);
assert(state.surface = wl_compositor_create_surface(state.compositor)); assert(state.surface = wl_compositor_create_surface(state.compositor));
state.layer_surface = zwlr_layer_shell_v1_get_layer_surface( state.layer_surface = zwlr_layer_shell_v1_get_layer_surface(