commit ba4483c41b7a0e0d089fc6659343d19151d3d490
parent e0b5719e03f721339c4ea2846ce4b2920f89068a
Author: MTRNord <mtrnord1@gmail.com>
Date: Wed, 14 Oct 2020 18:52:44 +0200
refactor!: Move abstractions to specific modules (matching those of the c files)
Diffstat:
| A | src/display.rs | | | 188 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | src/lib.rs | | | 188 | +------------------------------------------------------------------------------ |
2 files changed, 189 insertions(+), 187 deletions(-)
diff --git a/src/display.rs b/src/display.rs
@@ -0,0 +1,188 @@
+use crate::bindings;
+use enum_primitive_derive::Primitive;
+
+#[derive(Clone)]
+pub struct XPLMWindow {
+ inner: bindings::XPLMWindowID,
+}
+
+impl XPLMWindow {
+ pub fn get_inner(&self) -> bindings::XPLMWindowID {
+ self.inner
+ }
+}
+
+impl Drop for XPLMWindow {
+ fn drop(&mut self) {
+ unsafe {
+ bindings::XPLMDestroyWindow(self.inner);
+ }
+ }
+}
+
+unsafe impl Send for XPLMWindow {}
+unsafe impl Sync for XPLMWindow {}
+
+#[derive(Debug, Copy, Clone, PartialEq, Primitive)]
+#[repr(i32)]
+pub enum WindowDecoration {
+ None = bindings::xplm_WindowDecorationNone,
+ RoundRectangle = bindings::xplm_WindowDecorationRoundRectangle,
+ SelfDecorated = bindings::xplm_WindowDecorationSelfDecorated,
+ SelfDecoratedResizeable = bindings::xplm_WindowDecorationSelfDecoratedResizable,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Primitive)]
+#[repr(i32)]
+pub enum WindowLayer {
+ FlightOverlay = bindings::xplm_WindowLayerFlightOverlay,
+ FloatingWindows = bindings::xplm_WindowLayerFloatingWindows,
+ Modal = bindings::xplm_WindowLayerModal,
+ GrowlNotifications = bindings::xplm_WindowLayerGrowlNotifications,
+}
+
+pub struct XPLMWindowBuilder {
+ left: i32,
+ top: i32,
+ right: i32,
+ bottom: i32,
+ visible: i32,
+ drawWindowFunc: bindings::XPLMDrawWindow_f,
+ handleMouseClickFunc: bindings::XPLMHandleMouseClick_f,
+ handleKeyFunc: bindings::XPLMHandleKey_f,
+ handleCursorFunc: bindings::XPLMHandleCursor_f,
+ handleMouseWheelFunc: bindings::XPLMHandleMouseWheel_f,
+ refcon: *mut ::std::os::raw::c_void,
+ decorateAsFloatingWindow: WindowDecoration,
+ layer: WindowLayer,
+ handleRightClickFunc: bindings::XPLMHandleMouseClick_f,
+}
+
+impl XPLMWindowBuilder {
+ pub fn new() -> Self {
+ XPLMWindowBuilder {
+ left: 0,
+ top: 0,
+ right: 0,
+ bottom: 0,
+ visible: 1,
+ drawWindowFunc: None,
+ handleMouseClickFunc: None,
+ handleKeyFunc: None,
+ handleCursorFunc: None,
+ handleMouseWheelFunc: None,
+ refcon: std::ptr::null_mut(),
+ decorateAsFloatingWindow: WindowDecoration::RoundRectangle,
+ layer: WindowLayer::FloatingWindows,
+ handleRightClickFunc: None,
+ }
+ }
+ pub fn left<'a>(&'a mut self, left: i32) -> &'a mut Self {
+ self.left = left;
+ self
+ }
+ pub fn top<'a>(&'a mut self, top: i32) -> &'a mut Self {
+ self.top = top;
+ self
+ }
+ pub fn right<'a>(&'a mut self, right: i32) -> &'a mut Self {
+ self.right = right;
+ self
+ }
+ pub fn bottom<'a>(&'a mut self, bottom: i32) -> &'a mut Self {
+ self.bottom = bottom;
+ self
+ }
+ pub fn visible<'a>(&'a mut self, visible: i32) -> &'a mut Self {
+ self.visible = visible;
+ self
+ }
+ pub fn drawWindowFunc<'a>(
+ &'a mut self,
+ drawWindowFunc: bindings::XPLMDrawWindow_f,
+ ) -> &'a mut Self {
+ self.drawWindowFunc = drawWindowFunc;
+ self
+ }
+
+ pub fn handleMouseClickFunc<'a>(
+ &'a mut self,
+ handleMouseClickFunc: bindings::XPLMHandleMouseClick_f,
+ ) -> &'a mut Self {
+ self.handleMouseClickFunc = handleMouseClickFunc;
+ self
+ }
+ pub fn handleKeyFunc<'a>(
+ &'a mut self,
+ handleKeyFunc: bindings::XPLMHandleKey_f,
+ ) -> &'a mut Self {
+ self.handleKeyFunc = handleKeyFunc;
+ self
+ }
+ pub fn handleCursorFunc<'a>(
+ &'a mut self,
+ handleCursorFunc: bindings::XPLMHandleCursor_f,
+ ) -> &'a mut Self {
+ self.handleCursorFunc = handleCursorFunc;
+ self
+ }
+
+ pub fn handleMouseWheelFunc<'a>(
+ &'a mut self,
+ handleMouseWheelFunc: bindings::XPLMHandleMouseWheel_f,
+ ) -> &'a mut Self {
+ self.handleMouseWheelFunc = handleMouseWheelFunc;
+ self
+ }
+
+ pub fn refcon<'a>(&'a mut self, refcon: *mut ::std::os::raw::c_void) -> &'a mut Self {
+ self.refcon = refcon;
+ self
+ }
+
+ pub fn decorateAsFloatingWindow<'a>(
+ &'a mut self,
+ decorateAsFloatingWindow: WindowDecoration,
+ ) -> &'a mut Self {
+ self.decorateAsFloatingWindow = decorateAsFloatingWindow;
+ self
+ }
+
+ pub fn layer<'a>(&'a mut self, layer: WindowLayer) -> &'a mut Self {
+ self.layer = layer;
+ self
+ }
+
+ pub fn handleRightClickFunc<'a>(
+ &'a mut self,
+ handleRightClickFunc: bindings::XPLMHandleMouseClick_f,
+ ) -> &'a mut Self {
+ self.handleRightClickFunc = handleRightClickFunc;
+ self
+ }
+ pub fn build(&self) -> XPLMWindow {
+ use num_traits::ToPrimitive;
+ let params = &mut bindings::XPLMCreateWindow_t {
+ structSize: std::mem::size_of::<bindings::XPLMCreateWindow_t>() as i32,
+ left: self.left,
+ top: self.top,
+ right: self.right,
+ bottom: self.bottom,
+ visible: self.visible,
+ drawWindowFunc: self.drawWindowFunc,
+ handleMouseClickFunc: self.handleMouseClickFunc,
+ handleKeyFunc: self.handleKeyFunc,
+ handleCursorFunc: self.handleCursorFunc,
+ handleMouseWheelFunc: self.handleMouseWheelFunc,
+ refcon: self.refcon,
+ decorateAsFloatingWindow: self.decorateAsFloatingWindow.to_i32().unwrap(),
+ layer: self.layer.to_i32().unwrap(),
+ handleRightClickFunc: self.handleRightClickFunc,
+ };
+ let window: bindings::XPLMWindowID;
+ unsafe {
+ window = bindings::XPLMCreateWindowEx(params);
+ }
+ XPLMWindow { inner: window }
+ }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,196 +2,10 @@
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
-use enum_primitive_derive::Primitive;
+pub mod display;
pub mod utils;
pub mod bindings {
include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
}
-#[derive(Clone)]
-pub struct XPLMWindow {
- inner: bindings::XPLMWindowID,
-}
-
-impl XPLMWindow {
- pub fn get_inner(&self) -> bindings::XPLMWindowID {
- self.inner
- }
-}
-
-impl Drop for XPLMWindow {
- fn drop(&mut self) {
- unsafe {
- bindings::XPLMDestroyWindow(self.inner);
- }
- }
-}
-
-unsafe impl Send for XPLMWindow {}
-unsafe impl Sync for XPLMWindow {}
-
-#[derive(Debug, Copy, Clone, PartialEq, Primitive)]
-#[repr(i32)]
-pub enum WindowDecoration {
- None = bindings::xplm_WindowDecorationNone,
- RoundRectangle = bindings::xplm_WindowDecorationRoundRectangle,
- SelfDecorated = bindings::xplm_WindowDecorationSelfDecorated,
- SelfDecoratedResizeable = bindings::xplm_WindowDecorationSelfDecoratedResizable,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Primitive)]
-#[repr(i32)]
-pub enum WindowLayer {
- FlightOverlay = bindings::xplm_WindowLayerFlightOverlay,
- FloatingWindows = bindings::xplm_WindowLayerFloatingWindows,
- Modal = bindings::xplm_WindowLayerModal,
- GrowlNotifications = bindings::xplm_WindowLayerGrowlNotifications,
-}
-
-pub struct XPLMWindowBuilder {
- left: i32,
- top: i32,
- right: i32,
- bottom: i32,
- visible: i32,
- drawWindowFunc: bindings::XPLMDrawWindow_f,
- handleMouseClickFunc: bindings::XPLMHandleMouseClick_f,
- handleKeyFunc: bindings::XPLMHandleKey_f,
- handleCursorFunc: bindings::XPLMHandleCursor_f,
- handleMouseWheelFunc: bindings::XPLMHandleMouseWheel_f,
- refcon: *mut ::std::os::raw::c_void,
- decorateAsFloatingWindow: WindowDecoration,
- layer: WindowLayer,
- handleRightClickFunc: bindings::XPLMHandleMouseClick_f,
-}
-
-impl XPLMWindowBuilder {
- pub fn new() -> Self {
- XPLMWindowBuilder {
- left: 0,
- top: 0,
- right: 0,
- bottom: 0,
- visible: 1,
- drawWindowFunc: None,
- handleMouseClickFunc: None,
- handleKeyFunc: None,
- handleCursorFunc: None,
- handleMouseWheelFunc: None,
- refcon: std::ptr::null_mut(),
- decorateAsFloatingWindow: WindowDecoration::RoundRectangle,
- layer: WindowLayer::FloatingWindows,
- handleRightClickFunc: None,
- }
- }
- pub fn left<'a>(&'a mut self, left: i32) -> &'a mut Self {
- self.left = left;
- self
- }
- pub fn top<'a>(&'a mut self, top: i32) -> &'a mut Self {
- self.top = top;
- self
- }
- pub fn right<'a>(&'a mut self, right: i32) -> &'a mut Self {
- self.right = right;
- self
- }
- pub fn bottom<'a>(&'a mut self, bottom: i32) -> &'a mut Self {
- self.bottom = bottom;
- self
- }
- pub fn visible<'a>(&'a mut self, visible: i32) -> &'a mut Self {
- self.visible = visible;
- self
- }
- pub fn drawWindowFunc<'a>(
- &'a mut self,
- drawWindowFunc: bindings::XPLMDrawWindow_f,
- ) -> &'a mut Self {
- self.drawWindowFunc = drawWindowFunc;
- self
- }
-
- pub fn handleMouseClickFunc<'a>(
- &'a mut self,
- handleMouseClickFunc: bindings::XPLMHandleMouseClick_f,
- ) -> &'a mut Self {
- self.handleMouseClickFunc = handleMouseClickFunc;
- self
- }
- pub fn handleKeyFunc<'a>(
- &'a mut self,
- handleKeyFunc: bindings::XPLMHandleKey_f,
- ) -> &'a mut Self {
- self.handleKeyFunc = handleKeyFunc;
- self
- }
- pub fn handleCursorFunc<'a>(
- &'a mut self,
- handleCursorFunc: bindings::XPLMHandleCursor_f,
- ) -> &'a mut Self {
- self.handleCursorFunc = handleCursorFunc;
- self
- }
-
- pub fn handleMouseWheelFunc<'a>(
- &'a mut self,
- handleMouseWheelFunc: bindings::XPLMHandleMouseWheel_f,
- ) -> &'a mut Self {
- self.handleMouseWheelFunc = handleMouseWheelFunc;
- self
- }
-
- pub fn refcon<'a>(&'a mut self, refcon: *mut ::std::os::raw::c_void) -> &'a mut Self {
- self.refcon = refcon;
- self
- }
-
- pub fn decorateAsFloatingWindow<'a>(
- &'a mut self,
- decorateAsFloatingWindow: WindowDecoration,
- ) -> &'a mut Self {
- self.decorateAsFloatingWindow = decorateAsFloatingWindow;
- self
- }
-
- pub fn layer<'a>(&'a mut self, layer: WindowLayer) -> &'a mut Self {
- self.layer = layer;
- self
- }
-
- pub fn handleRightClickFunc<'a>(
- &'a mut self,
- handleRightClickFunc: bindings::XPLMHandleMouseClick_f,
- ) -> &'a mut Self {
- self.handleRightClickFunc = handleRightClickFunc;
- self
- }
- pub fn build(&self) -> XPLMWindow {
- use num_traits::ToPrimitive;
- let params = &mut bindings::XPLMCreateWindow_t {
- structSize: std::mem::size_of::<bindings::XPLMCreateWindow_t>() as i32,
- left: self.left,
- top: self.top,
- right: self.right,
- bottom: self.bottom,
- visible: self.visible,
- drawWindowFunc: self.drawWindowFunc,
- handleMouseClickFunc: self.handleMouseClickFunc,
- handleKeyFunc: self.handleKeyFunc,
- handleCursorFunc: self.handleCursorFunc,
- handleMouseWheelFunc: self.handleMouseWheelFunc,
- refcon: self.refcon,
- decorateAsFloatingWindow: self.decorateAsFloatingWindow.to_i32().unwrap(),
- layer: self.layer.to_i32().unwrap(),
- handleRightClickFunc: self.handleRightClickFunc,
- };
- let window: bindings::XPLMWindowID;
- unsafe {
- window = bindings::XPLMCreateWindowEx(params);
- }
- XPLMWindow { inner: window }
- }
-}
-
// TODO enum from XPLMWindowPositioningMode
