From d69354eedb0b25767293b7aac9ab32def01005f3 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Mon, 4 Oct 2021 07:18:56 -0700 Subject: checkin(wm) --- sys/cmd/wm/output.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'sys/cmd/wm/output.c') diff --git a/sys/cmd/wm/output.c b/sys/cmd/wm/output.c index 910f57b..1474a5f 100644 --- a/sys/cmd/wm/output.c +++ b/sys/cmd/wm/output.c @@ -70,7 +70,7 @@ render_clients(Monitor *monitor, struct timespec *now) surface = client->xdg->surface; - x = client->geo.x, y = client->geo.y; + x = client->geometry.x, y = client->geometry.y; wlr_output_layout_output_coords(server.monitor.layout, output, &x, &y); if((bw=client->border)) { @@ -95,8 +95,8 @@ render_clients(Monitor *monitor, struct timespec *now) .client = client, .when = now, - .x = client->geo.x + client->border, - .y = client->geo.y + client->border, + .x = client->geometry.x + client->border, + .y = client->geometry.y + client->border, }; wlr_xdg_surface_for_each_surface(client->xdg, render, &payload); @@ -115,13 +115,11 @@ render_monitor(struct wl_listener *l, void *data) clock_gettime(CLOCK_MONOTONIC, &now); monitor = wl_container_of(l, monitor, event.render); - /* wl_list_for_each(client, &server.client.list, link) { if(client->resize) { wlr_surface_send_frame_done(client->xdg->surface, &now); } } - */ if(!wlr_output_attach_render(monitor->output, nil)) return; @@ -193,7 +191,7 @@ make_monitor(struct wl_listener *l, void *data) wlr_output_set_scale(output, rule->scale); wlr_xcursor_manager_load(server.cursor.manager, rule->scale); - monitor->layout[0] = monitor->layout[1] = rule->layout; + monitor->layouts[0] = monitor->layouts[1] = monitor->layout = rule->layout; wlr_output_set_transform(output, rule->transform); break; @@ -223,9 +221,14 @@ make_monitor(struct wl_listener *l, void *data) /* first monitor in the list = most recently added */ wl_list_for_each(client, &server.client.list, link) { if(client->isfloating) - resize(client, client->geo.x+monitor->window.width, client->geo.y, - client->geo.width, client->geo.height, 0); + resize(client, client->geometry.x+monitor->window.width, client->geometry.y, + client->geometry.width, client->geometry.height, 0); } return; } } + +void +layout_change(struct wl_listener *l, void *data) +{ +} -- cgit v1.2.1