Merge branch 'master' into update-keyboard-events

Author: micahrj

src/gl/x11.rs

@@ -241,5 +241,9 @@ impl GlContext {
 }
 
 impl Drop for GlContext {
-    fn drop(&mut self) {}
+    fn drop(&mut self) {
+        unsafe {
+            glx::glXDestroyContext(self.display, self.context);
+        }
+    }
 }

src/x11/event_loop.rs

@@ -108,10 +108,6 @@ impl EventLoop {
 
             // Check if the parents's handle was dropped (such as when the host
             // requested the window to close)
-            //
-            // FIXME: This will need to be changed from just setting an atomic to somehow
-            // synchronizing with the window being closed (using a synchronous channel, or
-            // by joining on the event loop thread).
             if let Some(parent_handle) = &self.parent_handle {
                 if parent_handle.parent_did_drop() {
                     self.handle_must_close();

src/x11/keyboard.rs

@@ -370,9 +370,9 @@ pub(super) fn key_mods(mods: KeyButMask) -> Modifiers {
         // X11's mod keys are configurable, but this seems
         // like a reasonable default for US keyboards, at least,
         // where the "windows" key seems to be MOD_MASK_4.
-        (KeyButMask::BUTTON1, Modifiers::ALT),
-        (KeyButMask::BUTTON2, Modifiers::NUM_LOCK),
-        (KeyButMask::BUTTON4, Modifiers::META),
+        (KeyButMask::MOD1, Modifiers::ALT),
+        (KeyButMask::MOD2, Modifiers::NUM_LOCK),
+        (KeyButMask::MOD4, Modifiers::META),
         (KeyButMask::LOCK, Modifiers::CAPS_LOCK),
     ];
     for (mask, modifiers) in &key_masks {

src/x11/window.rs

@@ -4,7 +4,7 @@ use std::ffi::c_void;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc;
 use std::sync::Arc;
-use std::thread;
+use std::thread::{self, JoinHandle};
 
 use raw_window_handle::{
     HasRawDisplayHandle, HasRawWindowHandle, RawDisplayHandle, RawWindowHandle, XlibDisplayHandle,
@@ -31,18 +31,16 @@ use crate::x11::visual_info::WindowVisualConfig;
 
 pub struct WindowHandle {
     raw_window_handle: Option<RawWindowHandle>,
+    event_loop_handle: Option<JoinHandle<()>>,
     close_requested: Arc<AtomicBool>,
     is_open: Arc<AtomicBool>,
 }
 
 impl WindowHandle {
     pub fn close(&mut self) {
-        if self.raw_window_handle.take().is_some() {
-            // FIXME: This will need to be changed from just setting an atomic to somehow
-            // synchronizing with the window being closed (using a synchronous channel, or
-            // by joining on the event loop thread).
-
-            self.close_requested.store(true, Ordering::Relaxed);
+        self.close_requested.store(true, Ordering::Relaxed);
+        if let Some(event_loop) = self.event_loop_handle.take() {
+            let _ = event_loop.join();
         }
     }
 
@@ -72,9 +70,9 @@ impl ParentHandle {
     pub fn new() -> (Self, WindowHandle) {
         let close_requested = Arc::new(AtomicBool::new(false));
         let is_open = Arc::new(AtomicBool::new(true));
-
         let handle = WindowHandle {
             raw_window_handle: None,
+            event_loop_handle: None,
             close_requested: Arc::clone(&close_requested),
             is_open: Arc::clone(&is_open),
         };
@@ -94,16 +92,17 @@ impl Drop for ParentHandle {
 }
 
 pub(crate) struct WindowInner {
+    // GlContext should be dropped **before** XcbConnection is dropped
+    #[cfg(feature = "opengl")]
+    gl_context: Option<GlContext>,
+
     pub(crate) xcb_connection: XcbConnection,
     window_id: XWindow,
     pub(crate) window_info: WindowInfo,
     visual_id: Visualid,
     mouse_cursor: Cell<MouseCursor>,
 
     pub(crate) close_requested: Cell<bool>,
-
-    #[cfg(feature = "opengl")]
-    gl_context: Option<GlContext>,
 }
 
 pub struct Window<'a> {
@@ -133,17 +132,15 @@ impl<'a> Window<'a> {
         };
 
         let (tx, rx) = mpsc::sync_channel::<WindowOpenResult>(1);
-
         let (parent_handle, mut window_handle) = ParentHandle::new();
-
-        thread::spawn(move || {
+        let join_handle = thread::spawn(move || {
             Self::window_thread(Some(parent_id), options, build, tx.clone(), Some(parent_handle))
                 .unwrap();
         });
 
         let raw_window_handle = rx.recv().unwrap().unwrap();
         window_handle.raw_window_handle = Some(raw_window_handle.0);
-
+        window_handle.event_loop_handle = Some(join_handle);
         window_handle
     }