X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fblackbox.hh;h=2d5d5f6d917324e0a40c4d695047998f405b54b6;hb=7bf96a9123a9f6b29a4c6168f7391db72f374f8a;hp=055f7761972a543b5dc239cb2bbe7c301579e812;hpb=18064df19f670589b9387c194b55345c717473db;p=chaz%2Fopenbox

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 055f7761..2d5d5f6d 100644
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -47,10 +47,10 @@ extern "C" {
 #include <map>
 #include <string>
 
-#include "i18n.hh"
-#include "BaseDisplay.hh"
-#include "Configuration.hh"
-#include "Timer.hh"
+#include "basedisplay.hh"
+#include "configuration.hh"
+#include "timer.hh"
+#include "xatom.hh"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -88,13 +88,6 @@ class BScreen;
 class Blackbox;
 class BlackboxWindow;
 class BWindowGroup;
-class Basemenu;
-class Toolbar;
-class Slit;
-class XAtom;
-class BInput;
-
-extern I18n i18n;
 
 class Blackbox : public BaseDisplay, public TimeoutHandler {
 private:
@@ -103,11 +96,6 @@ private:
   };
   BCursor cursor;
 
-  struct MenuTimestamp {
-    std::string filename;
-    time_t timestamp;
-  };
-
   struct BResource {
     Time double_click_interval;
 
@@ -116,6 +104,12 @@ private:
     timeval auto_raise_delay;
     unsigned long cache_life, cache_max;
     std::string titlebar_layout;
+    unsigned int mod_mask;  // modifier mask used for window-mouse interaction
+
+
+#ifdef    XINERAMA
+    bool xinerama_placement, xinerama_maximize, xinerama_snap;
+#endif // XINERAMA
   } resource;
 
   typedef std::map<Window, BlackboxWindow*> WindowLookup;
@@ -124,27 +118,12 @@ private:
 
   typedef std::map<Window, BScreen*> WindowScreenLookup;
   typedef WindowScreenLookup::value_type WindowScreenLookupPair;
-  WindowScreenLookup systraySearchList, desktopSearchList;
+  WindowScreenLookup systraySearchList;
 
   typedef std::map<Window, BWindowGroup*> GroupLookup;
   typedef GroupLookup::value_type GroupLookupPair;
   GroupLookup groupSearchList;
 
-  typedef std::map<Window, Basemenu*> MenuLookup;
-  typedef MenuLookup::value_type MenuLookupPair;
-  MenuLookup menuSearchList;
-
-  typedef std::map<Window, Toolbar*> ToolbarLookup;
-  typedef ToolbarLookup::value_type ToolbarLookupPair;
-  ToolbarLookup toolbarSearchList;
-
-  typedef std::map<Window, Slit*> SlitLookup;
-  typedef SlitLookup::value_type SlitLookupPair;
-  SlitLookup slitSearchList;
-
-  typedef std::list<MenuTimestamp*> MenuTimestampList;
-  MenuTimestampList menuTimestamps;
-
   typedef std::list<BScreen*> ScreenList;
   ScreenList screenList;
 
@@ -153,56 +132,53 @@ private:
   BTimer *timer;
   Configuration config;
   XAtom *xatom;
-  BInput *input;
 
-  bool no_focus, reconfigure_wait, reread_menu_wait;
+  bool no_focus, reconfigure_wait;
   Time last_time;
   char **argv;
-  std::string menu_file, rc_file;
+  std::string rc_file;
 
   Blackbox(const Blackbox&);
   Blackbox& operator=(const Blackbox&);
 
   void load_rc(void);
   void save_rc(void);
-  void real_rereadMenu(void);
   void real_reconfigure(void);
 
   virtual void process_event(XEvent *);
 
 
 public:
-  Blackbox(char **m_argv, char *dpy_name = 0, char *rc = 0, char *menu = 0);
+  Blackbox(char **m_argv, char *dpy_name = 0, char *rc = 0);
   virtual ~Blackbox(void);
 
-  Basemenu *searchMenu(Window window);
   BWindowGroup *searchGroup(Window window);
-  BScreen *searchDesktopWindow(Window window);
   BScreen *searchSystrayWindow(Window window);
   BlackboxWindow *searchWindow(Window window);
   BScreen *searchScreen(Window window);
-  Toolbar *searchToolbar(Window);
-  Slit *searchSlit(Window);
 
-  void saveMenuSearch(Window window, Basemenu *data);
-  void saveDesktopWindowSearch(Window window, BScreen *screen);
+#ifdef    XINERAMA
+  inline bool doXineramaPlacement(void) const
+    { return resource.xinerama_placement; }
+  inline bool doXineramaMaximizing(void) const
+    { return resource.xinerama_maximize; }
+  inline bool doXineramaSnapping(void) const
+    { return resource.xinerama_snap; }
+
+  void saveXineramaPlacement(bool x);
+  void saveXineramaMaximizing(bool x);
+  void saveXineramaSnapping(bool x);
+#endif // XINERAMA
+  
   void saveSystrayWindowSearch(Window window, BScreen *screen);
   void saveWindowSearch(Window window, BlackboxWindow *data);
   void saveGroupSearch(Window window, BWindowGroup *data);
-  void saveToolbarSearch(Window window, Toolbar *data);
-  void saveSlitSearch(Window window, Slit *data);
-  void removeMenuSearch(Window window);
-  void removeDesktopWindowSearch(Window window);
   void removeSystrayWindowSearch(Window window);
   void removeWindowSearch(Window window);
   void removeGroupSearch(Window window);
-  void removeToolbarSearch(Window window);
-  void removeSlitSearch(Window window);
 
   inline XAtom *getXAtom(void) { return xatom; }
-  inline BInput *getInput(void) { return input; }
-  
-  inline BScreen *getFocusedScreen(void) { return active_screen; }
+
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
   inline BlackboxWindow *getChangingWindow(void) { return changing_window; }
 
@@ -213,8 +189,6 @@ public:
 
   inline const char *getStyleFilename(void) const
     { return resource.style_file.c_str(); }
-  inline const char *getMenuFilename(void) const
-    { return menu_file.c_str(); }
 
   inline int getColorsPerChannel(void) const
     { return resource.colors_per_channel; }
@@ -244,16 +218,16 @@ public:
     { return cursor.ul_angle; }
   inline Cursor getUpperRightAngleCursor(void) const
     { return cursor.ur_angle; }
+  
+  inline unsigned int getMouseModMask(void) const
+    { return resource.mod_mask; }
 
   void setFocusedWindow(BlackboxWindow *win);
   void setChangingWindow(BlackboxWindow *win);
   void shutdown(void);
   void saveStyleFilename(const std::string& filename);
-  void addMenuTimestamp(const std::string& filename);
   void restart(const char *prog = 0);
   void reconfigure(void);
-  void rereadMenu(void);
-  void checkMenu(void);
 
   bool validateWindow(Window window);
 
@@ -261,9 +235,7 @@ public:
 
   virtual void timeout(void);
 
-#ifndef   HAVE_STRFTIME
   enum { B_AmericanDate = 1, B_EuropeanDate };
-#endif // HAVE_STRFTIME
 };