From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: 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 --- core/os/os.h | 165 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 77 insertions(+), 88 deletions(-) (limited to 'core/os/os.h') diff --git a/core/os/os.h b/core/os/os.h index 7c8100679a..46e57e5186 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -29,22 +29,21 @@ #ifndef OS_H #define OS_H -#include "ustring.h" -#include "list.h" -#include "vector.h" #include "engine.h" +#include "list.h" #include "os/main_loop.h" #include "power.h" +#include "ustring.h" +#include "vector.h" #include - /** @author Juan Linietsky */ class OS { - static OS* singleton; + static OS *singleton; String _execpath; List _cmdline; bool _keep_screen_on; @@ -57,7 +56,6 @@ class OS { int _orientation; bool _allow_hidpi; - char *last_error; public: @@ -69,45 +67,51 @@ public: }; struct VideoMode { - int width,height; + int width, height; bool fullscreen; bool resizable; bool borderless_window; - float get_aspect() const { return (float)width/(float)height; } - VideoMode(int p_width=1024,int p_height=600,bool p_fullscreen=false, bool p_resizable = true,bool p_borderless_window=false) { width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; borderless_window=p_borderless_window; } + float get_aspect() const { return (float)width / (float)height; } + VideoMode(int p_width = 1024, int p_height = 600, bool p_fullscreen = false, bool p_resizable = true, bool p_borderless_window = false) { + width = p_width; + height = p_height; + fullscreen = p_fullscreen; + resizable = p_resizable; + borderless_window = p_borderless_window; + } }; + protected: -friend class Main; + friend class Main; RenderThreadMode _render_thread_mode; // functions used by main to initialize/deintialize the OS - virtual int get_video_driver_count() const=0; - virtual const char * get_video_driver_name(int p_driver) const=0; + virtual int get_video_driver_count() const = 0; + virtual const char *get_video_driver_name(int p_driver) const = 0; - virtual VideoMode get_default_video_mode() const=0; + virtual VideoMode get_default_video_mode() const = 0; - virtual int get_audio_driver_count() const=0; - virtual const char * get_audio_driver_name(int p_driver) const=0; + virtual int get_audio_driver_count() const = 0; + virtual const char *get_audio_driver_name(int p_driver) const = 0; - virtual void initialize_core()=0; - virtual void initialize(const VideoMode& p_desired,int p_video_driver,int p_audio_driver)=0; + virtual void initialize_core() = 0; + virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) = 0; - virtual void set_main_loop( MainLoop * p_main_loop )=0; - virtual void delete_main_loop()=0; + virtual void set_main_loop(MainLoop *p_main_loop) = 0; + virtual void delete_main_loop() = 0; - virtual void finalize()=0; - virtual void finalize_core()=0; + virtual void finalize() = 0; + virtual void finalize_core() = 0; - virtual void set_cmdline(const char* p_execpath, const List& p_args); + virtual void set_cmdline(const char *p_execpath, const List &p_args); void _ensure_data_dir(); public: - typedef int64_t ProcessID; - static OS* get_singleton(); + static OS *get_singleton(); enum ErrorType { ERR_ERROR, @@ -116,20 +120,18 @@ public: ERR_SHADER }; - virtual 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=ERR_ERROR); + virtual 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 = ERR_ERROR); - virtual void print(const char *p_format, ... ); - virtual void printerr(const char *p_format, ... ); - virtual void vprint(const char* p_format, va_list p_list, bool p_stderr=false)=0; - virtual void alert(const String& p_alert,const String& p_title="ALERT!")=0; - virtual String get_stdin_string(bool p_block = true)=0; + virtual void print(const char *p_format, ...); + virtual void printerr(const char *p_format, ...); + virtual void vprint(const char *p_format, va_list p_list, bool p_stderr = false) = 0; + virtual void alert(const String &p_alert, const String &p_title = "ALERT!") = 0; + virtual String get_stdin_string(bool p_block = true) = 0; - virtual void set_last_error(const char* p_error); + virtual void set_last_error(const char *p_error); virtual const char *get_last_error() const; virtual void clear_last_error(); - - enum MouseMode { MOUSE_MODE_VISIBLE, MOUSE_MODE_HIDDEN, @@ -140,30 +142,28 @@ public: virtual void set_mouse_mode(MouseMode p_mode); virtual MouseMode get_mouse_mode() const; + virtual void warp_mouse_pos(const Point2 &p_to) {} + virtual Point2 get_mouse_pos() const = 0; + virtual int get_mouse_button_state() const = 0; + virtual void set_window_title(const String &p_title) = 0; - virtual void warp_mouse_pos(const Point2& p_to) {} - virtual Point2 get_mouse_pos() const=0; - virtual int get_mouse_button_state() const=0; - virtual void set_window_title(const String& p_title)=0; - - virtual void set_clipboard(const String& p_text); + virtual void set_clipboard(const String &p_text); virtual String get_clipboard() const; - virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0)=0; - virtual VideoMode get_video_mode(int p_screen=0) const=0; - virtual void get_fullscreen_mode_list(List *p_list,int p_screen=0) const=0; + virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0) = 0; + virtual VideoMode get_video_mode(int p_screen = 0) const = 0; + virtual void get_fullscreen_mode_list(List *p_list, int p_screen = 0) const = 0; - - virtual int get_screen_count() const{ return 1; } + virtual int get_screen_count() const { return 1; } virtual int get_current_screen() const { return 0; } - virtual void set_current_screen(int p_screen) { } - virtual Point2 get_screen_position(int p_screen=0) const { return Point2(); } - virtual Size2 get_screen_size(int p_screen=0) const { return get_window_size(); } - virtual int get_screen_dpi(int p_screen=0) const { return 72; } + virtual void set_current_screen(int p_screen) {} + virtual Point2 get_screen_position(int p_screen = 0) const { return Point2(); } + virtual Size2 get_screen_size(int p_screen = 0) const { return get_window_size(); } + virtual int get_screen_dpi(int p_screen = 0) const { return 72; } virtual Point2 get_window_position() const { return Vector2(); } - virtual void set_window_position(const Point2& p_position) {} - virtual Size2 get_window_size() const=0; - virtual void set_window_size(const Size2 p_size){} + virtual void set_window_position(const Point2 &p_position) {} + virtual Size2 get_window_size() const = 0; + virtual void set_window_size(const Size2 p_size) {} virtual void set_window_fullscreen(bool p_enabled) {} virtual bool is_window_fullscreen() const { return true; } virtual void set_window_resizable(bool p_enabled) {} @@ -172,12 +172,11 @@ public: virtual bool is_window_minimized() const { return false; } virtual void set_window_maximized(bool p_enabled) {} virtual bool is_window_maximized() const { return true; } - virtual void request_attention() { } + virtual void request_attention() {} virtual void set_borderless_window(int p_borderless) {} virtual bool get_borderless_window() { return 0; } - virtual void set_keep_screen_on(bool p_enabled); virtual bool is_keep_screen_on() const; virtual void set_low_processor_usage_mode(bool p_enabled); @@ -185,22 +184,21 @@ public: virtual String get_installed_templates_path() const { return ""; } virtual String get_executable_path() const; - virtual Error execute(const String& p_path, const List& p_arguments,bool p_blocking,ProcessID *r_child_id=NULL,String* r_pipe=NULL,int *r_exitcode=NULL)=0; - virtual Error kill(const ProcessID& p_pid)=0; + virtual Error execute(const String &p_path, const List &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL) = 0; + virtual Error kill(const ProcessID &p_pid) = 0; virtual int get_process_ID() const; virtual Error shell_open(String p_uri); - virtual Error set_cwd(const String& p_cwd); + virtual Error set_cwd(const String &p_cwd); - virtual bool has_environment(const String& p_var) const=0; - virtual String get_environment(const String& p_var) const=0; + virtual bool has_environment(const String &p_var) const = 0; + virtual String get_environment(const String &p_var) const = 0; - virtual String get_name()=0; + virtual String get_name() = 0; virtual List get_cmdline_args() const { return _cmdline; } - virtual String get_model_name() const; - - virtual MainLoop *get_main_loop() const=0; + virtual String get_model_name() const; + virtual MainLoop *get_main_loop() const = 0; virtual void yield(); @@ -252,18 +250,17 @@ public: String name; }; - virtual Date get_date(bool local=false) const=0; - virtual Time get_time(bool local=false) const=0; - virtual TimeZoneInfo get_time_zone_info() const=0; + virtual Date get_date(bool local = false) const = 0; + virtual Time get_time(bool local = false) const = 0; + virtual TimeZoneInfo get_time_zone_info() const = 0; virtual uint64_t get_unix_time() const; virtual uint64_t get_system_time_secs() const; - virtual void delay_usec(uint32_t p_usec) const=0; - virtual uint64_t get_ticks_usec() const=0; + virtual void delay_usec(uint32_t p_usec) const = 0; + virtual uint64_t get_ticks_usec() const = 0; uint32_t get_ticks_msec() const; uint64_t get_splash_tick_msec() const; - virtual bool can_draw() const = 0; bool is_stdout_verbose() const; @@ -289,18 +286,17 @@ public: CURSOR_MAX }; - 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 void set_cursor_shape(CursorShape p_shape)=0; + virtual void set_cursor_shape(CursorShape p_shape) = 0; virtual bool get_swap_ok_cancel() { return false; } - virtual void dump_memory_to_file(const char* p_file); - virtual void dump_resources_to_file(const char* p_file); - virtual void print_resources_in_use(bool p_short=false); - virtual void print_all_resources(String p_to_file=""); + virtual void dump_memory_to_file(const char *p_file); + virtual void dump_resources_to_file(const char *p_file); + virtual void print_resources_in_use(bool p_short = false); + virtual void print_all_resources(String p_to_file = ""); virtual int get_static_memory_usage() const; virtual int get_static_memory_peak_usage() const; @@ -328,7 +324,6 @@ public: virtual String get_system_dir(SystemDir p_dir) const; - virtual void set_no_window_mode(bool p_enable); virtual bool is_no_window_mode_enabled() const; @@ -357,8 +352,7 @@ public: virtual void make_rendering_thread(); virtual void swap_buffers(); - - virtual void set_icon(const Image& p_icon); + virtual void set_icon(const Image &p_icon); virtual int get_exit_code() const; virtual void set_exit_code(int p_code); @@ -375,9 +369,8 @@ public: virtual bool can_use_threads() const; - virtual Error dialog_show(String p_title, String p_description, Vector p_buttons, Object* p_obj, String p_callback); - virtual Error dialog_input_text(String p_title, String p_description, String p_partial, Object* p_obj, String p_callback); - + virtual Error dialog_show(String p_title, String p_description, Vector p_buttons, Object *p_obj, String p_callback); + virtual Error dialog_input_text(String p_title, String p_description, String p_partial, Object *p_obj, String p_callback); enum LatinKeyboardVariant { LATIN_KEYBOARD_QWERTY, @@ -388,12 +381,10 @@ public: LATIN_KEYBOARD_NEO, }; - virtual LatinKeyboardVariant get_latin_keyboard_variant() const; - virtual bool is_joy_known(int p_device); - virtual String get_joy_guid(int p_device)const; + virtual String get_joy_guid(int p_device) const; enum EngineContext { CONTEXT_EDITOR, @@ -404,18 +395,16 @@ public: virtual void set_use_vsync(bool p_enable); virtual bool is_vsync_enabled() const; - + virtual PowerState get_power_state(); virtual int get_power_seconds_left(); virtual int get_power_percent_left(); - virtual bool check_feature_support(const String& p_feature)=0; + virtual bool check_feature_support(const String &p_feature) = 0; bool is_hidpi_allowed() const { return _allow_hidpi; } OS(); virtual ~OS(); - }; #endif - -- cgit v1.2.3