summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/osdsdl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/sdl/osdsdl.h')
-rw-r--r--src/osd/sdl/osdsdl.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index c8ce167d699..74730f69df5 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -10,11 +10,14 @@
#include "modules/lib/osdobj_common.h"
#include "modules/osdmodule.h"
+#include <SDL2/SDL.h>
+
#include <cassert>
#include <chrono>
#include <memory>
#include <mutex>
#include <unordered_map>
+#include <utility>
#include <string>
#include <vector>
@@ -128,8 +131,6 @@ public:
};
-union SDL_Event;
-
using sdl_event_manager = event_subscription_manager<SDL_Event, uint32_t>;
@@ -167,10 +168,6 @@ public:
virtual void process_events() override;
-protected:
- virtual void build_slider_list() override;
- virtual void update_slider_list() override;
-
private:
enum
{
@@ -194,6 +191,8 @@ private:
bool mouse_over_window() const { return m_mouse_over_window > 0; }
template <typename T> sdl_window_info *focus_window(T const &event) const;
+ unsigned map_pointer_device(SDL_TouchID device);
+
sdl_options &m_options;
sdl_window_info *m_focus_window;
int m_mouse_over_window;
@@ -202,6 +201,10 @@ private:
std::chrono::steady_clock::time_point m_last_click_time;
int m_last_click_x;
int m_last_click_y;
+
+ bool m_enable_touch;
+ unsigned m_next_ptrdev;
+ std::vector<std::pair<SDL_TouchID, unsigned> > m_ptrdev_map;
};
//============================================================