X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.cc;h=9ab8ed2f0b898ab2e8c23aee9e895d8db4120a6f;hb=e451c08ac5a103362adbece9b8a11a16ade739c1;hp=98288bd02dcdf54990437673a55fb1e9d14264f4;hpb=e8f5cf2940667a60698d28fe0cae208792357676;p=chaz%2Fopenbox diff --git a/otk/display.cc b/otk/display.cc index 98288bd0..9ab8ed2f 100644 --- a/otk/display.cc +++ b/otk/display.cc @@ -1,12 +1,10 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "display.hh" #include "screeninfo.hh" -#include "gccache.hh" +#include "rendercontrol.hh" #include "util.hh" extern "C" { @@ -24,10 +22,6 @@ extern "C" { #include #endif // XINERAMA -#ifdef HAVE_STDIO_H -# include -#endif // HAVE_STDIO_H - #ifdef HAVE_SIGNAL_H # include #endif // HAVE_SIGNAL_H @@ -41,175 +35,209 @@ extern "C" { # include #endif // HAVE_UNISTD_H -#include "gettext.h" +#include "../src/gettext.h" #define _(str) gettext(str) } -namespace otk { +#include +namespace otk { -Display *OBDisplay::display = (Display*) 0; -bool OBDisplay::_xkb = false; -int OBDisplay::_xkb_event_basep = 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*) 0; -int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e) +static int xerrorHandler(::Display *d, XErrorEvent *e) { + if (!display->ignoreErrors()) { #ifdef DEBUG - char errtxt[128]; - - //if (e->error_code != BadWindow) - { - XGetErrorText(d, e->error_code, errtxt, 128); - printf("X Error: %s\n", errtxt); - if (e->error_code != BadWindow) - abort(); - } + char errtxt[128]; + + //if (e->error_code != BadWindow) + { + XGetErrorText(d, e->error_code, errtxt, 127); + printf("X Error: %s\n", errtxt); + if (e->error_code != BadWindow) + abort(); + } #else - (void)d; - (void)e; + (void)d; + (void)e; #endif - + } return false; } -void OBDisplay::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), + _screeninfo_list(0), + _rendercontrol_list(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); - if (modmap && modmap->max_keypermod > 0) { + _modmap = XGetModifierMapping(_display); + assert(_modmap); + if (_modmap && _modmap->max_keypermod > 0) { const int mask_table[] = { ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask }; const size_t size = (sizeof(mask_table) / sizeof(mask_table[0])) * - modmap->max_keypermod; + _modmap->max_keypermod; // 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 (! _modmap->modifiermap[cnt]) continue; - if (num_lock == modmap->modifiermap[cnt]) - _numLockMask = mask_table[cnt / modmap->max_keypermod]; - if (scroll_lock == modmap->modifiermap[cnt]) - _scrollLockMask = mask_table[cnt / modmap->max_keypermod]; + if (num_lock == _modmap->modifiermap[cnt]) + _num_lock_mask = mask_table[cnt / _modmap->max_keypermod]; + if (scroll_lock == _modmap->modifiermap[cnt]) + _scroll_lock_mask = mask_table[cnt / _modmap->max_keypermod]; } } - if (modmap) XFreeModifiermap(modmap); - _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; - - // Get information on all the screens which are available. - _screenInfoList.reserve(ScreenCount(display)); - for (int i = 0; i < ScreenCount(display); ++i) - _screenInfoList.push_back(ScreenInfo(i)); - - _gccache = new BGCCache(_screenInfoList.size()); + _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, and create their + // RenderControl + _screeninfo_list = new ScreenInfo*[ScreenCount(_display)]; + _rendercontrol_list = new RenderControl*[ScreenCount(_display)]; + for (int i = 0; i < ScreenCount(_display); ++i) { + _screeninfo_list[i] = new ScreenInfo(i); + _rendercontrol_list[i] = RenderControl::getRenderControl(i); + } } -void OBDisplay::destroy() +Display::~Display() { - delete _gccache; while (_grab_count > 0) ungrab(); - XCloseDisplay(display); + + XFreeModifiermap(_modmap); + + for (int i = 0; i < ScreenCount(_display); ++i) { + delete _rendercontrol_list[i]; + delete _screeninfo_list[i]; + } + delete [] _rendercontrol_list; + delete [] _screeninfo_list; + + XCloseDisplay(_display); } -const ScreenInfo* OBDisplay::screenInfo(int snum) { +const ScreenInfo* Display::screenInfo(int snum) const +{ assert(snum >= 0); - assert(snum < static_cast(_screenInfoList.size())); - return &_screenInfoList[snum]; + assert(snum < (signed) ScreenCount(_display)); + return _screeninfo_list[snum]; } -const ScreenInfo* OBDisplay::findScreen(Window root) +const ScreenInfo* Display::findScreen(Window root) const { - ScreenInfoList::iterator it, end = _screenInfoList.end(); - for (it = _screenInfoList.begin(); it != end; ++it) - if (it->rootWindow() == root) - return &(*it); + for (int i = 0; i < ScreenCount(_display); ++i) + if (_screeninfo_list[i]->rootWindow() == root) + return _screeninfo_list[i]; return 0; } -void OBDisplay::grab() +const RenderControl *Display::renderControl(int snum) const { - if (_grab_count == 0) - XGrabServer(display); + assert(snum >= 0); + assert(snum < (signed) ScreenCount(_display)); + return _rendercontrol_list[snum]; +} + + +void Display::setIgnoreErrors(bool t) +{ + _ignore_errors = t; + // sync up so that anything already sent is/isn't ignored! + XSync(_display, false); +} + +void Display::grab() +{ + if (_grab_count == 0) { + XGrabServer(_display); + XSync(_display, false); // make sure it kicks in + } _grab_count++; } -void OBDisplay::ungrab() +void Display::ungrab() { if (_grab_count == 0) return; _grab_count--; - if (_grab_count == 0) - XUngrabServer(display); + if (_grab_count == 0) { + XUngrabServer(_display); + XFlush(_display); // ungrab as soon as possible + } } @@ -225,15 +253,16 @@ void OBDisplay::ungrab() * if allow_scroll_lock is true then only the top half of the lock mask * table is used and scroll lock is ignored. This value defaults to false. */ -void OBDisplay::grabButton(unsigned int button, unsigned int modifiers, +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(otk::OBDisplay::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); } @@ -243,31 +272,37 @@ void OBDisplay::grabButton(unsigned int button, unsigned int modifiers, * Releases the grab on a button, and ungrabs all possible combinations of the * keyboard lock keys. */ -void OBDisplay::ungrabButton(unsigned int button, unsigned int modifiers, - Window grab_window) { +void Display::ungrabButton(unsigned int button, unsigned int modifiers, + Window grab_window) const +{ for (size_t cnt = 0; cnt < 8; ++cnt) - XUngrabButton(otk::OBDisplay::display, button, modifiers | _mask_list[cnt], + XUngrabButton(_display, button, modifiers | _mask_list[cnt], grab_window); } -void OBDisplay::grabKey(unsigned int keycode, unsigned int modifiers, +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(otk::OBDisplay::display, keycode, modifiers | _mask_list[cnt], + XGrabKey(_display, keycode, modifiers | _mask_list[cnt], grab_window, owner_events, pointer_mode, keyboard_mode); } -void OBDisplay::ungrabKey(unsigned int keycode, unsigned int modifiers, - Window grab_window) +void Display::ungrabKey(unsigned int keycode, unsigned int modifiers, + Window grab_window) const { for (size_t cnt = 0; cnt < 8; ++cnt) - XUngrabKey(otk::OBDisplay::display, keycode, modifiers | _mask_list[cnt], + XUngrabKey(_display, keycode, modifiers | _mask_list[cnt], grab_window); } +void Display::ungrabAllKeys(Window grab_window) const +{ + XUngrabKey(_display, AnyKey, AnyModifier, grab_window); +} + }