Fix bug 1300 by querying current border size in ConfigureNotify, and adjusting window coordinates accordingly.
Fixed compiling with the new X11 symbol wrapping