X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.cc;h=8e9214675383304a9d0461c573acb12365f6eb3d;hb=0eff3cc41539cada7fdd471ddbdcb51a214f13d3;hp=6995c0b534218c8c450ab31b9b7f194820faf8df;hpb=72c56d793b21cb0dae7a6a3d0baf580dacc4a34f;p=chaz%2Fopenbox

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 6995c0b5..8e921467 100644
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -1,25 +1,4 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-// blackbox.cc for Blackbox - an X11 Window manager
-// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
@@ -96,26 +75,19 @@ extern "C" {
 #include <string>
 using std::string;
 
-#include "i18n.hh"
 #include "blackbox.hh"
-#include "Basemenu.hh"
-#include "Clientmenu.hh"
-#include "GCCache.hh"
-#include "Image.hh"
-#include "Rootmenu.hh"
-#include "Screen.hh"
-#include "Slit.hh"
-#include "Toolbar.hh"
-#include "Util.hh"
-#include "Window.hh"
-#include "Workspace.hh"
-#include "Workspacemenu.hh"
-#include "XAtom.hh"
+#include "gccache.hh"
+#include "image.hh"
+#include "screen.hh"
+#include "util.hh"
+#include "window.hh"
+#include "workspace.hh"
+#include "xatom.hh"
 
 Blackbox *blackbox;
 
 
-Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
+Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc)
   : BaseDisplay(m_argv[0], dpy_name) {
   if (! XSupportsLocale())
     fprintf(stderr, "X server does not support locale\n");
@@ -134,8 +106,6 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   if (! rc) rc = "~/.openbox/rc";
   rc_file = expandTilde(rc);
   config.setFile(rc_file);  
-  if (! menu) menu = "~/.openbox/menu";
-  menu_file = expandTilde(menu);
 
   no_focus = False;
 
@@ -168,8 +138,7 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
 
   if (screenList.empty()) {
     fprintf(stderr,
-            i18n(blackboxSet, blackboxNoManagableScreens,
-              "Blackbox::Blackbox: no managable screens found, aborting.\n"));
+            "Blackbox::Blackbox: no managable screens found, aborting.\n");
     ::exit(3);
   }
 
@@ -183,7 +152,7 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   XSynchronize(getXDisplay(), False);
   XSync(getXDisplay(), False);
 
-  reconfigure_wait = reread_menu_wait = False;
+  reconfigure_wait = False;
 
   timer = new BTimer(this, this);
   timer->setTimeout(0l);
@@ -193,9 +162,6 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
 Blackbox::~Blackbox(void) {
   std::for_each(screenList.begin(), screenList.end(), PointerAssassin());
 
-  std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
-                PointerAssassin());
-
   delete xatom;
 
   delete timer;
@@ -211,9 +177,6 @@ void Blackbox::process_event(XEvent *e) {
     last_time = e->xbutton.time;
 
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
-    Slit *slit = (Slit *) 0;
-    Toolbar *tbar = (Toolbar *) 0;
     BScreen *scrn = (BScreen *) 0;
 
     if ((win = searchWindow(e->xbutton.window))) {
@@ -222,12 +185,6 @@ void Blackbox::process_event(XEvent *e) {
       /* XXX: is this sane on low colour desktops? */
       if (e->xbutton.button == 1)
         win->installColormap(True);
-    } else if ((menu = searchMenu(e->xbutton.window))) {
-      menu->buttonPressEvent(&e->xbutton);
-    } else if ((slit = searchSlit(e->xbutton.window))) {
-      slit->buttonPressEvent(&e->xbutton);
-    } else if ((tbar = searchToolbar(e->xbutton.window))) {
-      tbar->buttonPressEvent(&e->xbutton);
     } else if ((scrn = searchScreen(e->xbutton.window))) {
       scrn->buttonPressEvent(&e->xbutton);
       if (active_screen != scrn) {
@@ -248,27 +205,18 @@ void Blackbox::process_event(XEvent *e) {
     last_time = e->xbutton.time;
 
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
-    Toolbar *tbar = (Toolbar *) 0;
 
     if ((win = searchWindow(e->xbutton.window)))
       win->buttonReleaseEvent(&e->xbutton);
-    else if ((menu = searchMenu(e->xbutton.window)))
-      menu->buttonReleaseEvent(&e->xbutton);
-    else if ((tbar = searchToolbar(e->xbutton.window)))
-      tbar->buttonReleaseEvent(&e->xbutton);
 
     break;
   }
 
   case ConfigureRequest: {
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Slit *slit = (Slit *) 0;
 
     if ((win = searchWindow(e->xconfigurerequest.window))) {
       win->configureRequestEvent(&e->xconfigurerequest);
-    } else if ((slit = searchSlit(e->xconfigurerequest.window))) {
-      slit->configureRequestEvent(&e->xconfigurerequest);
     } else {
       if (validateWindow(e->xconfigurerequest.window)) {
         XWindowChanges xwc;
@@ -346,13 +294,10 @@ void Blackbox::process_event(XEvent *e) {
 
   case UnmapNotify: {
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Slit *slit = (Slit *) 0;
     BScreen *screen = (BScreen *) 0;
 
     if ((win = searchWindow(e->xunmap.window))) {
       win->unmapNotifyEvent(&e->xunmap);
-    } else if ((slit = searchSlit(e->xunmap.window))) {
-      slit->unmapNotifyEvent(&e->xunmap);
     } else if ((screen = searchSystrayWindow(e->xunmap.window))) {
       screen->removeSystrayWindow(e->xunmap.window);
     }
@@ -362,14 +307,11 @@ void Blackbox::process_event(XEvent *e) {
 
   case DestroyNotify: {
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Slit *slit = (Slit *) 0;
     BScreen *screen = (BScreen *) 0;
     BWindowGroup *group = (BWindowGroup *) 0;
 
     if ((win = searchWindow(e->xdestroywindow.window))) {
       win->destroyNotifyEvent(&e->xdestroywindow);
-    } else if ((slit = searchSlit(e->xdestroywindow.window))) {
-      slit->removeClient(e->xdestroywindow.window, False);
     } else if ((group = searchGroup(e->xdestroywindow.window))) {
       delete group;
     } else if ((screen = searchSystrayWindow(e->xunmap.window))) {
@@ -387,13 +329,8 @@ void Blackbox::process_event(XEvent *e) {
       to an already unmapped window.
     */
     BlackboxWindow *win = searchWindow(e->xreparent.window);
-    if (win) {
+    if (win)
       win->reparentNotifyEvent(&e->xreparent);
-    } else {
-      Slit *slit = searchSlit(e->xreparent.window);
-      if (slit && slit->getWindowID() != e->xreparent.parent)
-        slit->removeClient(e->xreparent.window, True);
-    }
     break;
   }
 
@@ -420,12 +357,9 @@ void Blackbox::process_event(XEvent *e) {
     last_time = e->xmotion.time;
 
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
 
     if ((win = searchWindow(e->xmotion.window)))
       win->motionNotifyEvent(&e->xmotion);
-    else if ((menu = searchMenu(e->xmotion.window)))
-      menu->motionNotifyEvent(&e->xmotion);
 
     break;
   }
@@ -448,9 +382,6 @@ void Blackbox::process_event(XEvent *e) {
 
     BScreen *screen = (BScreen *) 0;
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
-    Toolbar *tbar = (Toolbar *) 0;
-    Slit *slit = (Slit *) 0;
 
     if (e->xcrossing.mode == NotifyGrab) break;
 
@@ -460,12 +391,6 @@ void Blackbox::process_event(XEvent *e) {
     } else if ((win = searchWindow(e->xcrossing.window))) {
       if (! no_focus)
         win->enterNotifyEvent(&e->xcrossing);
-    } else if ((menu = searchMenu(e->xcrossing.window))) {
-      menu->enterNotifyEvent(&e->xcrossing);
-    } else if ((tbar = searchToolbar(e->xcrossing.window))) {
-      tbar->enterNotifyEvent(&e->xcrossing);
-    } else if ((slit = searchSlit(e->xcrossing.window))) {
-      slit->enterNotifyEvent(&e->xcrossing);
     }
     break;
   }
@@ -474,18 +399,9 @@ void Blackbox::process_event(XEvent *e) {
     last_time = e->xcrossing.time;
 
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
-    Toolbar *tbar = (Toolbar *) 0;
-    Slit *slit = (Slit *) 0;
 
-    if ((menu = searchMenu(e->xcrossing.window)))
-      menu->leaveNotifyEvent(&e->xcrossing);
-    else if ((win = searchWindow(e->xcrossing.window)))
+    if ((win = searchWindow(e->xcrossing.window)))
       win->leaveNotifyEvent(&e->xcrossing);
-    else if ((tbar = searchToolbar(e->xcrossing.window)))
-      tbar->leaveNotifyEvent(&e->xcrossing);
-    else if ((slit = searchSlit(e->xcrossing.window)))
-      slit->leaveNotifyEvent(&e->xcrossing);
     break;
   }
 
@@ -518,25 +434,14 @@ void Blackbox::process_event(XEvent *e) {
     e->xexpose.height = ey2 - ey1 + 1;
 
     BlackboxWindow *win = (BlackboxWindow *) 0;
-    Basemenu *menu = (Basemenu *) 0;
-    Toolbar *tbar = (Toolbar *) 0;
 
     if ((win = searchWindow(e->xexpose.window)))
       win->exposeEvent(&e->xexpose);
-    else if ((menu = searchMenu(e->xexpose.window)))
-      menu->exposeEvent(&e->xexpose);
-    else if ((tbar = searchToolbar(e->xexpose.window)))
-      tbar->exposeEvent(&e->xexpose);
 
     break;
   }
 
   case KeyPress: {
-    Toolbar *tbar = searchToolbar(e->xkey.window);
-
-    if (tbar && tbar->isEditing())
-      tbar->keyPressEvent(&e->xkey);
-
     break;
   }
 
@@ -574,6 +479,8 @@ void Blackbox::process_event(XEvent *e) {
         has moved to a known window.
       */
       e->xfocus.window = None;
+
+      no_focus = False;   // focusing is back on
     }
 
     break;
@@ -682,8 +589,10 @@ void Blackbox::process_event(XEvent *e) {
           if (win->isIconic())
             win->deiconify(False, False);
           if (! win->isStuck() &&
-              (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID()))
+              (win->getWorkspaceNumber() != screen->getCurrentWorkspaceID())) {
+            no_focus = True;
             screen->changeWorkspaceID(win->getWorkspaceNumber());
+          }
           if (win->isVisible() && win->setInputFocus()) {
             win->getScreen()->getWorkspace(win->getWorkspaceNumber())->
               raiseWindow(win);
@@ -921,7 +830,7 @@ void Blackbox::process_event(XEvent *e) {
       XShapeEvent *shape_event = (XShapeEvent *) e;
       BlackboxWindow *win = searchWindow(e->xany.window);
 
-      if (win)
+      if (win && shape_event->kind == ShapeBounding)
         win->shapeEvent(shape_event);
     }
 #endif // SHAPE
@@ -941,7 +850,6 @@ bool Blackbox::handleSignal(int sig) {
     break;
 
   case SIGUSR2:
-    rereadMenu();
     break;
 
   case SIGPIPE:
@@ -1011,33 +919,6 @@ BWindowGroup *Blackbox::searchGroup(Window window) {
 }
 
 
-Basemenu *Blackbox::searchMenu(Window window) {
-  MenuLookup::iterator it = menuSearchList.find(window);
-  if (it != menuSearchList.end())
-    return it->second;
-
-  return (Basemenu*) 0;
-}
-
-
-Toolbar *Blackbox::searchToolbar(Window window) {
-  ToolbarLookup::iterator it = toolbarSearchList.find(window);
-  if (it != toolbarSearchList.end())
-    return it->second;
-
-  return (Toolbar*) 0;
-}
-
-
-Slit *Blackbox::searchSlit(Window window) {
-  SlitLookup::iterator it = slitSearchList.find(window);
-  if (it != slitSearchList.end())
-    return it->second;
-
-  return (Slit*) 0;
-}
-
-
 void Blackbox::saveSystrayWindowSearch(Window window, BScreen *screen) {
   systraySearchList.insert(WindowScreenLookupPair(window, screen));
 }
@@ -1053,21 +934,6 @@ void Blackbox::saveGroupSearch(Window window, BWindowGroup *data) {
 }
 
 
-void Blackbox::saveMenuSearch(Window window, Basemenu *data) {
-  menuSearchList.insert(MenuLookupPair(window, data));
-}
-
-
-void Blackbox::saveToolbarSearch(Window window, Toolbar *data) {
-  toolbarSearchList.insert(ToolbarLookupPair(window, data));
-}
-
-
-void Blackbox::saveSlitSearch(Window window, Slit *data) {
-  slitSearchList.insert(SlitLookupPair(window, data));
-}
-
-
 void Blackbox::removeSystrayWindowSearch(Window window) {
   systraySearchList.erase(window);
 }
@@ -1083,21 +949,6 @@ void Blackbox::removeGroupSearch(Window window) {
 }
 
 
-void Blackbox::removeMenuSearch(Window window) {
-  menuSearchList.erase(window);
-}
-
-
-void Blackbox::removeToolbarSearch(Window window) {
-  toolbarSearchList.erase(window);
-}
-
-
-void Blackbox::removeSlitSearch(Window window) {
-  slitSearchList.erase(window);
-}
-
-
 void Blackbox::restart(const char *prog) {
   shutdown();
 
@@ -1169,6 +1020,17 @@ void Blackbox::save_rc(void) {
   config.setValue("session.cacheMax", resource.cache_max);
   config.setValue("session.styleFile", resource.style_file);
   config.setValue("session.titlebarLayout", resource.titlebar_layout);
+
+  string s;
+  if (resource.mod_mask & Mod1Mask) s += "Mod1-";
+  if (resource.mod_mask & Mod2Mask) s += "Mod2-";
+  if (resource.mod_mask & Mod3Mask) s += "Mod3-";
+  if (resource.mod_mask & Mod4Mask) s += "Mod4-";
+  if (resource.mod_mask & Mod5Mask) s += "Mod5-";
+  if (resource.mod_mask & ShiftMask) s += "Shift-";
+  if (resource.mod_mask & ControlMask) s += "Control-";
+  s.resize(s.size() - 1); // drop the last '-'
+  config.setValue("session.modifierMask", s);
   
 #ifdef    XINERAMA
   saveXineramaPlacement(resource.xinerama_placement);
@@ -1236,6 +1098,26 @@ void Blackbox::load_rc(void) {
                         resource.xinerama_snap))
     resource.xinerama_snap = false;
 #endif // XINERAMA
+  
+  resource.mod_mask = 0;
+  if (config.getValue("session.modifierMask", s)) {
+    if (s.find("Mod1") != string::npos)
+      resource.mod_mask |= Mod1Mask;
+    if (s.find("Mod2") != string::npos)
+      resource.mod_mask |= Mod2Mask;
+    if (s.find("Mod3") != string::npos)
+      resource.mod_mask |= Mod3Mask;
+    if (s.find("Mod4") != string::npos)
+      resource.mod_mask |= Mod4Mask;
+    if (s.find("Mod5") != string::npos)
+      resource.mod_mask |= Mod5Mask;
+    if (s.find("Shift") != string::npos)
+      resource.mod_mask |= ShiftMask;
+    if (s.find("Control") != string::npos)
+      resource.mod_mask |= ControlMask;
+  }
+  if (! resource.mod_mask)
+    resource.mod_mask = Mod1Mask;
 }
 
 
@@ -1253,10 +1135,6 @@ void Blackbox::reconfigure(void) {
 void Blackbox::real_reconfigure(void) {
   load_rc();
   
-  std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
-                PointerAssassin());
-  menuTimestamps.clear();
-
   gcCache()->purge();
 
   std::for_each(screenList.begin(), screenList.end(),
@@ -1264,42 +1142,6 @@ void Blackbox::real_reconfigure(void) {
 }
 
 
-void Blackbox::checkMenu(void) {
-  bool reread = False;
-  MenuTimestampList::iterator it = menuTimestamps.begin();
-  for(; it != menuTimestamps.end(); ++it) {
-    MenuTimestamp *tmp = *it;
-    struct stat buf;
-
-    if (! stat(tmp->filename.c_str(), &buf)) {
-      if (tmp->timestamp != buf.st_ctime)
-        reread = True;
-    } else {
-      reread = True;
-    }
-  }
-
-  if (reread) rereadMenu();
-}
-
-
-void Blackbox::rereadMenu(void) {
-  reread_menu_wait = True;
-
-  if (! timer->isTiming()) timer->start();
-}
-
-
-void Blackbox::real_rereadMenu(void) {
-  std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
-                PointerAssassin());
-  menuTimestamps.clear();
-
-  std::for_each(screenList.begin(), screenList.end(),
-                std::mem_fun(&BScreen::rereadMenu));
-}
-
-
 void Blackbox::saveStyleFilename(const string& filename) {
   assert(! filename.empty());
   resource.style_file = filename;
@@ -1307,37 +1149,11 @@ void Blackbox::saveStyleFilename(const string& filename) {
 }
 
 
-void Blackbox::addMenuTimestamp(const string& filename) {
-  assert(! filename.empty());
-  bool found = False;
-
-  MenuTimestampList::iterator it = menuTimestamps.begin();
-  for (; it != menuTimestamps.end() && ! found; ++it) {
-    if ((*it)->filename == filename) found = True;
-  }
-  if (! found) {
-    struct stat buf;
-
-    if (! stat(filename.c_str(), &buf)) {
-      MenuTimestamp *ts = new MenuTimestamp;
-
-      ts->filename = filename;
-      ts->timestamp = buf.st_ctime;
-
-      menuTimestamps.push_back(ts);
-    }
-  }
-}
-
-
 void Blackbox::timeout(void) {
   if (reconfigure_wait)
     real_reconfigure();
 
-  if (reread_menu_wait)
-    real_rereadMenu();
-
-  reconfigure_wait = reread_menu_wait = False;
+  reconfigure_wait = False;
 }
 
 
@@ -1388,12 +1204,10 @@ void Blackbox::setFocusedWindow(BlackboxWindow *win) {
   }
 
   if (active_screen && active_screen->isScreenManaged()) {
-    active_screen->getToolbar()->redrawWindowLabel(True);
     active_screen->updateNetizenWindowFocus();
   }
 
   if (old_screen && old_screen != active_screen) {
-    old_screen->getToolbar()->redrawWindowLabel(True);
     old_screen->updateNetizenWindowFocus();
   }
 }