diff options
author | fluxgen <fluxgen> | 2002-08-04 15:00:50 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-08-04 15:00:50 (GMT) |
commit | 33d482aba5053964594fb3c5b6f6a1537ca10cbf (patch) | |
tree | a0ce5328e0e0bbc89099c4d5d986ee4448b20673 /src | |
parent | abf74ed036f9d3f6134d64cae4fb3b4ca3b8e12d (diff) | |
download | fluxbox_lack-33d482aba5053964594fb3c5b6f6a1537ca10cbf.zip fluxbox_lack-33d482aba5053964594fb3c5b6f6a1537ca10cbf.tar.bz2 |
minor fixes for preprocessors
Diffstat (limited to 'src')
-rw-r--r-- | src/fluxbox.cc | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 6338f11..45a67bc 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.63 2002/08/02 13:00:23 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.64 2002/08/04 15:00:50 fluxgen Exp $ |
26 | 26 | ||
27 | //Use GNU extensions | 27 | //Use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -534,17 +534,17 @@ void Fluxbox::process_event(XEvent *e) { | |||
534 | { | 534 | { |
535 | FluxboxWindow *win = (FluxboxWindow *) 0; | 535 | FluxboxWindow *win = (FluxboxWindow *) 0; |
536 | 536 | ||
537 | #ifdef SLIT | 537 | #ifdef SLIT |
538 | Slit *slit = (Slit *) 0; | 538 | Slit *slit = (Slit *) 0; |
539 | #endif // SLIT | 539 | #endif // SLIT |
540 | 540 | ||
541 | if ((win = searchWindow(e->xconfigurerequest.window))) { | 541 | if ((win = searchWindow(e->xconfigurerequest.window))) { |
542 | win->configureRequestEvent(&e->xconfigurerequest); | 542 | win->configureRequestEvent(&e->xconfigurerequest); |
543 | 543 | ||
544 | #ifdef SLIT | 544 | #ifdef SLIT |
545 | } else if ((slit = searchSlit(e->xconfigurerequest.window))) { | 545 | } else if ((slit = searchSlit(e->xconfigurerequest.window))) { |
546 | slit->configureRequestEvent(&e->xconfigurerequest); | 546 | slit->configureRequestEvent(&e->xconfigurerequest); |
547 | #endif // SLIT | 547 | #endif // SLIT |
548 | 548 | ||
549 | } else { | 549 | } else { |
550 | grab(); | 550 | grab(); |
@@ -571,17 +571,17 @@ void Fluxbox::process_event(XEvent *e) { | |||
571 | break; | 571 | break; |
572 | case MapRequest: | 572 | case MapRequest: |
573 | { | 573 | { |
574 | #ifdef DEBUG | 574 | #ifdef DEBUG |
575 | fprintf(stderr, | 575 | fprintf(stderr, |
576 | I18n::instance()-> | 576 | I18n::instance()-> |
577 | getMessage( | 577 | getMessage( |
578 | FBNLS::blackboxSet, FBNLS::blackboxMapRequest, | 578 | FBNLS::blackboxSet, FBNLS::blackboxMapRequest, |
579 | "Fluxbox::process_event(): MapRequest for 0x%lx\n"), | 579 | "Fluxbox::process_event(): MapRequest for 0x%lx\n"), |
580 | e->xmaprequest.window); | 580 | e->xmaprequest.window); |
581 | #endif // DEBUG | 581 | #endif // DEBUG |
582 | 582 | ||
583 | #ifdef SLIT | 583 | #ifdef SLIT |
584 | #ifdef KDE | 584 | #ifdef KDE |
585 | //Check and see if client is KDE dock applet. | 585 | //Check and see if client is KDE dock applet. |
586 | //If so add to Slit | 586 | //If so add to Slit |
587 | bool iskdedockapp = False; | 587 | bool iskdedockapp = False; |
@@ -620,8 +620,8 @@ void Fluxbox::process_event(XEvent *e) { | |||
620 | } | 620 | } |
621 | return; | 621 | return; |
622 | } | 622 | } |
623 | #endif //KDE | 623 | #endif //KDE |
624 | #endif // SLIT | 624 | #endif // SLIT |
625 | 625 | ||
626 | FluxboxWindow *win = searchWindow(e->xmaprequest.window); | 626 | FluxboxWindow *win = searchWindow(e->xmaprequest.window); |
627 | 627 | ||
@@ -1045,11 +1045,11 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) { | |||
1045 | // Handles XClientMessageEvent | 1045 | // Handles XClientMessageEvent |
1046 | //----------------------------------------- | 1046 | //----------------------------------------- |
1047 | void Fluxbox::handleClientMessage(XClientMessageEvent &ce) { | 1047 | void Fluxbox::handleClientMessage(XClientMessageEvent &ce) { |
1048 | #ifdef DEBUG | 1048 | #ifdef DEBUG |
1049 | cerr<<__FILE__<<"("<<__LINE__<<"): ClientMessage. data.l[0]=0x"<<hex<<ce.data.l[0]<< | 1049 | cerr<<__FILE__<<"("<<__LINE__<<"): ClientMessage. data.l[0]=0x"<<hex<<ce.data.l[0]<< |
1050 | " type=0x"<<ce.message_type<<dec<<endl; | 1050 | " message_type=0x"<<ce.message_type<<dec<<endl; |
1051 | 1051 | ||
1052 | #endif | 1052 | #endif // DEBUG |
1053 | 1053 | ||
1054 | if (ce.format != 32) | 1054 | if (ce.format != 32) |
1055 | return; | 1055 | return; |
@@ -1501,10 +1501,11 @@ bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) { | |||
1501 | FluxboxWindow *win = 0; | 1501 | FluxboxWindow *win = 0; |
1502 | win = searchWindow(ce.window); | 1502 | win = searchWindow(ce.window); |
1503 | screen = searchScreen(ce.window); | 1503 | screen = searchScreen(ce.window); |
1504 | |||
1504 | if (ce.message_type == getGnomeWorkspaceAtom()) { | 1505 | if (ce.message_type == getGnomeWorkspaceAtom()) { |
1505 | #ifdef DEBUG | 1506 | #ifdef DEBUG |
1506 | cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl; | 1507 | cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl; |
1507 | #endif//!DEBUG | 1508 | #endif//!DEBUG |
1508 | if ( win !=0 && // the message sent to client window? | 1509 | if ( win !=0 && // the message sent to client window? |
1509 | win->getScreen() && ce.data.l[0] >= 0 && | 1510 | win->getScreen() && ce.data.l[0] >= 0 && |
1510 | ce.data.l[0] < (signed)win->getScreen()->getCount()) { | 1511 | ce.data.l[0] < (signed)win->getScreen()->getCount()) { |
@@ -1517,15 +1518,15 @@ bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) { | |||
1517 | return true; | 1518 | return true; |
1518 | } else if (win) { | 1519 | } else if (win) { |
1519 | if (ce.message_type == getGnomeStateAtom()) { | 1520 | if (ce.message_type == getGnomeStateAtom()) { |
1520 | #ifdef DEBUG | 1521 | #ifdef DEBUG |
1521 | cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_STATE"<<endl; | 1522 | cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_STATE"<<endl; |
1522 | #endif | 1523 | #endif // DEBUG |
1523 | 1524 | ||
1524 | #ifdef DEBUG | 1525 | #ifdef DEBUG |
1525 | cerr<<__FILE__<<"("<<__LINE__<<"): Mask of members to change:"<< | 1526 | cerr<<__FILE__<<"("<<__LINE__<<"): Mask of members to change:"<< |
1526 | hex<<ce.data.l[0]<<dec<<endl; // mask_of_members_to_change | 1527 | hex<<ce.data.l[0]<<dec<<endl; // mask_of_members_to_change |
1527 | cerr<<"New members:"<<ce.data.l[1]<<endl; | 1528 | cerr<<"New members:"<<ce.data.l[1]<<endl; |
1528 | #endif | 1529 | #endif // DEBUG |
1529 | 1530 | ||
1530 | //get new states | 1531 | //get new states |
1531 | int flag = ce.data.l[0] & ce.data.l[1]; | 1532 | int flag = ce.data.l[0] & ce.data.l[1]; |
@@ -1533,9 +1534,10 @@ bool Fluxbox::checkGnomeAtoms(XClientMessageEvent &ce) { | |||
1533 | win->setGnomeState(flag); | 1534 | win->setGnomeState(flag); |
1534 | 1535 | ||
1535 | } else if (ce.message_type == getGnomeHintsAtom()) { | 1536 | } else if (ce.message_type == getGnomeHintsAtom()) { |
1536 | #ifdef DEBUG | 1537 | #ifdef DEBUG |
1537 | cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_HINTS"<<endl; | 1538 | cerr<<__FILE__<<"("<<__LINE__<<"): _WIN_HINTS"<<endl; |
1538 | #endif | 1539 | #endif // DEBUG |
1540 | |||
1539 | } else | 1541 | } else |
1540 | return false; //the gnome atom wasn't found or not supported | 1542 | return false; //the gnome atom wasn't found or not supported |
1541 | } else | 1543 | } else |