X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.cc;h=0f76a1cdbe667fed8a41dc3c9576e329c0a75ada;hb=0dcbf985c11c850b30b2983e1e20cd8cf033f054;hp=97e77de1830c92f9370d03eb7b709d253d1b485a;hpb=f1b9e2168d8c1b03b0fcf0b6dd70aa46c513059d;p=chaz%2Fopenbox diff --git a/otk/display.cc b/otk/display.cc index 97e77de1..0f76a1cd 100644 --- a/otk/display.cc +++ b/otk/display.cc @@ -48,20 +48,7 @@ extern "C" { namespace otk { -::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; - +Display *display = (Display*) 0; static int xerrorHandler(::Display *d, XErrorEvent *e) { @@ -84,49 +71,66 @@ static int xerrorHandler(::Display *d, XErrorEvent *e) } -void Display::initialize(char *name) +Display::Display() + : _display(0), + _xkb(false), + _xkb_event_basep(0), + _shape(false), + _shape_event_basep(0), + _xinerama(false), + _xinerama_event_basep(0), + _mask_list(), + _num_lock_mask(0), + _scroll_lock_mask(0), + _grab_count(0), + _screenInfoList(), + _gccache((GCCache*) 0) { int junk; (void)junk; + display = this; + // Open the X display - if (!(display = XOpenDisplay(name))) { + if (!(_display = XOpenDisplay(NULL))) { printf(_("Unable to open connection to the X server. Please set the \n\ -DISPLAY environment variable approriately, or use the '-display' command \n\ -line argument.\n\n")); +DISPLAY environment variable approriately.\n\n")); ::exit(1); } - if (fcntl(ConnectionNumber(display), F_SETFD, 1) == -1) { + if (fcntl(ConnectionNumber(_display), F_SETFD, 1) == -1) { printf(_("Couldn't mark display connection as close-on-exec.\n\n")); ::exit(1); } - + if (!XSupportsLocale()) + printf(_("X server does not support locale.\n")); + if (!XSetLocaleModifiers("")) + printf(_("Cannot set locale modifiers for the X server.\n")); + // set our error handler for X errors XSetErrorHandler(xerrorHandler); // set the DISPLAY environment variable for any lauched children, to the // display we're using, so they open in the right place. - // XXX rm -> std::string dtmp = "DISPLAY=" + DisplayString(display); - putenv(std::string("DISPLAY=") + DisplayString(display)); + putenv(std::string("DISPLAY=") + DisplayString(_display)); // find the availability of X extensions we like to use #ifdef XKB - _xkb = XkbQueryExtension(display, &junk, &_xkb_event_basep, &junk, NULL, + _xkb = XkbQueryExtension(_display, &junk, &_xkb_event_basep, &junk, NULL, NULL); #endif #ifdef SHAPE - _shape = XShapeQueryExtension(display, &_shape_event_basep, &junk); + _shape = XShapeQueryExtension(_display, &_shape_event_basep, &junk); #endif #ifdef XINERAMA - _xinerama = XineramaQueryExtension(display, &_xinerama_event_basep, &junk); + _xinerama = XineramaQueryExtension(_display, &_xinerama_event_basep, &junk); #endif // XINERAMA // get lock masks that are defined by the display (not constant) XModifierKeymap *modmap; - modmap = XGetModifierMapping(display); + modmap = XGetModifierMapping(_display); if (modmap && modmap->max_keypermod > 0) { const int mask_table[] = { ShiftMask, LockMask, ControlMask, Mod1Mask, @@ -137,16 +141,16 @@ line argument.\n\n")); // get the values of the keyboard lock modifiers // Note: Caps lock is not retrieved the same way as Scroll and Num lock // since it doesn't need to be. - const KeyCode num_lock = XKeysymToKeycode(display, XK_Num_Lock); - const KeyCode scroll_lock = XKeysymToKeycode(display, XK_Scroll_Lock); + const KeyCode num_lock = XKeysymToKeycode(_display, XK_Num_Lock); + const KeyCode scroll_lock = XKeysymToKeycode(_display, XK_Scroll_Lock); for (size_t cnt = 0; cnt < size; ++cnt) { if (! modmap->modifiermap[cnt]) continue; if (num_lock == modmap->modifiermap[cnt]) - _numLockMask = mask_table[cnt / modmap->max_keypermod]; + _num_lock_mask = mask_table[cnt / modmap->max_keypermod]; if (scroll_lock == modmap->modifiermap[cnt]) - _scrollLockMask = mask_table[cnt / modmap->max_keypermod]; + _scroll_lock_mask = mask_table[cnt / modmap->max_keypermod]; } } @@ -154,32 +158,33 @@ line argument.\n\n")); _mask_list[0] = 0; _mask_list[1] = LockMask; - _mask_list[2] = _numLockMask; - _mask_list[3] = LockMask | _numLockMask; - _mask_list[4] = _scrollLockMask; - _mask_list[5] = _scrollLockMask | LockMask; - _mask_list[6] = _scrollLockMask | _numLockMask; - _mask_list[7] = _scrollLockMask | LockMask | _numLockMask; + _mask_list[2] = _num_lock_mask; + _mask_list[3] = LockMask | _num_lock_mask; + _mask_list[4] = _scroll_lock_mask; + _mask_list[5] = _scroll_lock_mask | LockMask; + _mask_list[6] = _scroll_lock_mask | _num_lock_mask; + _mask_list[7] = _scroll_lock_mask | LockMask | _num_lock_mask; // Get information on all the screens which are available. - _screenInfoList.reserve(ScreenCount(display)); - for (int i = 0; i < ScreenCount(display); ++i) + _screenInfoList.reserve(ScreenCount(_display)); + for (int i = 0; i < ScreenCount(_display); ++i) _screenInfoList.push_back(ScreenInfo(i)); _gccache = new GCCache(_screenInfoList.size()); } -void Display::destroy() +Display::~Display() { delete _gccache; while (_grab_count > 0) ungrab(); - XCloseDisplay(display); + XCloseDisplay(_display); } -const ScreenInfo* Display::screenInfo(int snum) { +const ScreenInfo* Display::screenInfo(int snum) +{ assert(snum >= 0); assert(snum < static_cast(_screenInfoList.size())); return &_screenInfoList[snum]; @@ -199,7 +204,7 @@ const ScreenInfo* Display::findScreen(Window root) void Display::grab() { if (_grab_count == 0) - XGrabServer(display); + XGrabServer(_display); _grab_count++; } @@ -209,7 +214,7 @@ void Display::ungrab() if (_grab_count == 0) return; _grab_count--; if (_grab_count == 0) - XUngrabServer(display); + XUngrabServer(_display); } @@ -229,11 +234,12 @@ void Display::grabButton(unsigned int button, unsigned int modifiers, Window grab_window, bool owner_events, unsigned int event_mask, int pointer_mode, int keyboard_mode, Window confine_to, - Cursor cursor, bool allow_scroll_lock) { + Cursor cursor, bool allow_scroll_lock) const +{ unsigned int length = (allow_scroll_lock) ? 8 / 2: 8; for (size_t cnt = 0; cnt < length; ++cnt) - XGrabButton(Display::display, button, modifiers | _mask_list[cnt], + XGrabButton(_display, button, modifiers | _mask_list[cnt], grab_window, owner_events, event_mask, pointer_mode, keyboard_mode, confine_to, cursor); } @@ -244,29 +250,30 @@ void Display::grabButton(unsigned int button, unsigned int modifiers, * keyboard lock keys. */ void Display::ungrabButton(unsigned int button, unsigned int modifiers, - Window grab_window) { + Window grab_window) const +{ for (size_t cnt = 0; cnt < 8; ++cnt) - XUngrabButton(Display::display, button, modifiers | _mask_list[cnt], + XUngrabButton(_display, button, modifiers | _mask_list[cnt], grab_window); } void Display::grabKey(unsigned int keycode, unsigned int modifiers, Window grab_window, bool owner_events, int pointer_mode, int keyboard_mode, - bool allow_scroll_lock) + bool allow_scroll_lock) const { unsigned int length = (allow_scroll_lock) ? 8 / 2: 8; for (size_t cnt = 0; cnt < length; ++cnt) - XGrabKey(Display::display, keycode, modifiers | _mask_list[cnt], + XGrabKey(_display, keycode, modifiers | _mask_list[cnt], grab_window, owner_events, pointer_mode, keyboard_mode); } void Display::ungrabKey(unsigned int keycode, unsigned int modifiers, - Window grab_window) + Window grab_window) const { for (size_t cnt = 0; cnt < 8; ++cnt) - XUngrabKey(Display::display, keycode, modifiers | _mask_list[cnt], + XUngrabKey(_display, keycode, modifiers | _mask_list[cnt], grab_window); }