mouse handling simplified
Merge pull request #88 from Mario-S/2.2

mouse handling simplified