michael/safex11
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

screen

Browse source
This commit is contained in:
Michael Zhang 2023-08-20 05:07:29 -05:00
parent 97ceb1062d
commit 5387a0f543
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xlib/display.rs
View file

@ -92,8 +92,8 @@ impl Display {
} }
/// Gets the default visual /// Gets the default visual
pub fn default_visual(&self, screen: i32) -> Visual { pub fn default_visual(&self, screen: &Screen) -> Visual {
let visual = unsafe { xlib::XDefaultVisual(self.inner, screen) }; let visual = unsafe { xlib::XDefaultVisual(self.inner, screen.0) };
Visual { inner: visual } Visual { inner: visual }
} }
@ -104,8 +104,8 @@ impl Display {
} }
/// Returns the root window for the given screen. /// Returns the root window for the given screen.
pub fn get_root_window(&self, screen: i32) -> Result<Window> { pub fn get_root_window(&self, screen: &Screen) -> Result<Window> {
let inner = unsafe { xlib::XRootWindow(self.inner, screen) }; let inner = unsafe { xlib::XRootWindow(self.inner, screen.0) };
if inner == 0 { if inner == 0 {
return Err(Error::GetWindowError); return Err(Error::GetWindowError);
} }

3
src/xlib/window.rs
View file

@ -29,7 +29,8 @@ impl<'a> Window<'a> {
Some(parent) => parent, Some(parent) => parent,
None => display.get_default_root_window()?, None => display.get_default_root_window()?,
}; };
let visual = display.default_visual(0); let screen = display.get_default_screen()?;
let visual = display.default_visual(&screen);
let window = unsafe { let window = unsafe {
xlib::XCreateWindow( xlib::XCreateWindow(
display.as_raw(), display.as_raw(),