Added proper support for number of mouse buttons in X11, and