diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 20:36:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 20:36:46 +0100 |
| commit | 247b7e24483931e978f0c203030b5135109655cc (patch) | |
| tree | 930c25b13032f8d75425ec06b165099c0c8c0f4b /platform/windows/display_server_windows.h | |
| parent | 310496a89f583b49217915b9add165d51aea575e (diff) | |
| parent | 3e0262509f394ad174d8abe0742a6a6b66b0b16a (diff) | |
Merge pull request #46131 from bruvzg/move_tablet_to_ds
Move tablet driver API from OS to DisplayServer
Diffstat (limited to 'platform/windows/display_server_windows.h')
| -rw-r--r-- | platform/windows/display_server_windows.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index c8c6a75bf5..a734077e59 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -264,7 +264,6 @@ class DisplayServerWindows : public DisplayServer { _THREAD_SAFE_CLASS_ -public: // WinTab API static bool wintab_available; static WTOpenPtr wintab_WTOpen; @@ -279,8 +278,9 @@ public: static GetPointerPenInfoPtr win8p_GetPointerPenInfo; void _update_tablet_ctx(const String &p_old_driver, const String &p_new_driver); + String tablet_driver; + Vector<String> tablet_drivers; -private: void GetMaskBitmaps(HBITMAP hSourceBitmap, COLORREF clrTransparent, OUT HBITMAP &hAndMaskBitmap, OUT HBITMAP &hXorMaskBitmap); enum { @@ -542,6 +542,11 @@ public: virtual String keyboard_get_layout_language(int p_index) const; virtual String keyboard_get_layout_name(int p_index) const; + virtual int tablet_get_driver_count() const; + virtual String tablet_get_driver_name(int p_driver) const; + virtual String tablet_get_current_driver() const; + virtual void tablet_set_current_driver(const String &p_driver); + virtual void process_events(); virtual void force_process_and_drop_events(); |