summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fluxbox.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index b9fa1aa..d6b7784 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.110 2003/04/15 13:58:57 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.111 2003/04/15 19:04:18 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -643,8 +643,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
643 FluxboxWindow *win = (FluxboxWindow *) 0; 643 FluxboxWindow *win = (FluxboxWindow *) 0;
644 644
645 if ((win = searchWindow(e->xconfigurerequest.window))) { 645 if ((win = searchWindow(e->xconfigurerequest.window))) {
646 win->configureRequestEvent(e->xconfigurerequest); 646 // already handled in FluxboxWindow::handleEvent
647
648 } else { 647 } else {
649 grab(); 648 grab();
650 649
@@ -659,7 +658,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
659 xwc.sibling = e->xconfigurerequest.above; 658 xwc.sibling = e->xconfigurerequest.above;
660 xwc.stack_mode = e->xconfigurerequest.detail; 659 xwc.stack_mode = e->xconfigurerequest.detail;
661 660
662 XConfigureWindow(getXDisplay(), e->xconfigurerequest.window, 661 XConfigureWindow(FbTk::App::instance()->display(),
662 e->xconfigurerequest.window,
663 e->xconfigurerequest.value_mask, &xwc); 663 e->xconfigurerequest.value_mask, &xwc);
664 } 664 }
665 665
@@ -684,9 +684,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
684 else 684 else
685 cerr<<"Fluxbox Warning! Could not find screen to map window on!"<<endl; 685 cerr<<"Fluxbox Warning! Could not find screen to map window on!"<<endl;
686 } 686 }
687 687 // handled in FluxboxWindow::handleEvent
688 if ((win = searchWindow(e->xmaprequest.window)))
689 win->mapRequestEvent(e->xmaprequest);
690 688
691 } 689 }
692 break; 690 break;
@@ -1033,14 +1031,12 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1033 case KeyPress: 1031 case KeyPress:
1034 { 1032 {
1035 BScreen *screen = searchScreen(ke.window); 1033 BScreen *screen = searchScreen(ke.window);
1036
1037
1038 1034
1039 if (screen == 0) 1035 if (screen == 0)
1040 break; 1036 break;
1041 1037
1042#ifdef DEBUG 1038#ifdef DEBUG
1043 cerr<<"KeyEvent"<<endl; 1039 cerr<<__FILE__<<"("<<__FUNCTION__<<"): KeyEvent"<<endl;
1044#endif 1040#endif
1045 //find action 1041 //find action
1046 Keys::KeyAction action = key->getAction(&ke); 1042 Keys::KeyAction action = key->getAction(&ke);