-Display *OBDisplay::display = (Display*) 0;
-bool OBDisplay::_shape = false;
-int OBDisplay::_shape_event_basep = 0;
-bool OBDisplay::_xinerama = false;
-int OBDisplay::_xinerama_event_basep = 0;
-unsigned int OBDisplay::_mask_list[8];
-unsigned int OBDisplay::_scrollLockMask = 0;
-unsigned int OBDisplay::_numLockMask = 0;
-OBDisplay::ScreenInfoList OBDisplay::_screenInfoList;
-BGCCache *OBDisplay::_gccache = (BGCCache*) 0;
-int OBDisplay::_grab_count = 0;
+::Display *Display::display = (::Display*) 0;
+bool Display::_xkb = false;
+int Display::_xkb_event_basep = 0;
+bool Display::_shape = false;
+int Display::_shape_event_basep = 0;
+bool Display::_xinerama = false;
+int Display::_xinerama_event_basep = 0;
+unsigned int Display::_mask_list[8];
+unsigned int Display::_scrollLockMask = 0;
+unsigned int Display::_numLockMask = 0;
+Display::ScreenInfoList Display::_screenInfoList;
+GCCache *Display::_gccache = (GCCache*) 0;
+int Display::_grab_count = 0;