mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +11:00
Merge pull request #480 from tomaka/leaking-colormap
Fix leaking color map and destruction of IM
This commit is contained in:
commit
a0e29d9410
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue