Remove System::tabletAPI() function

We can just use System::tabletOptions().api.

os/common/system.h

@@ -40,7 +40,6 @@ class CommonSystem : public System {
   // moment)
   void setTabletOptions(const TabletOptions&) override { }
   TabletOptions tabletOptions() const override { return TabletOptions(); }
-  TabletAPI tabletAPI() const override { return TabletAPI::Default; }
 
   Logger* logger() override {
     return nullptr;

os/none/os.cpp

@@ -30,7 +30,6 @@ class NoneSystem : public System {
   Capabilities capabilities() const override { return (Capabilities)0; }
   void setTabletOptions(const TabletOptions&) override { }
   TabletOptions tabletOptions() const override { return TabletOptions(); }
-  TabletAPI tabletAPI() const override { return TabletAPI::Default; }
   Logger* logger() override { return nullptr; }
   Menus* menus() override { return nullptr; }
   NativeDialogs* nativeDialogs() override { return nullptr; }

os/system.h

@@ -120,9 +120,6 @@ namespace os {
     virtual void setTabletOptions(const TabletOptions& opts) = 0;
     virtual TabletOptions tabletOptions() const = 0;
 
-    // Shortcut alternative (could be faster?) for tabletOptions().api
-    virtual TabletAPI tabletAPI() const = 0;
-
     // Sub-interfaces
     virtual Logger* logger() = 0;
     virtual Menus* menus() = 0;

os/tablet_options.h

@@ -33,13 +33,15 @@ namespace os {
   };
 
   struct TabletOptions {
+#if LAF_WINDOWS
     // Windows API to get stylus/digital tablet position of the pen
     // (Windows Pointer API, legacy Wintab, etc.).
     TabletAPI api = TabletAPI::Default;
 
     // Use a fix for live streaming software like OBS to set the
     // cursor position each time we receive a pointer event like
     bool setCursorFix = false;
+#endif
   };
 
 } // namespace os

os/win/system.h

@@ -30,7 +30,6 @@ class SystemWin : public CommonSystem {
 
   void setTabletOptions(const TabletOptions& options) override;
   TabletOptions tabletOptions() const override { return m_tabletOptions; }
-  TabletAPI tabletAPI() const override { return m_tabletOptions.api; }
 
   bool isKeyPressed(KeyScancode scancode) override;
   int getUnicodeFromScancode(KeyScancode scancode) override;

os/win/window.cpp

@@ -861,7 +861,7 @@ void WindowWin::setInterpretOneFingerGestureAsMouseMovement(bool state)
 void WindowWin::onTabletOptionsChange()
 {
   LOG("WIN: On window %p tablet options change tablet API=%d\n",
-      m_hwnd, int(system()->tabletAPI()));
+      m_hwnd, int(tabletAPI()));
 
   closeWintabCtx();
   openWintabCtx();
@@ -882,7 +882,7 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
 
     case WM_CREATE: {
       LOG("WIN: Creating window %p (tablet API %d)\n",
-          m_hwnd, int(system()->tabletAPI()));
+          m_hwnd, int(tabletAPI()));
       openWintabCtx();
 
       if (m_borderless &&
@@ -1294,7 +1294,7 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
                   ev.position().x, ev.position().y,
                   ev.button(), (int)m_pointerType);
 
-      if (system()->tabletAPI() == TabletAPI::WintabPackets &&
+      if (tabletAPI() == TabletAPI::WintabPackets &&
           same_mouse_event(ev, m_lastWintabEvent)) {
         MOUSE_TRACE(" - IGNORED (WinTab)\n");
       }
@@ -1329,7 +1329,7 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
                   ev.position().x, ev.position().y,
                   ev.button());
 
-      if (system()->tabletAPI() == TabletAPI::WintabPackets &&
+      if (tabletAPI() == TabletAPI::WintabPackets &&
           same_mouse_event(ev, m_lastWintabEvent)) {
         MOUSE_TRACE(" - IGNORED (WinTab)\n");
       }
@@ -1940,7 +1940,6 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
     }
 
     case WT_PACKET: {
-      const TabletAPI tabletAPI = system()->tabletAPI();
       auto& api = system()->wintabApi();
       HCTX ctx = (HCTX)lparam;
       if (m_packets.size() < api.packetQueueSize())
@@ -1973,7 +1972,7 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
         }
         m_pointerType = wt_packet_pkcursor_to_pointer_type(packet.pkCursor);
 
-        if (tabletAPI == TabletAPI::WintabPackets) {
+        if (tabletAPI() == TabletAPI::WintabPackets) {
           POINT pos = { packet.pkX,
                         // Wintab API uses lower-left corner as the origin
                         (api.outBounds().h-1) - packet.pkY };
@@ -2019,8 +2018,7 @@ LRESULT WindowWin::wndProc(UINT msg, WPARAM wparam, LPARAM lparam)
     }
 
     case WT_INFOCHANGE: {
-      const TabletAPI tabletAPI = system()->tabletAPI();
-      MOUSE_TRACE("WT_INFOCHANGE tablet API %d\n", int(tabletAPI));
+      MOUSE_TRACE("WT_INFOCHANGE tablet API %d\n", int(tabletAPI()));
 
       if (m_hpenctx) {
         closeWintabCtx();
@@ -2146,16 +2144,15 @@ void WindowWin::handleMouseMove(Event& ev)
 
   ev.setType(Event::MouseMove);
 
-  auto sys = system();
-  if (sys->tabletAPI() == TabletAPI::WintabPackets &&
+  if (tabletAPI() == TabletAPI::WintabPackets &&
       same_mouse_event(ev, m_lastWintabEvent)) {
     MOUSE_TRACE(" - IGNORED (WinTab)\n");
   }
   else {
     queueEvent(ev);
     m_lastWintabEvent.setType(Event::None);
 
-    sys->_setInternalMousePosition(ev);
+    system()->_setInternalMousePosition(ev);
   }
 }
 
@@ -2492,6 +2489,14 @@ void WindowWin::notifyFullScreenStateToShell()
   taskbar->MarkFullscreenWindow(m_hwnd, m_fullscreen ? TRUE: FALSE);
 }
 
+TabletAPI WindowWin::tabletAPI() const
+{
+  if (auto sys = system())
+    return sys->tabletOptions().api;
+  else
+    return TabletAPI::Default;
+}
+
 //static
 void WindowWin::registerClass()
 {

os/win/window.h

@@ -16,6 +16,7 @@
 #include "os/native_cursor.h"
 #include "os/pointer_type.h"
 #include "os/screen.h"
+#include "os/tablet_options.h"
 #include "os/win/dnd.h"
 #include "os/win/wintab.h"
 
@@ -111,6 +112,8 @@ namespace os {
       return true;
     }
 
+    TabletAPI tabletAPI() const;
+
     virtual void onResize(const gfx::Size& sz) { }
     virtual void onStartResizing() { }
     virtual void onEndResizing() { }