Fixing text caret (take 2)

The earlier change fixed the text caret for fullscreen, but broke it for
non-fullscreen.  This new change should fix it in both cases.
Applying fullscreen offsets for text caret

One last thing I missed: we should also apply the fullscreen offsets to
the caret, too.
Fix a few left-over bad things.
Merge remote-tracking branch 'GabuEx/master' into BackToGabu
Merge branch 'BackToGabu'