leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windowed: Fully initialize fake wl_output

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-07-06 23:33:40 +02:00
parent bbe5af64c9
commit ae33728a4e
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/backend/winit.rs
View file

@ -21,7 +21,7 @@ use smithay::{
DisplayHandle, DisplayHandle,
}, },
}, },
wayland::output::{Mode, Output, PhysicalProperties}, wayland::output::{Mode, Output, PhysicalProperties, Scale},
}; };
use std::cell::RefCell; use std::cell::RefCell;
@ -136,13 +136,14 @@ pub fn init_backend(
}; };
let output = Output::new(name, props, None); let output = Output::new(name, props, None);
let _global = output.create_global::<State>(dh); let _global = output.create_global::<State>(dh);
output.add_mode(mode);
output.set_preferred(mode);
output.change_current_state( output.change_current_state(
Some(mode), Some(mode),
Some(Transform::Flipped180), Some(Transform::Flipped180),
None, Some(Scale::Integer(1)),
Some((0, 0).into()), Some((0, 0).into()),
); );
output.set_preferred(mode);
output.user_data().insert_if_missing(|| { output.user_data().insert_if_missing(|| {
RefCell::new(OutputConfig { RefCell::new(OutputConfig {
mode: ( mode: (

15
src/backend/x11.rs
View file

@ -20,9 +20,12 @@ use smithay::{
reexports::{ reexports::{
calloop::{ping, EventLoop, LoopHandle}, calloop::{ping, EventLoop, LoopHandle},
gbm::{Device as GbmDevice, FdWrapper}, gbm::{Device as GbmDevice, FdWrapper},
wayland_server::{protocol::wl_output::Subpixel, DisplayHandle}, wayland_server::{
protocol::wl_output::{Subpixel, Transform},
DisplayHandle,
},
}, },
wayland::output::{Mode, Output, PhysicalProperties}, wayland::output::{Mode, Output, PhysicalProperties, Scale},
}; };
use std::{ use std::{
cell::RefCell, cell::RefCell,
@ -73,8 +76,14 @@ impl X11State {
refresh: 60_000, refresh: 60_000,
}; };
let output = Output::new(name, props, None); let output = Output::new(name, props, None);
output.change_current_state(Some(mode), None, None, Some((0, 0).into())); output.add_mode(mode);
output.set_preferred(mode); output.set_preferred(mode);
output.change_current_state(
Some(mode),
Some(Transform::Normal),
Some(Scale::Integer(1)),
Some((0, 0).into()),
);
output.user_data().insert_if_missing(|| { output.user_data().insert_if_missing(|| {
RefCell::new(OutputConfig { RefCell::new(OutputConfig {
mode: ((size.w as i32, size.h as i32), None), mode: ((size.w as i32, size.h as i32), None),