aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/tty.rs5
-rw-r--r--src/backend/winit.rs18
2 files changed, 4 insertions, 19 deletions
diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index 4d2afef7..f8044a9c 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -28,7 +28,7 @@ use smithay::backend::session::libseat::LibSeatSession;
use smithay::backend::session::{Event as SessionEvent, Session};
use smithay::backend::udev::{self, UdevBackend, UdevEvent};
use smithay::desktop::utils::OutputPresentationFeedback;
-use smithay::output::{Mode, Output, OutputModeSource, PhysicalProperties, Scale, Subpixel};
+use smithay::output::{Mode, Output, OutputModeSource, PhysicalProperties, Subpixel};
use smithay::reexports::calloop::timer::{TimeoutAction, Timer};
use smithay::reexports::calloop::{Dispatcher, LoopHandle, RegistrationToken};
use smithay::reexports::drm::control::{
@@ -712,8 +712,7 @@ impl Tty {
);
let wl_mode = Mode::from(*mode);
- let scale = config.scale.clamp(1., 10.).ceil() as i32;
- output.change_current_state(Some(wl_mode), None, Some(Scale::Integer(scale)), None);
+ output.change_current_state(Some(wl_mode), None, None, None);
output.set_preferred(wl_mode);
output
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index af09a487..56ea0d43 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -11,7 +11,7 @@ use smithay::backend::renderer::damage::OutputDamageTracker;
use smithay::backend::renderer::gles::GlesRenderer;
use smithay::backend::renderer::{DebugFlags, ImportDma, ImportEgl, Renderer};
use smithay::backend::winit::{self, WinitEvent, WinitGraphicsBackend};
-use smithay::output::{Mode, Output, PhysicalProperties, Scale, Subpixel};
+use smithay::output::{Mode, Output, PhysicalProperties, Subpixel};
use smithay::reexports::calloop::LoopHandle;
use smithay::reexports::wayland_protocols::wp::presentation_time::server::wp_presentation_feedback;
use smithay::reexports::winit::dpi::LogicalSize;
@@ -39,14 +39,6 @@ impl Winit {
.with_title("niri");
let (backend, winit) = winit::init_from_builder(builder).unwrap();
- let output_config = config
- .borrow()
- .outputs
- .iter()
- .find(|o| o.name == "winit")
- .cloned()
- .unwrap_or_default();
-
let output = Output::new(
"winit".to_string(),
PhysicalProperties {
@@ -61,13 +53,7 @@ impl Winit {
size: backend.window_size(),
refresh: 60_000,
};
- let scale = output_config.scale.clamp(1., 10.).ceil() as i32;
- output.change_current_state(
- Some(mode),
- Some(Transform::Flipped180),
- Some(Scale::Integer(scale)),
- None,
- );
+ output.change_current_state(Some(mode), Some(Transform::Flipped180), None, None);
output.set_preferred(mode);
let connectors = Arc::new(Mutex::new(HashMap::from([(