Added support for Xlib surface