More x11 callback refactoring.  This should fix an interesting issues with click counts.