Add draw image functionality from custom libui branch

Author: masche842

ui-sys/libui

@@ -743,7 +743,7 @@ extern {
 }
 
 
-pub enum uiImage {}
+pub enum uiPixmapImage {}
 pub type uiPixmap32Format = u32;
 
 #[repr(C)]
@@ -757,20 +757,20 @@ pub struct uiImageData {
 
 #[link(name = "ui")]
 extern {
-    pub fn uiNewImage(width: c_int, height: c_int) -> *mut uiImage;
-    pub fn uiFreeImage(img: *mut uiImage);
-    pub fn uiImageGetFormat(img: *mut uiImage) -> uiPixmap32Format;
-    pub fn uiImageGetData(img: *const uiImage, data: *mut uiImageData);
-    pub fn uiImageLoadPixmap32Raw(img: *mut uiImage,
+    pub fn uiNewPixmapImage(width: c_int, height: c_int) -> *mut uiPixmapImage;
+    pub fn uiFreePixmapImage(img: *mut uiPixmapImage);
+    pub fn uiPixmapImageGetFormat(img: *mut uiPixmapImage) -> uiPixmap32Format;
+    pub fn uiPixmapImageGetData(img: *const uiPixmapImage, data: *mut uiImageData);
+    pub fn uiImageLoadPixmap32Raw(img: *mut uiPixmapImage,
                                   x: c_int,
                                   y: c_int,
                                   width: c_int,
                                   height: c_int,
                                   rowstrideBytes: c_int,
                                   fmt: uiPixmap32Format,
                                   data: *const c_void);
-    pub fn uiDrawImage(c: *mut uiDrawContext,
-                       x: c_double,
-                       y: c_double,
-                       img: *const uiImage);
+    pub fn uiDrawPixmapImage(c: *mut uiDrawContext,
+                             x: c_double,
+                             y: c_double,
+                             img: *const uiPixmapImage);
 }

ui-sys/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "ui"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Patrick Walton <[email protected]>"]
 
 [dependencies]

ui/Cargo.toml

@@ -2,9 +2,7 @@
 
 extern crate ui;
 
-use ui::{BoxControl, Button, Checkbox, ColorButton, Combobox, DateTimePicker, Entry};
-use ui::{FontButton, Group, InitOptions, Label, Menu, MenuItem, ProgressBar, RadioButtons};
-use ui::{Separator, Slider, Spinbox, Tab, Window};
+use ui::{BoxControl, Window, InitOptions};
 use ui::{Image, Area, AreaHandler, AreaKeyEvent, AreaDrawParams};
 
 struct ImageAreaHandler {
@@ -25,21 +23,6 @@ impl AreaHandler for ImageAreaHandler {
 }
 
 fn run() {
-    let menu = Menu::new("File");
-    menu.append_item("Open").on_clicked(Box::new(open_clicked));
-    menu.append_item("Save").on_clicked(Box::new(save_clicked));
-
-    let menu = Menu::new("Edit");
-    menu.append_check_item("Checkable Item");
-    menu.append_separator();
-    let item = menu.append_item("Disabled Item");
-    item.disable();
-    menu.append_preferences_item();
-
-    let menu = Menu::new("Help");
-    menu.append_item("Help");
-    menu.append_about_item();
-
     let mainwin = Window::new("ui Control Gallery", 640, 480, true);
     mainwin.set_margined(true);
     mainwin.on_closing(Box::new(|_| {
@@ -51,58 +34,8 @@ fn run() {
     vbox.set_padded(true);
     mainwin.set_child(vbox.clone().into());
 
-    let hbox = BoxControl::new_horizontal();
-    hbox.set_padded(true);
-    vbox.append(hbox.clone().into(), true);
-
-    let group = Group::new("Basic Controls");
-    group.set_margined(true);
-    hbox.append(group.clone().into(), false);
-
-    let inner = BoxControl::new_vertical();
-    inner.set_padded(true);
-    group.set_child(inner.clone().into());
-
-    inner.append(Button::new("Button").into(), false);
-    inner.append(Checkbox::new("Checkbox").into(), false);
-    let entry = Entry::new();
-    entry.set_text("Entry");
-    inner.append(entry.into(), false);
-    inner.append(Label::new("Label").into(), false);
-    inner.append(Separator::new_horizontal().into(), false);
-
-    inner.append(DateTimePicker::new_date_picker().into(), false);
-    inner.append(DateTimePicker::new_time_picker().into(), false);
-    inner.append(DateTimePicker::new_date_time_picker().into(), false);
-
-    inner.append(FontButton::new().into(), false);
-    inner.append(ColorButton::new().into(), false);
-
-    let inner2 = BoxControl::new_vertical();
-    inner2.set_padded(true);
-    hbox.append(inner2.clone().into(), true);
-
-    let group = Group::new("Numbers");
-    group.set_margined(true);
-    inner2.append(group.clone().into(), false);
-
-    let inner = BoxControl::new_vertical();
-    inner.set_padded(true);
-    group.set_child(inner.clone().into());
-
-    let spinbox = Spinbox::new(0, 100);
-    spinbox.on_changed(Box::new(|spinbox| update(spinbox.value())));
-    inner.append(spinbox.into(), false);
-
-    let slider = Slider::new(0, 100);
-    slider.on_changed(Box::new(|slider| update(slider.value())));
-    inner.append(slider.into(), false);
-
-    let progress_bar = ProgressBar::new();
-    inner.append(progress_bar.into(), false);
-
     let area = Area::new(Box::new(ImageAreaHandler {data: vec![0xff123456;100*100]}));
-    inner2.append(area.into(),false);
+    vbox.append(area.into(),false);
 
     mainwin.show();
     ui::main();
@@ -113,24 +46,3 @@ pub fn main() {
     run();
     ui::uninit();
 }
-
-fn open_clicked(_: &MenuItem, mainwin: &Window) {
-    match ui::open_file(mainwin) {
-        Some(filename) => ui::msg_box(mainwin, "File selected", &*filename),
-        None => ui::msg_box_error(mainwin, "No file selected", "Don't be alarmed!"),
-    }
-}
-
-fn save_clicked(_: &MenuItem, mainwin: &Window) {
-    match ui::open_file(mainwin) {
-        Some(filename) => {
-            ui::msg_box(mainwin, "File selected (don't worry, it's still there)", &*filename)
-        }
-        None => ui::msg_box_error(mainwin, "No file selected", "Don't be alarmed!"),
-    }
-}
-
-fn update(_: i64) {
-    // TODO(pcwalton)
-}
-

ui/examples/image.rs

@@ -90,7 +90,7 @@ impl Context {
 
     pub fn draw_image(&self, x: f64, y: f64, img: &image::Image) {
         unsafe {
-            ui_sys::uiDrawImage(self.ui_draw_context, x, y, img.as_ui_draw_image())
+            ui_sys::uiDrawPixmapImage(self.ui_draw_context, x, y, img.as_ui_draw_image())
         }
     }
 }

ui/src/draw.rs

@@ -1,11 +1,11 @@
 use libc::c_void;
-use ui_sys::{self, uiImage, uiImageData, uiNewImage,
-             uiFreeImage, uiImageGetFormat, uiImageGetData,
-             uiImageLoadPixmap32Raw, uiDrawImage};
+use ui_sys::{self, uiPixmapImage, uiImageData, uiNewPixmapImage,
+             uiFreePixmapImage, uiPixmapImageGetFormat, uiPixmapImageGetData,
+             uiImageLoadPixmap32Raw, uiDrawPixmapImage};
 use ui_sys::uiDrawContext;
 
 pub struct Image {
-    ui_image: *mut uiImage
+    ui_image: *mut uiPixmapImage
 }
 
 // #define uiPixmap32FormatOffsets(a,r,g,b)    ((a) << 0 | (r) << 2 | (g) << 4 | (b) << 6)
@@ -18,13 +18,13 @@ impl Image {
     pub fn new(w: i32, h: i32) -> Image {
         unsafe {
             Image {
-                ui_image: uiNewImage(w, h)
+                ui_image: uiNewPixmapImage(w, h)
             }
         }
     }
 
     #[inline]
-    pub fn as_ui_draw_image(&self) -> *const uiImage {
+    pub fn as_ui_draw_image(&self) -> *const uiPixmapImage {
         self.ui_image
     }
 
@@ -40,11 +40,11 @@ impl Image {
 
 impl Drop for Image {
     fn drop(&mut self) {
-        unsafe { uiFreeImage(self.ui_image) };
+        unsafe { uiFreePixmapImage(self.ui_image) };
     }
 }
 
-fn get_image_data(img: *const uiImage) -> uiImageData {
+fn get_image_data(img: *const uiPixmapImage) -> uiImageData {
     use std::ptr;
     let mut d = uiImageData {
         fmt: 0,
@@ -54,7 +54,7 @@ fn get_image_data(img: *const uiImage) -> uiImageData {
         data: ptr::null_mut(),
     };
 
-    unsafe { uiImageGetData(img, &mut d) }
+    unsafe { uiPixmapImageGetData(img, &mut d) }
 
     d
 }