alex/baseview
1
0
Fork 0
Code Activity

x11/window: nitpicky code aesthetics

Browse source
This commit is contained in:
William Light 2020-09-11 15:50:10 +02:00
parent b5dfbd946e
commit c76f089c96
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/x11/window.rs
View file

@ -17,13 +17,6 @@ pub struct WindowHandle;
impl Window { impl Window {
pub fn open<H: WindowHandler>(options: WindowOpenOptions) -> WindowHandle { pub fn open<H: WindowHandler>(options: WindowOpenOptions) -> WindowHandle {
// Convert the parent to a X11 window ID if we're given one
let parent = match options.parent {
Parent::None => None,
Parent::AsIfParented => None, // TODO: ???
Parent::WithParent(p) => Some(p as u32),
};
// Connect to the X server // Connect to the X server
// FIXME: baseview error type instead of unwrap() // FIXME: baseview error type instead of unwrap()
let xcb_connection = XcbConnection::new().unwrap(); let xcb_connection = XcbConnection::new().unwrap();
@ -38,10 +31,9 @@ impl Window {
let foreground = xcb_connection.conn.generate_id(); let foreground = xcb_connection.conn.generate_id();
// Convert parent into something that X understands // Convert parent into something that X understands
let parent_id = if let Some(p) = parent { let parent_id = match options.parent {
p Parent::WithParent(p) => p as u32,
} else { Parent::None | Parent::AsIfParented => screen.root(),
screen.root()
}; };
xcb::create_gc( xcb::create_gc(
@ -77,6 +69,7 @@ impl Window {
| xcb::EVENT_MASK_KEY_RELEASE, | xcb::EVENT_MASK_KEY_RELEASE,
)], )],
); );
xcb::map_window(&xcb_connection.conn, window_id); xcb::map_window(&xcb_connection.conn, window_id);
// Change window title // Change window title