mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-24 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: tidy swaybar_output struct

Browse source 
- prefix remaining output properties with output_ (scale, subpixel)
- plumb updates to all output properties (x, y, width, height)
This commit is contained in:
Nathan Schulte 2021-09-14 05:12:08 -05:00
parent a47f8ef478
commit d5db744f6c
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/swaybar/bar.h
View file

@ -69,14 +69,13 @@ struct swaybar_output {
bool focused; bool focused;
uint32_t width, height; uint32_t width, height;
int32_t scale;
enum wl_output_subpixel subpixel;
struct pool_buffer buffers[2]; struct pool_buffer buffers[2];
struct pool_buffer *current_buffer; struct pool_buffer *current_buffer;
bool dirty; bool dirty;
bool frame_scheduled; bool frame_scheduled;
uint32_t output_height, output_width, output_x, output_y; uint32_t output_height, output_width, output_x, output_y, output_scale;
enum wl_output_subpixel output_subpixel;
}; };
struct swaybar_workspace { struct swaybar_workspace {

14
swaybar/bar.c
View file

@ -199,12 +199,17 @@ static void output_geometry(void *data, struct wl_output *wl_output, int32_t x,
int32_t y, int32_t width_mm, int32_t height_mm, int32_t subpixel, int32_t y, int32_t width_mm, int32_t height_mm, int32_t subpixel,
const char *make, const char *model, int32_t transform) { const char *make, const char *model, int32_t transform) {
struct swaybar_output *output = data; struct swaybar_output *output = data;
output->subpixel = subpixel; output->output_x = x;
output->output_y = y;
output->output_subpixel = subpixel;
} }
static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags,
int32_t width, int32_t height, int32_t refresh) { int32_t width, int32_t height, int32_t refresh) {
// Who cares // Still unsure who cares
struct swaybar_output *output = data;
output->output_width = width;
output->output_height = height;
} }
static void output_done(void *data, struct wl_output *wl_output) { static void output_done(void *data, struct wl_output *wl_output) {
@ -215,7 +220,7 @@ static void output_done(void *data, struct wl_output *wl_output) {
static void output_scale(void *data, struct wl_output *wl_output, static void output_scale(void *data, struct wl_output *wl_output,
int32_t factor) { int32_t factor) {
struct swaybar_output *output = data; struct swaybar_output *output = data;
output->scale = factor; output->output_scale = factor;
bool render = false; bool render = false;
struct swaybar_seat *seat; struct swaybar_seat *seat;
@ -246,6 +251,7 @@ static void xdg_output_handle_logical_position(void *data,
static void xdg_output_handle_logical_size(void *data, static void xdg_output_handle_logical_size(void *data,
struct zxdg_output_v1 *xdg_output, int32_t width, int32_t height) { struct zxdg_output_v1 *xdg_output, int32_t width, int32_t height) {
// Who cares
struct swaybar_output *output = data; struct swaybar_output *output = data;
output->output_height = height; output->output_height = height;
output->output_width = width; output->output_width = width;
@ -353,7 +359,7 @@ static void handle_global(void *data, struct wl_registry *registry,
output->output = wl_registry_bind(registry, name, output->output = wl_registry_bind(registry, name,
&wl_output_interface, 3); &wl_output_interface, 3);
wl_output_add_listener(output->output, &output_listener, output); wl_output_add_listener(output->output, &output_listener, output);
output->scale = 1; output->output_scale = 1;
output->wl_name = name; output->wl_name = name;
wl_list_init(&output->workspaces); wl_list_init(&output->workspaces);
wl_list_init(&output->hotspots); wl_list_init(&output->hotspots);

2
swaybar/input.c
View file

@ -78,7 +78,7 @@ void update_cursor(struct swaybar_seat *seat) {
cursor_size = size; cursor_size = size;
} }
} }
int scale = pointer->current ? pointer->current->scale : 1; int scale = pointer->current ? pointer->current->output_scale : 1;
pointer->cursor_theme = wl_cursor_theme_load( pointer->cursor_theme = wl_cursor_theme_load(
cursor_theme, cursor_size * scale, seat->bar->shm); cursor_theme, cursor_size * scale, seat->bar->shm);
struct wl_cursor *cursor; struct wl_cursor *cursor;

12
swaybar/render.c
View file

@ -764,7 +764,7 @@ void render_frame(struct swaybar_output *output) {
cairo_surface_t *recorder = cairo_recording_surface_create( cairo_surface_t *recorder = cairo_recording_surface_create(
CAIRO_CONTENT_COLOR_ALPHA, NULL); CAIRO_CONTENT_COLOR_ALPHA, NULL);
cairo_t *cairo = cairo_create(recorder); cairo_t *cairo = cairo_create(recorder);
cairo_scale(cairo, output->scale, output->scale); cairo_scale(cairo, output->output_scale, output->output_scale);
cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST); cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
ctx.cairo = cairo; ctx.cairo = cairo;
@ -772,14 +772,14 @@ void render_frame(struct swaybar_output *output) {
cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY); cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_GRAY);
ctx.textaa_safe = fo; ctx.textaa_safe = fo;
if (output->subpixel == WL_OUTPUT_SUBPIXEL_NONE) { if (output->output_subpixel == WL_OUTPUT_SUBPIXEL_NONE) {
ctx.textaa_sharp = ctx.textaa_safe; ctx.textaa_sharp = ctx.textaa_safe;
} else { } else {
fo = cairo_font_options_create(); fo = cairo_font_options_create();
cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL); cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL); cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
cairo_font_options_set_subpixel_order(fo, cairo_font_options_set_subpixel_order(fo,
to_cairo_subpixel_order(output->subpixel)); to_cairo_subpixel_order(output->output_subpixel));
ctx.textaa_sharp = fo; ctx.textaa_sharp = fo;
} }
@ -810,8 +810,8 @@ void render_frame(struct swaybar_output *output) {
// Replay recording into shm and send it off // Replay recording into shm and send it off
output->current_buffer = get_next_buffer(output->bar->shm, output->current_buffer = get_next_buffer(output->bar->shm,
output->buffers, output->buffers,
output->width * output->scale, output->width * output->output_scale,
output->height * output->scale); output->height * output->output_scale);
if (!output->current_buffer) { if (!output->current_buffer) {
cairo_surface_destroy(recorder); cairo_surface_destroy(recorder);
cairo_destroy(cairo); cairo_destroy(cairo);
@ -827,7 +827,7 @@ void render_frame(struct swaybar_output *output) {
cairo_set_source_surface(shm, recorder, 0.0, 0.0); cairo_set_source_surface(shm, recorder, 0.0, 0.0);
cairo_paint(shm); cairo_paint(shm);
wl_surface_set_buffer_scale(output->surface, output->scale); wl_surface_set_buffer_scale(output->surface, output->output_scale);
wl_surface_attach(output->surface, wl_surface_attach(output->surface,
output->current_buffer->buffer, 0, 0); output->current_buffer->buffer, 0, 0);
wl_surface_damage(output->surface, 0, 0, wl_surface_damage(output->surface, 0, 0,

2
swaybar/tray/item.c
View file

@ -454,7 +454,7 @@ static void reload_sni(struct swaybar_sni *sni, char *icon_theme,
uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x, uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
struct swaybar_sni *sni) { struct swaybar_sni *sni) {
uint32_t height = output->height * output->scale; uint32_t height = output->height * output->output_scale;
int padding = output->bar->config->tray_padding; int padding = output->bar->config->tray_padding;
int target_size = height - 2*padding; int target_size = height - 2*padding;
if (target_size != sni->target_size && sni_ready(sni)) { if (target_size != sni->target_size && sni_ready(sni)) {