[WIP] Mouse coordinate fix

Builds on #5816, attempting to correct an issue where the reported mouse coordinate is off by one.