all the xcb wrapper types are in individual files now

the trait inheritance structure isn't THAT convoluted, but having more than one of these in a file was obscuring things.

Change-Id: I5132a6304796654d778d731be1ecb1c7b4e77120
Force-Push: yes

1 files changed, 9 insertions, 15 deletions

diff --git a/src/main.rs b/src/main.rs
index 57eabf0..51cb7bf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,11 @@
-use crate::xtypes::*;
-use crate::xcolor::DisplayColorExt;
-use crate::xcontext::GraphicContext;
+use crate::x::*;
 
 use std::sync::Arc;
 
 use xcb::{ Xid };
 use xcb::x::{
-  self,
   ClientMessageData,
   Cw, CreateWindow,
-  CreateGc, FreeGc,
   Drawable,
   EventMask,
   PolyFillRectangle,
@@ -17,9 +13,7 @@ use xcb::x::{
   WindowClass
 };
 
-mod xcolor;
-mod xcontext;
-mod xtypes;
+mod x;
 
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -66,15 +60,15 @@ fn main() -> xcb::Result<()> {
 
   loop {
     match display.wait_for_event()? {
-      xcb::Event::X(x::Event::Expose(_event)) => {
+      xcb::Event::X(xcb::x::Event::Expose(_event)) => {
 	let _ = dock.redraw(); // TODO
       }
 
-      xcb::Event::X(x::Event::ButtonPress(event)) => {
+      xcb::Event::X(xcb::x::Event::ButtonPress(event)) => {
         println!("click {:?}", event);
       }
 
-      xcb::Event::X(x::Event::ClientMessage(event)) => {
+      xcb::Event::X(xcb::x::Event::ClientMessage(event)) => {
         if let ClientMessageData::Data32([atom, ..]) = event.data() {
           if atom == display.atoms().wm_delete_window.resource_id() {
             break;
@@ -99,8 +93,8 @@ impl Dock {
     let dock_bounds = Dock::compute_bounds(&screen, &configuration);
 
     let window = Window::new(Arc::clone(&display), &mut CreateWindow {
-      depth: x::COPY_FROM_PARENT as u8,
-      wid: x::Window::none(),
+      depth: xcb::x::COPY_FROM_PARENT as u8,
+      wid: xcb::x::Window::none(),
       parent: screen.root(),
       x: dock_bounds.left as i16,
       y: dock_bounds.top as i16,
@@ -116,7 +110,7 @@ impl Dock {
     })?;
     let dock = Dock { window, configuration, bounds: Arc::new(dock_bounds) };
 
-    dock.set_string_property(&x::ATOM_WM_NAME, b"sandbar")?;
+    dock.set_string_property(&xcb::x::ATOM_WM_NAME, b"sandbar")?;
 
     dock.set_atom_property(&dock.atoms().wm_protocols,
                            &[dock.atoms().wm_delete_window])?;
@@ -221,7 +215,7 @@ impl Dock {
     let cookie = connection.send_request_checked(&PolyFillRectangle {
       drawable: Drawable::Window(self.window_id()),
       property: *property,
-      r#type: x::ATOM_CARDINAL,
+      r#type: xcb::x::ATOM_CARDINAL,
       data: values,
     });
     connection.check_request(cookie)?;