diff options
Diffstat (limited to 'src/osd/mac/window.h')
-rw-r--r-- | src/osd/mac/window.h | 57 |
1 files changed, 9 insertions, 48 deletions
diff --git a/src/osd/mac/window.h b/src/osd/mac/window.h index 24e749a425b..fce0b5f54bf 100644 --- a/src/osd/mac/window.h +++ b/src/osd/mac/window.h @@ -8,11 +8,13 @@ // //============================================================ -#ifndef __MACWINDOW__ -#define __MACWINDOW__ +#ifndef MAME_OSD_MAC_WINDOW_H +#define MAME_OSD_MAC_WINDOW_H + +#pragma once #include "osdmac.h" -#include "video.h" +#include "osdsync.h" #include "modules/osdwindow.h" @@ -28,12 +30,12 @@ class render_target; typedef uintptr_t HashT; -#define OSDWORK_CALLBACK(name) void *name(void *param, ATTR_UNUSED int threadid) +#define OSDWORK_CALLBACK(name) void *name(void *param, int threadid) class mac_window_info : public osd_window_t<void *> { public: - mac_window_info(running_machine &a_machine, int index, std::shared_ptr<osd_monitor_info> a_monitor, + mac_window_info(running_machine &a_machine, render_module &renderprovider, int index, std::shared_ptr<osd_monitor_info> a_monitor, const osd_window_config *config); ~mac_window_info(); @@ -44,7 +46,7 @@ public: void toggle_full_screen(); void modify_prescale(int dir); void resize(int32_t width, int32_t height); - void destroy() override; + void complete_destroy() override; void capture_pointer() override; void release_pointer() override; @@ -57,20 +59,8 @@ public: int xy_to_render_target(int x, int y, int *xt, int *yt); - running_machine &machine() const override { return m_machine; } - osd_monitor_info *monitor() const override { return m_monitor.get(); } - int fullscreen() const override { return m_fullscreen; } - - render_target *target() override { return m_target; } - - int prescale() const { return m_prescale; } - - // Pointer to next window - mac_window_info * m_next; - private: // window handle and info - char m_title[256]; int m_startmaximized; // dimensions @@ -79,18 +69,15 @@ private: // rendering info osd_event m_rendered_event; - render_target * m_target; //int m_extra_flags; // returns 0 on success, else 1 int complete_create(); - void complete_destroy(); private: int wnd_extra_width(); int wnd_extra_height(); - void set_starting_view(int index, const char *defview, const char *view); osd_rect constrain_to_aspect_ratio(const osd_rect &rect, int adjustment); osd_dim get_min_bounds(int constrain); osd_dim get_max_bounds(int constrain); @@ -98,37 +85,11 @@ private: osd_dim pick_best_mode(); void set_fullscreen(int afullscreen) { m_fullscreen = afullscreen; } - // Pointer to machine - running_machine & m_machine; - // monitor info - std::shared_ptr<osd_monitor_info> m_monitor; - int m_fullscreen; bool m_mouse_captured; bool m_mouse_hidden; void measure_fps(int update); }; -struct osd_draw_callbacks -{ - osd_renderer *(*create)(osd_window *window); -}; - -//============================================================ -// PROTOTYPES -//============================================================ - -//============================================================ -// PROTOTYPES - drawogl.c -//============================================================ - -int drawogl_init(running_machine &machine, osd_draw_callbacks *callbacks); - -//============================================================ -// PROTOTYPES - drawbgfx.c -//============================================================ - -int drawbgfx_init(running_machine &machine, osd_draw_callbacks *callbacks); - -#endif /* __MACWINDOW__ */ +#endif // MAME_OSD_MAC_WINDOW_H |