move XftDraw pointers into a new wrapper FontGraphicContext

impl Drop :)

Force-Push: yes
Change-Id: I2a2a488819c9f03205aade5dd5d119c02dd8a3c2

1 files changed, 3 insertions, 2 deletions

diff --git a/src/x/font.rs b/src/x/font.rs
index 20ae7e4..d12cbe8 100644
--- a/src/x/font.rs
+++ b/src/x/font.rs
@@ -30,13 +30,14 @@ impl Font {
     Ok(Font { display, font_state })
   }
 
-  pub fn draw(&self, xft_context: *mut XftDraw, xft_color: &XftColor,
+  pub fn draw(&self, context: &FontGraphicContext, xft_color: &XftColor,
 	      x: i32, y: i32, text: &str)
     -> xcb::Result<()>
   {
+    let xft_draw = context.get_xft_draw();
     let text = CString::new(text).unwrap();
     unsafe {
-      XftDrawStringUtf8(xft_context, xft_color, self.font_state, x, y,
+      XftDrawStringUtf8(xft_draw, xft_color, self.font_state, x, y,
                         text.as_ptr().cast(), text.count_bytes() as i32)
     };