mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: add enable and disable functions

Browse source 
These will allow different patterns of multimonitor behaviour. In a
followup commit, we will introduce a behaviour where only the last
connected output is in use.
This commit is contained in:
Jente Hidskes 2020-05-31 15:31:16 +02:00
parent 4e96d913fb
commit f4b63cd6b8
1 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

56
output.c
View file

@ -239,6 +239,37 @@ scan_out_primary_view(struct cg_output *output)
return wlr_output_commit(wlr_output); return wlr_output_commit(wlr_output);
} }
static void
output_enable(struct cg_output *output)
{
struct wlr_output *wlr_output = output->wlr_output;
/* Outputs get enabled by the backend before firing the new_output event,
* so we can't do a check for already enabled outputs here unless we
* duplicate the enabled property in cg_output. */
wlr_log(WLR_DEBUG, "Enabling output %s", wlr_output->name);
wlr_output_layout_add_auto(output->server->output_layout, wlr_output);
wlr_output_enable(wlr_output, true);
wlr_output_commit(wlr_output);
}
static void
output_disable(struct cg_output *output)
{
struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_output->enabled) {
wlr_log(WLR_DEBUG, "Not disabling already disabled output %s", wlr_output->name);
return;
}
wlr_log(WLR_DEBUG, "Disabling output %s", wlr_output->name);
wlr_output_enable(wlr_output, false);
wlr_output_layout_remove(output->server->output_layout, wlr_output);
wlr_output_commit(wlr_output);
}
static void static void
damage_surface_iterator(struct cg_output *output, struct wlr_surface *surface, struct wlr_box *box, void *user_data) damage_surface_iterator(struct cg_output *output, struct wlr_surface *surface, struct wlr_box *box, void *user_data)
{ {
@ -270,6 +301,11 @@ damage_surface_iterator(struct cg_output *output, struct wlr_surface *surface, s
void void
output_damage_surface(struct cg_output *output, struct wlr_surface *surface, double lx, double ly, bool whole) output_damage_surface(struct cg_output *output, struct wlr_surface *surface, double lx, double ly, bool whole)
{ {
if (!output->wlr_output->enabled) {
wlr_log(WLR_DEBUG, "Not adding damage for disabled output %s", output->wlr_output->name);
return;
}
double ox = lx, oy = ly; double ox = lx, oy = ly;
wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &ox, &oy); wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &ox, &oy);
output_surface_for_each_surface(output, surface, ox, oy, damage_surface_iterator, &whole); output_surface_for_each_surface(output, surface, ox, oy, damage_surface_iterator, &whole);
@ -427,23 +463,20 @@ handle_new_output(struct wl_listener *listener, void *data)
if (preferred_mode) { if (preferred_mode) {
wlr_output_set_mode(wlr_output, preferred_mode); wlr_output_set_mode(wlr_output, preferred_mode);
} }
wlr_output_set_transform(wlr_output, server->output_transform); wlr_output_set_transform(wlr_output, output->server->output_transform);
wlr_output_layout_add_auto(server->output_layout, wlr_output);
struct cg_view *view;
wl_list_for_each (view, &output->server->views, link) {
view_position(view);
}
if (wlr_xcursor_manager_load(server->seat->xcursor_manager, wlr_output->scale)) { if (wlr_xcursor_manager_load(server->seat->xcursor_manager, wlr_output->scale)) {
wlr_log(WLR_ERROR, "Cannot load XCursor theme for output '%s' with scale %f", wlr_output->name, wlr_log(WLR_ERROR, "Cannot load XCursor theme for output '%s' with scale %f", wlr_output->name,
wlr_output->scale); wlr_output->scale);
} }
wlr_output_enable(wlr_output, true); output_enable(output);
wlr_output_commit(wlr_output);
wlr_output_damage_add_whole(output->damage); struct cg_view *view;
wl_list_for_each (view, &output->server->views, link) {
view_position(view);
}
} }
void void
@ -451,6 +484,11 @@ output_set_window_title(struct cg_output *output, const char *title)
{ {
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_output->enabled) {
wlr_log(WLR_DEBUG, "Not setting window title for disabled output %s", wlr_output->name);
return;
}
if (wlr_output_is_wl(wlr_output)) { if (wlr_output_is_wl(wlr_output)) {
wlr_wl_output_set_title(wlr_output, title); wlr_wl_output_set_title(wlr_output, title);
#if WLR_HAS_X11_BACKEND #if WLR_HAS_X11_BACKEND