Merge pull request #249 from pcc/xgetinputfocus