properly handle workspace names, and changes to them.
Dana Jansens danakj@orodu.net
9 files changed,
109 insertions(+),
56 deletions(-)
M
src/Screen.cc
→
src/Screen.cc
@@ -205,17 +205,19 @@ workspacemenu = new Workspacemenu(this);
iconmenu = new Iconmenu(this); configmenu = new Configmenu(this); - Workspace *wkspc = (Workspace *) 0; if (resource.workspaces != 0) { for (unsigned int i = 0; i < resource.workspaces; ++i) { - wkspc = new Workspace(this, workspacesList.size()); + Workspace *wkspc = new Workspace(this, workspacesList.size()); workspacesList.push_back(wkspc); - workspacemenu->insert(wkspc->getName(), wkspc->getMenu()); + workspacemenu->insertWorkspace(wkspc); + workspacemenu->update(); + } } else { - wkspc = new Workspace(this, workspacesList.size()); + Workspace *wkspc = new Workspace(this, workspacesList.size()); workspacesList.push_back(wkspc); - workspacemenu->insert(wkspc->getName(), wkspc->getMenu()); + workspacemenu->insertWorkspace(wkspc); + workspacemenu->update(); } saveWorkspaceNames();@@ -496,18 +498,14 @@ #endif // HAVE_STRFTIME
void BScreen::saveWorkspaceNames() { - XAtom::StringVect nameList; - unsigned long numnames = (unsigned) -1; string names; - if (numnames > 0 && - xatom->getValue(getRootWindow(), XAtom::net_desktop_names, XAtom::utf8, - numnames, nameList)) { - for (unsigned int i = 0; i < nameList.size(); ++i) { - if (i > 0) names += ","; - names += nameList[i]; - } + for (unsigned int i = 0; i < workspacesList.size(); ++i) { + names += workspacesList[i]->getName(); + if (i < workspacesList.size() - 1) + names += ','; } + config->setValue(screenstr + "workspaceNames", names); }@@ -980,9 +978,9 @@ unsigned int BScreen::addWorkspace(void) {
Workspace *wkspc = new Workspace(this, workspacesList.size()); workspacesList.push_back(wkspc); saveWorkspaces(getWorkspaceCount()); + saveWorkspaceNames(); - workspacemenu->insert(wkspc->getName(), wkspc->getMenu(), - wkspc->getID() + 2); + workspacemenu->insertWorkspace(wkspc); workspacemenu->update(); toolbar->reconfigure();@@ -1004,13 +1002,14 @@ changeWorkspaceID(current_workspace->getID() - 1);
wkspc->removeAll(); - workspacemenu->remove(wkspc->getID() + 2); + workspacemenu->removeWorkspace(wkspc); workspacemenu->update(); workspacesList.pop_back(); delete wkspc; saveWorkspaces(getWorkspaceCount()); + saveWorkspaceNames(); toolbar->reconfigure();@@ -2114,6 +2113,23 @@ if (getCurrentWorkspaceID() == 0)
changeWorkspaceID(getWorkspaceCount() - 1); else changeWorkspaceID(getCurrentWorkspaceID() - 1); + } +} + + +void BScreen::propertyNotifyEvent(const XPropertyEvent *pe) { + if (pe->atom == xatom->getAtom(XAtom::net_desktop_names)) { + // _NET_WM_DESKTOP_NAMES + fprintf(stderr, "UPDATING WORKSPACE NAMES\n"); + WorkspaceList::iterator it = workspacesList.begin(); + const WorkspaceList::iterator end = workspacesList.end(); + for (; it != end; ++it) { + (*it)->readName(); // re-read its name from the window property + workspacemenu->changeWorkspaceLabel((*it)->getID(), (*it)->getName()); + } + workspacemenu->update(); + toolbar->reconfigure(); + saveWorkspaceNames(); } }
M
src/Screen.hh
→
src/Screen.hh
@@ -344,6 +344,7 @@ void showGeometry(unsigned int gx, unsigned int gy);
void hideGeometry(void); void buttonPressEvent(const XButtonEvent *xbutton); + void propertyNotifyEvent(const XPropertyEvent *pe); void updateNetizenCurrentWorkspace(void); void updateNetizenWorkspaceCount(void);
M
src/Toolbar.cc
→
src/Toolbar.cc
@@ -916,13 +916,9 @@ } 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;@@ -938,7 +934,6 @@ texture->color().pixel());
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 ||
M
src/Workspace.cc
→
src/Workspace.cc
@@ -70,8 +70,7 @@ clientmenu = new Clientmenu(this);
lastfocus = (BlackboxWindow *) 0; - setName(""); - fprintf(stderr, "WORKSPACE NAME: %s\n", name.c_str()); + readName(); }@@ -420,43 +419,48 @@ screen->changeWorkspaceID(id);
} -void Workspace::setName(const string& new_name) { - if (! new_name.empty()) { - name = new_name; +void Workspace::readName(void) { + XAtom::StringVect namesList; + unsigned long numnames = id + 1; + + // attempt to get from the _NET_WM_DESKTOP_NAMES property + if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names, + XAtom::utf8, numnames, namesList) && + namesList.size() > id) { + name = namesList[id]; + + clientmenu->setLabel(name); + clientmenu->update(); } else { - // attempt to get from the _NET_WM_DESKTOP_NAMES property - XAtom::StringVect namesList; - unsigned long numnames = id + 1; - if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names, - XAtom::utf8, numnames, namesList) && - namesList.size() > id) { - name = namesList[id]; - } else { - string tmp =i18n(WorkspaceSet, WorkspaceDefaultNameFormat, - "Workspace %d"); - assert(tmp.length() < 32); - char default_name[32]; - sprintf(default_name, tmp.c_str(), id + 1); - name = default_name; - } + /* + Use a default name. This doesn't actually change the class. That will + happen after the setName changes the root property, and that change + makes its way back to this function. + */ + string tmp =i18n(WorkspaceSet, WorkspaceDefaultNameFormat, + "Workspace %d"); + assert(tmp.length() < 32); + char default_name[32]; + sprintf(default_name, tmp.c_str(), id + 1); + + setName(default_name); // save this into the _NET_WM_DESKTOP_NAMES property } - - // reset the property with the new name +} + + +void Workspace::setName(const string& new_name) { + // set the _NET_WM_DESKTOP_NAMES property with the new name XAtom::StringVect namesList; unsigned long numnames = (unsigned) -1; if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names, XAtom::utf8, numnames, namesList) && namesList.size() > id) - namesList[id] = name; + namesList[id] = new_name; else - namesList.push_back(name); + namesList.push_back(new_name); xatom->setValue(screen->getRootWindow(), XAtom::net_desktop_names, XAtom::utf8, namesList); - - clientmenu->setLabel(name); - clientmenu->update(); - screen->saveWorkspaceNames(); }
M
src/Workspace.hh
→
src/Workspace.hh
@@ -104,6 +104,7 @@ void raiseWindow(BlackboxWindow *w);
void lowerWindow(BlackboxWindow *w); void reconfigure(void); void setCurrent(void); + void readName(); void setName(const std::string& new_name); };
M
src/blackbox.cc
→
src/blackbox.cc
@@ -462,9 +462,13 @@
case PropertyNotify: { last_time = e->xproperty.time; - BlackboxWindow *win = searchWindow(e->xproperty.window); - if (win) + BlackboxWindow *win = (BlackboxWindow *) 0; + BScreen *screen = (BScreen *) 0; + + if ((win = searchWindow(e->xproperty.window))) win->propertyNotifyEvent(&e->xproperty); + else if ((screen = searchScreen(e->xproperty.window))) + screen->propertyNotifyEvent(&e->xproperty); break; }