entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

autocommit 2022-03-13 23:16:26 CET

Browse source
This commit is contained in:
Julian Orth 2022-03-13 23:16:26 +01:00
parent a15a02a95c
commit 18806a38fb
13 changed files with 77 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/backends/metal.rs
View file

@ -15,7 +15,7 @@ use crate::udev::{UdevError, UdevMonitor};
use crate::utils::copyhashmap::CopyHashMap;
use crate::utils::oserror::OsError;
use crate::utils::syncqueue::SyncQueue;
use crate::{AsyncError, CloneCell, RenderError, State, Udev};
use crate::{AsyncError, CloneCell, ErrorFmt, RenderError, State, Udev};
use std::cell::{Cell, RefCell};
use std::ffi::{CStr, CString};
use std::future::pending;
@ -96,7 +96,15 @@ struct MetalBackend {
drm_ids: DrmIds,
}
impl Backend for MetalBackend {}
impl Backend for MetalBackend {
fn switch_to(&self, vtnr: u32) {
self.session.switch_to(vtnr, move |res| {
if let Err(e) = res {
log::error!("Could not switch to VT {}: {}", vtnr, ErrorFmt(e));
}
})
}
}
async fn run_(state: Rc<State>) -> Result<(), MetalError> {
let socket = match state.dbus.system() {
@ -160,6 +168,7 @@ async fn run_(state: Rc<State>) -> Result<(), MetalError> {
if let Err(e) = metal.enumerate_devices() {
return Err(MetalError::Enumerate(Box::new(e)));
}
state.backend.set(Some(metal.clone()));
pending().await
}

6
src/backends/xorg.rs
View file

@ -220,7 +220,11 @@ pub struct XorgBackend {
b: Cell<f32>,
}
impl Backend for XorgBackend {}
impl Backend for XorgBackend {
fn switch_to(&self, _vtnr: u32) {
log::error!("Xorg backend cannot switch vts");
}
}
fn get_drm(con: &XcbCon) -> Result<Drm, XorgBackendError> {
unsafe {