xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 4 ++++
debian/patches/500_pointer_barrier_thresholds.diff | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 98324889b2d56905757396359f9904fa2d99aa83
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Nov 8 12:55:21 2012 +0200
500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724)
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index cf97252..564405c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xorg-server (2:1.13.0-0ubuntu6.1) UNRELEASED; urgency=low
when acpid is stopped before Xorg is. (LP: #1070481)
* add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794)
+ [ Tim Lunn ]
+ * 500_pointer_barrier_thresholds.diff: Update to fix gaps above
+ barriers at edge of screen (LP: #1073724)
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Oct 2012 10:22:24 +0300
xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff
index b61dcfc..70020b7 100644
--- a/debian/patches/500_pointer_barrier_thresholds.diff
+++ b/debian/patches/500_pointer_barrier_thresholds.diff
@@ -392,8 +392,7 @@ index 602b906..cab5b31 100644
+ dir = barrier_get_direction(ox, oy, unclamped_prex, unclamped_prey);
+ barrier_calculate_velocity_components(ox, oy, unclamped_prex, unclamped_prey, &vel_x, &vel_y);
-- nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
-+ nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
if (nearest) {
- barrier_clamp_to_barrier(nearest, dir, x, y);
+ int velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;
@@ -419,8 +418,7 @@ index 602b906..cab5b31 100644
oy = *y;
}
-- nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
-+ nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
if (nearest) {
- barrier_clamp_to_barrier(nearest, dir, x, y);
+ velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;
Reply to: