new i18n class using overloaded operator() instead of getMessage()

[chaz/openbox] / src / XDisplay.h

diff --git a/src/XDisplay.h b/src/XDisplay.h
index 3b58003f5522c8df032d7341d1db832bde1b99bd..a506eee9d0aa94f6beb80966a338577029815dbf 100644 (file)
--- a/src/XDisplay.h
+++ b/src/XDisplay.h
@@ -41,8 +41,11 @@ private:
 
   typedef std::vector<XScreen*> XScreenList;
   XScreenList    _screens;
- 
+
+  // X error handling
   static int XErrorHandler(Display *d, XErrorEvent *e);
+  static std::string _app_name;
+  static Window _last_bad_window;
 
   // no copying!!
   XDisplay(const XDisplay &);
@@ -52,7 +55,7 @@ protected:
   virtual void process_event(XEvent *) = 0;
 
 public:
-  XDisplay(const char *dpyname = 0);
+  XDisplay(const std::string &application_name, const char *dpyname = 0);
   virtual ~XDisplay();
 
   XScreen *screen(unsigned int s) const;