Make the Port an option to allow for stealing

src/lib/lib.rs

@@ -650,6 +650,7 @@ impl WindowMode {
 }
 
 /// A group of key modifiers
+#[deriving(Clone)]
 pub struct Modifiers {
     values: c_int,
 }
@@ -693,6 +694,7 @@ impl fmt::Show for Modifiers {
 
 pub type Scancode = c_int;
 
+#[deriving(Clone)]
 pub enum WindowEvent {
     PosEvent(i32, i32),
     SizeEvent(i32, i32),
@@ -735,7 +737,7 @@ impl<'a> Iterator<(f64, WindowEvent)> for FlushedWindowEvents<'a> {
 /// A struct that wraps a `*GLFWwindow` handle.
 pub struct Window {
     ptr: *ffi::GLFWwindow,
-    event_port: Port<(f64, WindowEvent)>,
+    event_port: Option<Port<(f64, WindowEvent)>>,
     is_shared: bool,
 }
 
@@ -780,7 +782,7 @@ impl Window {
             unsafe { ffi::glfwSetWindowUserPointer(ptr, cast::transmute(~chan)); }
             Some(Window {
                 ptr: ptr,
-                event_port: port,
+                event_port: Some(port),
                 is_shared: share.is_none(),
             })
         }
@@ -791,11 +793,11 @@ impl Window {
     }
 
     pub fn events<'a>(&'a self) -> WindowEvents<'a> {
-        WindowEvents { event_port: &'a self.event_port }
+        WindowEvents { event_port: self.event_port.as_ref().unwrap() }
     }
 
     pub fn flush_events<'a>(&'a self) -> FlushedWindowEvents<'a> {
-        FlushedWindowEvents { event_port: &'a self.event_port }
+        FlushedWindowEvents { event_port: self.event_port.as_ref().unwrap() }
     }
 
     /// Wrapper for `glfwWindowShouldClose`.