#include "i18n.hh"
#include "blackbox.hh"
-#include "Clientmenu.hh"
#include "Font.hh"
#include "GCCache.hh"
-#include "Iconmenu.hh"
#include "Image.hh"
-#include "Rootmenu.hh"
#include "Screen.hh"
#include "Toolbar.hh"
#include "Window.hh"
#include "Workspace.hh"
+#include "Clientmenu.hh"
#include "Workspacemenu.hh"
#include "Slit.hh"
editing = False;
blackbox->setNoFocus(False);
- if (blackbox->getFocusedWindow()) {
+ if (blackbox->getFocusedWindow())
blackbox->getFocusedWindow()->setInputFocus();
- } else {
+ else
blackbox->setFocusedWindow(0);
- }
-
- Workspace *wkspc = screen->getCurrentWorkspace();
- wkspc->setName(new_workspace_name);
- wkspc->getMenu()->hide();
- screen->getWorkspacemenu()->changeItemLabel(wkspc->getID() + 2,
- wkspc->getName());
- screen->getWorkspacemenu()->update();
+ // the toolbar will be reconfigured when the change to the workspace name
+ // gets caught in the PropertyNotify event handler
+ screen->getCurrentWorkspace()->setName(new_workspace_name);
new_workspace_name.erase();
new_name_pos = 0;
else
XSetWindowBackgroundPixmap(display, frame.workspace_label,
frame.wlabel);
- reconfigure();
} else if (! (ks == XK_Shift_L || ks == XK_Shift_R ||
ks == XK_Control_L || ks == XK_Control_R ||
ks == XK_Caps_Lock || ks == XK_Shift_Lock ||