X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.cc;h=0f76a1cdbe667fed8a41dc3c9576e329c0a75ada;hb=00bc993775b916de76772bdc5e31618076194797;hp=32674be9736787564ebb6799f33976a325741aca;hpb=a2de94e91e1c0e7775c97745ae11d14e5c5f5659;p=chaz%2Fopenbox diff --git a/otk/display.cc b/otk/display.cc index 32674be9..0f76a1cd 100644 --- a/otk/display.cc +++ b/otk/display.cc @@ -7,22 +7,27 @@ #include "display.hh" #include "screeninfo.hh" #include "gccache.hh" +#include "util.hh" extern "C" { #include +#ifdef XKB +#include +#endif // XKB + #ifdef SHAPE #include #endif // SHAPE +#ifdef XINERAMA +#include +#endif // XINERAMA + #ifdef HAVE_STDIO_H # include #endif // HAVE_STDIO_H -#ifdef HAVE_STDLIB_H -# include -#endif // HAVE_STDLIB_H - #ifdef HAVE_SIGNAL_H # include #endif // HAVE_SIGNAL_H @@ -43,20 +48,9 @@ extern "C" { namespace otk { -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*) 0; - -int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e) +static int xerrorHandler(::Display *d, XErrorEvent *e) { #ifdef DEBUG char errtxt[128]; @@ -65,8 +59,8 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e) { XGetErrorText(d, e->error_code, errtxt, 128); printf("X Error: %s\n", errtxt); -// if (e->error_code != BadWindow) -// abort(); + if (e->error_code != BadWindow) + abort(); } #else (void)d; @@ -77,48 +71,66 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e) } -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), + _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); - if (putenv(const_cast((std::string("DISPLAY=") + - DisplayString(display)).c_str()))) { - printf(_("warning: couldn't set environment variable 'DISPLAY'\n")); - perror("putenv()"); - } + 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, + 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, @@ -129,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]; } } @@ -146,39 +158,40 @@ 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 BGCCache(_screenInfoList.size()); + _gccache = new GCCache(_screenInfoList.size()); } -void OBDisplay::destroy() +Display::~Display() { delete _gccache; while (_grab_count > 0) ungrab(); - XCloseDisplay(display); + XCloseDisplay(_display); } -const ScreenInfo* OBDisplay::screenInfo(int snum) { +const ScreenInfo* Display::screenInfo(int snum) +{ assert(snum >= 0); assert(snum < static_cast(_screenInfoList.size())); return &_screenInfoList[snum]; } -const ScreenInfo* OBDisplay::findScreen(Window root) +const ScreenInfo* Display::findScreen(Window root) { ScreenInfoList::iterator it, end = _screenInfoList.end(); for (it = _screenInfoList.begin(); it != end; ++it) @@ -188,20 +201,20 @@ const ScreenInfo* OBDisplay::findScreen(Window root) } -void OBDisplay::grab() +void Display::grab() { if (_grab_count == 0) - XGrabServer(display); + XGrabServer(_display); _grab_count++; } -void OBDisplay::ungrab() +void Display::ungrab() { if (_grab_count == 0) return; _grab_count--; if (_grab_count == 0) - XUngrabServer(display); + XUngrabServer(_display); } @@ -217,15 +230,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); } @@ -235,30 +249,31 @@ 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); }