summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-14 12:10:54 (GMT)
committerfluxgen <fluxgen>2003-05-14 12:10:54 (GMT)
commit4195e26d01a37e7e3b131da2b196941c3ce78b12 (patch)
tree0d180da11e6edb5be5b278efb1956a57547c2a98
parentf478e85aa8c21847fd4b79b9c3eb4d6082cf21d6 (diff)
downloadfluxbox_lack-4195e26d01a37e7e3b131da2b196941c3ce78b12.zip
fluxbox_lack-4195e26d01a37e7e3b131da2b196941c3ce78b12.tar.bz2
using clients screen instead of fluxboxwindwos screen
-rw-r--r--src/fluxbox.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index a80c1bc..ba8994f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.145 2003/05/13 14:05:58 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.146 2003/05/14 12:10:54 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -361,13 +361,13 @@ static Window last_bad_window = None;
361 361
362static int handleXErrors(Display *d, XErrorEvent *e) { 362static int handleXErrors(Display *d, XErrorEvent *e) {
363#ifdef DEBUG 363#ifdef DEBUG
364 364 /*
365 char errtxt[128]; 365 char errtxt[128];
366 366
367 XGetErrorText(d, e->error_code, errtxt, 128); 367 XGetErrorText(d, e->error_code, errtxt, 128);
368 cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<< 368 cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<<
369 (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl; 369 (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl;
370 370 */
371#endif // !DEBUG 371#endif // !DEBUG
372 372
373 if (e->error_code == BadWindow) 373 if (e->error_code == BadWindow)
@@ -1160,7 +1160,8 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1160 case Keys::WORKSPACE6: 1160 case Keys::WORKSPACE6:
1161 mousescreen->changeWorkspaceID(5); 1161 mousescreen->changeWorkspaceID(5);
1162 break; 1162 break;
1163 case Keys::WORKSPACE7: mousescreen->changeWorkspaceID(6); 1163 case Keys::WORKSPACE7:
1164 mousescreen->changeWorkspaceID(6);
1164 break; 1165 break;
1165 case Keys::WORKSPACE8: 1166 case Keys::WORKSPACE8:
1166 mousescreen->changeWorkspaceID(7); 1167 mousescreen->changeWorkspaceID(7);
@@ -1626,11 +1627,9 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1626 WinClient::WinClientSubj *subj = dynamic_cast<WinClient::WinClientSubj *>(changedsub); 1627 WinClient::WinClientSubj *subj = dynamic_cast<WinClient::WinClientSubj *>(changedsub);
1627 WinClient &client = subj->winClient(); 1628 WinClient &client = subj->winClient();
1628 1629
1629 if (client.fbwindow()) { 1630 BScreen &screen = client.screen();
1630 BScreen &screen = client.fbwindow()->screen(); 1631 screen.updateNetizenWindowDel(client.window());
1631 screen.updateNetizenWindowDel(client.window()); 1632 screen.removeClient(client);
1632 screen.removeClient(client);
1633 }
1634 1633
1635 removeWindowSearch(client.window()); 1634 removeWindowSearch(client.window());
1636 //!! TODO 1635 //!! TODO