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

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,
const char *make, const char *model, int32_t transform) {
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,
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) {
@ -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,
int32_t factor) {
struct swaybar_output *output = data;
output->scale = factor;
output->output_scale = factor;
bool render = false;
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,
struct zxdg_output_v1 *xdg_output, int32_t width, int32_t height) {
// Who cares
struct swaybar_output *output = data;
output->output_height = height;
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,
&wl_output_interface, 3);
wl_output_add_listener(output->output, &output_listener, output);
output->scale = 1;
output->output_scale = 1;
output->wl_name = name;
wl_list_init(&output->workspaces);
wl_list_init(&output->hotspots);