X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.cc;h=e5e498a3e7a6bea2320d7d4a91e9f5df08bf0007;hb=373de009f7e98b0c6f3a78f31c1e5c120cd722ed;hp=63e0ef0536676703ed1b14d1cd16913c46361559;hpb=db451d95bf97b8a8e995f031ac98da50606fd3a0;p=chaz%2Fopenbox

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 63e0ef05..e5e498a3 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"
@@ -97,32 +76,30 @@ extern "C" {
 using std::string;
 
 #include "blackbox.hh"
-#include "basemenu.hh"
-#include "clientmenu.hh"
-#include "gccache.hh"
-#include "image.hh"
-#include "rootmenu.hh"
+#include "otk/gccache.hh"
+#include "otk/image.hh"
+#include "otk/assassin.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"
 
+namespace ob {
+
 Blackbox *blackbox;
 
 
-Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
-  : BaseDisplay(m_argv[0], dpy_name) {
+Blackbox::Blackbox(int argc, char **m_argv, char *rc)
+  : Openbox(argc, m_argv) {
+
   if (! XSupportsLocale())
     fprintf(stderr, "X server does not support locale\n");
 
   if (XSetLocaleModifiers("") == NULL)
     fprintf(stderr, "cannot set locale modifiers\n");
 
-  ::blackbox = this;
+  ob::blackbox = this;
   argv = m_argv;
 
   // try to make sure the ~/.openbox directory exists
@@ -134,17 +111,6 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   rc_file = expandTilde(rc);
   config.setFile(rc_file);  
 
-  string rcmenu;
-  if (! menu) {
-    //have to come up with something better than this
-    config.load();
-    if (! config.getValue("session.menuFile", rcmenu))
-      rcmenu = "~/.openbox/menu";
-  } else {
-    rcmenu = menu;
-  }
-  menu_file = expandTilde(rcmenu.c_str());
-
   no_focus = False;
 
   resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0;
@@ -154,16 +120,16 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
 
   load_rc();
 
-  xatom = new XAtom(getXDisplay());
+  xatom = new XAtom(otk::OBDisplay::display);
 
-  cursor.session = XCreateFontCursor(getXDisplay(), XC_left_ptr);
-  cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur);
-  cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle);
-  cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle);
-  cursor.ul_angle = XCreateFontCursor(getXDisplay(), XC_ul_angle);
-  cursor.ur_angle = XCreateFontCursor(getXDisplay(), XC_ur_angle);
+  cursor.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);
+  cursor.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur);
+  cursor.ll_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ll_angle);
+  cursor.lr_angle = XCreateFontCursor(otk::OBDisplay::display, XC_lr_angle);
+  cursor.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle);
+  cursor.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
 
-  for (unsigned int i = 0; i < getNumberOfScreens(); i++) {
+  for (int i = 0; i < ScreenCount(otk::OBDisplay::display); i++) {
     BScreen *screen = new BScreen(this, i);
 
     if (! screen->isScreenManaged()) {
@@ -176,8 +142,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);
   }
 
@@ -188,21 +153,18 @@ Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc, char *menu)
   active_screen = screenList.front();
   setFocusedWindow(0);
 
-  XSynchronize(getXDisplay(), False);
-  XSync(getXDisplay(), False);
+  XSynchronize(otk::OBDisplay::display, False);
+  XSync(otk::OBDisplay::display, False);
 
-  reconfigure_wait = reread_menu_wait = False;
+  reconfigure_wait = False;
 
-  timer = new BTimer(this, this);
+  timer = new OBTimer(this);
   timer->setTimeout(0l);
 }
 
 
 Blackbox::~Blackbox(void) {
-  std::for_each(screenList.begin(), screenList.end(), PointerAssassin());
-
-  std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
-                PointerAssassin());
+  std::for_each(screenList.begin(), screenList.end(), otk::PointerAssassin());
 
   delete xatom;
 
@@ -214,14 +176,11 @@ void Blackbox::process_event(XEvent *e) {
   switch (e->type) {
   case ButtonPress: {
     // strip the lock key modifiers
-    e->xbutton.state &= ~(NumLockMask | ScrollLockMask | LockMask);
+    //e->xbutton.state &= ~(NumLockMask | ScrollLockMask | LockMask);
 
     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))) {
@@ -230,12 +189,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) {
@@ -251,32 +204,23 @@ void Blackbox::process_event(XEvent *e) {
 
   case ButtonRelease: {
     // strip the lock key modifiers
-    e->xbutton.state &= ~(NumLockMask | ScrollLockMask | LockMask);
+    //e->xbutton.state &= ~(NumLockMask | ScrollLockMask | LockMask);
 
     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;
@@ -289,7 +233,7 @@ void Blackbox::process_event(XEvent *e) {
         xwc.sibling = e->xconfigurerequest.above;
         xwc.stack_mode = e->xconfigurerequest.detail;
 
-        XConfigureWindow(getXDisplay(), e->xconfigurerequest.window,
+        XConfigureWindow(otk::OBDisplay::display, e->xconfigurerequest.window,
                          e->xconfigurerequest.value_mask, &xwc);
       }
     }
@@ -335,7 +279,7 @@ void Blackbox::process_event(XEvent *e) {
           the window is on
         */
         XWindowAttributes wattrib;
-        if (! XGetWindowAttributes(getXDisplay(), e->xmaprequest.window,
+        if (! XGetWindowAttributes(otk::OBDisplay::display, e->xmaprequest.window,
                                    &wattrib)) {
           // failed to get the window attributes, perhaps the window has
           // now been destroyed?
@@ -354,13 +298,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);
     }
@@ -370,14 +311,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))) {
@@ -395,13 +333,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;
   }
 
@@ -409,7 +342,7 @@ void Blackbox::process_event(XEvent *e) {
     // motion notify compression...
     XEvent realevent;
     unsigned int i = 0;
-    while (XCheckTypedWindowEvent(getXDisplay(), e->xmotion.window,
+    while (XCheckTypedWindowEvent(otk::OBDisplay::display, e->xmotion.window,
                                   MotionNotify, &realevent)) {
       i++;
     }
@@ -423,17 +356,14 @@ void Blackbox::process_event(XEvent *e) {
       break;
 
     // strip the lock key modifiers
-    e->xmotion.state &= ~(NumLockMask | ScrollLockMask | LockMask);
+    //e->xmotion.state &= ~(NumLockMask | ScrollLockMask | LockMask);
 
     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;
   }
@@ -456,9 +386,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;
 
@@ -468,12 +395,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;
   }
@@ -482,18 +403,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;
   }
 
@@ -506,7 +418,7 @@ void Blackbox::process_event(XEvent *e) {
     ey1 = e->xexpose.y;
     ex2 = ex1 + e->xexpose.width - 1;
     ey2 = ey1 + e->xexpose.height - 1;
-    while (XCheckTypedWindowEvent(getXDisplay(), e->xexpose.window,
+    while (XCheckTypedWindowEvent(otk::OBDisplay::display, e->xexpose.window,
                                   Expose, &realevent)) {
       i++;
 
@@ -526,25 +438,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;
   }
 
@@ -617,7 +518,7 @@ void Blackbox::process_event(XEvent *e) {
         (the FocusIn event handler sets the window in the event
         structure to None to indicate this).
       */
-      if (XCheckTypedEvent(getXDisplay(), FocusIn, &event)) {
+      if (XCheckTypedEvent(otk::OBDisplay::display, FocusIn, &event)) {
 
         process_event(&event);
         if (event.xfocus.window == None) {
@@ -634,7 +535,7 @@ void Blackbox::process_event(XEvent *e) {
         BlackboxWindow *focus;
         Window w;
         int revert;
-        XGetInputFocus(getXDisplay(), &w, &revert);
+        XGetInputFocus(otk::OBDisplay::display, &w, &revert);
         focus = searchWindow(w);
         if (focus) {
           /*
@@ -916,28 +817,6 @@ void Blackbox::process_event(XEvent *e) {
             }
           }
         }
-      } else if (e->xclient.message_type ==
-                 xatom->getAtom(XAtom::openbox_show_root_menu) ||
-                 e->xclient.message_type ==
-                 xatom->getAtom(XAtom::openbox_show_workspace_menu)) {
-        // find the screen the mouse is on
-        int x, y;
-        ScreenList::iterator it, end = screenList.end();
-        for (it = screenList.begin(); it != end; ++it) {
-          Window w;
-          int i;
-          unsigned int m;
-          if (XQueryPointer(getXDisplay(), (*it)->getRootWindow(),
-                            &w, &w, &x, &y, &i, &i, &m))
-            break;
-        }
-        if (it != end) {
-          if (e->xclient.message_type ==
-              xatom->getAtom(XAtom::openbox_show_root_menu))
-            (*it)->showRootMenu(x, y);
-          else
-            (*it)->showWorkspaceMenu(x, y);
-        }
       }
     }
 
@@ -975,7 +854,6 @@ bool Blackbox::handleSignal(int sig) {
     break;
 
   case SIGUSR2:
-    rereadMenu();
     break;
 
   case SIGPIPE:
@@ -995,8 +873,8 @@ bool Blackbox::handleSignal(int sig) {
 
 bool Blackbox::validateWindow(Window window) {
   XEvent event;
-  if (XCheckTypedWindowEvent(getXDisplay(), window, DestroyNotify, &event)) {
-    XPutBackEvent(getXDisplay(), &event);
+  if (XCheckTypedWindowEvent(otk::OBDisplay::display, window, DestroyNotify, &event)) {
+    XPutBackEvent(otk::OBDisplay::display, &event);
 
     return False;
   }
@@ -1045,33 +923,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));
 }
@@ -1087,21 +938,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);
 }
@@ -1117,21 +953,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();
 
@@ -1143,20 +964,20 @@ void Blackbox::restart(const char *prog) {
 
   // fall back in case the above execlp doesn't work
   execvp(argv[0], argv);
-  string name = basename(argv[0]);
+  string name = ::basename(argv[0]);
   execvp(name.c_str(), argv);
 }
 
 
 void Blackbox::shutdown(void) {
-  BaseDisplay::shutdown();
+  Openbox::shutdown();
 
-  XSetInputFocus(getXDisplay(), PointerRoot, None, CurrentTime);
+  XSetInputFocus(otk::OBDisplay::display, PointerRoot, None, CurrentTime);
 
   std::for_each(screenList.begin(), screenList.end(),
                 std::mem_fun(&BScreen::shutdown));
 
-  XSync(getXDisplay(), False);
+  XSync(otk::OBDisplay::display, False);
 }
 
 
@@ -1165,9 +986,7 @@ void Blackbox::saveXineramaPlacement(bool x) {
   resource.xinerama_placement = x;
   config.setValue("session.xineramaSupport.windowPlacement",
                   resource.xinerama_placement);
-  reconfigure();  // make sure all screens get this change
-}
-
+  reconfigure();  // make sure all screens get this 
 
 void Blackbox::saveXineramaMaximizing(bool x) {
   resource.xinerama_maximize = x;
@@ -1307,7 +1126,7 @@ void Blackbox::load_rc(void) {
 void Blackbox::reconfigure(void) {
   // don't reconfigure while saving the initial rc file, it's a waste and it
   // breaks somethings (workspace names)
-  if (isStartup()) return;
+  if (state() == Openbox::State_Starting) return;
 
   reconfigure_wait = True;
 
@@ -1318,53 +1137,13 @@ void Blackbox::reconfigure(void) {
 void Blackbox::real_reconfigure(void) {
   load_rc();
   
-  std::for_each(menuTimestamps.begin(), menuTimestamps.end(),
-                PointerAssassin());
-  menuTimestamps.clear();
-
-  gcCache()->purge();
+  otk::OBDisplay::gcCache()->purge();
 
   std::for_each(screenList.begin(), screenList.end(),
                 std::mem_fun(&BScreen::reconfigure));
 }
 
 
-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;
@@ -1372,37 +1151,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;
 }
 
 
@@ -1436,29 +1189,30 @@ void Blackbox::setFocusedWindow(BlackboxWindow *win) {
     if (! old_screen) {
       if (active_screen) {
         // set input focus to the toolbar of the screen with mouse
-        XSetInputFocus(getXDisplay(),
+        XSetInputFocus(otk::OBDisplay::display,
                        active_screen->getRootWindow(),
                        RevertToPointerRoot, CurrentTime);
       } else {
         // set input focus to the toolbar of the first managed screen
-        XSetInputFocus(getXDisplay(),
+        XSetInputFocus(otk::OBDisplay::display,
                        screenList.front()->getRootWindow(),
                        RevertToPointerRoot, CurrentTime);
       }
     } else {
       // set input focus to the toolbar of the last screen
-      XSetInputFocus(getXDisplay(), old_screen->getRootWindow(),
+      XSetInputFocus(otk::OBDisplay::display, old_screen->getRootWindow(),
                      RevertToPointerRoot, CurrentTime);
     }
   }
 
   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();
   }
 }
+
+
+}