X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.cc;h=32674be9736787564ebb6799f33976a325741aca;hb=a2de94e91e1c0e7775c97745ae11d14e5c5f5659;hp=459244283e4a99f59fa4aa50ca45346f5f0a802c;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox

diff --git a/otk/display.cc b/otk/display.cc
index 45924428..32674be9 100644
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
@@ -11,6 +11,10 @@
 extern "C" {
 #include <X11/keysym.h>
 
+#ifdef    SHAPE
+#include <X11/extensions/shape.h>
+#endif // SHAPE
+
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -41,12 +45,15 @@ namespace otk {
 
 Display *OBDisplay::display = (Display*) 0;
 bool OBDisplay::_shape = false;
-int  OBDisplay::_shape_event_basep;
+int  OBDisplay::_shape_event_basep = 0;
 bool OBDisplay::_xinerama = false;
-int  OBDisplay::_xinerama_event_basep;
+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;
 
 
 int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e)
@@ -54,8 +61,13 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e)
 #ifdef DEBUG
   char errtxt[128];
 
-  XGetErrorText(d, e->error_code, errtxt, 128);
-  printf("X Error: %s\n", errtxt);
+  //if (e->error_code != BadWindow)
+  {
+    XGetErrorText(d, e->error_code, errtxt, 128);
+    printf("X Error: %s\n", errtxt);
+//    if (e->error_code != BadWindow)
+//      abort();
+  }
 #else
   (void)d;
   (void)e;
@@ -105,7 +117,6 @@ line argument.\n\n"));
 
   // get lock masks that are defined by the display (not constant)
   XModifierKeymap *modmap;
-  unsigned int NumLockMask = 0, ScrollLockMask = 0;
 
   modmap = XGetModifierMapping(display);
   if (modmap && modmap->max_keypermod > 0) {
@@ -125,9 +136,9 @@ line argument.\n\n"));
       if (! modmap->modifiermap[cnt]) continue;
 
       if (num_lock == modmap->modifiermap[cnt])
-        NumLockMask = mask_table[cnt / modmap->max_keypermod];
+        _numLockMask = mask_table[cnt / modmap->max_keypermod];
       if (scroll_lock == modmap->modifiermap[cnt])
-        ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
+        _scrollLockMask = mask_table[cnt / modmap->max_keypermod];
     }
   }
 
@@ -135,12 +146,12 @@ 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] = _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));
@@ -154,12 +165,44 @@ line argument.\n\n"));
 void OBDisplay::destroy()
 {
   delete _gccache;
+  while (_grab_count > 0)
+    ungrab();
   XCloseDisplay(display);
 }
 
 
+const ScreenInfo* OBDisplay::screenInfo(int snum) {
+  assert(snum >= 0);
+  assert(snum < static_cast<int>(_screenInfoList.size()));
+  return &_screenInfoList[snum];
+}
+
+
+const ScreenInfo* OBDisplay::findScreen(Window root)
+{
+  ScreenInfoList::iterator it, end = _screenInfoList.end();
+  for (it = _screenInfoList.begin(); it != end; ++it)
+    if (it->rootWindow() == root)
+      return &(*it);
+  return 0;
+}
+
+
+void OBDisplay::grab()
+{
+  if (_grab_count == 0)
+    XGrabServer(display);
+  _grab_count++;
+}
 
 
+void OBDisplay::ungrab()
+{
+  if (_grab_count == 0) return;
+  _grab_count--;
+  if (_grab_count == 0)
+    XUngrabServer(display);
+}
 
 
 
@@ -199,5 +242,24 @@ void OBDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
                   grab_window);
 }
 
+void OBDisplay::grabKey(unsigned int keycode, unsigned int modifiers,
+                        Window grab_window, bool owner_events,
+                        int pointer_mode, int keyboard_mode,
+                        bool allow_scroll_lock)
+{
+  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],
+                grab_window, owner_events, pointer_mode, keyboard_mode);
+}
+
+void OBDisplay::ungrabKey(unsigned int keycode, unsigned int modifiers,
+                          Window grab_window)
+{
+  for (size_t cnt = 0; cnt < 8; ++cnt)
+    XUngrabKey(otk::OBDisplay::display, keycode, modifiers | _mask_list[cnt],
+               grab_window);
+}
 
 }