nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using winclient instance name

Browse source
This commit is contained in:
fluxgen 2003-06-15 19:34:34 +00:00
parent 2b1bc6565e
commit 7e04a570e3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Workspace.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.72 2003/06/13 20:50:49 fluxgen Exp $ // $Id: Workspace.cc,v 1.73 2003/06/15 19:34:34 fluxgen Exp $
#include "Workspace.hh" #include "Workspace.hh"
@ -331,7 +331,7 @@ class FindInGroup {
public: public:
FindInGroup(const FluxboxWindow &w):m_w(w) { } FindInGroup(const FluxboxWindow &w):m_w(w) { }
bool operator ()(const string &name) { bool operator ()(const string &name) {
return (name == m_w.instanceName()); return (name == m_w.winClient().getWMClassName());
} }
private: private:
const FluxboxWindow &m_w; const FluxboxWindow &m_w;
@ -341,9 +341,10 @@ private:
//Note: this function doesn't check if the window is groupable //Note: this function doesn't check if the window is groupable
bool Workspace::checkGrouping(FluxboxWindow &win) { bool Workspace::checkGrouping(FluxboxWindow &win) {
if (win.numClients() == 0)
return false;
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): Checking grouping. ("<<win.instanceName()<<"/"<< cerr<<__FILE__<<"("<<__LINE__<<"): Checking grouping. ("<<win.title()<<")"<<endl;
win.className()<<")"<<endl;
#endif // DEBUG #endif // DEBUG
if (!win.isGroupable()) { // make sure this window can hold a tab if (!win.isGroupable()) { // make sure this window can hold a tab
#ifdef DEBUG #ifdef DEBUG
@ -352,6 +353,8 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
return false; return false;
} }
string instance_name = win.winClient().getWMClassName();
// go throu every group and search for matching win instancename // go throu every group and search for matching win instancename
GroupList::iterator g(m_groups.begin()); GroupList::iterator g(m_groups.begin());
GroupList::iterator g_end(m_groups.end()); GroupList::iterator g_end(m_groups.end());
@ -360,7 +363,7 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
Group::iterator name_end((*g).end()); Group::iterator name_end((*g).end());
for (; name != name_end; ++name) { for (; name != name_end; ++name) {
if ((*name) != win.instanceName()) if ((*name) != instance_name)
continue; continue;
// find a window with the specific name // find a window with the specific name
@ -368,7 +371,7 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
Windows::iterator wit_end(m_windowlist.end()); Windows::iterator wit_end(m_windowlist.end());
for (; wit != wit_end; ++wit) { for (; wit != wit_end; ++wit) {
#ifdef DEBUG #ifdef DEBUG
cerr<<__FILE__<<" check group with : "<<(*wit)->instanceName()<<endl; cerr<<__FILE__<<" check group with : "<<(*wit)->winClient().getWMClassName()<<endl;
#endif // DEBUG #endif // DEBUG
if (find_if((*g).begin(), if (find_if((*g).begin(),
(*g).end(), (*g).end(),
@ -381,7 +384,9 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
#endif // DEBUG #endif // DEBUG
(*wit)->attachClient(win.winClient()); (*wit)->attachClient(win.winClient());
return true; // grouping done return true; // grouping done
} }
} }
} }