From 88c1dabefc303e2325fa07adb654eb1d6a6c8a0f Mon Sep 17 00:00:00 2001
From: Joe Wilm <joe@jwilm.com>
Date: Fri, 6 Oct 2017 11:32:53 -0700
Subject: Revert "Update glutin & fix a few wayland issues (#815)"

This reverts commit e17d38167e174a2cf664e430fe968ec6492e1f08.

Was breaking builds for mac users.
---
 src/event.rs  |  3 ---
 src/main.rs   |  2 +-
 src/window.rs | 20 --------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/event.rs b/src/event.rs
index 6ec8415a..95685001 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -327,9 +327,6 @@ impl<N: Notify> Processor<N> {
             },
             Event::Awakened => {
                 processor.ctx.terminal.dirty = true;
-            },
-            Event::Suspended(_) => {
-                // Only relevant on mobile devices
             }
         }
     }
diff --git a/src/main.rs b/src/main.rs
index ee774094..ec327009 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -181,7 +181,7 @@ fn run(mut config: Config, options: cli::Options) -> Result<(), Box<Error>> {
             });
 
         // Maybe draw the terminal
-        if terminal.needs_draw() && display.window().drawing_ready() {
+        if terminal.needs_draw() {
             // Try to update the position of the input method editor
             display.update_ime_position(&terminal);
             // Handle pending resize events
diff --git a/src/window.rs b/src/window.rs
index a99b1437..f24def3a 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -256,9 +256,6 @@ impl Window {
 
     #[inline]
     pub fn resize(&self, width: u32, height: u32) {
-        // resize the window
-        self.window.set_inner_size(width, height);
-        // resize the gl context (needed on some platforms)
         self.window.resize(width, height);
     }
 
@@ -334,20 +331,6 @@ impl Window {
     pub fn get_window_id(&self) -> Option<usize> {
         None
     }
-
-    #[cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))]
-    #[inline]
-    pub fn drawing_ready(&self) -> bool {
-        // needed for wayland support while glutin does not manage it itself
-        use glutin::os::unix::WindowExt;
-        self.window.is_ready()
-    }
-
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd")))]
-    #[inline]
-    pub fn drawing_ready(&self) -> bool {
-        true
-    }
 }
 
 pub trait OsExtensions {
@@ -411,9 +394,6 @@ pub trait SetInnerSize<T> {
 impl SetInnerSize<Pixels<u32>> for Window {
     fn set_inner_size<T: ToPoints>(&mut self, size: &T) {
         let size = size.to_points(self.hidpi_factor());
-        // resize the window
         self.window.set_inner_size(*size.width as _, *size.height as _);
-        // resize the gl context (needed on some platforms)
-        self.window.resize(*size.width as _, *size.height as _);
     }
 }
-- 
cgit