acquire and provide Xinerama information for the window manager. now we just gotta...

[chaz/openbox] / src / Window.cc

diff --git a/src/Window.cc b/src/Window.cc
index a336eaeb4e9a1511c207aa4c825a49904fb7f67f..316bbf1ae4127918743994b8e1d47f6e8c2632c2 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -44,6 +44,7 @@ extern "C" {
 
 #include "i18n.hh"
 #include "blackbox.hh"
+#include "Clientmenu.hh"
 #include "Font.hh"
 #include "GCCache.hh"
 #include "Iconmenu.hh"
@@ -152,10 +153,17 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
   client.rect.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
   client.old_bw = wattrib.border_width;
 
-  timer = 0;
   windowmenu = 0;
   lastButtonPressTime = 0;
 
+  timer = new BTimer(blackbox, this);
+  timer->setTimeout(blackbox->getAutoRaiseDelay());
+
+  if (! getBlackboxHints()) {
+    getMWMHints();
+    getNetWMHints();
+  }
+
   // get size, aspect, minimum/maximum size and other hints set by the
   // client
   getWMProtocols();
@@ -168,14 +176,6 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
     return;
   }
 
-  timer = new BTimer(blackbox, this);
-  timer->setTimeout(blackbox->getAutoRaiseDelay());
-
-  if (! getBlackboxHints()) {
-    getMWMHints();
-    getNetWMHints();
-  }
-
   frame.window = createToplevelWindow();
   frame.plate = createChildWindow(frame.window);
   associateClientWindow();
@@ -819,24 +819,27 @@ void BlackboxWindow::reconfigure(void) {
 
 
 void BlackboxWindow::grabButtons(void) {
-  if ((! screen->isSloppyFocus()) || screen->doClickRaise())
+  if (! screen->isSloppyFocus() || screen->doClickRaise())
     // grab button 1 for changing focus/raising
     blackbox->grabButton(Button1, 0, frame.plate, True, ButtonPressMask,
-                         GrabModeSync, GrabModeSync, frame.plate, None);
-
+                         GrabModeSync, GrabModeSync, frame.plate, None,
+                         screen->allowScrollLock());
+  
   if (functions & Func_Move)
     blackbox->grabButton(Button1, Mod1Mask, frame.window, True,
                          ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
-                         GrabModeAsync, frame.window,
-                         blackbox->getMoveCursor());
+                         GrabModeAsync, frame.window, None,
+                         screen->allowScrollLock());
   if (functions & Func_Resize)
     blackbox->grabButton(Button3, Mod1Mask, frame.window, True,
                          ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
-                         GrabModeAsync, frame.window, None);
+                         GrabModeAsync, frame.window, None,
+                         screen->allowScrollLock());
   // alt+middle lowers the window
   blackbox->grabButton(Button2, Mod1Mask, frame.window, True,
                        ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
-                       frame.window, None);
+                       frame.window, None,
+                       screen->allowScrollLock());
 }
 
 
@@ -2039,6 +2042,9 @@ void BlackboxWindow::setFocusFlag(bool focus) {
 
   if (isFocused())
     blackbox->setFocusedWindow(this);
+  
+  Clientmenu *menu = screen->getWorkspace(blackbox_attrib.workspace)->getMenu();
+  menu->setItemSelected(window_number, isFocused());
 }
 
 
@@ -2510,7 +2516,8 @@ void BlackboxWindow::mapRequestEvent(const XMapRequestEvent *re) {
     if (isNormal()) {
       if (! blackbox->isStartup()) {
         XSync(blackbox->getXDisplay(), False); // make sure the frame is mapped
-        if (isTransient() || screen->doFocusNew()) {
+        if (screen->doFocusNew()|| (isTransient() && getTransientFor() &&
+                                    getTransientFor()->isFocused())) {
           setInputFocus();
         }
         if (screen->getPlacementPolicy() == BScreen::ClickMousePlacement) {