First two patches are Keith's patches with 2/2 having a minor fix to keep event history replaying correct. With those 5 applied, the current passive grab/pointer emulation/button state tests all pass, finally. Cheers, Peter