xorg-server: Changes to 'ubuntu'
.gitignore | 1
ChangeLog |11239 ++++++++--
Makefile.am | 2
Xext/Makefile.am | 7
Xext/geext.c | 9
Xext/panoramiX.c | 26
Xext/panoramiX.h | 4
Xext/panoramiXprocs.c | 50
Xext/panoramiXsrv.h | 23
Xext/saver.c | 3
Xext/security.c | 4
Xext/shm.c | 14
Xext/xcalibrate.c | 297
Xext/xselinux_hooks.c | 36
Xext/xtest.c | 16
Xext/xvdisp.c | 8
Xext/xvdix.h | 12
Xext/xvmain.c | 21
Xext/xvmc.c | 6
Xi/chgdctl.c | 72
Xi/exevents.c | 1531 +
Xi/exglobals.h | 2
Xi/extinit.c | 36
Xi/getdctl.c | 75
Xi/grabdev.c | 2
Xi/grabdevb.c | 4
Xi/grabdevk.c | 4
Xi/stubs.c | 12
Xi/ungrdev.c | 2
Xi/ungrdevb.c | 32
Xi/ungrdevk.c | 31
Xi/xiallowev.c | 53
Xi/xichangehierarchy.c | 21
Xi/xigrabdev.c | 19
Xi/xipassivegrab.c | 142
Xi/xiproperty.c | 9
Xi/xiquerydevice.c | 123
Xi/xiquerydevice.h | 2
Xi/xiquerypointer.c | 4
Xi/xiqueryversion.c | 7
Xi/xiselectev.c | 53
Xi/xiwarppointer.c | 4
composite/compalloc.c | 188
composite/compext.c | 5
composite/compint.h | 5
composite/compwindow.c | 19
config/config-backends.h | 2
config/config.c | 13
config/dbus.c | 10
config/hal.c | 11
config/udev.c | 30
configure.ac | 218
damageext/damageext.c | 2
debian/changelog | 223
debian/control | 38
debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 22
debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 16
debian/patches/100_rethrow_signals.patch | 205
debian/patches/15-nouveau.diff | 88
debian/patches/165_man_xorg_conf_no_device_ident.patch | 6
debian/patches/208_switch_on_release.diff | 14
debian/patches/210_pixman_null_ptr_check.patch | 25
debian/patches/214_glx_dri_searchdirs.patch | 530
debian/patches/220_dont_scale_indirect.patch | 34
debian/patches/220_xi21_always_deliver_raw_events.diff | 283
debian/patches/221_fix_SendEvent_flag_mask.diff | 42
debian/patches/221_pointer_motion_update_fix.patch | 34
debian/patches/222_touch_valuators_absolute.patch | 49
debian/patches/223_indirect_touch_x_y_valuators.patch | 35
debian/patches/224_return_BadWindow_not_BadMatch.diff | 47
debian/patches/500_xi2.1.patch | 4603 ----
debian/patches/501_xf86CoordinatesToWindow.patch | 97
debian/patches/502_gestures-extension.patch | 1482 -
debian/patches/503_fix_masked_transformed_valuators.patch | 106
debian/patches/504_fix_no_coords.patch | 66
debian/patches/505_Xi_ensure_replayed_touch_events_have_devices.patch | 35
debian/patches/506_Xi_ensure_touch_events_update_currentTime.patch | 27
debian/patches/507_touch_grab_reject_send_ownership.patch | 12
debian/patches/508_CVE-2011-4028.patch | 15
debian/patches/509_CVE-2011-4029.patch | 15
debian/patches/510_fix_touchpad_touch_event_removal.patch | 16
debian/patches/511_Update_border_clip_in_compAllocPixmap.patch | 42
debian/patches/series | 22
debian/rules | 19
debian/serverminver | 6
debian/xserver-xorg-core.install | 1
debian/xserver-xorg-core.lintian-overrides | 3
dev/null |binary
devbook.am | 62
dix/.gitignore | 1
dix/Makefile.am | 8
dix/cursor.c | 5
dix/deprecated.c | 165
dix/devices.c | 275
dix/dispatch.c | 48
dix/dixfonts.c | 30
dix/dixutils.c | 10
dix/enterleave.c | 19
dix/eventconvert.c | 193
dix/events.c | 1885 +
dix/extension.c | 17
dix/getevents.c | 1353 -
dix/grabs.c | 245
dix/inpututils.c | 457
dix/main.c | 7
dix/ptrveloc.c | 652
dix/region.c | 234
dix/resource.c | 36
dix/tables.c | 2
dix/touch.c | 982
dix/window.c | 265
doc/.gitignore | 4
doc/Makefile.am | 16
doc/Xinput.xml | 1209 +
doc/Xserver-spec.xml | 5102 ++++
doc/dtrace/.gitignore | 5
doc/dtrace/Makefile.am | 15
doc/dtrace/Xserver-DTrace.xml | 578
doc/man/Makefile.am | 6
doc/man/Xserver.man | 584
doc/xml/.gitignore | 5
doc/xml/Makefile.am | 30
doc/xml/Xserver-spec.xml | 5102 ----
doc/xml/dtrace/.gitignore | 3
doc/xml/dtrace/Makefile.am | 36
doc/xml/dtrace/Xserver-DTrace.xml | 579
doc/xml/xmlrules-inst.in | 23
doc/xml/xmlrules-noinst.in | 22
doc/xml/xmlrules.in | 47
doc/xml/xserver.ent.in | 3
docbook.am | 99
exa/exa.c | 4
exa/exa_accel.c | 6
exa/exa_classic.c | 2
exa/exa_driver.c | 2
exa/exa_migration_classic.c | 4
exa/exa_migration_mixed.c | 2
exa/exa_mixed.c | 2
exa/exa_priv.h | 7
exa/exa_unaccel.c | 11
fb/fb.h | 34
fb/fb24_32.c | 4
fb/fballpriv.c | 4
fb/fbarc.c | 13
fb/fbbits.c | 2
fb/fbblt.c | 17
fb/fbbltone.c | 27
fb/fbcopy.c | 2
fb/fbfill.c | 6
fb/fbgc.c | 6
fb/fbgetsp.c | 2
fb/fbglyph.c | 18
fb/fbimage.c | 4
fb/fbline.c | 8
fb/fboverlay.c | 8
fb/fbpict.c | 12
fb/fbpict.h | 20
fb/fbpixmap.c | 2
fb/fbpoint.c | 6
fb/fbpush.c | 2
fb/fbscreen.c | 6
fb/fbseg.c | 14
fb/fbsetsp.c | 2
fb/fbsolid.c | 4
fb/fbstipple.c | 4
fb/fbtrap.c | 222
fb/fbwindow.c | 61
fb/wfbrename.h | 2
glx/Makefile.am | 9
glx/glapi.c | 87
glx/glapi.h | 3
glx/glthread.c | 162
glx/glthread.h | 72
glx/glxcmds.c | 14
glx/glxcontext.h | 2
glx/glxdri.c | 75
glx/glxdri2.c | 62
glx/glxdricommon.c | 57
glx/glxdricommon.h | 5
glx/glxdriswrast.c | 56
glx/glxext.c | 17
glx/glxserver.h | 10
glx/single2.c | 8
glx/single2swap.c | 8
glx/singlepix.c | 2
glx/singlepixswap.c | 2
hw/dmx/Makefile.am | 2
hw/dmx/config/xdmxconfig.c | 8
hw/dmx/dmx.h | 2
hw/dmx/dmxcb.c | 7
hw/dmx/dmxextension.c | 4
hw/dmx/dmxgcops.c | 2
hw/dmx/dmxinit.c | 6
hw/dmx/dmxinput.c | 1
hw/dmx/dmxpict.c | 87
hw/dmx/dmxpict.h | 10
hw/dmx/dmxwindow.c | 4
hw/dmx/doc/.gitignore | 17
hw/dmx/doc/Makefile.am | 383
hw/dmx/doc/doxygen.conf.in | 1053
hw/dmx/doc/doxygen.css | 49
hw/dmx/doc/doxygen.foot | 12
hw/dmx/doc/doxygen.head | 8
hw/dmx/doxygen/.gitignore | 2
hw/dmx/doxygen/Makefile.am | 36
hw/dmx/doxygen/doxygen.conf.in | 1559 +
hw/dmx/doxygen/footer.html | 4
hw/dmx/examples/Makefile.am | 56
hw/dmx/examples/xbell.c | 3
hw/dmx/glxProxy/Makefile.am | 2
hw/dmx/glxProxy/compsize.c | 1
hw/dmx/glxProxy/compsize.h | 51
hw/dmx/glxProxy/g_renderswap.c | 1
hw/dmx/glxProxy/glxcmds.c | 2
hw/dmx/glxProxy/glxcmds.h | 37
hw/dmx/glxProxy/glxcmdsswap.c | 3
hw/dmx/glxProxy/glxserver.h | 8
hw/dmx/input/dmxevents.c | 66
hw/dmx/input/dmxinputinit.c | 3
hw/dmx/man/Xdmx.man | 30
hw/kdrive/ephyr/ephyr.c | 27
hw/kdrive/ephyr/ephyr.h | 2
hw/kdrive/ephyr/ephyr_draw.c | 2
hw/kdrive/ephyr/ephyrinit.c | 10
hw/kdrive/ephyr/hostx.c | 2
hw/kdrive/ephyr/hostx.h | 2
hw/kdrive/ephyr/man/Xephyr.man | 2
hw/kdrive/ephyr/os.c | 2
hw/kdrive/fake/fakeinit.c | 1
hw/kdrive/fake/kbd.c | 2
hw/kdrive/fbdev/fbdev.c | 2
hw/kdrive/fbdev/fbdev.h | 2
hw/kdrive/fbdev/fbinit.c | 3
hw/kdrive/linux/keyboard.c | 14
hw/kdrive/linux/linux.c | 2
hw/kdrive/linux/mouse.c | 2
hw/kdrive/linux/ms.c | 4
hw/kdrive/linux/ps2.c | 6
hw/kdrive/linux/tslib.c | 10
hw/kdrive/src/kcmap.c | 2
hw/kdrive/src/kdrive.c | 99
hw/kdrive/src/kdrive.h | 7
hw/kdrive/src/kinfo.c | 2
hw/kdrive/src/kinput.c | 43
hw/kdrive/src/kshadow.c | 2
hw/vfb/InitInput.c | 1
hw/vfb/InitOutput.c | 12
hw/xfree86/.gitignore | 4
hw/xfree86/Makefile.am | 53
hw/xfree86/common/xf86Config.c | 169
hw/xfree86/common/xf86Configure.c | 20
hw/xfree86/common/xf86Cursor.c | 2
hw/xfree86/common/xf86DGA.c | 6
hw/xfree86/common/xf86Events.c | 15
hw/xfree86/common/xf86Helper.c | 108
hw/xfree86/common/xf86Init.c | 49
hw/xfree86/common/xf86Module.h | 6
hw/xfree86/common/xf86Option.c | 2
hw/xfree86/common/xf86Priv.h | 5
hw/xfree86/common/xf86RandR.c | 40
hw/xfree86/common/xf86ShowOpts.c | 2
hw/xfree86/common/xf86VidMode.c | 3
hw/xfree86/common/xf86Xinput.c | 174
hw/xfree86/common/xf86Xinput.h | 6
hw/xfree86/common/xf86xv.c | 9
hw/xfree86/ddc/ddcProperty.c | 1
hw/xfree86/dixmods/Makefile.am | 2
hw/xfree86/dixmods/xkbPrivate.c | 15
hw/xfree86/doc/.gitignore | 4
hw/xfree86/doc/Makefile.am | 18
hw/xfree86/doc/README.DRIcomp | 554
hw/xfree86/doc/Registry | 409
hw/xfree86/doc/ddxDesign.xml | 9394 ++++++++
hw/xfree86/doc/devel/Makefile.am | 7
hw/xfree86/doc/devel/README.DRIcomp | 556
hw/xfree86/doc/devel/Registry | 409
hw/xfree86/doc/devel/exa-driver.txt | 94
hw/xfree86/doc/exa-driver.txt | 94
hw/xfree86/doc/man/Makefile.am | 3
hw/xfree86/doc/man/Xorg.man | 689
hw/xfree86/doc/man/xorg.conf.d.man | 1
hw/xfree86/doc/man/xorg.conf.man | 2485 --
hw/xfree86/doc/sgml/.gitignore | 6
hw/xfree86/doc/sgml/DESIGN.xml | 9394 --------
hw/xfree86/doc/sgml/Makefile.am | 27
hw/xfree86/dri/dri.c | 6
hw/xfree86/dri/xf86dri.c | 1
hw/xfree86/dri2/dri2.c | 47
hw/xfree86/dri2/dri2.h | 2
hw/xfree86/dri2/dri2ext.c | 10
hw/xfree86/exa/examodule.c | 2
hw/xfree86/fbdevhw/fbdevhw.c | 19
hw/xfree86/loader/.gitignore | 3
hw/xfree86/loader/Makefile.am | 14
hw/xfree86/loader/loadmod.c | 34
hw/xfree86/loader/sdksyms.sh | 424
hw/xfree86/man/Makefile.am | 3
hw/xfree86/man/Xorg.man | 690
hw/xfree86/man/xorg.conf.d.man | 1
hw/xfree86/man/xorg.conf.man | 2506 ++
hw/xfree86/modes/xf86Crtc.c | 67
hw/xfree86/modes/xf86EdidModes.c | 5
hw/xfree86/modes/xf86Modes.h | 2
hw/xfree86/modes/xf86RandR12.c | 41
hw/xfree86/modes/xf86cvt.c | 4
hw/xfree86/os-support/.gitignore | 2
hw/xfree86/os-support/Makefile.am | 7
hw/xfree86/os-support/linux/lnx_init.c | 14
hw/xfree86/os-support/linux/lnx_video.c | 8
hw/xfree86/os-support/shared/posix_tty.c | 2
hw/xfree86/os-support/solaris/sun_agp.c | 4
hw/xfree86/os-support/xf86_OSlib.h | 11
hw/xfree86/parser/InputClass.c | 21
hw/xfree86/parser/Pointer.c | 2
hw/xfree86/parser/scan.c | 11
hw/xfree86/parser/xf86Parser.h | 1
hw/xfree86/parser/xf86tokens.h | 1
hw/xfree86/ramdac/xf86Cursor.c | 6
hw/xfree86/sdksyms.sh | 425
hw/xfree86/vbe/vbe.c | 5
hw/xfree86/xaa/xaaGC.c | 1
hw/xfree86/xaa/xaalocal.h | 4
hw/xnest/Events.c | 36
hw/xnest/Init.c | 11
hw/xnest/Keyboard.c | 25
hw/xnest/Pixmap.c | 1
hw/xquartz/GL/capabilities.c | 6
hw/xquartz/GL/indirect.c | 25
hw/xquartz/GL/visualConfigs.c | 1
hw/xquartz/Makefile.am | 4
hw/xquartz/X11Application.h | 3
hw/xquartz/X11Application.m | 102
hw/xquartz/applewm.c | 6
hw/xquartz/bundle/Info.plist.cpp | 8
hw/xquartz/bundle/Makefile.am | 2
hw/xquartz/console_redirect.c | 418
hw/xquartz/console_redirect.h | 44
hw/xquartz/darwin.c | 189
hw/xquartz/darwin.h | 22
hw/xquartz/darwinEvents.c | 51
hw/xquartz/darwinEvents.h | 4
hw/xquartz/darwinXinput.c | 17
hw/xquartz/mach-startup/Makefile.am | 7
hw/xquartz/mach-startup/bundle-main.c | 154
hw/xquartz/mach-startup/launchd_fd.c | 20
hw/xquartz/mach-startup/stub.c | 92
hw/xquartz/man/Xquartz.man | 67
hw/xquartz/pbproxy/Makefile.am | 3
hw/xquartz/pbproxy/app-main.m | 29
hw/xquartz/pbproxy/main.m | 20
hw/xquartz/pbproxy/pbproxy.h | 19
hw/xquartz/pbproxy/x-input.m | 2
hw/xquartz/pbproxy/x-selection.m | 171
hw/xquartz/quartz.c | 12
hw/xquartz/quartz.h | 2
hw/xquartz/quartzKeyboard.c | 33
hw/xquartz/quartzKeyboard.h | 2
hw/xquartz/quartzStartup.c | 6
hw/xquartz/sanitizedCocoa.h | 39
hw/xquartz/threadSafety.c | 78
hw/xquartz/threadSafety.h | 56
hw/xquartz/xpr/appledri.c | 153
hw/xquartz/xpr/dri.c | 5
hw/xquartz/xpr/xpr.h | 7
hw/xquartz/xpr/xprCursor.c | 1
hw/xquartz/xpr/xprEvent.c | 3
hw/xquartz/xpr/xprFrame.c | 179
hw/xquartz/xpr/xprScreen.c | 5
hw/xwin/InitInput.c | 1
hw/xwin/InitOutput.c | 12
hw/xwin/Makefile.am | 22
hw/xwin/XWin.rc | 2
hw/xwin/glx/.gitignore | 7
hw/xwin/glx/Makefile.am | 40
hw/xwin/glx/gen_gl_wrappers.py | 2
hw/xwin/glx/indirect.c | 104
hw/xwin/glx/wgl_ext_api.c | 15
hw/xwin/glx/wgl_ext_api.h | 2
hw/xwin/glx/winpriv.c | 5
hw/xwin/man/XWin.man | 10
hw/xwin/man/XWinrc.man | 2
hw/xwin/win.h | 1
hw/xwin/winclipboardxevents.c | 5
hw/xwin/windialogs.c | 2
hw/xwin/winerror.c | 2
hw/xwin/winkeybd.c | 13
hw/xwin/winmonitors.c | 2
hw/xwin/winmouse.c | 25
hw/xwin/winmultiwindowicons.c | 5
hw/xwin/winmultiwindowwindow.c | 94
hw/xwin/winmultiwindowwm.c | 46
hw/xwin/winmultiwindowwndproc.c | 72
hw/xwin/winpfbdd.c | 3
hw/xwin/winprefs.c | 26
hw/xwin/winprefs.h | 2
hw/xwin/winrandr.c | 104
hw/xwin/winscrinit.c | 4
hw/xwin/winshaddd.c | 3
hw/xwin/winshadddnl.c | 3
hw/xwin/winshadgdi.c | 3
hw/xwin/winvideo.c | 2
hw/xwin/winwin32rootless.c | 20
hw/xwin/winwindow.h | 4
hw/xwin/winwindowswm.c | 4
hw/xwin/xlaunch/COPYING | 25
hw/xwin/xlaunch/Makefile | 79
hw/xwin/xlaunch/config.cc | 282
hw/xwin/xlaunch/config.h | 60
hw/xwin/xlaunch/main.cc | 700
hw/xwin/xlaunch/resources/dialog.rc | 118
hw/xwin/xlaunch/resources/images.rc | 29
hw/xwin/xlaunch/resources/resources.h | 99
hw/xwin/xlaunch/resources/resources.rc | 30
hw/xwin/xlaunch/resources/strings.rc | 108
hw/xwin/xlaunch/window/dialog.cc | 86
hw/xwin/xlaunch/window/dialog.h | 54
hw/xwin/xlaunch/window/util.cc | 1112
hw/xwin/xlaunch/window/util.h | 53
hw/xwin/xlaunch/window/window.cc | 284
hw/xwin/xlaunch/window/window.h | 114
hw/xwin/xlaunch/window/wizard.cc | 244
hw/xwin/xlaunch/window/wizard.h | 59
include/Makefile.am | 1
include/client.h | 59
include/dix-config.h.in | 15
include/dix.h | 58
include/dixgrabs.h | 11
include/dixstruct.h | 3
include/eventconvert.h | 9
include/events.h | 1
include/eventstr.h | 46
include/exevents.h | 50
include/extension.h | 2
include/input.h | 204
include/inputstr.h | 161
include/inpututils.h | 29
include/list.h | 375
include/misc.h | 50
include/os.h | 24
include/propertyst.h | 4
include/protocol-versions.h | 8
include/ptrveloc.h | 70
include/regionstr.h | 15
include/resource.h | 31
include/scrnintstr.h | 4
include/window.h | 3
include/windowstr.h | 1
include/xkbsrv.h | 4
include/xserver-properties.h | 10
m4/ax_tls.m4 | 74
m4/xorg-tls.m4 | 55
man/Makefile.am | 6
man/Xserver.man | 586
manpages.am | 7
mi/mi.h | 2
mi/midispcur.c | 2
mi/mieq.c | 316
mi/miexpose.c | 4
mi/mipointer.c | 274
mi/mipointer.h | 9
mi/mipointrst.h | 1
mi/misprite.c | 62
mi/mivaltree.c | 2
miext/cw/cw.h | 2
miext/cw/cw_render.c | 64
miext/damage/damage.c | 101
miext/damage/damage.h | 4
miext/rootless/rootlessScreen.c | 5
miext/rootless/rootlessValTree.c | 2
miext/shadow/shadow.c | 2
miext/shadow/shpacked.c | 2
miext/shadow/shplanar.c | 2
miext/shadow/shplanar8.c | 2
miext/shadow/shrotate.c | 2
miext/shadow/shrotpack.h | 2
miext/shadow/shrotpackYX.h | 2
os/.gitignore | 2
os/Makefile.am | 24
os/access.c | 19
os/client.c | 309
os/connection.c | 7
os/io.c | 1
os/log.c | 13
os/osinit.c | 9
os/utils.c | 15
os/xdmcp.c | 2
randr/randr.c | 2
randr/randrstr.h | 4
randr/rrcrtc.c | 146
randr/rrdispatch.c | 8
record/record.c | 69
render/animcur.c | 3
render/mipict.c | 68
render/mipict.h | 54
render/mitrap.c | 110
render/mitri.c | 123
render/picture.c | 102
render/picturestr.h | 50
render/render.c | 39
test/.gitignore | 17
test/Makefile.am | 29
test/fixes.c | 327
test/input.c | 1106
test/list.c | 374
test/misc.c | 163
test/touch.c | 270
test/xfree86.c | 80
test/xi2/.gitignore | 10
test/xi2/Makefile.am | 31
test/xi2/protocol-common.c | 69
test/xi2/protocol-common.h | 12
test/xi2/protocol-eventconvert.c | 337
test/xi2/protocol-xigetclientpointer.c | 31
test/xi2/protocol-xigetselectedevents.c | 28
test/xi2/protocol-xipassivegrabdevice.c | 234
test/xi2/protocol-xiquerydevice.c | 145
test/xi2/protocol-xiquerypointer.c | 40
test/xi2/protocol-xiqueryversion.c | 28
test/xi2/protocol-xiselectevents.c | 62
test/xi2/protocol-xisetclientpointer.c | 32
test/xi2/protocol-xiwarppointer.c | 26
test/xi2/xi2.c | 129
test/xkb.c | 76
test/xtest.c | 39
xfixes/cursor.c | 407
xfixes/region.c | 2
xfixes/xfixes.c | 36
xfixes/xfixes.h | 17
xfixes/xfixesint.h | 16
xkb/XKBGAlloc.c | 77
xkb/ddxLoad.c | 21
xkb/maprules.c | 33
xkb/xkb.c | 94
xkb/xkbAccessX.c | 11
xkb/xkbActions.c | 23
xkb/xkbEvents.c | 44
xkb/xkbInit.c | 20
xkb/xkbUtils.c | 129
xkb/xkbfmisc.c | 58
xkb/xkbgeom.h | 20
xkb/xkmread.c | 52
xserver.ent.in | 3
542 files changed, 49515 insertions(+), 43033 deletions(-)
New commits:
commit 9e211dae959dcf8402c5ba2122f695c5279523a0
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jan 23 16:10:21 2012 +1100
Cherry-pick commit fixing BadWindow error returns; fixes some g-s-d crashers
diff --git a/debian/changelog b/debian/changelog
index 1fe6b50..31ee64a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.11.3-0ubuntu8) precise; urgency=low
+
+ * debian/patches/224_return_BadWindow_not_BadMatch.diff:
+ - Fix the error values of a whole slew of window-related calls.
+ Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 23 Jan 2012 16:09:29 +1100
+
xorg-server (2:1.11.3-0ubuntu7) precise; urgency=low
* Fixes for relative devices
diff --git a/debian/patches/224_return_BadWindow_not_BadMatch.diff b/debian/patches/224_return_BadWindow_not_BadMatch.diff
new file mode 100644
index 0000000..12f59eb
--- /dev/null
+++ b/debian/patches/224_return_BadWindow_not_BadMatch.diff
@@ -0,0 +1,47 @@
+commit ef492e9797b6d4f6bbc25e86bedc24477819fde7
+Author: Chris Halse Rogers <christopher.halse.rogers@canonical.com>
+Date: Thu Jan 5 01:22:39 2012 +0000
+
+ dix: Return BadWindow rather than BadMatch from dixLookupWindow
+
+ dixLookupWindow uses dixLookupDrawable internally, which returns
+ BadMatch when the XID matches a non-Window drawable. Users
+ of dixLookupWindow don't care about this, just that it's not
+ a valid Window.
+
+ This is a generalised version of the fix for X.Org Bug 23562,
+ where GetProperty was incorrectly returning BadMatch. Auditing other
+ window requests, all that I checked would incorrectly return BadMatch
+ in these circumstances. An incomplete list of calls that could
+ incorrectly return BadMatch is: ListProperties, SetSelectionOwner,
+ {Destroy,Map,Unmap}{,Sub}Window.
+
+ None of the callers of dixLookupWindow, except for GetProperty, check
+ for BadMatch
+
+ Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+diff --git a/dix/dixutils.c b/dix/dixutils.c
+index 2b5391f..da26dc1 100644
+--- a/dix/dixutils.c
++++ b/dix/dixutils.c
+@@ -224,7 +224,15 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
+ {
+ int rc;
+ rc = dixLookupDrawable((DrawablePtr*)pWin, id, client, M_WINDOW, access);
+- return (rc == BadDrawable) ? BadWindow : rc;
++ /* dixLookupDrawable returns BadMatch iff id is a valid Drawable
++ but is not a Window. Users of dixLookupWindow expect a BadWindow
++ error in this case; they don't care that it's a valid non-Window XID */
++ if (rc == BadMatch)
++ rc = BadWindow;
++ /* Similarly, users of dixLookupWindow don't want BadDrawable. */
++ if (rc == BadDrawable)
++ rc = BadWindow;
++ return rc;
+ }
+
+ int
diff --git a/debian/patches/series b/debian/patches/series
index 50da304..c481ca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@
221_pointer_motion_update_fix.patch
222_touch_valuators_absolute.patch
223_indirect_touch_x_y_valuators.patch
+224_return_BadWindow_not_BadMatch.diff
commit db485215999c6313159f6efd251462a6d91a3eb4
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Thu Jan 19 16:23:38 2012 -0800
releasing version 2:1.11.3-0ubuntu7
diff --git a/debian/changelog b/debian/changelog
index 9459645..1fe6b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.11.3-0ubuntu7) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu7) precise; urgency=low
* Fixes for relative devices
- Add 220_dont_scale_indirect.patch
@@ -6,7 +6,7 @@ xorg-server (2:1.11.3-0ubuntu7) UNRELEASED; urgency=low
- Add 222_touch_valuators_absolute.patch
- Add 223_indirect_touch_x_y_valuators.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 19 Jan 2012 10:31:20 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 19 Jan 2012 16:23:28 -0800
xorg-server (2:1.11.3-0ubuntu6) precise; urgency=low
commit 5c2123a815da1d417529ade3644e10938efed967
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Thu Jan 19 10:36:23 2012 -0800
Fixes for relative devices
* Fixes for relative devices
- Add 220_dont_scale_indirect.patch
- Add 221_pointer_motion_update_fix.patch
- Add 222_touch_valuators_absolute.patch
- Add 223_indirect_touch_x_y_valuators.patch
diff --git a/debian/changelog b/debian/changelog
index 8288890..9459645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.11.3-0ubuntu7) UNRELEASED; urgency=low
+
+ * Fixes for relative devices
+ - Add 220_dont_scale_indirect.patch
+ - Add 221_pointer_motion_update_fix.patch
+ - Add 222_touch_valuators_absolute.patch
+ - Add 223_indirect_touch_x_y_valuators.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 19 Jan 2012 10:31:20 -0800
+
xorg-server (2:1.11.3-0ubuntu6) precise; urgency=low
* Bump Build-Depends on x11proto-input-dev to 2.1.99.5
diff --git a/debian/patches/220_dont_scale_indirect.patch b/debian/patches/220_dont_scale_indirect.patch
new file mode 100644
index 0000000..6d40fbd
--- /dev/null
+++ b/debian/patches/220_dont_scale_indirect.patch
@@ -0,0 +1,34 @@
+From 1bc4343fc28e8626872fdfd48522ab8191cfedd1 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 18 Jan 2012 17:19:31 -0800
+Subject: [PATCH 1/4] Only scale direct device touch coordinates
+
+Indirect touch devices provide valuator values in pure device
+coordinates. They also don't need to be fixed up for screen crossings.
+
+Signed-off-by: Chase Douglas <chase.douglas@ubuntu.com>
+---
+ dix/getevents.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index d0014e6..2946b16 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -1867,7 +1867,12 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
+ if (need_rawevent)
+ set_raw_valuators(raw, &mask, raw->valuators.data);
+
+- scr = scale_to_desktop(dev, &mask, &devx, &devy, &screenx, &screeny);
++ /* Indirect device touch coordinates are not used for cursor positioning.
++ * They are merely informational, and are provided in device coordinates.
++ * The device sprite is used for positioning instead, and it is already
++ * scaled. */
++ if (t->mode == XIDirectTouch)
++ scr = scale_to_desktop(dev, &mask, &devx, &devy, &screenx, &screeny);
+ if (emulate_pointer)
+ scr = positionSprite(dev, Absolute, &mask,
+ &devx, &devy, &screenx, &screeny);
+--
+1.7.8.3
+
diff --git a/debian/patches/221_pointer_motion_update_fix.patch b/debian/patches/221_pointer_motion_update_fix.patch
new file mode 100644
index 0000000..acfbcb6
--- /dev/null
+++ b/debian/patches/221_pointer_motion_update_fix.patch
@@ -0,0 +1,34 @@
+From e90415cc873d07e0323c15d5ec7f90311f60a1a1 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 18 Jan 2012 17:22:47 -0800
+Subject: [PATCH 2/4] Only update pointer motion data for pointer emulated
+ touch events
+
+Signed-off-by: Chase Douglas <chase.douglas@ubuntu.com>
+---
+ dix/getevents.c | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 2946b16..1547059 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -1878,9 +1878,13 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
+ &devx, &devy, &screenx, &screeny);
+
+ /* see fill_pointer_events for coordinate systems */
+- updateHistory(dev, &mask, ms);
++ if (emulate_pointer)
++ updateHistory(dev, &mask, ms);
++
+ clipValuators(dev, &mask);
+- storeLastValuators(dev, &mask, 0, 1, devx, devy);
++
++ if (emulate_pointer)
++ storeLastValuators(dev, &mask, 0, 1, devx, devy);
+
+ event->root = scr->root->drawable.id;
+
+--
+1.7.8.3
+
diff --git a/debian/patches/222_touch_valuators_absolute.patch b/debian/patches/222_touch_valuators_absolute.patch
new file mode 100644
index 0000000..475871f
--- /dev/null
+++ b/debian/patches/222_touch_valuators_absolute.patch
@@ -0,0 +1,49 @@
+From d9f359e17e1ba15ef0605250c6fa0cf48301c386 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 18 Jan 2012 18:39:01 -0800
+Subject: [PATCH 3/4] Treat all touch event valuators as absolute
+
+An indirect touch device, such as a multitouch touchpad, has relative X
+and Y axes internally. These axes are in screen coordinates. However,
+the cooresponding axes for touch events are in absolute device
+coordinates.
+
+Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+---
+ dix/getevents.c | 12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 1547059..3e37910 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -222,17 +222,23 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
+ int i;
+
+ /* Set the data to the previous value for unset absolute axes. The values
+- * may be used when sent as part of an XI 1.x valuator event. */
++ * may be used when sent as part of an XI 1.x valuator event.
++ *
++ * All touch event valuators are absolute, even if the corresponding pointer
++ * valuator is relative. This is the case for indirect touch devices for the
++ * X and Y axes. */
+ for (i = 0; i < valuator_mask_size(mask); i++)
+ {
+ if (valuator_mask_isset(mask, i))
+ {
+ SetBit(event->valuators.mask, i);
+- if (valuator_get_mode(dev, i) == Absolute)
++ if (IsTouchEvent((InternalEvent *)event) ||
++ valuator_get_mode(dev, i) == Absolute)
+ SetBit(event->valuators.mode, i);
+ event->valuators.data[i] = valuator_mask_get_double(mask, i);
+ }
+- else if (valuator_get_mode(dev, i) == Absolute)
++ else if (IsTouchEvent((InternalEvent *)event) ||
++ valuator_get_mode(dev, i) == Absolute)
+ event->valuators.data[i] = dev->valuator->axisVal[i];
+ }
+ }
+--
+1.7.8.3
+
diff --git a/debian/patches/223_indirect_touch_x_y_valuators.patch b/debian/patches/223_indirect_touch_x_y_valuators.patch
new file mode 100644
index 0000000..11d435c
--- /dev/null
+++ b/debian/patches/223_indirect_touch_x_y_valuators.patch
@@ -0,0 +1,35 @@
+From 32b62f7ab26a1ce7665230859cea55e5bb2507db Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 18 Jan 2012 19:03:57 -0800
+Subject: [PATCH 4/4] Don't set X and Y valuators for indirect touch events
+
+For expediency, it made sense to always have the X and Y axes set for
+direct touch device event propagation. The last X and Y values are
+stored internally. However, indirect device touch event propagation
+does not depend on the touch's X and Y values. Thus, we don't need to
+set the values for every indirect touch event.
+
+On top of this, the previous X and Y values aren't stored for indirect
+touches, so without this change the axes get erroneously set to 0.
+
+Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+---
+ dix/getevents.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 3e37910..546b5a8 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -1842,7 +1842,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
+ default:
+ return 0;
+ }
+- if (!(flags & TOUCH_CLIENT_ID))
++ if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID))
+ {
+ if (!valuator_mask_isset(&mask, 0))
+ valuator_mask_set_double(&mask, 0, valuator_mask_get_double(touchpoint.ti->valuators, 0));
+--
+1.7.8.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a37033e..50da304 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,7 @@
208_switch_on_release.diff
209_add_legacy_bgnone_option.patch
214_glx_dri_searchdirs.patch
+220_dont_scale_indirect.patch
+221_pointer_motion_update_fix.patch
+222_touch_valuators_absolute.patch
+223_indirect_touch_x_y_valuators.patch
commit f75f93e7b70eaa4b97cce3283ddc62b6c76025a4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 22:23:13 2012 +0100
releasing version 2:1.11.3-0ubuntu6
diff --git a/debian/changelog b/debian/changelog
index f5fb126..8288890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.11.3-0ubuntu6) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu6) precise; urgency=low
* Bump Build-Depends on x11proto-input-dev to 2.1.99.5
- -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 22:21:54 +0100
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 22:22:57 +0100
xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
commit 1d7991682bbbb371fcb124af692f1603cf588b93
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 22:22:50 2012 +0100
Bump Build-Depends on x11proto-input-dev to 2.1.99.5
diff --git a/debian/changelog b/debian/changelog
index 2351511..f5fb126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.3-0ubuntu6) UNRELEASED; urgency=low
+
+ * Bump Build-Depends on x11proto-input-dev to 2.1.99.5
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 22:21:54 +0100
+
xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
* Add Breaks clause for XInput changes
diff --git a/debian/control b/debian/control
index d2dba41..a80659e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
x11proto-xf86vidmode-dev (>= 2.2.99.1),
xtrans-dev (>= 1.2.2),
libxau-dev (>= 1:1.0.5-2),
- x11proto-input-dev (>= 2.1.99.4),
+ x11proto-input-dev (>= 2.1.99.5),
x11proto-dri2-dev (>= 2.6),
libxdmcp-dev (>= 1:0.99.1),
libxfont-dev (>= 1:1.4.2),
commit ddc9f2dbd671c5245d75d38bba8fa17d018e60f4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 22:03:49 2012 +0100
releasing version 2:1.11.3-0ubuntu5
diff --git a/debian/changelog b/debian/changelog
index 9328415..2351511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu5) precise; urgency=low
* Add Breaks clause for XInput changes
- qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
@@ -6,7 +6,7 @@ xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
- utouch-frame < 2.1.0 (crashes due to XI ABI change)
- unity < 5.0.0 (crashes if utouch stack is unavailable)
- -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 21:58:01 +0100
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 22:03:35 +0100
xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
commit 54a418cb0d6caefcd802211bcfbcac493b0099ef
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 17 22:03:29 2012 +0100
Add Breaks clause for XInput changes
* Add Breaks clause for XInput changes
- qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
- utouch-geis < 2.2.3 (infinite loop if utouch XCB backend is unavailable)
- utouch-frame < 2.1.0 (crashes due to XI ABI change)
- unity < 5.0.0 (crashes if utouch stack is unavailable)
diff --git a/debian/changelog b/debian/changelog
index 266632f..9328415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.11.3-0ubuntu5) UNRELEASED; urgency=low
+
+ * Add Breaks clause for XInput changes
+ - qt4-x11 < 4:4.8.0-1ubuntu2 (crashes due to XI ABI change)
+ - utouch-geis < 2.2.3 (infinite loop if utouch XCB backend is unavailable)
+ - utouch-frame < 2.1.0 (crashes due to XI ABI change)
+ - unity < 5.0.0 (crashes if utouch stack is unavailable)
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 17 Jan 2012 21:58:01 +0100
+
xorg-server (2:1.11.3-0ubuntu4) precise; urgency=low
* Merge in input changes from upstream master through commit 954bb99
diff --git a/debian/control b/debian/control
index e334140..d2dba41 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,10 @@ Breaks:
xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
+ qt4-x11 (<< 4:4.8.0-1ubuntu2),
+ utouch-geis (<< 2.2.3),
+ utouch-frame (<< 2.1.0),
+ unity (<< 5.0.0),
Provides:
Reply to: