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

formatting

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-02-04 21:14:20 +01:00
parent b3780d6f5f
commit 6cbda03d87
4 changed files with 158 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

248
src/backend/kms/drm_helpers.rs
View file

@ -1,26 +1,19 @@
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use anyhow::Result; use anyhow::Result;
use smithay::{ use smithay::reexports::drm::control::{
reexports::drm::control::{ atomic::AtomicModeReq,
AtomicCommitFlags, connector::{self, State as ConnectorState},
Device as ControlDevice, crtc,
ResourceHandle, dumbbuffer::DumbBuffer,
atomic::AtomicModeReq, property, AtomicCommitFlags, Device as ControlDevice, Mode, ModeFlags, ResourceHandle,
crtc,
connector::{
self,
State as ConnectorState,
},
dumbbuffer::DumbBuffer,
property,
Mode,
ModeFlags,
},
}; };
use std::collections::HashMap; use std::collections::HashMap;
pub fn display_configuration(device: &mut impl ControlDevice, supports_atomic: bool) -> Result<HashMap<connector::Handle, crtc::Handle>> { pub fn display_configuration(
device: &mut impl ControlDevice,
supports_atomic: bool,
) -> Result<HashMap<connector::Handle, crtc::Handle>> {
let res_handles = device.resource_handles()?; let res_handles = device.resource_handles()?;
let connectors = res_handles.connectors(); let connectors = res_handles.connectors();
@ -53,7 +46,8 @@ pub fn display_configuration(device: &mut impl ControlDevice, supports_atomic: b
.flat_map(|conn| device.get_connector(*conn).ok()) .flat_map(|conn| device.get_connector(*conn).ok())
.filter(|conn| conn.state() == ConnectorState::Connected) .filter(|conn| conn.state() == ConnectorState::Connected)
.filter(|conn| !map.contains_key(&conn.handle())) .filter(|conn| !map.contains_key(&conn.handle()))
.collect::<Vec<_>>().iter() .collect::<Vec<_>>()
.iter()
{ {
'outer: for encoder_info in conn 'outer: for encoder_info in conn
.encoders() .encoders()
@ -140,7 +134,11 @@ pub fn interface_name(device: &impl ControlDevice, connector: connector::Handle)
} }
}; };
Ok(format!("{}-{}", interface_short_name, conn_info.interface_id())) Ok(format!(
"{}-{}",
interface_short_name,
conn_info.interface_id()
))
} }
pub struct EdidInfo { pub struct EdidInfo {
@ -159,9 +157,7 @@ pub fn edid_info(device: &impl ControlDevice, connector: connector::Handle) -> R
let (ids, vals) = props.as_props_and_values(); let (ids, vals) = props.as_props_and_values();
for (&id, &val) in ids.iter().zip(vals.iter()) { for (&id, &val) in ids.iter().zip(vals.iter()) {
if id == edid_prop { if id == edid_prop {
if let property::Value::Blob(edid_blob) = if let property::Value::Blob(edid_blob) = edid_info.value_type().convert_value(val) {
edid_info.value_type().convert_value(val)
{
let blob = device.get_property_blob(edid_blob)?; let blob = device.get_property_blob(edid_blob)?;
let mut reader = std::io::Cursor::new(blob); let mut reader = std::io::Cursor::new(blob);
if let Some(edid) = edid_parse(&mut reader).ok() { if let Some(edid) = edid_parse(&mut reader).ok() {
@ -170,7 +166,9 @@ pub fn edid_info(device: &impl ControlDevice, connector: connector::Handle) -> R
let code = [id.0, id.1, id.2]; let code = [id.0, id.1, id.2];
get_manufacturer(&code).into() get_manufacturer(&code).into()
}; };
model = if let Some(MonitorDescriptor::MonitorName(name)) = edid.descriptors.0 model = if let Some(MonitorDescriptor::MonitorName(name)) = edid
.descriptors
.0
.iter() .iter()
.find(|x| matches!(x, MonitorDescriptor::MonitorName(_))) .find(|x| matches!(x, MonitorDescriptor::MonitorName(_)))
{ {
@ -190,7 +188,11 @@ pub fn edid_info(device: &impl ControlDevice, connector: connector::Handle) -> R
}) })
} }
pub fn get_prop(device: &impl ControlDevice, handle: impl ResourceHandle, name: &str) -> Result<property::Handle> { pub fn get_prop(
device: &impl ControlDevice,
handle: impl ResourceHandle,
name: &str,
) -> Result<property::Handle> {
let props = device.get_properties(handle)?; let props = device.get_properties(handle)?;
let (prop_handles, _) = props.as_props_and_values(); let (prop_handles, _) = props.as_props_and_values();
for prop in prop_handles { for prop in prop_handles {
@ -202,7 +204,11 @@ pub fn get_prop(device: &impl ControlDevice, handle: impl ResourceHandle, name:
anyhow::bail!("No prop found") anyhow::bail!("No prop found")
} }
pub fn get_property_val(device: &impl ControlDevice, handle: impl ResourceHandle, name: &str) -> Result<(property::ValueType, property::RawValue)> { pub fn get_property_val(
device: &impl ControlDevice,
handle: impl ResourceHandle,
name: &str,
) -> Result<(property::ValueType, property::RawValue)> {
let props = device.get_properties(handle)?; let props = device.get_properties(handle)?;
let (prop_handles, values) = props.as_props_and_values(); let (prop_handles, values) = props.as_props_and_values();
for (&prop, &val) in prop_handles.iter().zip(values.iter()) { for (&prop, &val) in prop_handles.iter().zip(values.iter()) {
@ -216,113 +222,123 @@ pub fn get_property_val(device: &impl ControlDevice, handle: impl ResourceHandle
} }
fn get_manufacturer(vendor: &[char; 3]) -> &'static str { fn get_manufacturer(vendor: &[char; 3]) -> &'static str {
match vendor { match vendor {
['A', 'A', 'A'] => "Avolites Ltd", ['A', 'A', 'A'] => "Avolites Ltd",
['A', 'C', 'I'] => "Ancor Communications Inc", ['A', 'C', 'I'] => "Ancor Communications Inc",
['A', 'C', 'R'] => "Acer Technologies", ['A', 'C', 'R'] => "Acer Technologies",
['A', 'D', 'A'] => "Addi-Data GmbH", ['A', 'D', 'A'] => "Addi-Data GmbH",
['A', 'P', 'P'] => "Apple Computer Inc", ['A', 'P', 'P'] => "Apple Computer Inc",
['A', 'S', 'K'] => "Ask A/S", ['A', 'S', 'K'] => "Ask A/S",
['A', 'V', 'T'] => "Avtek (Electronics) Pty Ltd", ['A', 'V', 'T'] => "Avtek (Electronics) Pty Ltd",
['B', 'N', 'O'] => "Bang & Olufsen", ['B', 'N', 'O'] => "Bang & Olufsen",
['B', 'N', 'Q'] => "BenQ Corporation", ['B', 'N', 'Q'] => "BenQ Corporation",
['C', 'M', 'N'] => "Chimei Innolux Corporation", ['C', 'M', 'N'] => "Chimei Innolux Corporation",
['C', 'M', 'O'] => "Chi Mei Optoelectronics corp.", ['C', 'M', 'O'] => "Chi Mei Optoelectronics corp.",
['C', 'R', 'O'] => "Extraordinary Technologies PTY Limited", ['C', 'R', 'O'] => "Extraordinary Technologies PTY Limited",
['D', 'E', 'L'] => "Dell Inc.", ['D', 'E', 'L'] => "Dell Inc.",
['D', 'G', 'C'] => "Data General Corporation", ['D', 'G', 'C'] => "Data General Corporation",
['D', 'O', 'N'] => "DENON, Ltd.", ['D', 'O', 'N'] => "DENON, Ltd.",
['E', 'N', 'C'] => "Eizo Nanao Corporation", ['E', 'N', 'C'] => "Eizo Nanao Corporation",
['E', 'P', 'H'] => "Epiphan Systems Inc.", ['E', 'P', 'H'] => "Epiphan Systems Inc.",
['E', 'X', 'P'] => "Data Export Corporation", ['E', 'X', 'P'] => "Data Export Corporation",
['F', 'N', 'I'] => "Funai Electric Co., Ltd.", ['F', 'N', 'I'] => "Funai Electric Co., Ltd.",
['F', 'U', 'S'] => "Fujitsu Siemens Computers GmbH", ['F', 'U', 'S'] => "Fujitsu Siemens Computers GmbH",
['G', 'S', 'M'] => "Goldstar Company Ltd", ['G', 'S', 'M'] => "Goldstar Company Ltd",
['H', 'I', 'Q'] => "Kaohsiung Opto Electronics Americas, Inc.", ['H', 'I', 'Q'] => "Kaohsiung Opto Electronics Americas, Inc.",
['H', 'S', 'D'] => "HannStar Display Corp", ['H', 'S', 'D'] => "HannStar Display Corp",
['H', 'T', 'C'] => "Hitachi Ltd", ['H', 'T', 'C'] => "Hitachi Ltd",
['H', 'W', 'P'] => "Hewlett Packard", ['H', 'W', 'P'] => "Hewlett Packard",
['I', 'N', 'T'] => "Interphase Corporation", ['I', 'N', 'T'] => "Interphase Corporation",
['I', 'N', 'X'] => "Communications Supply Corporation (A division of WESCO)", ['I', 'N', 'X'] => "Communications Supply Corporation (A division of WESCO)",
['I', 'T', 'E'] => "Integrated Tech Express Inc", ['I', 'T', 'E'] => "Integrated Tech Express Inc",
['I', 'V', 'M'] => "Iiyama North America", ['I', 'V', 'M'] => "Iiyama North America",
['L', 'E', 'N'] => "Lenovo Group Limited", ['L', 'E', 'N'] => "Lenovo Group Limited",
['M', 'A', 'X'] => "Rogen Tech Distribution Inc", ['M', 'A', 'X'] => "Rogen Tech Distribution Inc",
['M', 'E', 'G'] => "Abeam Tech Ltd", ['M', 'E', 'G'] => "Abeam Tech Ltd",
['M', 'E', 'I'] => "Panasonic Industry Company", ['M', 'E', 'I'] => "Panasonic Industry Company",
['M', 'T', 'C'] => "Mars-Tech Corporation", ['M', 'T', 'C'] => "Mars-Tech Corporation",
['M', 'T', 'X'] => "Matrox", ['M', 'T', 'X'] => "Matrox",
['N', 'E', 'C'] => "NEC Corporation", ['N', 'E', 'C'] => "NEC Corporation",
['N', 'E', 'X'] => "Nexgen Mediatech Inc.", ['N', 'E', 'X'] => "Nexgen Mediatech Inc.",
['O', 'N', 'K'] => "ONKYO Corporation", ['O', 'N', 'K'] => "ONKYO Corporation",
['O', 'R', 'N'] => "ORION ELECTRIC CO., LTD.", ['O', 'R', 'N'] => "ORION ELECTRIC CO., LTD.",
['O', 'T', 'M'] => "Optoma Corporation", ['O', 'T', 'M'] => "Optoma Corporation",
['O', 'V', 'R'] => "Oculus VR, Inc.", ['O', 'V', 'R'] => "Oculus VR, Inc.",
['P', 'H', 'L'] => "Philips Consumer Electronics Company", ['P', 'H', 'L'] => "Philips Consumer Electronics Company",
['P', 'I', 'O'] => "Pioneer Electronic Corporation", ['P', 'I', 'O'] => "Pioneer Electronic Corporation",
['P', 'N', 'R'] => "Planar Systems, Inc.", ['P', 'N', 'R'] => "Planar Systems, Inc.",
['Q', 'D', 'S'] => "Quanta Display Inc.", ['Q', 'D', 'S'] => "Quanta Display Inc.",
['R', 'A', 'T'] => "Rent-A-Tech", ['R', 'A', 'T'] => "Rent-A-Tech",
['R', 'E', 'N'] => "Renesas Technology Corp.", ['R', 'E', 'N'] => "Renesas Technology Corp.",
['S', 'A', 'M'] => "Samsung Electric Company", ['S', 'A', 'M'] => "Samsung Electric Company",
['S', 'A', 'N'] => "Sanyo Electric Co., Ltd.", ['S', 'A', 'N'] => "Sanyo Electric Co., Ltd.",
['S', 'E', 'C'] => "Seiko Epson Corporation", ['S', 'E', 'C'] => "Seiko Epson Corporation",
['S', 'H', 'P'] => "Sharp Corporation", ['S', 'H', 'P'] => "Sharp Corporation",
['S', 'I', 'I'] => "Silicon Image, Inc.", ['S', 'I', 'I'] => "Silicon Image, Inc.",
['S', 'N', 'Y'] => "Sony", ['S', 'N', 'Y'] => "Sony",
['S', 'T', 'D'] => "STD Computer Inc", ['S', 'T', 'D'] => "STD Computer Inc",
['S', 'V', 'S'] => "SVSI", ['S', 'V', 'S'] => "SVSI",
['S', 'Y', 'N'] => "Synaptics Inc", ['S', 'Y', 'N'] => "Synaptics Inc",
['T', 'C', 'L'] => "Technical Concepts Ltd", ['T', 'C', 'L'] => "Technical Concepts Ltd",
['T', 'O', 'P'] => "Orion Communications Co., Ltd.", ['T', 'O', 'P'] => "Orion Communications Co., Ltd.",
['T', 'S', 'B'] => "Toshiba America Info Systems Inc", ['T', 'S', 'B'] => "Toshiba America Info Systems Inc",
['T', 'S', 'T'] => "Transtream Inc", ['T', 'S', 'T'] => "Transtream Inc",
['U', 'N', 'K'] => "Unknown", ['U', 'N', 'K'] => "Unknown",
['V', 'E', 'S'] => "Vestel Elektronik Sanayi ve Ticaret A. S.", ['V', 'E', 'S'] => "Vestel Elektronik Sanayi ve Ticaret A. S.",
['V', 'I', 'T'] => "Visitech AS", ['V', 'I', 'T'] => "Visitech AS",
['V', 'I', 'Z'] => "VIZIO, Inc", ['V', 'I', 'Z'] => "VIZIO, Inc",
['V', 'S', 'C'] => "ViewSonic Corporation", ['V', 'S', 'C'] => "ViewSonic Corporation",
['Y', 'M', 'H'] => "Yamaha Corporation", ['Y', 'M', 'H'] => "Yamaha Corporation",
_ => "Unknown", _ => "Unknown",
} }
} }
pub fn calculate_refresh_rate(mode: Mode) -> u32 { pub fn calculate_refresh_rate(mode: Mode) -> u32 {
let htotal = mode.hsync().2 as u32; let htotal = mode.hsync().2 as u32;
let vtotal = mode.vsync().2 as u32; let vtotal = mode.vsync().2 as u32;
let mut refresh = (mode.clock() as u64 * 1000000_u64 / htotal as u64 + let mut refresh =
vtotal as u64 / 2) / vtotal as u64; (mode.clock() as u64 * 1000000_u64 / htotal as u64 + vtotal as u64 / 2) / vtotal as u64;
if mode.flags().contains(ModeFlags::INTERLACE) { if mode.flags().contains(ModeFlags::INTERLACE) {
refresh *= 2; refresh *= 2;
} }
if mode.flags().contains(ModeFlags::DBLSCAN) { if mode.flags().contains(ModeFlags::DBLSCAN) {
refresh /= 2; refresh /= 2;
} }
if mode.vscan() > 1 { if mode.vscan() > 1 {
refresh /= mode.vscan() as u64; refresh /= mode.vscan() as u64;
} }
refresh as u32 refresh as u32
} }
pub fn supports_vrr(dev: &impl ControlDevice, conn: connector::Handle) -> Result<bool> { pub fn supports_vrr(dev: &impl ControlDevice, conn: connector::Handle) -> Result<bool> {
get_property_val(dev, conn, "vrr_capable") get_property_val(dev, conn, "vrr_capable").map(|(val_type, val)| {
.map(|(val_type, val)| match val_type.convert_value(val) { match val_type.convert_value(val) {
property::Value::UnsignedRange(res) => res == 1, property::Value::UnsignedRange(res) => res == 1,
_ => false, _ => false,
}) }
})
} }
pub fn set_vrr(dev: &impl ControlDevice, crtc: crtc::Handle, conn: connector::Handle, vrr: bool) -> Result<bool> { pub fn set_vrr(
dev: &impl ControlDevice,
crtc: crtc::Handle,
conn: connector::Handle,
vrr: bool,
) -> Result<bool> {
if supports_vrr(dev, conn)? { if supports_vrr(dev, conn)? {
dev.set_property(conn, get_prop(dev, crtc, "VRR_ENABLED")?, property::Value::UnsignedRange(if vrr { 1 } else { 0 }).into()) dev.set_property(
.map_err(Into::<anyhow::Error>::into) conn,
.and_then(|_| get_property_val(dev, crtc, "VRR_ENABLED")) get_prop(dev, crtc, "VRR_ENABLED")?,
.map(|(val_type, val)| match val_type.convert_value(val) { property::Value::UnsignedRange(if vrr { 1 } else { 0 }).into(),
property::Value::UnsignedRange(vrr) => vrr == 1, )
_ => false, .map_err(Into::<anyhow::Error>::into)
}) .and_then(|_| get_property_val(dev, crtc, "VRR_ENABLED"))
.map(|(val_type, val)| match val_type.convert_value(val) {
property::Value::UnsignedRange(vrr) => vrr == 1,
_ => false,
})
} else { } else {
Ok(false) Ok(false)
} }

6
src/backend/kms/session_fd.rs
View file

@ -1,9 +1,9 @@
use smithay::reexports::nix::unistd::close;
use std::{ use std::{
fmt, fmt,
os::unix::io::{AsRawFd, RawFd},
rc::Rc, rc::Rc,
os::unix::io::{RawFd, AsRawFd},
}; };
use smithay::reexports::nix::unistd::close;
#[derive(Clone)] #[derive(Clone)]
pub struct SessionFd(Rc<DropFd>); pub struct SessionFd(Rc<DropFd>);
@ -31,7 +31,7 @@ impl AsRawFd for SessionFd {
impl Drop for DropFd { impl Drop for DropFd {
fn drop(&mut self) { fn drop(&mut self) {
if let Err(err) = close(self.0) { if let Err(err) = close(self.0) {
slog_scope::warn!("Failed to close file descriptor {}", self.0); slog_scope::warn!("Failed to close file descriptor {}: {}", self.0, err);
} }
} }
} }

3
src/shell/mod.rs
View file

@ -335,7 +335,8 @@ fn check_grab_preconditions(
fn commit(surface: &WlSurface, state: &mut State) { fn commit(surface: &WlSurface, state: &mut State) {
// TODO figure out which output the surface is on. // TODO figure out which output the surface is on.
for output in state.common.spaces.outputs() {//.cloned().collect::<Vec<_>>().into_iter() { for output in state.common.spaces.outputs() {
//.cloned().collect::<Vec<_>>().into_iter() {
state.backend.schedule_render(output); state.backend.schedule_render(output);
// let space = state.common.spaces.active_space(output); // let space = state.common.spaces.active_space(output);
// get output for surface // get output for surface

28
src/state.rs
View file

@ -7,10 +7,7 @@ use crate::{
use smithay::{ use smithay::{
reexports::{ reexports::{
calloop::LoopHandle, calloop::LoopHandle,
wayland_server::{ wayland_server::{protocol::wl_surface::WlSurface, Display},
Display,
protocol::wl_surface::WlSurface,
},
}, },
wayland::{ wayland::{
data_device::{default_action_chooser, init_data_device, DataDeviceEvent}, data_device::{default_action_chooser, init_data_device, DataDeviceEvent},
@ -103,7 +100,7 @@ impl BackendData {
pub fn schedule_render(&mut self, output: &Output) { pub fn schedule_render(&mut self, output: &Output) {
match self { match self {
BackendData::Winit(_) => {}, // We cannot do this on the winit backend. BackendData::Winit(_) => {} // We cannot do this on the winit backend.
// Winit has a very strict render-loop and skipping frames breaks atleast the wayland winit-backend. // Winit has a very strict render-loop and skipping frames breaks atleast the wayland winit-backend.
// Swapping with damage (which should be empty on these frames) is likely good enough anyway. // Swapping with damage (which should be empty on these frames) is likely good enough anyway.
BackendData::X11(ref mut state) => state.schedule_render(output), BackendData::X11(ref mut state) => state.schedule_render(output),
@ -119,7 +116,9 @@ struct DnDIcon {
pub fn get_dnd_icon(seat: &Seat) -> Option<WlSurface> { pub fn get_dnd_icon(seat: &Seat) -> Option<WlSurface> {
let userdata = seat.user_data(); let userdata = seat.user_data();
userdata.get::<DnDIcon>().and_then(|x| x.surface.borrow().clone()) userdata
.get::<DnDIcon>()
.and_then(|x| x.surface.borrow().clone())
} }
impl State { impl State {
@ -133,13 +132,20 @@ impl State {
|dnd_event| match dnd_event { |dnd_event| match dnd_event {
DataDeviceEvent::DnDStarted { icon, seat, .. } => { DataDeviceEvent::DnDStarted { icon, seat, .. } => {
let user_data = seat.user_data(); let user_data = seat.user_data();
user_data.insert_if_missing(|| DnDIcon { surface: RefCell::new(None) }); user_data.insert_if_missing(|| DnDIcon {
surface: RefCell::new(None),
});
*user_data.get::<DnDIcon>().unwrap().surface.borrow_mut() = icon; *user_data.get::<DnDIcon>().unwrap().surface.borrow_mut() = icon;
}, }
DataDeviceEvent::DnDDropped { seat } => { DataDeviceEvent::DnDDropped { seat } => {
seat.user_data().get::<DnDIcon>().unwrap().surface.borrow_mut().take(); seat.user_data()
}, .get::<DnDIcon>()
_ => {}, .unwrap()
.surface
.borrow_mut()
.take();
}
_ => {}
}, },
default_action_chooser, default_action_chooser,
None, None,