xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sat Apr 26 17:04:54 PDT 2008
hw/xquartz/X11Application.m | 2 --
hw/xquartz/darwinEvents.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 00a9567acce2b27a649cbebd4790e3043688a7d8
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Apr 26 17:04:49 2008 -0700
XQuartz: Don't subtract the titlebar off of the pointer_y
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index d23fc03..b29efc6 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -878,8 +878,6 @@ static void send_nsevent (NSEventType type, NSEvent *e) {
pointer_y = (screen.origin.y + screen.size.height) - location.y;
}
- pointer_y -= aquaMenuBarHeight;
-
pressure = 0; // for tablets
tilt_x = 0;
tilt_y = 0;
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index afa292f..0643e53 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -367,6 +367,8 @@ void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int poin
static int darwinFakeMouseButtonMask = 0;
int i, num_events;
+ //DEBUG_LOG("x=%d, y=%d, p=%f, tx=%f, ty=%f\n", pointer_x, pointer_y, pressure, tilt_x, tilt_y);
+
if(!darwinEvents) {
ErrorF("DarwinSendPointerEvents called before darwinEvents was initialized\n");
return;
More information about the xorg-commit
mailing list