From 826a0df380a60f2c375caa16d23526f4c48fe8d2 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Sat, 23 Feb 2019 00:35:49 -0800
Subject: [PATCH] add helper for calling from TabHost -> TerminalWindow

---
 src/guiloop/x11.rs   |   4 +-
 src/xwindows/xwin.rs | 110 +++++++++++++------------------------------
 2 files changed, 34 insertions(+), 80 deletions(-)

diff --git a/src/guiloop/x11.rs b/src/guiloop/x11.rs
index 160f2e78a..69a93d0ea 100644
--- a/src/guiloop/x11.rs
+++ b/src/guiloop/x11.rs
@@ -200,10 +200,10 @@ impl GuiEventLoop {
 
     /// Run a function with access to the mutable version of the window with
     /// the specified window id
-    pub fn with_window<F: FnMut(&mut TerminalWindow) -> Result<(), Error>>(
+    pub fn with_window<F: FnOnce(&mut TerminalWindow) -> Result<(), Error>>(
         &self,
         window_id: WindowId,
-        mut func: F,
+        func: F,
     ) -> Result<(), Error> {
         let mut windows = self.windows.borrow_mut();
 
diff --git a/src/xwindows/xwin.rs b/src/xwindows/xwin.rs
index 15670a13f..b305ac39d 100644
--- a/src/xwindows/xwin.rs
+++ b/src/xwindows/xwin.rs
@@ -115,6 +115,23 @@ pub struct TerminalWindow {
     tabs: Tabs,
 }
 
+impl<'a> TabHost<'a> {
+    fn with_window<F: 'static + Fn(&mut TerminalWindow) -> Result<(), Error>>(&self, func: F) {
+        let events = Rc::clone(&self.host.event_loop);
+        let window_id = self.host.window.window.window_id;
+
+        self.host
+            .event_loop
+            .core
+            .spawn(futures::future::poll_fn(move || {
+                events
+                    .with_window(window_id, &func)
+                    .map(futures::Async::Ready)
+                    .map_err(|_| ())
+            }));
+    }
+}
+
 impl<'a> term::TerminalHost for TabHost<'a> {
     fn writer(&mut self) -> &mut Write {
         &mut self.pty
@@ -146,21 +163,10 @@ impl<'a> term::TerminalHost for TabHost<'a> {
     }
 
     fn set_title(&mut self, _title: &str) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| {
-                        win.update_title();
-                        Ok(())
-                    })
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| {
+            win.update_title();
+            Ok(())
+        })
     }
 
     fn new_window(&mut self) {
@@ -196,81 +202,29 @@ impl<'a> term::TerminalHost for TabHost<'a> {
     }
 
     fn activate_tab(&mut self, tab: usize) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| win.activate_tab(tab))
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| win.activate_tab(tab))
     }
 
     fn activate_tab_relative(&mut self, tab: isize) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| win.activate_tab_relative(tab))
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| win.activate_tab_relative(tab))
     }
 
     fn increase_font_size(&mut self) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| {
-                        let scale = win.fonts.get_font_scale();
-                        win.scaling_changed(Some(scale * 1.1))
-                    })
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| {
+            let scale = win.fonts.get_font_scale();
+            win.scaling_changed(Some(scale * 1.1))
+        })
     }
 
     fn decrease_font_size(&mut self) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| {
-                        let scale = win.fonts.get_font_scale();
-                        win.scaling_changed(Some(scale * 0.9))
-                    })
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| {
+            let scale = win.fonts.get_font_scale();
+            win.scaling_changed(Some(scale * 0.9))
+        })
     }
 
     fn reset_font_size(&mut self) {
-        let events = Rc::clone(&self.host.event_loop);
-        let window_id = self.host.window.window.window_id;
-        self.host
-            .event_loop
-            .core
-            .spawn(futures::future::poll_fn(move || {
-                events
-                    .with_window(window_id, |win| win.scaling_changed(Some(1.0)))
-                    .map(futures::Async::Ready)
-                    .map_err(|_| ())
-            }));
+        self.with_window(move |win| win.scaling_changed(Some(1.0)))
     }
 }