Support image drawing

Author: arcturu

ui-sys/libui

@@ -665,45 +665,45 @@ pub enum uiExtKey {
     /// Equivalent to "Help" on Apple keyboards.
     Insert = 2,
     Delete = 3,
-	Home = 4,
-	End = 5,
-	PageUp = 6,
-	PageDown = 7,
-	Up = 8,
-	Down = 9,
-	Left = 10,
-	Right = 11,
+    Home = 4,
+    End = 5,
+    PageUp = 6,
+    PageDown = 7,
+    Up = 8,
+    Down = 9,
+    Left = 10,
+    Right = 11,
     // F1..F12 are guaranteed to be consecutive.
-	F1 = 12,
-	F2 = 13,
-	F3 = 14,
-	F4 = 15,
-	F5 = 16,
-	F6 = 17,
-	F7 = 18,
-	F8 = 19,
-	F9 = 20,
-	F10 = 21,
-	F11 = 22,
-	F12 = 23,
+    F1 = 12,
+    F2 = 13,
+    F3 = 14,
+    F4 = 15,
+    F5 = 16,
+    F6 = 17,
+    F7 = 18,
+    F8 = 19,
+    F9 = 20,
+    F10 = 21,
+    F11 = 22,
+    F12 = 23,
     // Numpad keys; independent of Num Lock state.
     // N0..N9 are guaranteed to be consecutive.
-	N0 = 24,
-	N1 = 25,
-	N2 = 26,
-	N3 = 27,
-	N4 = 28,
-	N5 = 29,
-	N6 = 30,
-	N7 = 31,
-	N8 = 32,
-	N9 = 33,
-	NDot = 34,
-	NEnter = 35,
-	NAdd = 36,
-	NSubtract = 37,
-	NMultiply = 38,
-	NDivide = 39,
+    N0 = 24,
+    N1 = 25,
+    N2 = 26,
+    N3 = 27,
+    N4 = 28,
+    N5 = 29,
+    N6 = 30,
+    N7 = 31,
+    N8 = 32,
+    N9 = 33,
+    NDot = 34,
+    NEnter = 35,
+    NAdd = 36,
+    NSubtract = 37,
+    NMultiply = 38,
+    NDivide = 39,
 }
 
 #[repr(C)]
@@ -749,3 +749,21 @@ extern {
     pub fn uiNewColorButton() -> *mut uiColorButton;
 }
 
+pub enum uiImage {}
+
+#[link(name = "ui")]
+extern {
+    pub fn uiNewImage(width: c_double, height: c_double) -> *mut uiImage;
+    pub fn uiFreeImage(i: *mut uiImage);
+    pub fn uiImageAppend(i: *mut uiImage,
+                         pixels: *mut c_void,
+                         pixelWidth: c_int,
+                         pixelHeight: c_int,
+                         pixelStride: c_int);
+    pub fn uiDrawImage(c: *mut uiDrawContext,
+                       x: c_double,
+                       y: c_double,
+                       width: c_double,
+                       height: c_double,
+                       image: *mut uiImage);
+}

ui-sys/src/lib.rs

@@ -6,6 +6,7 @@ authors = ["Patrick Walton <[email protected]>"]
 [dependencies]
 bitflags = "0.7"
 libc = "*"
+#image = "*"
 
 [dependencies.ui-sys]
 path = "../ui-sys"

ui/Cargo.toml

@@ -1,14 +1,16 @@
 //! Functions and types related to 2D vector graphics.
 
 use ffi_utils::{self, Text};
-use libc::{c_double, c_int};
+use libc::{c_double, c_int, c_void};
 use std::marker::PhantomData;
 use std::mem;
 use std::ops::Mul;
 use std::ptr;
 use ui_sys::{self, uiDrawBrush, uiDrawBrushType, uiDrawContext, uiDrawFontFamilies, uiDrawMatrix};
 use ui_sys::{uiDrawPath, uiDrawStrokeParams};
 
+use image;
+
 pub use ui_sys::uiDrawBrushGradientStop as BrushGradientStop;
 pub use ui_sys::uiDrawLineCap as LineCap;
 pub use ui_sys::uiDrawLineJoin as LineJoin;
@@ -85,6 +87,15 @@ impl Context {
             ui_sys::uiDrawText(self.ui_draw_context, x, y, layout.as_ui_draw_text_layout())
         }
     }
+
+    #[inline]
+    pub fn draw_image(&self, x: f64, y: f64, width: f64, height: f64, image: &mut image::Image) {
+        ffi_utils::ensure_initialized();
+        unsafe {
+            ui_sys::uiImageAppend(image.ui_image, image.data.as_mut_ptr() as *mut c_void, image.width as i32, image.height as i32, image.width as i32 * 4);
+            ui_sys::uiDrawImage(self.ui_draw_context, x, y, width, height, image.ui_image);
+        }
+    }
 }
 
 #[derive(Clone, Debug)]

ui/src/draw.rs

@@ -0,0 +1,31 @@
+use ffi_utils;
+use ui_sys;
+
+pub struct Image {
+    pub ui_image: *mut ui_sys::uiImage,
+    pub data: Vec<u8>,
+    pub width: f64,
+    pub height: f64,
+}
+
+impl Image {
+    pub fn new(x: f64, y: f64) -> Image {
+        ffi_utils::ensure_initialized();
+        unsafe {
+            Image {
+                ui_image: ui_sys::uiNewImage(x, y),
+                data: Vec::with_capacity((x * y * 4.0) as usize),
+                width: x,
+                height: y,
+            }
+        }
+    }
+}
+impl Drop for Image {
+    fn drop(&mut self) {
+        ffi_utils::ensure_initialized();
+        unsafe {
+            ui_sys::uiFreeImage(self.ui_image);
+        }
+    }
+}

ui/src/image.rs

@@ -17,6 +17,7 @@ pub use menus::{Menu, MenuItem};
 pub use ui::{InitError, InitOptions, init, main, msg_box, msg_box_error, on_should_quit};
 pub use ui::{open_file, queue_main, quit, save_file, uninit};
 pub use windows::Window;
+pub use image::Image;
 
 #[macro_use]
 mod controls;
@@ -25,4 +26,5 @@ pub mod ffi_utils;
 mod menus;
 mod ui;
 mod windows;
+mod image;