X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.hh;h=ed469a6c5c79e9acfa85a9e2bf7f979c532c403f;hb=4c768d5d63154e416e1282396dc48492d0585d42;hp=9b3d6b31fd58afe94af51019f9fc46b340479ad4;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox

diff --git a/otk/display.hh b/otk/display.hh
index 9b3d6b31..ed469a6c 100644
--- a/otk/display.hh
+++ b/otk/display.hh
@@ -42,6 +42,12 @@ private:
   //! A list of all possible combinations of keyboard lock masks
   static unsigned int _mask_list[8];
 
+  //! The value of the mask for the NumLock modifier
+  static unsigned int _numLockMask;
+
+  //! The value of the mask for the ScrollLock modifier
+  static unsigned int _scrollLockMask;
+
   //! The number of requested grabs on the display
   static int _grab_count;
 
@@ -90,6 +96,9 @@ public:
   */
   static const ScreenInfo* screenInfo(int snum);
 
+  //! Find a ScreenInfo based on a root window
+  static const ScreenInfo* findScreen(Window root);
+
   //! Returns if the display has the shape extention available
   inline static bool shape() { return _shape; }
   //! Returns the shape extension's event base
@@ -97,6 +106,9 @@ public:
   //! Returns if the display has the xinerama extention available
   inline static bool xinerama() { return _xinerama; }
 
+  inline static unsigned int numLockMask() { return _numLockMask; }
+  inline static unsigned int scrollLockMask() { return _scrollLockMask; }
+
   //! Grabs the display
   static void grab();
 
@@ -116,7 +128,7 @@ public:
   static void grabKey(unsigned int keycode, unsigned int modifiers,
                   Window grab_window, bool owner_events,
                   int pointer_mode, int keyboard_mode, bool allow_scroll_lock);
-  static void ungrabKey(unsigned int button, unsigned int modifiers,
+  static void ungrabKey(unsigned int keycode, unsigned int modifiers,
                         Window grab_window);
 };