xserver: Branch 'master'

[GitLab Mirror]

 hw/xquartz/X11Application.m |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 35622980685afeb34108f547854569e61bd0a142
Author: Aki Sakurai <akisakurai at outlook.com>
Date:   Mon Feb 10 22:02:16 2025 +0800

    xquartz: fix inverted tablet pen Y tilt on macOS
    
    On macOS, the y tilt behavior is inverted; an increase in the tilt
    value corresponds to tilting the device away from the user.
    
    see https://chromium-review.googlesource.com/c/chromium/src/+/2348544
    see https://github.com/qt/qtbase/blob/0f128fd7c5a9ee721d1e631743f6eb61d927cf3b/src/plugins/platforms/cocoa/qnsview_tablet.mm#L63
    
    Fixes #792
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1779>

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f6f83936a..b2e2d6540 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1101,7 +1101,7 @@ handle_mouse:
             else
                 DarwinSendTabletEvents(darwinTabletCurrent, ProximityOut, 0,
                                        location.x, location.y, pressure,
-                                       tilt.x, tilt.y);
+                                       tilt.x, -tilt.y);
             return;
         }
 
@@ -1115,7 +1115,7 @@ handle_mouse:
             if (needsProximityIn) {
                 DarwinSendTabletEvents(darwinTabletCurrent, ProximityIn, 0,
                                        location.x, location.y, pressure,
-                                       tilt.x, tilt.y);
+                                       tilt.x, -tilt.y);
 
                 needsProximityIn = NO;
             }
@@ -1157,7 +1157,7 @@ handle_mouse:
         } else {
             DarwinSendTabletEvents(pDev, ev_type, ev_button,
                                    location.x, location.y, pressure,
-                                   tilt.x, tilt.y);
+                                   tilt.x, -tilt.y);
         }
 
         break;
@@ -1184,7 +1184,7 @@ handle_mouse:
         else
             DarwinSendTabletEvents(darwinTabletCurrent, ProximityOut, 0,
                                    location.x, location.y, pressure,
-                                   tilt.x, tilt.y);
+                                   tilt.x, -tilt.y);
         break;
 
     case NSScrollWheel: