diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /platform/uwp/os_uwp.h | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'platform/uwp/os_uwp.h')
-rw-r--r-- | platform/uwp/os_uwp.h | 116 |
1 files changed, 54 insertions, 62 deletions
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index 72cc8a7854..ebbb8af39c 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -29,26 +29,25 @@ #ifndef OSUWP_H #define OSUWP_H -#include "os/input.h" -#include "os/os.h" -#include "servers/visual_server.h" -#include "servers/visual/rasterizer.h" -#include "servers/physics/physics_server_sw.h" -#include "servers/audio_server.h" -#include "servers/physics_2d/physics_2d_server_sw.h" -#include "drivers/xaudio2/audio_driver_xaudio2.h" -#include "gl_context_egl.h" #include "core/math/math_2d.h" #include "core/ustring.h" -#include "main/input_default.h" +#include "drivers/xaudio2/audio_driver_xaudio2.h" +#include "gl_context_egl.h" #include "joypad_uwp.h" +#include "main/input_default.h" +#include "os/input.h" +#include "os/os.h" #include "power_winrt.h" +#include "servers/audio_server.h" +#include "servers/physics/physics_server_sw.h" +#include "servers/physics_2d/physics_2d_server_sw.h" +#include "servers/visual/rasterizer.h" +#include "servers/visual_server.h" -#include <windows.h> -#include <io.h> #include <fcntl.h> +#include <io.h> #include <stdio.h> - +#include <windows.h> /** @author Juan Linietsky <reduzio@gmail.com> @@ -56,11 +55,9 @@ class OSUWP : public OS { public: - struct KeyEvent { - enum MessageType - { + enum MessageType { KEY_EVENT_MESSAGE, CHAR_EVENT_MESSAGE }; @@ -72,16 +69,14 @@ public: unsigned int unicode; bool echo; CorePhysicalKeyStatus status; - }; private: - enum { JOYPADS_MAX = 8, JOY_AXIS_COUNT = 6, MAX_JOY_AXIS = 32768, // I've no idea - KEY_EVENT_BUFFER_SIZE=512 + KEY_EVENT_BUFFER_SIZE = 512 }; FILE *stdo; @@ -89,14 +84,13 @@ private: KeyEvent key_event_buffer[KEY_EVENT_BUFFER_SIZE]; int key_event_pos; - uint64_t ticks_start; uint64_t ticks_per_second; bool minimized; bool old_invalid; bool outside; - int old_x,old_y; + int old_x, old_y; Point2i center; unsigned int last_id; VisualServer *visual_server; @@ -105,7 +99,7 @@ private: Physics2DServer *physics_2d_server; int pressrc; - ContextEGL* gl_context; + ContextEGL *gl_context; VideoMode video_mode; @@ -128,52 +122,52 @@ private: InputDefault *input; - JoypadUWP^ joypad; + JoypadUWP ^ joypad; - Windows::System::Display::DisplayRequest^ display_request; + Windows::System::Display::DisplayRequest ^ display_request; void _post_dpad(DWORD p_dpad, int p_device, bool p_pressed); - void _drag_event(int idx,UINT uMsg, WPARAM wParam, LPARAM lParam); - void _touch_event(int idx, UINT uMsg, WPARAM wParam, LPARAM lParam); + void _drag_event(int idx, UINT uMsg, WPARAM wParam, LPARAM lParam); + void _touch_event(int idx, UINT uMsg, WPARAM wParam, LPARAM lParam); ref class ManagedType { public: property bool alert_close_handle; - property Platform::String^ clipboard; - void alert_close(Windows::UI::Popups::IUICommand^ command); - void on_clipboard_changed(Platform::Object^ sender, Platform::Object^ ev); + property Platform::String ^ clipboard; + void alert_close(Windows::UI::Popups::IUICommand ^ command); + void on_clipboard_changed(Platform::Object ^ sender, Platform::Object ^ ev); void update_clipboard(); - void on_accelerometer_reading_changed(Windows::Devices::Sensors::Accelerometer^ sender, Windows::Devices::Sensors::AccelerometerReadingChangedEventArgs^ args); - void on_magnetometer_reading_changed(Windows::Devices::Sensors::Magnetometer^ sender, Windows::Devices::Sensors::MagnetometerReadingChangedEventArgs^ args); - void on_gyroscope_reading_changed(Windows::Devices::Sensors::Gyrometer^ sender, Windows::Devices::Sensors::GyrometerReadingChangedEventArgs^ args); + void on_accelerometer_reading_changed(Windows::Devices::Sensors::Accelerometer ^ sender, Windows::Devices::Sensors::AccelerometerReadingChangedEventArgs ^ args); + void on_magnetometer_reading_changed(Windows::Devices::Sensors::Magnetometer ^ sender, Windows::Devices::Sensors::MagnetometerReadingChangedEventArgs ^ args); + void on_gyroscope_reading_changed(Windows::Devices::Sensors::Gyrometer ^ sender, Windows::Devices::Sensors::GyrometerReadingChangedEventArgs ^ args); - /** clang-format breaks this, it does not understand this token. */ - /* clang-format off */ + /** clang-format breaks this, it does not understand this token. */ + /* clang-format off */ internal: ManagedType() { alert_close_handle = false; } property OSUWP* os; - /* clang-format on */ + /* clang-format on */ }; - ManagedType^ managed_object; - Windows::Devices::Sensors::Accelerometer^ accelerometer; - Windows::Devices::Sensors::Magnetometer^ magnetometer; - Windows::Devices::Sensors::Gyrometer^ gyrometer; + ManagedType ^ managed_object; + Windows::Devices::Sensors::Accelerometer ^ accelerometer; + Windows::Devices::Sensors::Magnetometer ^ magnetometer; + Windows::Devices::Sensors::Gyrometer ^ gyrometer; // functions used by main to initialize/deintialize the OS protected: virtual int get_video_driver_count() const; - virtual const char * get_video_driver_name(int p_driver) const; + virtual const char *get_video_driver_name(int p_driver) const; virtual VideoMode get_default_video_mode() const; virtual int get_audio_driver_count() const; - virtual const char * get_audio_driver_name(int p_driver) const; + virtual const char *get_audio_driver_name(int p_driver) const; virtual void initialize_core(); - virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver); + virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); - virtual void set_main_loop( MainLoop * p_main_loop ); + virtual void set_main_loop(MainLoop *p_main_loop); virtual void delete_main_loop(); virtual void finalize(); @@ -184,14 +178,13 @@ protected: void process_key_events(); public: - // Event to send to the app wrapper HANDLE mouse_mode_changed; - void print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type); + void print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type); - virtual void vprint(const char *p_format, va_list p_list, bool p_stderr=false); - virtual void alert(const String& p_alert,const String& p_title="ALERT!"); + virtual void vprint(const char *p_format, va_list p_list, bool p_stderr = false); + virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); String get_stdin_string(bool p_block); void set_mouse_mode(MouseMode p_mode); @@ -199,11 +192,11 @@ public: virtual Point2 get_mouse_pos() const; virtual int get_mouse_button_state() const; - virtual void set_window_title(const String& p_title); + virtual void set_window_title(const String &p_title); - virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0); - virtual VideoMode get_video_mode(int p_screen=0) const; - virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const; + virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0); + virtual VideoMode get_video_mode(int p_screen = 0) const; + virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const; virtual Size2 get_window_size() const; virtual void set_window_size(const Size2 p_size); virtual void set_window_fullscreen(bool p_enabled); @@ -220,22 +213,22 @@ public: virtual uint64_t get_unix_time() const; virtual bool can_draw() const; - virtual Error set_cwd(const String& p_cwd); + virtual Error set_cwd(const String &p_cwd); virtual void delay_usec(uint32_t p_usec) const; virtual uint64_t get_ticks_usec() const; - virtual Error execute(const String& p_path, const List<String>& p_arguments,bool p_blocking,ProcessID *r_child_id=NULL,String* r_pipe=NULL,int *r_exitcode=NULL); - virtual Error kill(const ProcessID& p_pid); + virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL); + virtual Error kill(const ProcessID &p_pid); - virtual bool has_environment(const String& p_var) const; - virtual String get_environment(const String& p_var) const; + virtual bool has_environment(const String &p_var) const; + virtual String get_environment(const String &p_var) const; - virtual void set_clipboard(const String& p_text); + virtual void set_clipboard(const String &p_text); virtual String get_clipboard() const; void set_cursor_shape(CursorShape p_shape); - void set_icon(const Image& p_icon); + void set_icon(const Image &p_icon); virtual String get_executable_path() const; @@ -244,7 +237,7 @@ public: virtual void move_window_to_foreground(); virtual String get_data_dir() const; - void set_gl_context(ContextEGL* p_context); + void set_gl_context(ContextEGL *p_context); void screen_size_changed(); virtual void release_rendering_thread(); @@ -254,7 +247,7 @@ public: virtual bool has_touchscreen_ui_hint() const; virtual bool has_virtual_keyboard() const; - virtual void show_virtual_keyboard(const String& p_existing_text, const Rect2& p_screen_rect = Rect2()); + virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2()); virtual void hide_virtual_keyboard(); virtual Error shell_open(String p_uri); @@ -264,7 +257,7 @@ public: virtual bool get_swap_ok_cancel() { return true; } void input_event(InputEvent &p_event); - + virtual PowerState get_power_state(); virtual int get_power_seconds_left(); virtual int get_power_percent_left(); @@ -273,7 +266,6 @@ public: OSUWP(); ~OSUWP(); - }; #endif |