Fixing bugs introduced into X11 shaping implementation by merge.
Fixing bugs introduced into X11 shaping implementation by merge.

aduros/SDL,cebash/SDL_PSL1GHT,aduros/SDL,aduros/SDL,aduros/SDL,cebash/SDL_PSL1GHT,cebash/SDL_PSL1GHT,cebash/SDL_PSL1GHT,aduros/SDL,cebash/SDL_PSL1GHT