alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-23 22:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #484 from pinumbernumber/master

Browse source 
Implement transparency for X11
This commit is contained in:
tomaka 2015-06-16 08:52:29 +02:00
parent 5e8271dad0 da4bcad6e3
commit e48c853b9c
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/api/x11/window.rs
View file

@ -342,7 +342,23 @@ impl Window {
if fb.is_null() { if fb.is_null() {
return Err(OsError(format!("glx::ChooseFBConfig failed"))); return Err(OsError(format!("glx::ChooseFBConfig failed")));
} }
let preferred_fb = *fb; // TODO: choose more wisely
let preferred_fb = if builder.transparent {
let mut best_fbi_for_transparent = 0isize;
for i in 0isize..num_fb as isize {
let vi = display.glx.as_ref().unwrap().GetVisualFromFBConfig(display.display as *mut _, *fb.offset(i));
if (*vi).depth == 32 {
best_fbi_for_transparent = i;
break;
}
}
*fb.offset(best_fbi_for_transparent)
} else {
*fb // TODO: choose more wisely
};
(display.xlib.XFree)(fb as *mut _); (display.xlib.XFree)(fb as *mut _);
preferred_fb preferred_fb
}; };
@ -428,11 +444,19 @@ impl Window {
ffi::KeyReleaseMask | ffi::ButtonPressMask | ffi::KeyReleaseMask | ffi::ButtonPressMask |
ffi::ButtonReleaseMask | ffi::KeymapStateMask; ffi::ButtonReleaseMask | ffi::KeymapStateMask;
swa.border_pixel = 0; swa.border_pixel = 0;
if builder.transparent {
swa.background_pixel = 0;
}
swa.override_redirect = 0; swa.override_redirect = 0;
swa swa
}; };
let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi::CWEventMask; let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi::CWEventMask;
if builder.transparent {
window_attributes |= ffi::CWBackPixel;
}
if builder.monitor.is_some() { if builder.monitor.is_some() {
window_attributes |= ffi::CWOverrideRedirect; window_attributes |= ffi::CWOverrideRedirect;
unsafe { unsafe {