aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-06-09 20:44:23 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-06-09 20:44:23 +0200
commita0e29d9410181368eee1e0b6db1bbbf11abf45f8 (patch)
tree955541b0cf9aca4434bb66edcddd41d2aa7f7124 /src/api
parentaf725563d142b8fe62e646ceb018ff283e27f8e8 (diff)
parent30c525a5b1cead4c1a435411af18e567d43f545a (diff)
downloadglutin-a0e29d9410181368eee1e0b6db1bbbf11abf45f8.tar.gz
glutin-a0e29d9410181368eee1e0b6db1bbbf11abf45f8.zip
Merge pull request #480 from tomaka/leaking-colormap
Fix leaking color map and destruction of IM
Diffstat (limited to 'src/api')
-rw-r--r--src/api/x11/window.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index 42134d0..8b74e77 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -43,6 +43,7 @@ pub struct XWindow {
xf86_desk_mode: *mut ffi::XF86VidModeModeInfo,
ic: ffi::XIC,
im: ffi::XIM,
+ colormap: ffi::Colormap,
}
pub enum Context {
@@ -64,6 +65,8 @@ impl Drop for XWindow {
// is still the current one
self.context = Context::None;
+ let _lock = GLOBAL_XOPENIM_LOCK.lock().unwrap();
+
if self.is_fullscreen {
(self.display.xf86vmode.XF86VidModeSwitchToMode)(self.display.display, self.screen_id, self.xf86_desk_mode);
(self.display.xf86vmode.XF86VidModeSetViewPort)(self.display.display, self.screen_id, 0, 0);
@@ -72,6 +75,7 @@ impl Drop for XWindow {
(self.display.xlib.XDestroyIC)(self.ic);
(self.display.xlib.XCloseIM)(self.im);
(self.display.xlib.XDestroyWindow)(self.display.display, self.window);
+ (self.display.xlib.XFreeColormap)(self.display.display, self.colormap);
}
}
}
@@ -425,7 +429,7 @@ impl Window {
swa
};
- let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi:: CWEventMask;
+ let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi::CWEventMask;
if builder.monitor.is_some() {
window_attributes |= ffi::CWOverrideRedirect;
unsafe {
@@ -551,6 +555,7 @@ impl Window {
screen_id: screen_id,
is_fullscreen: is_fullscreen,
xf86_desk_mode: xf86_desk_mode,
+ colormap: cmap,
}),
is_closed: AtomicBool::new(false),
wm_delete_window: wm_delete_window,