fixed change workspace and indenting

This commit is contained in:
Scott Moynes 2002-08-07 02:10:16 +00:00
parent b0239459c3
commit 1f539dccc6

View file

@ -214,8 +214,7 @@ void screen::handleKeypress(const XEvent &e) {
return; return;
case Action::changeWorkspace: case Action::changeWorkspace:
// we subtract one so counting starts at 1 in the config file changeWorkspace(it->number());
changeWorkspace(it->number() - 1);
return; return;
case Action::execute: case Action::execute:
@ -374,7 +373,7 @@ void screen::updateClientList() {
break; break;
if (it == end) { // didn't already exist if (it == end) { // didn't already exist
if (doAddWindow(rootclients[i])) { if (doAddWindow(rootclients[i])) {
// cout << "Added window: 0x" << hex << rootclients[i] << dec << endl; // cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
_clients.insert(insert_point, new XWindow(_epist, this, _clients.insert(insert_point, new XWindow(_epist, this,
rootclients[i])); rootclients[i]));
} }
@ -394,7 +393,7 @@ void screen::updateClientList() {
if (**it2 == rootclients[i]) if (**it2 == rootclients[i])
break; break;
if (i == num) { // no longer exists if (i == num) { // no longer exists
// cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl; // cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl;
// watch for the active and last-active window // watch for the active and last-active window
if (it2 == _active) if (it2 == _active)
_active = _clients.end(); _active = _clients.end();
@ -443,10 +442,10 @@ void screen::updateActiveWindow() {
if (it != end) if (it != end)
_last_active = it; _last_active = it;
/* cout << "Active window is now: "; /* cout << "Active window is now: ";
if (_active == _clients.end()) cout << "None\n"; if (_active == _clients.end()) cout << "None\n";
else cout << "0x" << hex << (*_active)->window() << dec << endl; else cout << "0x" << hex << (*_active)->window() << dec << endl;
*/ */
} }