From aa9cb99929ee1893699184ded888b2586455f016 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 21 Sep 2015 14:42:05 +0200
Subject: Add #[inline] attributes

---
 src/api/wayland/mod.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'src/api/wayland')

diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs
index 10d2acb..a57ffec 100644
--- a/src/api/wayland/mod.rs
+++ b/src/api/wayland/mod.rs
@@ -46,6 +46,7 @@ lazy_static! {
     };
 }
 
+#[inline]
 pub fn is_available() -> bool {
     WAYLAND_CONTEXT.is_some()
 }
@@ -56,6 +57,7 @@ enum ShellWindow {
 }
 
 impl ShellWindow {
+    #[inline]
     fn get_shell(&mut self) -> ShellGuard {
         match self {
             &mut ShellWindow::Plain(ref mut s) => {
@@ -98,6 +100,8 @@ enum ShellGuard<'a> {
 
 impl<'a> Deref for ShellGuard<'a> {
     type Target = ShellSurface<EGLSurface>;
+
+    #[inline]
     fn deref(&self) -> &ShellSurface<EGLSurface> {
         match self {
             &ShellGuard::Plain(ref s) => s,
@@ -107,6 +111,7 @@ impl<'a> Deref for ShellGuard<'a> {
 }
 
 impl<'a> DerefMut for ShellGuard<'a> {
+    #[inline]
     fn deref_mut(&mut self) -> &mut ShellSurface<EGLSurface> {
         match self {
             &mut ShellGuard::Plain(ref mut s) => s,
@@ -152,6 +157,7 @@ impl Window {
 pub struct WindowProxy;
 
 impl WindowProxy {
+    #[inline]
     pub fn wakeup_event_loop(&self) {
         if let Some(ref ctxt) = *WAYLAND_CONTEXT {
             ctxt.display.sync();
@@ -164,9 +170,11 @@ pub struct MonitorID {
     output: Arc<Output>
 }
 
+#[inline]
 pub fn get_available_monitors() -> VecDeque<MonitorID> {
     WAYLAND_CONTEXT.as_ref().unwrap().outputs.iter().map(|o| MonitorID::new(o.clone())).collect()
 }
+#[inline]
 pub fn get_primary_monitor() -> MonitorID {
     match WAYLAND_CONTEXT.as_ref().unwrap().outputs.iter().next() {
         Some(o) => MonitorID::new(o.clone()),
@@ -185,6 +193,7 @@ impl MonitorID {
         Some(format!("{} - {}", self.output.manufacturer(), self.output.model()))
     }
 
+    #[inline]
     pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
         ::native_monitor::NativeMonitorId::Unavailable
     }
@@ -336,19 +345,23 @@ impl Window {
         guard.get_shell().set_title(&ctitle);
     }
 
+    #[inline]
     pub fn show(&self) {
         // TODO
     }
 
+    #[inline]
     pub fn hide(&self) {
         // TODO
     }
 
+    #[inline]
     pub fn get_position(&self) -> Option<(i32, i32)> {
         // not available with wayland
         None
     }
 
+    #[inline]
     pub fn set_position(&self, _x: i32, _y: i32) {
         // not available with wayland
     }
@@ -362,84 +375,102 @@ impl Window {
         Some((w as u32, h as u32))
     }
 
+    #[inline]
     pub fn get_outer_size(&self) -> Option<(u32, u32)> {
         // maybe available if we draw the border ourselves ?
         // but for now, no.
         None
     }
 
+    #[inline]
     pub fn set_inner_size(&self, x: u32, y: u32) {
         self.shell_window.lock().unwrap().resize(x as i32, y as i32, 0, 0)
     }
 
+    #[inline]
     pub fn create_window_proxy(&self) -> WindowProxy {
         WindowProxy
     }
 
+    #[inline]
     pub fn poll_events(&self) -> PollEventsIterator {
         PollEventsIterator {
             window: self
         }
     }
 
+    #[inline]
     pub fn wait_events(&self) -> WaitEventsIterator {
         WaitEventsIterator {
             window: self
         }
     }
 
+    #[inline]
     pub fn set_window_resize_callback(&mut self, callback: Option<fn(u32, u32)>) {
         self.resize_callback = callback;
     }
 
+    #[inline]
     pub fn set_cursor(&self, cursor: MouseCursor) {
         // TODO
     }
 
+    #[inline]
     pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
         // TODO
         Ok(())
     }
 
+    #[inline]
     pub fn hidpi_factor(&self) -> f32 {
         1.0
     }
 
+    #[inline]
     pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> {
         // TODO
         Ok(())
     }
 
+    #[inline]
     pub fn platform_display(&self) -> *mut libc::c_void {
         unimplemented!()
     }
 
+    #[inline]
     pub fn platform_window(&self) -> *mut libc::c_void {
         unimplemented!()
     }
 }
 
 impl GlContext for Window {
+    #[inline]
     unsafe fn make_current(&self) -> Result<(), ContextError> {
         self.context.make_current()
     }
 
+    #[inline]
     fn is_current(&self) -> bool {
         self.context.is_current()
     }
 
+    #[inline]
     fn get_proc_address(&self, addr: &str) -> *const libc::c_void {
         self.context.get_proc_address(addr)
     }
 
+    #[inline]
     fn swap_buffers(&self) -> Result<(), ContextError> {
         self.context.swap_buffers()
     }
 
+    #[inline]
     fn get_api(&self) -> ::Api {
         self.context.get_api()
     }
 
+    #[inline]
     fn get_pixel_format(&self) -> PixelFormat {
         self.context.get_pixel_format().clone()
     }
-- 
cgit v1.2.3