diff options
Diffstat (limited to 'platform/osx/os_osx.h')
| -rw-r--r-- | platform/osx/os_osx.h | 71 |
1 files changed, 34 insertions, 37 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 9941774b40..2c7ad09b89 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -29,22 +29,21 @@ #ifndef OS_OSX_H #define OS_OSX_H - -#include "os/input.h" -#include "joypad_osx.h" -#include "power_osx.h" #include "drivers/unix/os_unix.h" +#include "joypad_osx.h" #include "main/input_default.h" +#include "os/input.h" +#include "power_osx.h" #include "servers/visual_server.h" // #include "servers/visual/visual_server_wrap_mt.h" -#include "servers/visual/rasterizer.h" -#include "servers/physics_server.h" -#include "servers/audio_server.h" -#include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/alsa/audio_driver_alsa.h" +#include "drivers/rtaudio/audio_driver_rtaudio.h" +#include "platform/osx/audio_driver_osx.h" +#include "servers/audio_server.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/physics_2d/physics_2d_server_wrap_mt.h" -#include "platform/osx/audio_driver_osx.h" +#include "servers/physics_server.h" +#include "servers/visual/rasterizer.h" #include <ApplicationServices/ApplicationServices.h> //bitch @@ -56,7 +55,7 @@ class OS_OSX : public OS_Unix { public: bool force_quit; -// rasterizer seems to no longer be given to visual server, its using GLES3 directly? + // rasterizer seems to no longer be given to visual server, its using GLES3 directly? //Rasterizer *rasterizer; VisualServer *visual_server; @@ -80,8 +79,8 @@ public: void process_events(); - void* framework; -// pthread_key_t current; + void *framework; + // pthread_key_t current; bool mouse_grab; Point2 mouse_pos; uint32_t last_id; @@ -108,60 +107,58 @@ public: Size2 window_size; int current_screen; Rect2 restore_rect; - + power_osx *power_manager; float _mouse_scale(float p_scale) { - if (display_scale>1.0) + if (display_scale > 1.0) return p_scale; else return 1.0; } float display_scale; -protected: +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 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 finalize(); - virtual void set_main_loop( MainLoop * p_main_loop ); + virtual void set_main_loop(MainLoop *p_main_loop); virtual void delete_main_loop(); public: - - - static OS_OSX* singleton; + static OS_OSX *singleton; void wm_minimized(bool p_minimized); virtual String get_name(); - virtual void alert(const String& p_alert, const String& p_title="ALERT!"); + virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); virtual void set_cursor_shape(CursorShape p_shape); virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual void warp_mouse_pos(const Point2& p_to); + virtual void warp_mouse_pos(const Point2 &p_to); 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 Size2 get_window_size() const; - virtual void set_icon(const Image& p_icon); + virtual void set_icon(const Image &p_icon); virtual MainLoop *get_main_loop() const; virtual bool can_draw() const; - virtual void set_clipboard(const String& p_text); + virtual void set_clipboard(const String &p_text); virtual String get_clipboard() const; virtual void release_rendering_thread(); @@ -169,13 +166,13 @@ public: virtual void swap_buffers(); Error shell_open(String p_uri); - void push_input(const InputEvent& p_event); + void push_input(const InputEvent &p_event); String get_locale() 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 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 String get_executable_path() const; @@ -186,12 +183,12 @@ public: virtual int get_screen_count() const; virtual int get_current_screen() const; virtual void set_current_screen(int p_screen); - virtual Point2 get_screen_position(int p_screen=0) const; - virtual Size2 get_screen_size(int p_screen=0) const; - virtual int get_screen_dpi(int p_screen=0) const; + virtual Point2 get_screen_position(int p_screen = 0) const; + virtual Size2 get_screen_size(int p_screen = 0) const; + virtual int get_screen_dpi(int p_screen = 0) const; virtual Point2 get_window_position() const; - virtual void set_window_position(const Point2& p_position); + virtual void set_window_position(const Point2 &p_position); virtual void set_window_size(const Size2 p_size); virtual void set_window_fullscreen(bool p_enabled); virtual bool is_window_fullscreen() const; @@ -203,15 +200,15 @@ public: virtual bool is_window_maximized() const; virtual void request_attention(); virtual String get_joy_guid(int p_device) const; - + virtual PowerState get_power_state(); virtual int get_power_seconds_left(); virtual int get_power_percent_left(); void run(); - void set_mouse_mode(MouseMode p_mode); - MouseMode get_mouse_mode() const; + void set_mouse_mode(MouseMode p_mode); + MouseMode get_mouse_mode() const; OS_OSX(); }; |