wayland: disable use of wlr-output-management protocol

refs: #2297 refs: #2293 refs: #2360
wez · Aug 7, 2022 · e2bf468 · e2bf468
1 parent e443593
commit e2bf468
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/config/src/config.rs b/config/src/config.rs
@@ -371,6 +371,8 @@ pub struct Config {
     /// The default is true.
     #[dynamic(default = "default_true")]
     pub enable_wayland: bool,
+    #[dynamic(default)]
+    pub enable_zwlr_output_manager: bool,
 
     /// Whether to prefer EGL over other GL implementations.
     /// EGL on Windows has jankier resize behavior than WGL (which

diff --git a/window/src/os/wayland/output.rs b/window/src/os/wayland/output.rs
@@ -64,7 +64,7 @@ impl Inner {
         _ddata: DispatchData,
         _inner: &Arc<Mutex<Self>>,
     ) {
-        log::debug!("{event:?}");
+        log::debug!("handle_zwlr_mode_event {event:?}");
         let id = wl_id(mode.detach());
         let mut info = self.zwlr_mode_info.entry(id).or_insert_with(|| ModeInfo {
             id,
@@ -98,7 +98,7 @@ impl Inner {
         _ddata: DispatchData,
         inner: &Arc<Mutex<Self>>,
     ) {
-        log::debug!("{event:?}");
+        log::debug!("handle_zwlr_head_event {event:?}");
         let id = wl_id(head.detach());
         let mut info = self.zwlr_head_info.entry(id).or_insert_with(|| HeadInfo {
             id,
@@ -155,6 +155,7 @@ impl Inner {
             }
             ZwlrOutputHeadEvent::Finished => {
                 drop(info);
+                log::debug!("remove head with id {id}");
                 self.zwlr_heads.remove(&id);
                 self.zwlr_head_info.remove(&id);
             }
@@ -170,7 +171,7 @@ impl Inner {
         _ddata: DispatchData,
         inner: &Arc<Mutex<Self>>,
     ) {
-        log::debug!("{event:?}");
+        log::debug!("handle_zwlr_output_event {event:?}");
         match event {
             ZwlrOutputEvent::Head { head } => {
                 let inner = Arc::clone(inner);
@@ -271,6 +272,9 @@ impl GlobalHandler<ZwlrOutputManagerV1> for OutputHandler {
         version: u32,
         _ddata: DispatchData,
     ) {
+        if !config::configuration().enable_zwlr_output_manager {
+            return;
+        }
         log::debug!("created ZwlrOutputManagerV1 {id} {version}");
         let zwlr = registry.bind::<ZwlrOutputManagerV1>(2, id);