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

fixed client and icon count

Browse source
This commit is contained in:
fluxgen 2003-04-15 12:22:06 +00:00
parent 143be7a2d1
commit 77beb5472b
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Ewmh.cc
View file

@ -19,7 +19,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: Ewmh.cc,v 1.16 2003/04/15 00:14:24 fluxgen Exp $ // $Id: Ewmh.cc,v 1.17 2003/04/15 12:22:06 fluxgen Exp $
#include "Ewmh.hh" #include "Ewmh.hh"
@ -50,7 +50,8 @@ void Ewmh::initForScreen(BScreen &screen) {
Window wincheck = XCreateSimpleWindow(disp, Window wincheck = XCreateSimpleWindow(disp,
screen.getRootWindow(), 0, 0, 5, 5, 0, 0, 0); screen.getRootWindow(),
0, 0, 5, 5, 0, 0, 0);
if (wincheck != None) { if (wincheck != None) {
m_windows.push_back(wincheck); m_windows.push_back(wincheck);
@ -142,13 +143,19 @@ void Ewmh::updateClientList(BScreen &screen) {
} }
} }
//int num = getCurrentWorkspace()->getWindowList().size(); // and count icons
BScreen::Icons::const_iterator icon_it = screen.getIconList().begin();
BScreen::Icons::const_iterator icon_it_end = screen.getIconList().end();
for (; icon_it != icon_it_end; ++icon_it) {
num += (*icon_it)->numClients();
}
Window *wl = new (nothrow) Window[num]; Window *wl = new (nothrow) Window[num];
if (wl == 0) { if (wl == 0) {
cerr<<"Fatal: Out of memory, can't allocate for Ewmh client list"<<endl; cerr<<"Fatal: Out of memory, can't allocate for Ewmh client list"<<endl;
return; return;
} }
//start the iterator from begining //start the iterator from begining
workspace_it = screen.getWorkspacesList().begin(); workspace_it = screen.getWorkspacesList().begin();
int win=0; int win=0;
@ -175,10 +182,12 @@ void Ewmh::updateClientList(BScreen &screen) {
} }
// plus iconified windows // plus iconified windows
BScreen::Icons::const_iterator it = screen.getIconList().begin(); icon_it = screen.getIconList().begin();
BScreen::Icons::const_iterator it_end = screen.getIconList().end(); for (; icon_it != icon_it_end; ++icon_it) {
for (; it != it_end; ++it) { FluxboxWindow::ClientList::iterator client_it = (*icon_it)->clientList().begin();
wl[win++] = (*it)->getClientWindow(); FluxboxWindow::ClientList::iterator client_it_end = (*icon_it)->clientList().end();
for (; client_it != client_it_end; ++client_it)
wl[win++] = (*client_it)->window();
} }
//number of windows to show in client list //number of windows to show in client list