From 7df59c60a06008226f6455619e7242ed0156ed8d Mon Sep 17 00:00:00 2001 From: Osspial Date: Wed, 22 Aug 2018 17:59:36 -0400 Subject: [PATCH] Rename platform to platform_impl --- src/lib.rs | 16 ++++++++-------- src/os/unix.rs | 12 ++++++------ src/os/windows.rs | 2 +- src/{platform => platform_impl}/android/ffi.rs | 0 src/{platform => platform_impl}/android/mod.rs | 0 .../emscripten/ffi.rs | 0 .../emscripten/mod.rs | 0 src/{platform => platform_impl}/ios/ffi.rs | 0 src/{platform => platform_impl}/ios/mod.rs | 0 .../linux/dlopen.rs | 0 src/{platform => platform_impl}/linux/mod.rs | 0 .../linux/wayland/event_loop.rs | 0 .../linux/wayland/keyboard.rs | 0 .../linux/wayland/mod.rs | 0 .../linux/wayland/pointer.rs | 0 .../linux/wayland/touch.rs | 0 .../linux/wayland/window.rs | 4 ++-- .../linux/x11/dnd.rs | 0 .../linux/x11/events.rs | 0 .../linux/x11/ffi.rs | 0 .../linux/x11/ime/callbacks.rs | 0 .../linux/x11/ime/context.rs | 0 .../linux/x11/ime/inner.rs | 0 .../linux/x11/ime/input_method.rs | 0 .../linux/x11/ime/mod.rs | 0 .../linux/x11/mod.rs | 2 +- .../linux/x11/monitor.rs | 0 .../linux/x11/util/atom.rs | 0 .../linux/x11/util/client_msg.rs | 0 .../linux/x11/util/format.rs | 0 .../linux/x11/util/geometry.rs | 0 .../linux/x11/util/hint.rs | 0 .../linux/x11/util/icon.rs | 0 .../linux/x11/util/input.rs | 0 .../linux/x11/util/memory.rs | 0 .../linux/x11/util/mod.rs | 0 .../linux/x11/util/randr.rs | 0 .../linux/x11/util/window_property.rs | 0 .../linux/x11/util/wm.rs | 0 .../linux/x11/window.rs | 6 +++--- .../linux/x11/xdisplay.rs | 0 .../macos/events_loop.rs | 0 src/{platform => platform_impl}/macos/ffi.rs | 0 src/{platform => platform_impl}/macos/mod.rs | 0 .../macos/monitor.rs | 0 src/{platform => platform_impl}/macos/util.rs | 4 ++-- src/{platform => platform_impl}/macos/view.rs | 8 ++++---- .../macos/window.rs | 6 +++--- src/{platform => platform_impl}/mod.rs | 0 src/{platform => platform_impl}/windows/dpi.rs | 0 .../windows/drop_handler.rs | 2 +- .../windows/event.rs | 0 .../windows/events_loop.rs | 14 +++++++------- .../windows/icon.rs | 2 +- src/{platform => platform_impl}/windows/mod.rs | 0 .../windows/monitor.rs | 4 ++-- .../windows/raw_input.rs | 2 +- .../windows/util.rs | 0 .../windows/window.rs | 18 +++++++++--------- src/window.rs | 8 ++++---- 60 files changed, 55 insertions(+), 55 deletions(-) rename src/{platform => platform_impl}/android/ffi.rs (100%) rename src/{platform => platform_impl}/android/mod.rs (100%) rename src/{platform => platform_impl}/emscripten/ffi.rs (100%) rename src/{platform => platform_impl}/emscripten/mod.rs (100%) rename src/{platform => platform_impl}/ios/ffi.rs (100%) rename src/{platform => platform_impl}/ios/mod.rs (100%) rename src/{platform => platform_impl}/linux/dlopen.rs (100%) rename src/{platform => platform_impl}/linux/mod.rs (100%) rename src/{platform => platform_impl}/linux/wayland/event_loop.rs (100%) rename src/{platform => platform_impl}/linux/wayland/keyboard.rs (100%) rename src/{platform => platform_impl}/linux/wayland/mod.rs (100%) rename src/{platform => platform_impl}/linux/wayland/pointer.rs (100%) rename src/{platform => platform_impl}/linux/wayland/touch.rs (100%) rename src/{platform => platform_impl}/linux/wayland/window.rs (98%) rename src/{platform => platform_impl}/linux/x11/dnd.rs (100%) rename src/{platform => platform_impl}/linux/x11/events.rs (100%) rename src/{platform => platform_impl}/linux/x11/ffi.rs (100%) rename src/{platform => platform_impl}/linux/x11/ime/callbacks.rs (100%) rename src/{platform => platform_impl}/linux/x11/ime/context.rs (100%) rename src/{platform => platform_impl}/linux/x11/ime/inner.rs (100%) rename src/{platform => platform_impl}/linux/x11/ime/input_method.rs (100%) rename src/{platform => platform_impl}/linux/x11/ime/mod.rs (100%) rename src/{platform => platform_impl}/linux/x11/mod.rs (99%) rename src/{platform => platform_impl}/linux/x11/monitor.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/atom.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/client_msg.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/format.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/geometry.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/hint.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/icon.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/input.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/memory.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/mod.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/randr.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/window_property.rs (100%) rename src/{platform => platform_impl}/linux/x11/util/wm.rs (100%) rename src/{platform => platform_impl}/linux/x11/window.rs (99%) rename src/{platform => platform_impl}/linux/x11/xdisplay.rs (100%) rename src/{platform => platform_impl}/macos/events_loop.rs (100%) rename src/{platform => platform_impl}/macos/ffi.rs (100%) rename src/{platform => platform_impl}/macos/mod.rs (100%) rename src/{platform => platform_impl}/macos/monitor.rs (100%) rename src/{platform => platform_impl}/macos/util.rs (94%) rename src/{platform => platform_impl}/macos/view.rs (98%) rename src/{platform => platform_impl}/macos/window.rs (99%) rename src/{platform => platform_impl}/mod.rs (100%) rename src/{platform => platform_impl}/windows/dpi.rs (100%) rename src/{platform => platform_impl}/windows/drop_handler.rs (99%) rename src/{platform => platform_impl}/windows/event.rs (100%) rename src/{platform => platform_impl}/windows/events_loop.rs (99%) rename src/{platform => platform_impl}/windows/icon.rs (98%) rename src/{platform => platform_impl}/windows/mod.rs (100%) rename src/{platform => platform_impl}/windows/monitor.rs (97%) rename src/{platform => platform_impl}/windows/raw_input.rs (99%) rename src/{platform => platform_impl}/windows/util.rs (100%) rename src/{platform => platform_impl}/windows/window.rs (98%) diff --git a/src/lib.rs b/src/lib.rs index 3b7a1fc16..c5378a3ec 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -102,7 +102,7 @@ pub use icon::*; pub mod dpi; mod events; mod icon; -mod platform; +mod platform_impl; mod window; pub mod os; @@ -127,7 +127,7 @@ pub mod os; /// }); /// ``` pub struct Window { - window: platform::Window, + window: platform_impl::Window, } impl std::fmt::Debug for Window { @@ -143,7 +143,7 @@ impl std::fmt::Debug for Window { /// Whenever you receive an event specific to a window, this event contains a `WindowId` which you /// can then compare to the ids of your windows. #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub struct WindowId(platform::WindowId); +pub struct WindowId(platform_impl::WindowId); /// Identifier of an input device. /// @@ -151,7 +151,7 @@ pub struct WindowId(platform::WindowId); /// identifies its origin. Note that devices may be virtual (representing an on-screen cursor and keyboard focus) or /// physical. Virtual devices typically aggregate inputs from multiple physical devices. #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub struct DeviceId(platform::DeviceId); +pub struct DeviceId(platform_impl::DeviceId); /// Provides a way to retrieve events from the system and from the windows that were registered to /// the events loop. @@ -167,7 +167,7 @@ pub struct DeviceId(platform::DeviceId); /// `Window` created from this `EventLoop` _can_ be sent to an other thread, and the /// `EventLoopProxy` allows you to wakeup an `EventLoop` from an other thread. pub struct EventLoop { - events_loop: platform::EventLoop, + events_loop: platform_impl::EventLoop, _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync } @@ -217,7 +217,7 @@ impl EventLoop { /// fallback on x11. If this variable is set with any other value, winit will panic. pub fn new_user_event() -> EventLoop { EventLoop { - events_loop: platform::EventLoop::new(), + events_loop: platform_impl::EventLoop::new(), _marker: ::std::marker::PhantomData, } } @@ -260,7 +260,7 @@ impl EventLoop { /// Used to wake up the `EventLoop` from another thread. #[derive(Clone)] pub struct EventLoopProxy { - events_loop_proxy: platform::EventLoopProxy, + events_loop_proxy: platform_impl::EventLoopProxy, } impl std::fmt::Debug for EventLoopProxy { @@ -304,7 +304,7 @@ pub struct WindowBuilder { pub window: WindowAttributes, // Platform-specific configuration. Private. - platform_specific: platform::PlatformSpecificWindowBuilderAttributes, + platform_specific: platform_impl::PlatformSpecificWindowBuilderAttributes, } impl std::fmt::Debug for WindowBuilder { diff --git a/src/os/unix.rs b/src/os/unix.rs index 9c2e44670..7b2640030 100644 --- a/src/os/unix.rs +++ b/src/os/unix.rs @@ -11,19 +11,19 @@ use { Window, WindowBuilder, }; -use platform::{ +use platform_impl::{ EventLoop as LinuxEventLoop, Window as LinuxWindow, }; -use platform::x11::XConnection; -use platform::x11::ffi::XVisualInfo; +use platform_impl::x11::XConnection; +use platform_impl::x11::ffi::XVisualInfo; // TODO: stupid hack so that glutin can do its work #[doc(hidden)] -pub use platform::x11; +pub use platform_impl::x11; -pub use platform::XNotSupported; -pub use platform::x11::util::WindowType as XWindowType; +pub use platform_impl::XNotSupported; +pub use platform_impl::x11::util::WindowType as XWindowType; /// Additional methods on `EventLoop` that are specific to Linux. pub trait EventLoopExt { diff --git a/src/os/windows.rs b/src/os/windows.rs index 6a5b67df1..96a178041 100644 --- a/src/os/windows.rs +++ b/src/os/windows.rs @@ -6,7 +6,7 @@ use libc; use winapi::shared::windef::HWND; use {DeviceId, EventLoop, Icon, MonitorId, Window, WindowBuilder}; -use platform::EventLoop as WindowsEventLoop; +use platform_impl::EventLoop as WindowsEventLoop; /// Additional methods on `EventLoop` that are specific to Windows. pub trait EventLoopExt { diff --git a/src/platform/android/ffi.rs b/src/platform_impl/android/ffi.rs similarity index 100% rename from src/platform/android/ffi.rs rename to src/platform_impl/android/ffi.rs diff --git a/src/platform/android/mod.rs b/src/platform_impl/android/mod.rs similarity index 100% rename from src/platform/android/mod.rs rename to src/platform_impl/android/mod.rs diff --git a/src/platform/emscripten/ffi.rs b/src/platform_impl/emscripten/ffi.rs similarity index 100% rename from src/platform/emscripten/ffi.rs rename to src/platform_impl/emscripten/ffi.rs diff --git a/src/platform/emscripten/mod.rs b/src/platform_impl/emscripten/mod.rs similarity index 100% rename from src/platform/emscripten/mod.rs rename to src/platform_impl/emscripten/mod.rs diff --git a/src/platform/ios/ffi.rs b/src/platform_impl/ios/ffi.rs similarity index 100% rename from src/platform/ios/ffi.rs rename to src/platform_impl/ios/ffi.rs diff --git a/src/platform/ios/mod.rs b/src/platform_impl/ios/mod.rs similarity index 100% rename from src/platform/ios/mod.rs rename to src/platform_impl/ios/mod.rs diff --git a/src/platform/linux/dlopen.rs b/src/platform_impl/linux/dlopen.rs similarity index 100% rename from src/platform/linux/dlopen.rs rename to src/platform_impl/linux/dlopen.rs diff --git a/src/platform/linux/mod.rs b/src/platform_impl/linux/mod.rs similarity index 100% rename from src/platform/linux/mod.rs rename to src/platform_impl/linux/mod.rs diff --git a/src/platform/linux/wayland/event_loop.rs b/src/platform_impl/linux/wayland/event_loop.rs similarity index 100% rename from src/platform/linux/wayland/event_loop.rs rename to src/platform_impl/linux/wayland/event_loop.rs diff --git a/src/platform/linux/wayland/keyboard.rs b/src/platform_impl/linux/wayland/keyboard.rs similarity index 100% rename from src/platform/linux/wayland/keyboard.rs rename to src/platform_impl/linux/wayland/keyboard.rs diff --git a/src/platform/linux/wayland/mod.rs b/src/platform_impl/linux/wayland/mod.rs similarity index 100% rename from src/platform/linux/wayland/mod.rs rename to src/platform_impl/linux/wayland/mod.rs diff --git a/src/platform/linux/wayland/pointer.rs b/src/platform_impl/linux/wayland/pointer.rs similarity index 100% rename from src/platform/linux/wayland/pointer.rs rename to src/platform_impl/linux/wayland/pointer.rs diff --git a/src/platform/linux/wayland/touch.rs b/src/platform_impl/linux/wayland/touch.rs similarity index 100% rename from src/platform/linux/wayland/touch.rs rename to src/platform_impl/linux/wayland/touch.rs diff --git a/src/platform/linux/wayland/window.rs b/src/platform_impl/linux/wayland/window.rs similarity index 98% rename from src/platform/linux/wayland/window.rs rename to src/platform_impl/linux/wayland/window.rs index 42b7c52b8..b0f28359b 100644 --- a/src/platform/linux/wayland/window.rs +++ b/src/platform_impl/linux/wayland/window.rs @@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex, Weak}; use {CreationError, MouseCursor, WindowAttributes}; use dpi::{LogicalPosition, LogicalSize}; -use platform::MonitorId as PlatformMonitorId; +use platform_impl::MonitorId as PlatformMonitorId; use window::MonitorId as RootMonitorId; use sctk::window::{ConceptFrame, Event as WEvent, Window as SWindow}; @@ -14,7 +14,7 @@ use sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceReque use sctk::output::OutputMgr; use super::{make_wid, EventLoop, MonitorId, WindowId}; -use platform::platform::wayland::event_loop::{get_available_monitors, get_primary_monitor}; +use platform_impl::platform::wayland::event_loop::{get_available_monitors, get_primary_monitor}; pub struct Window { surface: Proxy, diff --git a/src/platform/linux/x11/dnd.rs b/src/platform_impl/linux/x11/dnd.rs similarity index 100% rename from src/platform/linux/x11/dnd.rs rename to src/platform_impl/linux/x11/dnd.rs diff --git a/src/platform/linux/x11/events.rs b/src/platform_impl/linux/x11/events.rs similarity index 100% rename from src/platform/linux/x11/events.rs rename to src/platform_impl/linux/x11/events.rs diff --git a/src/platform/linux/x11/ffi.rs b/src/platform_impl/linux/x11/ffi.rs similarity index 100% rename from src/platform/linux/x11/ffi.rs rename to src/platform_impl/linux/x11/ffi.rs diff --git a/src/platform/linux/x11/ime/callbacks.rs b/src/platform_impl/linux/x11/ime/callbacks.rs similarity index 100% rename from src/platform/linux/x11/ime/callbacks.rs rename to src/platform_impl/linux/x11/ime/callbacks.rs diff --git a/src/platform/linux/x11/ime/context.rs b/src/platform_impl/linux/x11/ime/context.rs similarity index 100% rename from src/platform/linux/x11/ime/context.rs rename to src/platform_impl/linux/x11/ime/context.rs diff --git a/src/platform/linux/x11/ime/inner.rs b/src/platform_impl/linux/x11/ime/inner.rs similarity index 100% rename from src/platform/linux/x11/ime/inner.rs rename to src/platform_impl/linux/x11/ime/inner.rs diff --git a/src/platform/linux/x11/ime/input_method.rs b/src/platform_impl/linux/x11/ime/input_method.rs similarity index 100% rename from src/platform/linux/x11/ime/input_method.rs rename to src/platform_impl/linux/x11/ime/input_method.rs diff --git a/src/platform/linux/x11/ime/mod.rs b/src/platform_impl/linux/x11/ime/mod.rs similarity index 100% rename from src/platform/linux/x11/ime/mod.rs rename to src/platform_impl/linux/x11/ime/mod.rs diff --git a/src/platform/linux/x11/mod.rs b/src/platform_impl/linux/x11/mod.rs similarity index 99% rename from src/platform/linux/x11/mod.rs rename to src/platform_impl/linux/x11/mod.rs index d1ff7a63c..e87439e2f 100644 --- a/src/platform/linux/x11/mod.rs +++ b/src/platform_impl/linux/x11/mod.rs @@ -37,7 +37,7 @@ use { WindowEvent, }; use events::ModifiersState; -use platform::PlatformSpecificWindowBuilderAttributes; +use platform_impl::PlatformSpecificWindowBuilderAttributes; use self::dnd::{Dnd, DndState}; use self::ime::{ImeReceiver, ImeSender, ImeCreationError, Ime}; diff --git a/src/platform/linux/x11/monitor.rs b/src/platform_impl/linux/x11/monitor.rs similarity index 100% rename from src/platform/linux/x11/monitor.rs rename to src/platform_impl/linux/x11/monitor.rs diff --git a/src/platform/linux/x11/util/atom.rs b/src/platform_impl/linux/x11/util/atom.rs similarity index 100% rename from src/platform/linux/x11/util/atom.rs rename to src/platform_impl/linux/x11/util/atom.rs diff --git a/src/platform/linux/x11/util/client_msg.rs b/src/platform_impl/linux/x11/util/client_msg.rs similarity index 100% rename from src/platform/linux/x11/util/client_msg.rs rename to src/platform_impl/linux/x11/util/client_msg.rs diff --git a/src/platform/linux/x11/util/format.rs b/src/platform_impl/linux/x11/util/format.rs similarity index 100% rename from src/platform/linux/x11/util/format.rs rename to src/platform_impl/linux/x11/util/format.rs diff --git a/src/platform/linux/x11/util/geometry.rs b/src/platform_impl/linux/x11/util/geometry.rs similarity index 100% rename from src/platform/linux/x11/util/geometry.rs rename to src/platform_impl/linux/x11/util/geometry.rs diff --git a/src/platform/linux/x11/util/hint.rs b/src/platform_impl/linux/x11/util/hint.rs similarity index 100% rename from src/platform/linux/x11/util/hint.rs rename to src/platform_impl/linux/x11/util/hint.rs diff --git a/src/platform/linux/x11/util/icon.rs b/src/platform_impl/linux/x11/util/icon.rs similarity index 100% rename from src/platform/linux/x11/util/icon.rs rename to src/platform_impl/linux/x11/util/icon.rs diff --git a/src/platform/linux/x11/util/input.rs b/src/platform_impl/linux/x11/util/input.rs similarity index 100% rename from src/platform/linux/x11/util/input.rs rename to src/platform_impl/linux/x11/util/input.rs diff --git a/src/platform/linux/x11/util/memory.rs b/src/platform_impl/linux/x11/util/memory.rs similarity index 100% rename from src/platform/linux/x11/util/memory.rs rename to src/platform_impl/linux/x11/util/memory.rs diff --git a/src/platform/linux/x11/util/mod.rs b/src/platform_impl/linux/x11/util/mod.rs similarity index 100% rename from src/platform/linux/x11/util/mod.rs rename to src/platform_impl/linux/x11/util/mod.rs diff --git a/src/platform/linux/x11/util/randr.rs b/src/platform_impl/linux/x11/util/randr.rs similarity index 100% rename from src/platform/linux/x11/util/randr.rs rename to src/platform_impl/linux/x11/util/randr.rs diff --git a/src/platform/linux/x11/util/window_property.rs b/src/platform_impl/linux/x11/util/window_property.rs similarity index 100% rename from src/platform/linux/x11/util/window_property.rs rename to src/platform_impl/linux/x11/util/window_property.rs diff --git a/src/platform/linux/x11/util/wm.rs b/src/platform_impl/linux/x11/util/wm.rs similarity index 100% rename from src/platform/linux/x11/util/wm.rs rename to src/platform_impl/linux/x11/util/wm.rs diff --git a/src/platform/linux/x11/window.rs b/src/platform_impl/linux/x11/window.rs similarity index 99% rename from src/platform/linux/x11/window.rs rename to src/platform_impl/linux/x11/window.rs index a2b83c028..f37a55743 100644 --- a/src/platform/linux/x11/window.rs +++ b/src/platform_impl/linux/x11/window.rs @@ -10,9 +10,9 @@ use parking_lot::Mutex; use {Icon, MouseCursor, WindowAttributes}; use CreationError::{self, OsError}; use dpi::{LogicalPosition, LogicalSize}; -use platform::MonitorId as PlatformMonitorId; -use platform::PlatformSpecificWindowBuilderAttributes; -use platform::x11::MonitorId as X11MonitorId; +use platform_impl::MonitorId as PlatformMonitorId; +use platform_impl::PlatformSpecificWindowBuilderAttributes; +use platform_impl::x11::MonitorId as X11MonitorId; use window::MonitorId as RootMonitorId; use super::{ffi, util, ImeSender, XConnection, XError, WindowId, EventLoop}; diff --git a/src/platform/linux/x11/xdisplay.rs b/src/platform_impl/linux/x11/xdisplay.rs similarity index 100% rename from src/platform/linux/x11/xdisplay.rs rename to src/platform_impl/linux/x11/xdisplay.rs diff --git a/src/platform/macos/events_loop.rs b/src/platform_impl/macos/events_loop.rs similarity index 100% rename from src/platform/macos/events_loop.rs rename to src/platform_impl/macos/events_loop.rs diff --git a/src/platform/macos/ffi.rs b/src/platform_impl/macos/ffi.rs similarity index 100% rename from src/platform/macos/ffi.rs rename to src/platform_impl/macos/ffi.rs diff --git a/src/platform/macos/mod.rs b/src/platform_impl/macos/mod.rs similarity index 100% rename from src/platform/macos/mod.rs rename to src/platform_impl/macos/mod.rs diff --git a/src/platform/macos/monitor.rs b/src/platform_impl/macos/monitor.rs similarity index 100% rename from src/platform/macos/monitor.rs rename to src/platform_impl/macos/monitor.rs diff --git a/src/platform/macos/util.rs b/src/platform_impl/macos/util.rs similarity index 94% rename from src/platform/macos/util.rs rename to src/platform_impl/macos/util.rs index 2e5d6b49a..c4c348f03 100644 --- a/src/platform/macos/util.rs +++ b/src/platform_impl/macos/util.rs @@ -3,8 +3,8 @@ use cocoa::base::{id, nil}; use cocoa::foundation::{NSRect, NSUInteger}; use core_graphics::display::CGDisplay; -use platform::platform::ffi; -use platform::platform::window::IdRef; +use platform_impl::platform::ffi; +use platform_impl::platform::window::IdRef; pub const EMPTY_RANGE: ffi::NSRange = ffi::NSRange { location: ffi::NSNotFound as NSUInteger, diff --git a/src/platform/macos/view.rs b/src/platform_impl/macos/view.rs similarity index 98% rename from src/platform/macos/view.rs rename to src/platform_impl/macos/view.rs index 64296aeb1..6b8272645 100644 --- a/src/platform/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -14,10 +14,10 @@ use objc::declare::ClassDecl; use objc::runtime::{Class, Object, Protocol, Sel, BOOL, YES}; use {ElementState, Event, KeyboardInput, MouseButton, WindowEvent, WindowId}; -use platform::platform::events_loop::{DEVICE_ID, event_mods, Shared, to_virtual_key_code, check_additional_virtual_key_codes}; -use platform::platform::util; -use platform::platform::ffi::*; -use platform::platform::window::{get_window_id, IdRef}; +use platform_impl::platform::events_loop::{DEVICE_ID, event_mods, Shared, to_virtual_key_code, check_additional_virtual_key_codes}; +use platform_impl::platform::util; +use platform_impl::platform::ffi::*; +use platform_impl::platform::window::{get_window_id, IdRef}; struct ViewState { window: id, diff --git a/src/platform/macos/window.rs b/src/platform_impl/macos/window.rs similarity index 99% rename from src/platform/macos/window.rs rename to src/platform_impl/macos/window.rs index 26b14b3e2..2ca3187b5 100644 --- a/src/platform/macos/window.rs +++ b/src/platform_impl/macos/window.rs @@ -41,9 +41,9 @@ use { }; use CreationError::OsError; use os::macos::{ActivationPolicy, WindowExt}; -use platform::platform::{ffi, util}; -use platform::platform::events_loop::{EventLoop, Shared}; -use platform::platform::view::{new_view, set_ime_spot}; +use platform_impl::platform::{ffi, util}; +use platform_impl::platform::events_loop::{EventLoop, Shared}; +use platform_impl::platform::view::{new_view, set_ime_spot}; use window::MonitorId as RootMonitorId; #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] diff --git a/src/platform/mod.rs b/src/platform_impl/mod.rs similarity index 100% rename from src/platform/mod.rs rename to src/platform_impl/mod.rs diff --git a/src/platform/windows/dpi.rs b/src/platform_impl/windows/dpi.rs similarity index 100% rename from src/platform/windows/dpi.rs rename to src/platform_impl/windows/dpi.rs diff --git a/src/platform/windows/drop_handler.rs b/src/platform_impl/windows/drop_handler.rs similarity index 99% rename from src/platform/windows/drop_handler.rs rename to src/platform_impl/windows/drop_handler.rs index 43ba47d74..0d94c1234 100644 --- a/src/platform/windows/drop_handler.rs +++ b/src/platform_impl/windows/drop_handler.rs @@ -15,7 +15,7 @@ use winapi::um::oleidl::{IDropTarget, IDropTargetVtbl}; use winapi::um::winnt::HRESULT; use winapi::um::{shellapi, unknwnbase}; -use platform::platform::WindowId; +use platform_impl::platform::WindowId; use {Event, WindowId as SuperWindowId}; diff --git a/src/platform/windows/event.rs b/src/platform_impl/windows/event.rs similarity index 100% rename from src/platform/windows/event.rs rename to src/platform_impl/windows/event.rs diff --git a/src/platform/windows/events_loop.rs b/src/platform_impl/windows/events_loop.rs similarity index 99% rename from src/platform/windows/events_loop.rs rename to src/platform_impl/windows/events_loop.rs index ee74dc35a..f367abf7a 100644 --- a/src/platform/windows/events_loop.rs +++ b/src/platform_impl/windows/events_loop.rs @@ -52,18 +52,18 @@ use { WindowId as SuperWindowId, }; use events::{DeviceEvent, Touch, TouchPhase, StartCause}; -use platform::platform::{event, Cursor, WindowId, DEVICE_ID, wrap_device_id, util}; -use platform::platform::dpi::{ +use platform_impl::platform::{event, Cursor, WindowId, DEVICE_ID, wrap_device_id, util}; +use platform_impl::platform::dpi::{ become_dpi_aware, dpi_to_scale_factor, enable_non_client_dpi_scaling, get_hwnd_scale_factor, }; -use platform::platform::drop_handler::FileDropHandler; -use platform::platform::event::{handle_extended_keys, process_key_params, vkey_to_winit_vkey}; -use platform::platform::icon::WinIcon; -use platform::platform::raw_input::{get_raw_input_data, get_raw_mouse_button_state}; -use platform::platform::window::adjust_size; +use platform_impl::platform::drop_handler::FileDropHandler; +use platform_impl::platform::event::{handle_extended_keys, process_key_params, vkey_to_winit_vkey}; +use platform_impl::platform::icon::WinIcon; +use platform_impl::platform::raw_input::{get_raw_input_data, get_raw_mouse_button_state}; +use platform_impl::platform::window::adjust_size; /// Contains saved window info for switching between fullscreen #[derive(Clone)] diff --git a/src/platform/windows/icon.rs b/src/platform_impl/windows/icon.rs similarity index 98% rename from src/platform/windows/icon.rs rename to src/platform_impl/windows/icon.rs index 6ea1e9906..fb265c929 100644 --- a/src/platform/windows/icon.rs +++ b/src/platform_impl/windows/icon.rs @@ -8,7 +8,7 @@ use winapi::shared::windef::{HICON, HWND}; use winapi::um::winuser; use {Pixel, PIXEL_SIZE, Icon}; -use platform::platform::util; +use platform_impl::platform::util; impl Pixel { fn to_bgra(&mut self) { diff --git a/src/platform/windows/mod.rs b/src/platform_impl/windows/mod.rs similarity index 100% rename from src/platform/windows/mod.rs rename to src/platform_impl/windows/mod.rs diff --git a/src/platform/windows/monitor.rs b/src/platform_impl/windows/monitor.rs similarity index 97% rename from src/platform/windows/monitor.rs rename to src/platform_impl/windows/monitor.rs index b8a562ac2..67c4aa062 100644 --- a/src/platform/windows/monitor.rs +++ b/src/platform_impl/windows/monitor.rs @@ -8,8 +8,8 @@ use std::collections::VecDeque; use super::{EventLoop, util}; use dpi::{PhysicalPosition, PhysicalSize}; -use platform::platform::dpi::{dpi_to_scale_factor, get_monitor_dpi}; -use platform::platform::window::Window; +use platform_impl::platform::dpi::{dpi_to_scale_factor, get_monitor_dpi}; +use platform_impl::platform::window::Window; /// Win32 implementation of the main `MonitorId` object. #[derive(Debug, Clone)] diff --git a/src/platform/windows/raw_input.rs b/src/platform_impl/windows/raw_input.rs similarity index 99% rename from src/platform/windows/raw_input.rs rename to src/platform_impl/windows/raw_input.rs index 2f6e90594..12664435b 100644 --- a/src/platform/windows/raw_input.rs +++ b/src/platform_impl/windows/raw_input.rs @@ -31,7 +31,7 @@ use winapi::um::winuser::{ RID_INPUT, }; -use platform::platform::util; +use platform_impl::platform::util; use events::ElementState; #[allow(dead_code)] diff --git a/src/platform/windows/util.rs b/src/platform_impl/windows/util.rs similarity index 100% rename from src/platform/windows/util.rs rename to src/platform_impl/windows/util.rs diff --git a/src/platform/windows/window.rs b/src/platform_impl/windows/window.rs similarity index 98% rename from src/platform/windows/window.rs rename to src/platform_impl/windows/window.rs index ed66252f0..aed979a57 100644 --- a/src/platform/windows/window.rs +++ b/src/platform_impl/windows/window.rs @@ -28,15 +28,15 @@ use { PhysicalSize, WindowAttributes, }; -use platform::platform::{Cursor, PlatformSpecificWindowBuilderAttributes, WindowId}; -use platform::platform::dpi::{dpi_to_scale_factor, get_hwnd_dpi}; -use platform::platform::events_loop::{self, EventLoop, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID, REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID}; -use platform::platform::events_loop::WindowState; -use platform::platform::icon::{self, IconType, WinIcon}; -use platform::platform::monitor; -use platform::platform::raw_input::register_all_mice_and_keyboards_for_raw_input; -use platform::platform::drop_handler::FileDropHandler; -use platform::platform::util; +use platform_impl::platform::{Cursor, PlatformSpecificWindowBuilderAttributes, WindowId}; +use platform_impl::platform::dpi::{dpi_to_scale_factor, get_hwnd_dpi}; +use platform_impl::platform::events_loop::{self, EventLoop, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID, REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID}; +use platform_impl::platform::events_loop::WindowState; +use platform_impl::platform::icon::{self, IconType, WinIcon}; +use platform_impl::platform::monitor; +use platform_impl::platform::raw_input::register_all_mice_and_keyboards_for_raw_input; +use platform_impl::platform::drop_handler::FileDropHandler; +use platform_impl::platform::util; const WS_RESIZABLE: DWORD = winuser::WS_SIZEBOX | winuser::WS_MAXIMIZEBOX; diff --git a/src/window.rs b/src/window.rs index 0abba65f1..d80807e80 100644 --- a/src/window.rs +++ b/src/window.rs @@ -9,7 +9,7 @@ use { MouseCursor, PhysicalPosition, PhysicalSize, - platform, + platform_impl, Window, WindowBuilder, WindowId, @@ -154,7 +154,7 @@ impl WindowBuilder { })); // building - platform::Window::new( + platform_impl::Window::new( &events_loop.events_loop, self.window, self.platform_specific, @@ -449,7 +449,7 @@ impl Window { // This may change in the future. #[derive(Debug)] pub struct AvailableMonitorsIter { - pub(crate) data: VecDequeIter, + pub(crate) data: VecDequeIter, } impl Iterator for AvailableMonitorsIter { @@ -469,7 +469,7 @@ impl Iterator for AvailableMonitorsIter { /// Identifier for a monitor. #[derive(Debug, Clone)] pub struct MonitorId { - pub(crate) inner: platform::MonitorId + pub(crate) inner: platform_impl::MonitorId } impl MonitorId {