X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fdisplay.hh;h=25c1b45af074efe32341d7a58025466204f526a9;hb=648c55b829e09c66222a9bbf08d10434622feae2;hp=7724bbab7222817e044b00cc257a1d9abc4f8be7;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox

diff --git a/otk/display.hh b/otk/display.hh
index 7724bbab..25c1b45a 100644
--- a/otk/display.hh
+++ b/otk/display.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef   __display_hh
 #define   __display_hh
 
@@ -6,75 +6,119 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include <vector>
-
 namespace otk {
 
-class ScreenInfo;
-class BGCCache;
+class RenderControl;
 
-class OBDisplay
-{
-public:
-  static Display *display;       // the X display
+class Display;
 
-  typedef std::vector<ScreenInfo> ScreenInfoList;
-  
+//! The display instance for the library
+extern Display *display;
+
+//! Manages a single X11 display.
+class Display
+{
 private:
-  static bool _shape;          // does the display have the shape extention?
-  static int  _shape_event_basep;   // base for shape events
+  //! The X display
+  ::Display *_display;
+  
+  //! Does the display have the XKB extension?
+  bool _xkb;
+  //! Base for events for the XKB extension
+  int  _xkb_event_basep;
 
-  static bool _xinerama;       // does the display have the xinerama extention?
-  static int  _xinerama_event_basep;// base for xinerama events
+  //! Does the display have the Shape extension?
+  bool _shape;
+  //! Base for events for the Shape extension
+  int  _shape_event_basep;
 
-  static unsigned int _mask_list[8];// a list of all combinations of lock masks
+  //! Does the display have the Xinerama extension?
+  bool _xinerama;
+  //! Base for events for the Xinerama extension
+  int  _xinerama_event_basep;
 
-  static ScreenInfoList _screenInfoList; // info for all screens on the display
+  //! A list of all possible combinations of keyboard lock masks
+  unsigned int _mask_list[8];
 
-  static BGCCache *_gccache;
+  //! The value of the mask for the NumLock modifier
+  unsigned int _num_lock_mask;
 
-  static int xerrorHandler(Display *d, XErrorEvent *e); // handles X errors duh
+  //! The value of the mask for the ScrollLock modifier
+  unsigned int _scroll_lock_mask;
 
-  OBDisplay(); // this class cannot be instantiated
+  //! The key codes for the modifier keys
+  XModifierKeymap *_modmap;
+  
+  //! The number of requested grabs on the display
+  int _grab_count;
 
-public:
-  static void initialize(char *name);
-  static void destroy();
+  //! When true, X errors will be ignored. Use with care.
+  bool _ignore_errors;
 
-  //! Returns the GC cache for the application
-  inline static BGCCache *gcCache() { return _gccache; }
+  //! The optimal visual for the display
+  Visual *_visual;
 
+  //! Our colormap built for the optimal visual
+  Colormap _colormap;
+
+  //! The depth of our optimal visual
+  int _depth;
+  
+public:
+  //! Wraps an open Display connection
   /*!
-    Returns a ScreenInfo class, which gives information on a screen on the
-    display.
-    \param snum The screen number of the screen to retrieve info on
-    \return Info on the requested screen, in a ScreenInfo class
+    @param d An open Display connection.
   */
-  inline static const ScreenInfo* screenInfo(int snum) {
-    assert(snum >= 0);
-    assert(snum < static_cast<int>(_screenInfoList.size()));
-    return &_screenInfoList[snum];
-  }
-
-  //! Returns if the display has the shape extention available
-  inline static bool shape() { return _shape; }
+  Display(::Display *d);
+  //! Destroys the class, closes the X display
+  ~Display();
+
+  //! Returns if the display has the xkb extension available
+  inline bool xkb() const { return _xkb; }
+  //! Returns the xkb extension's event base
+  inline int xkbEventBase() const { return _xkb_event_basep; }
+
+  //! Returns if the display has the shape extension available
+  inline bool shape() const { return _shape; }
   //! Returns the shape extension's event base
-  inline static int shapeEventBase() { return _shape_event_basep; }
-  //! Returns if the display has the xinerama extention available
-  inline static bool xinerama() { return _xinerama; }
+  inline int shapeEventBase() const { return _shape_event_basep; }
+  //! Returns if the display has the xinerama extension available
+  inline bool xinerama() const { return _xinerama; }
+
+  inline unsigned int numLockMask() const { return _num_lock_mask; }
+  inline unsigned int scrollLockMask() const { return _scroll_lock_mask; }
+  const XModifierKeymap *modifierMap() const { return _modmap; }
 
+  inline ::Display* operator*() const { return _display; }
+
+  //! When true, X errors will be ignored.
+  inline bool ignoreErrors() const { return _ignore_errors; }
+  //! Set whether X errors should be ignored. Use with care.
+  void setIgnoreErrors(bool t);
+  
+  //! Grabs the display
+  void grab();
 
+  //! Ungrabs the display
+  void ungrab();
 
 
   
   /* TEMPORARY */
-  static void grabButton(unsigned int button, unsigned int modifiers,
+  void 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);
-  static void ungrabButton(unsigned int button, unsigned int modifiers,
-                    Window grab_window);
+                  bool allow_scroll_lock) const;
+  void ungrabButton(unsigned int button, unsigned int modifiers,
+                    Window grab_window) const;
+  void grabKey(unsigned int keycode, unsigned int modifiers,
+               Window grab_window, bool owner_events,
+               int pointer_mode, int keyboard_mode,
+               bool allow_scroll_lock) const;
+  void ungrabKey(unsigned int keycode, unsigned int modifiers,
+                 Window grab_window) const;
+  void ungrabAllKeys(Window grab_window) const;
 };
 
 }