X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=d49e418afbfa6c5bc57f3a7d22eea4c046baae8a;hb=eb1f1b359f821061e1fe6a2953c8d984474c9ef4;hp=e0ef585f20b09d9013ba8fda65fd832a6f69eb04;hpb=2dde696a1335ef61bb368c55f4ee52e1dd8610a1;p=chaz%2Fopenbox

diff --git a/src/Screen.cc b/src/Screen.cc
index e0ef585f..d49e418a 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -21,12 +21,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#ifdef    HAVE_CONFIG_H
 #include "../config.h"
+#endif // HAVE_CONFIG_H
 
 extern "C" {
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
+#ifdef    XINERAMA
+#  include <X11/Xlib.h>
+#  include <X11/extensions/Xinerama.h>
+#endif // XINERAMA
+
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
@@ -83,6 +90,7 @@ using std::string;
 #include "Window.hh"
 #include "Workspace.hh"
 #include "Workspacemenu.hh"
+#include "Util.hh"
 #include "XAtom.hh"
 
 #ifndef   FONT_ELEMENT_SIZE
@@ -151,8 +159,7 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
   XDefineCursor(blackbox->getXDisplay(), getRootWindow(),
                 blackbox->getSessionCursor());
 
-  // start off full screen, top left.
-  usableArea.setSize(getWidth(), getHeight());
+  updateAvailableArea();
 
   image_control =
     new BImageControl(blackbox, this, True, blackbox->getColorsPerChannel(),
@@ -205,7 +212,7 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
   iconmenu = new Iconmenu(this);
   configmenu = new Configmenu(this);
 
-  if (resource.workspaces != 0) {
+  if (resource.workspaces > 0) {
     for (unsigned int i = 0; i < resource.workspaces; ++i) {
       Workspace *wkspc = new Workspace(this, workspacesList.size());
       workspacesList.push_back(wkspc);
@@ -276,7 +283,7 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
 
   // manage shown windows
   for (i = 0; i < nchild; ++i) {
-    if (children[i] == None || (! blackbox->validateWindow(children[i])))
+    if (children[i] == None || ! blackbox->validateWindow(children[i]))
       continue;
 
     XWindowAttributes attrib;
@@ -410,10 +417,29 @@ void BScreen::saveHideToolbar(bool h) {
 }
 
 
-void BScreen::saveWindowToWindowSnap(bool s) {
-  resource.window_to_window_snap = s;
-  config->setValue(screenstr + "windowToWindowSnap",
-                   resource.window_to_window_snap);
+void BScreen::saveWindowToEdgeSnap(int s) {
+  resource.snap_to_edges = s;
+
+  const char *snap;
+  switch (resource.snap_to_edges) {
+  case WindowNoSnap: snap = "NoSnap"; break;
+  case WindowResistance: snap = "Resistance"; break;
+  case WindowSnap: default: snap = "Snap"; break;
+  }
+  config->setValue(screenstr + "windowToEdgeSnap", snap);
+}
+
+
+void BScreen::saveWindowToWindowSnap(int s) {
+  resource.snap_to_windows = s;
+  
+  const char *snap;
+  switch (resource.snap_to_windows) {
+  case WindowNoSnap: snap = "NoSnap"; break;
+  case WindowResistance: snap = "Resistance"; break;
+  case WindowSnap: default: snap = "Snap"; break;
+  }
+  config->setValue(screenstr + "windowToWindowSnap", snap);
 }
 
 
@@ -450,10 +476,24 @@ void BScreen::savePlacementPolicy(int p) {
 }
 
 
-void BScreen::saveEdgeSnapThreshold(int t) {
-  resource.edge_snap_threshold = t;
+void BScreen::saveResistanceSize(int s) {
+  resource.resistance_size = s;
+  config->setValue(screenstr + "resistanceSize",
+                   resource.resistance_size);
+}
+
+
+void BScreen::saveSnapThreshold(int t) {
+  resource.snap_threshold = t;
   config->setValue(screenstr + "edgeSnapThreshold",
-                   resource.edge_snap_threshold);
+                   resource.snap_threshold);
+}
+
+
+void BScreen::saveSnapOffset(int t) {
+  resource.snap_offset = t;
+  config->setValue(screenstr + "edgeSnapOffset",
+                   resource.snap_offset);
 }
 
 
@@ -523,6 +563,32 @@ void BScreen::savePlaceIgnoreMaximized(bool i) {
 }
 
 
+void BScreen::saveAllowScrollLock(bool a) {
+  resource.allow_scroll_lock = a;
+  config->setValue(screenstr + "disableBindingsWithScrollLock",
+                   resource.allow_scroll_lock);
+}
+
+
+void BScreen::saveWorkspaceWarping(bool w) {
+  resource.workspace_warping = w;
+  config->setValue(screenstr + "workspaceWarping",
+                   resource.workspace_warping);
+}
+
+
+void BScreen::saveRootScrollDirection(int d) {
+  resource.root_scroll = d;
+  const char *dir;
+  switch (resource.root_scroll) {
+  case NoScroll: dir = "None"; break;
+  case ReverseScroll: dir = "Reverse"; break;
+  case NormalScroll: default: dir = "Normal"; break;
+  }
+  config->setValue(screenstr + "rootScrollDirection", dir);
+}
+
+
 void BScreen::save_rc(void) {
   saveSloppyFocus(resource.sloppy_focus);
   saveAutoRaise(resource.auto_raise);
@@ -534,11 +600,14 @@ void BScreen::save_rc(void) {
   saveFocusNew(resource.focus_new);
   saveFocusLast(resource.focus_last);
   saveHideToolbar(resource.hide_toolbar);
-  saveWindowToWindowSnap(resource.window_to_window_snap);
+  saveWindowToWindowSnap(resource.snap_to_windows);
+  saveWindowToEdgeSnap(resource.snap_to_edges);
   saveWindowCornerSnap(resource.window_corner_snap);
   saveWorkspaces(resource.workspaces);
   savePlacementPolicy(resource.placement_policy);
-  saveEdgeSnapThreshold(resource.edge_snap_threshold);
+  saveSnapThreshold(resource.snap_threshold);
+  saveSnapOffset(resource.snap_offset);
+  saveResistanceSize(resource.resistance_size);
   saveRowPlacementDirection(resource.row_direction);
   saveColPlacementDirection(resource.col_direction);
 #ifdef    HAVE_STRFTIME
@@ -549,6 +618,9 @@ void BScreen::save_rc(void) {
 #endif // HAVE_STRFTIME
   savePlaceIgnoreShaded(resource.ignore_shaded);
   savePlaceIgnoreMaximized(resource.ignore_maximized);
+  saveAllowScrollLock(resource.allow_scroll_lock);
+  saveWorkspaceWarping(resource.workspace_warping);
+  saveRootScrollDirection(resource.root_scroll);
 
   toolbar->save_rc();
   slit->save_rc();
@@ -585,9 +657,21 @@ void BScreen::load_rc(void) {
   if (! config->getValue(screenstr + "hideToolbar", resource.hide_toolbar))
     resource.hide_toolbar = false;
 
-  if (! config->getValue(screenstr + "windowToWindowSnap",
-                         resource.window_to_window_snap))
-    resource.window_to_window_snap = true;
+  resource.snap_to_windows = WindowResistance;
+  if (config->getValue(screenstr + "windowToWindowSnap", s)) {
+    if (s == "NoSnap")
+      resource.snap_to_windows = WindowNoSnap;
+    else if (s == "Snap")
+      resource.snap_to_windows = WindowSnap;
+  }
+
+  resource.snap_to_edges = WindowResistance;
+  if (config->getValue(screenstr + "windowToEdgeSnap", s)) {
+    if (s == "NoSnap")
+      resource.snap_to_edges = WindowNoSnap;
+    else if (s == "Snap")
+      resource.snap_to_edges = WindowSnap;
+  }
 
   if (! config->getValue(screenstr + "windowCornerSnap",
                          resource.window_corner_snap))
@@ -597,9 +681,19 @@ void BScreen::load_rc(void) {
     b = true;
   image_control->setDither(b);
 
+  if (! config->getValue(screenstr + "edgeSnapOffset",
+                        resource.snap_offset))
+    resource.snap_offset = 0;
+  if (resource.snap_offset > 50)  // sanity check, setting this huge would
+    resource.snap_offset = 50;    // seriously suck.
+  
   if (! config->getValue(screenstr + "edgeSnapThreshold",
-                        resource.edge_snap_threshold))
-    resource.edge_snap_threshold = 4;
+                        resource.snap_threshold))
+    resource.snap_threshold = 4;
+  
+  if (! config->getValue(screenstr + "resistanceSize",
+                        resource.resistance_size))
+    resource.resistance_size = 18;
   
   if (config->getValue(screenstr + "rowPlacementDirection", s) &&
       s == "RightToLeft")
@@ -613,8 +707,9 @@ void BScreen::load_rc(void) {
   else
     resource.col_direction = TopBottom;
 
-  XAtom::StringVect workspaceNames;
   if (config->getValue(screenstr + "workspaceNames", s)) {
+    XAtom::StringVect workspaceNames;
+
     string::const_iterator it = s.begin(), end = s.end();
     while(1) {
       string::const_iterator tmp = it;     // current string.begin()
@@ -624,9 +719,10 @@ void BScreen::load_rc(void) {
         break;
       ++it;
     }
+
+    xatom->setValue(getRootWindow(), XAtom::net_desktop_names, XAtom::utf8,
+                    workspaceNames);
   }
-  xatom->setValue(getRootWindow(), XAtom::net_desktop_names, XAtom::utf8,
-                  workspaceNames);
 
   resource.sloppy_focus = true;
   resource.auto_raise = false;
@@ -681,15 +777,56 @@ void BScreen::load_rc(void) {
   if (! config->getValue(screenstr + "placementIgnoreMaximized",
                          resource.ignore_maximized))
     resource.ignore_maximized = true;
+
+  if (! config->getValue(screenstr + "disableBindingsWithScrollLock",
+                       resource.allow_scroll_lock))
+    resource.allow_scroll_lock = false;
+
+  if (! config->getValue(screenstr + "workspaceWarping",
+                         resource.workspace_warping))
+    resource.workspace_warping = false;
+
+  resource.root_scroll = NormalScroll;
+  if (config->getValue(screenstr + "rootScrollDirection", s)) {
+    if (s == "None")
+      resource.root_scroll = NoScroll;
+    else if (s == "Reverse")
+      resource.root_scroll = ReverseScroll;
+  }
+}
+
+
+void BScreen::changeWorkspaceCount(unsigned int new_count) {
+  assert(new_count > 0);
+
+  if (new_count < workspacesList.size()) {
+    // shrink
+    for (unsigned int i = workspacesList.size(); i > new_count; --i)
+      removeLastWorkspace();
+    // removeLast already sets the current workspace to the 
+    // last available one.
+  } else if (new_count > workspacesList.size()) {
+    // grow
+    for(unsigned int i = workspacesList.size(); i < new_count; ++i)
+      addWorkspace();
+  }
 }
 
 
 void BScreen::reconfigure(void) {
+  // don't reconfigure while saving the initial rc file, it's a waste and it
+  // breaks somethings (workspace names)
+  if (blackbox->isStartup()) return;
+
   load_rc();
   toolbar->load_rc();
   slit->load_rc();
   LoadStyle();
 
+  // we need to do this explicitly, because just loading this value from the rc
+  // does nothing
+  changeWorkspaceCount(resource.workspaces);
+
   XGCValues gcv;
   gcv.foreground = WhitePixel(blackbox->getXDisplay(),
                               getScreenNumber());
@@ -992,7 +1129,8 @@ void BScreen::removeIcon(BlackboxWindow *w) {
 BlackboxWindow *BScreen::getIcon(unsigned int index) {
   if (index < iconList.size()) {
     BlackboxWindowList::iterator it = iconList.begin();
-    for (; index > 0; --index, ++it) ; /* increment to index */
+    while (index-- > 0) // increment to index
+      ++it;
     return *it;
   }
 
@@ -1048,38 +1186,20 @@ unsigned int BScreen::removeLastWorkspace(void) {
 void BScreen::changeWorkspaceID(unsigned int id) {
   if (! current_workspace || id == current_workspace->getID()) return;
 
-  BlackboxWindow *focused = blackbox->getFocusedWindow();
-  if (focused && focused->getScreen() == this) {
-    assert(focused->isStuck() ||
-           focused->getWorkspaceNumber() == current_workspace->getID());
+  current_workspace->hide();
 
-    current_workspace->setLastFocusedWindow(focused);
-  } else {
-    // if no window had focus, no need to store a last focus
-    current_workspace->setLastFocusedWindow((BlackboxWindow *) 0);
-  }
-
-  // when we switch workspaces, unfocus whatever was focused
-  blackbox->setFocusedWindow((BlackboxWindow *) 0);
-    
-  current_workspace->hideAll();
   workspacemenu->setItemSelected(current_workspace->getID() + 2, False);
 
   current_workspace = getWorkspace(id);
 
+  current_workspace->show();
+
   xatom->setValue(getRootWindow(), XAtom::net_current_desktop,
                   XAtom::cardinal, id);
 
   workspacemenu->setItemSelected(current_workspace->getID() + 2, True);
   toolbar->redrawWorkspaceLabel(True);
 
-  current_workspace->showAll();
-
-  if (resource.focus_last && current_workspace->getLastFocusedWindow()) {
-    XSync(blackbox->getXDisplay(), False);
-    current_workspace->getLastFocusedWindow()->setInputFocus();
-  }
-
   updateNetizenCurrentWorkspace();
 }
 
@@ -1174,6 +1294,14 @@ void BScreen::manageWindow(Window w) {
     return;
   }
 
+  // is the window a docking app
+  XWMHints *wmhint = XGetWMHints(blackbox->getXDisplay(), w);
+  if (wmhint && (wmhint->flags & StateHint) &&
+      wmhint->initial_state == WithdrawnState) {
+    slit->addClient(w);
+    return;
+  }
+
   new BlackboxWindow(blackbox, w, this);
 
   BlackboxWindow *win = blackbox->searchWindow(w);
@@ -1185,6 +1313,9 @@ void BScreen::manageWindow(Window w) {
     // don't list non-normal windows as managed windows
     windowList.push_back(win);
     updateClientList();
+  
+    if (win->isTopmost())
+      specialWindowList.push_back(win->getFrameWindow());
   } else if (win->isDesktop()) {
     desktopWindowList.push_back(win->getFrameWindow());
   }
@@ -1199,16 +1330,35 @@ void BScreen::manageWindow(Window w) {
 void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) {
   w->restore(remap);
 
+  // Remove the modality so that its parent won't try to re-focus the window
+  if (w->isModal()) w->setModal(False);
+  
   if (w->getWorkspaceNumber() != BSENTINEL &&
-      w->getWindowNumber() != BSENTINEL)
+      w->getWindowNumber() != BSENTINEL) {
     getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
-  else if (w->isIconic())
+    if (w->isStuck()) {
+      for (unsigned int i = 0; i < getNumberOfWorkspaces(); ++i)
+        if (i != w->getWorkspaceNumber())
+          getWorkspace(i)->removeWindow(w, True);
+    }
+  } else if (w->isIconic())
     removeIcon(w);
 
   if (w->isNormal()) {
     // we don't list non-normal windows as managed windows
     windowList.remove(w);
     updateClientList();
+
+    if (w->isTopmost()) {
+      WindowList::iterator it = specialWindowList.begin();
+      const WindowList::iterator end = specialWindowList.end();
+      for (; it != end; ++it)
+        if (*it == w->getFrameWindow()) {
+          specialWindowList.erase(it);
+          break;
+        }
+      assert(it != end);  // the window wasnt a special window?
+    }
   } else if (w->isDesktop()) {
     WindowList::iterator it = desktopWindowList.begin();
     const WindowList::iterator end = desktopWindowList.end();
@@ -1353,8 +1503,14 @@ void BScreen::updateNetizenConfigNotify(XEvent *e) {
 
 void BScreen::raiseWindows(Window *workspace_stack, unsigned int num) {
   // the 13 represents the number of blackbox windows such as menus
+  int bbwins = 15;
+#ifdef    XINERAMA
+  ++bbwins;
+#endif // XINERAMA
+
   Window *session_stack = new
-    Window[(num + workspacesList.size() + rootmenuList.size() + 13)];
+    Window[(num + workspacesList.size() + rootmenuList.size() +
+            specialWindowList.size() + bbwins)];
   unsigned int i = 0, k = num;
 
   XRaiseWindow(blackbox->getXDisplay(), iconmenu->getWindowID());
@@ -1369,6 +1525,11 @@ void BScreen::raiseWindows(Window *workspace_stack, unsigned int num) {
 
   *(session_stack + i++) = configmenu->getFocusmenu()->getWindowID();
   *(session_stack + i++) = configmenu->getPlacementmenu()->getWindowID();
+  *(session_stack + i++) = configmenu->getWindowSnapmenu()->getWindowID();
+  *(session_stack + i++) = configmenu->getEdgeSnapmenu()->getWindowID();
+#ifdef    XINERAMA
+  *(session_stack + i++) = configmenu->getXineramamenu()->getWindowID();
+#endif // XINERAMA
   *(session_stack + i++) = configmenu->getWindowID();
 
   *(session_stack + i++) = slit->getMenu()->getDirectionmenu()->getWindowID();
@@ -1390,6 +1551,10 @@ void BScreen::raiseWindows(Window *workspace_stack, unsigned int num) {
   if (slit->isOnTop())
     *(session_stack + i++) = slit->getWindowID();
 
+  WindowList::iterator sit, send = specialWindowList.end();
+  for (sit = specialWindowList.begin(); sit != send; ++sit)
+    *(session_stack + i++) = *sit;
+
   while (k--)
     *(session_stack + i++) = *(workspace_stack + k);
 
@@ -1438,7 +1603,13 @@ void BScreen::reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
   if (w->isIconic()) {
     removeIcon(w);
     getWorkspace(wkspc_id)->addWindow(w);
+    if (w->isStuck())
+      for (unsigned int i = 0; i < getNumberOfWorkspaces(); ++i)
+        if (i != w->getWorkspaceNumber())
+          getWorkspace(i)->addWindow(w, True);
   } else if (ignore_sticky || ! w->isStuck()) {
+    if (w->isStuck())
+      w->stick();
     getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
     getWorkspace(wkspc_id)->addWindow(w);
   }
@@ -1567,37 +1738,38 @@ void BScreen::InitMenu(void) {
       memset(label, 0, 1024);
 
       while (fgets(line, 1024, menu_file) && ! feof(menu_file)) {
-        if (line[0] != '#') {
-          int i, key = 0, index = -1, len = strlen(line);
-
-          for (i = 0; i < len; i++) {
-            if (line[i] == '[') index = 0;
-            else if (line[i] == ']') break;
-            else if (line[i] != ' ')
-              if (index++ >= 0)
-                key += tolower(line[i]);
-          }
+        if (line[0] == '#')
+          continue;
 
-          if (key == 517) { // [begin]
-            index = -1;
-            for (i = index; i < len; i++) {
-              if (line[i] == '(') index = 0;
-              else if (line[i] == ')') break;
-              else if (index++ >= 0) {
-                if (line[i] == '\\' && i < len - 1) i++;
-                label[index - 1] = line[i];
-              }
-            }
+        int i, key = 0, index = -1, len = strlen(line);
 
-            if (index == -1) index = 0;
-            label[index] = '\0';
+        for (i = 0; i < len; i++) {
+          if (line[i] == '[') index = 0;
+          else if (line[i] == ']') break;
+          else if (line[i] != ' ')
+            if (index++ >= 0)
+              key += tolower(line[i]);
+        }
 
-            rootmenu->setLabel(label);
-            defaultMenu = parseMenuFile(menu_file, rootmenu);
-            if (! defaultMenu)
-              blackbox->addMenuTimestamp(menu_filename);
-            break;
+        if (key == 517) { // [begin]
+          index = -1;
+          for (i = index; i < len; i++) {
+            if (line[i] == '(') index = 0;
+            else if (line[i] == ')') break;
+            else if (index++ >= 0) {
+              if (line[i] == '\\' && i < len - 1) i++;
+              label[index - 1] = line[i];
+            }
           }
+
+          if (index == -1) index = 0;
+          label[index] = '\0';
+
+          rootmenu->setLabel(label);
+          defaultMenu = parseMenuFile(menu_file, rootmenu);
+          if (! defaultMenu)
+            blackbox->addMenuTimestamp(menu_filename);
+          break;
         }
       }
     }
@@ -1619,322 +1791,315 @@ void BScreen::InitMenu(void) {
 }
 
 
+static
+size_t string_within(char begin, char end,
+                     const char *input, size_t start_at, size_t length,
+                     char *output) {
+  bool parse = False;
+  size_t index = 0;
+  size_t i = start_at;
+  for (; i < length; ++i) {
+    if (input[i] == begin) {
+      parse = True;
+    } else if (input[i] == end) {
+      break;
+    } else if (parse) {
+      if (input[i] == '\\' && i < length - 1) i++;
+      output[index++] = input[i];
+    } 
+  }
+
+  if (parse)
+    output[index] = '\0';
+  else
+    output[0] = '\0';
+
+  return i;
+}
+
+
 bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
-  char line[1024], label[1024], command[1024];
+  char line[1024], keyword[1024], label[1024], command[1024];
+  bool done = False;
 
-  while (! feof(file)) {
+  while (! (done || feof(file))) {
     memset(line, 0, 1024);
     memset(label, 0, 1024);
     memset(command, 0, 1024);
 
-    if (fgets(line, 1024, file)) {
-      if (line[0] != '#') {
-        int i, key = 0, parse = 0, index = -1, line_length = strlen(line);
+    if (! fgets(line, 1024, file))
+      continue;
 
-        // determine the keyword
-        for (i = 0; i < line_length; i++) {
-          if (line[i] == '[') parse = 1;
-          else if (line[i] == ']') break;
-          else if (line[i] != ' ')
-            if (parse)
-              key += tolower(line[i]);
-        }
+    if (line[0] == '#') // comment, skip it
+      continue;
 
-        // get the label enclosed in ()'s
-        parse = 0;
-
-        for (i = 0; i < line_length; i++) {
-          if (line[i] == '(') {
-            index = 0;
-            parse = 1;
-          } else if (line[i] == ')') break;
-          else if (index++ >= 0) {
-            if (line[i] == '\\' && i < line_length - 1) i++;
-            label[index - 1] = line[i];
-          }
-        }
+    size_t line_length = strlen(line);
+    unsigned int key = 0;
 
-        if (parse) {
-          label[index] = '\0';
-        } else {
-          label[0] = '\0';
-        }
+    // get the keyword enclosed in []'s
+    size_t pos = string_within('[', ']', line, 0, line_length, keyword);
 
-        // get the command enclosed in {}'s
-        parse = 0;
-        index = -1;
-        for (i = 0; i < line_length; i++) {
-          if (line[i] == '{') {
-            index = 0;
-            parse = 1;
-          } else if (line[i] == '}') break;
-          else if (index++ >= 0) {
-            if (line[i] == '\\' && i < line_length - 1) i++;
-            command[index - 1] = line[i];
-          }
-        }
+    if (keyword[0] == '\0') {  // no keyword, no menu entry
+      continue;
+    } else {
+      size_t len = strlen(keyword);
+      for (size_t i = 0; i < len; ++i) {
+        if (keyword[i] != ' ')
+          key += tolower(keyword[i]);
+      }
+    }
 
-        if (parse) {
-          command[index] = '\0';
-        } else {
-          command[0] = '\0';
-        }
+    // get the label enclosed in ()'s
+    pos = string_within('(', ')', line, pos, line_length, label);
 
-        switch (key) {
-        case 311: // end
-          return ((menu->getCount() == 0) ? True : False);
+    // get the command enclosed in {}'s
+    pos = string_within('{', '}', line, pos, line_length, command);
 
-          break;
+    switch (key) {
+    case 311: // end
+      done = True;
 
-        case 333: // nop
-          if (! *label)
-            label[0] = '\0';
-          menu->insert(label);
+      break;
 
-          break;
+    case 333: // nop
+      if (! *label)
+        label[0] = '\0';
+      menu->insert(label);
 
-        case 421: // exec
-          if ((! *label) && (! *command)) {
-            fprintf(stderr, i18n(ScreenSet, ScreenEXECError,
-                                 "BScreen::parseMenuFile: [exec] error, "
-                                 "no menu label and/or command defined\n"));
-            continue;
-          }
+      break;
 
-          menu->insert(label, BScreen::Execute, command);
+    case 421: // exec
+      if (! (*label && *command)) {
+        fprintf(stderr, i18n(ScreenSet, ScreenEXECError,
+                             "BScreen::parseMenuFile: [exec] error, "
+                             "no menu label and/or command defined\n"));
+        continue;
+      }
 
-          break;
+      menu->insert(label, BScreen::Execute, command);
 
-        case 442: // exit
-          if (! *label) {
-            fprintf(stderr, i18n(ScreenSet, ScreenEXITError,
-                                 "BScreen::parseMenuFile: [exit] error, "
-                                 "no menu label defined\n"));
-            continue;
-          }
+      break;
 
-          menu->insert(label, BScreen::Exit);
+    case 442: // exit
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenEXITError,
+                             "BScreen::parseMenuFile: [exit] error, "
+                             "no menu label defined\n"));
+        continue;
+      }
 
-          break;
+      menu->insert(label, BScreen::Exit);
 
-        case 561: // style
-          {
-            if ((! *label) || (! *command)) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenSTYLEError,
-                           "BScreen::parseMenuFile: [style] error, "
-                           "no menu label and/or filename defined\n"));
-              continue;
-            }
+      break;
 
-            string style = expandTilde(command);
+    case 561: { // style
+      if (! (*label && *command)) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenSTYLEError,
+                     "BScreen::parseMenuFile: [style] error, "
+                     "no menu label and/or filename defined\n"));
+        continue;
+      }
 
-            menu->insert(label, BScreen::SetStyle, style.c_str());
-          }
+      string style = expandTilde(command);
 
-          break;
+      menu->insert(label, BScreen::SetStyle, style.c_str());
+    }
+      break;
 
-        case 630: // config
-          if (! *label) {
-            fprintf(stderr, i18n(ScreenSet, ScreenCONFIGError,
-                                 "BScreen::parseMenufile: [config] error, "
-                                 "no label defined"));
-            continue;
-          }
+    case 630: // config
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenCONFIGError,
+                             "BScreen::parseMenufile: [config] error, "
+                             "no label defined"));
+        continue;
+      }
 
-          menu->insert(label, configmenu);
+      menu->insert(label, configmenu);
 
-          break;
+      break;
 
-        case 740: // include
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenINCLUDEError,
-                                   "BScreen::parseMenuFile: [include] error, "
-                                   "no filename defined\n"));
-              continue;
-            }
+    case 740: { // include
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenINCLUDEError,
+                             "BScreen::parseMenuFile: [include] error, "
+                             "no filename defined\n"));
+        continue;
+      }
 
-            string newfile = expandTilde(label);
-            FILE *submenufile = fopen(newfile.c_str(), "r");
-
-            if (submenufile) {
-              struct stat buf;
-              if (fstat(fileno(submenufile), &buf) ||
-                  (! S_ISREG(buf.st_mode))) {
-                fprintf(stderr,
-                        i18n(ScreenSet, ScreenINCLUDEErrorReg,
-                             "BScreen::parseMenuFile: [include] error: "
-                             "'%s' is not a regular file\n"), newfile.c_str());
-                break;
-              }
-
-              if (! feof(submenufile)) {
-                if (! parseMenuFile(submenufile, menu))
-                  blackbox->addMenuTimestamp(newfile);
-
-                fclose(submenufile);
-              }
-            } else {
-              perror(newfile.c_str());
-            }
-          }
+      string newfile = expandTilde(label);
+      FILE *submenufile = fopen(newfile.c_str(), "r");
 
-          break;
+      if (! submenufile) {
+        perror(newfile.c_str());
+        continue;
+      }
 
-        case 767: // submenu
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenSUBMENUError,
-                                   "BScreen::parseMenuFile: [submenu] error, "
-                                   "no menu label defined\n"));
-              continue;
-            }
+      struct stat buf;
+      if (fstat(fileno(submenufile), &buf) ||
+          ! S_ISREG(buf.st_mode)) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenINCLUDEErrorReg,
+                     "BScreen::parseMenuFile: [include] error: "
+                     "'%s' is not a regular file\n"), newfile.c_str());
+        break;
+      }
 
-            Rootmenu *submenu = new Rootmenu(this);
+      if (! feof(submenufile)) {
+        if (! parseMenuFile(submenufile, menu))
+          blackbox->addMenuTimestamp(newfile);
 
-            if (*command)
-              submenu->setLabel(command);
-            else
-              submenu->setLabel(label);
+        fclose(submenufile);
+      }
+    }
 
-            parseMenuFile(file, submenu);
-            submenu->update();
-            menu->insert(label, submenu);
-            rootmenuList.push_back(submenu);
-          }
+      break;
 
-          break;
+    case 767: { // submenu
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenSUBMENUError,
+                             "BScreen::parseMenuFile: [submenu] error, "
+                             "no menu label defined\n"));
+        continue;
+      }
 
-        case 773: // restart
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenRESTARTError,
-                                   "BScreen::parseMenuFile: [restart] error, "
-                                   "no menu label defined\n"));
-              continue;
-            }
+      Rootmenu *submenu = new Rootmenu(this);
 
-            if (*command)
-              menu->insert(label, BScreen::RestartOther, command);
-            else
-              menu->insert(label, BScreen::Restart);
-          }
+      if (*command)
+        submenu->setLabel(command);
+      else
+        submenu->setLabel(label);
 
-          break;
+      parseMenuFile(file, submenu);
+      submenu->update();
+      menu->insert(label, submenu);
+      rootmenuList.push_back(submenu);
+    }
 
-        case 845: // reconfig
-          {
-            if (! *label) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenRECONFIGError,
-                           "BScreen::parseMenuFile: [reconfig] error, "
-                           "no menu label defined\n"));
-              continue;
-            }
+      break;
 
-            menu->insert(label, BScreen::Reconfigure);
-          }
+    case 773: { // restart
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenRESTARTError,
+                             "BScreen::parseMenuFile: [restart] error, "
+                             "no menu label defined\n"));
+        continue;
+      }
 
-          break;
+      if (*command)
+        menu->insert(label, BScreen::RestartOther, command);
+      else
+        menu->insert(label, BScreen::Restart);
+    }
 
-        case 995: // stylesdir
-        case 1113: // stylesmenu
-          {
-            bool newmenu = ((key == 1113) ? True : False);
-
-            if ((! *label) || ((! *command) && newmenu)) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenSTYLESDIRError,
-                           "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
-                           " error, no directory defined\n"));
-              continue;
-            }
+      break;
 
-            char *directory = ((newmenu) ? command : label);
+    case 845: { // reconfig
+      if (! *label) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenRECONFIGError,
+                     "BScreen::parseMenuFile: [reconfig] error, "
+                     "no menu label defined\n"));
+        continue;
+      }
 
-            string stylesdir = expandTilde(directory);
+      menu->insert(label, BScreen::Reconfigure);
+    }
 
-            struct stat statbuf;
+      break;
 
-            if (! stat(stylesdir.c_str(), &statbuf)) {
-              if (S_ISDIR(statbuf.st_mode)) {
-                Rootmenu *stylesmenu;
+    case 995:    // stylesdir
+    case 1113: { // stylesmenu
+      bool newmenu = ((key == 1113) ? True : False);
 
-                if (newmenu)
-                  stylesmenu = new Rootmenu(this);
-                else
-                  stylesmenu = menu;
+      if (! *label || (! *command && newmenu)) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenSTYLESDIRError,
+                     "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
+                     " error, no directory defined\n"));
+        continue;
+      }
 
-                DIR *d = opendir(stylesdir.c_str());
-                struct dirent *p;
-                std::vector<string> ls;
+      char *directory = ((newmenu) ? command : label);
 
-                while((p = readdir(d)))
-                  ls.push_back(p->d_name);
+      string stylesdir = expandTilde(directory);
 
-                closedir(d);
+      struct stat statbuf;
 
-                std::sort(ls.begin(), ls.end());
+      if (stat(stylesdir.c_str(), &statbuf) == -1) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenSTYLESDIRErrorNoExist,
+                     "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
+                     " error, %s does not exist\n"), stylesdir.c_str());
+        continue;
+      }
+      if (! S_ISDIR(statbuf.st_mode)) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenSTYLESDIRErrorNotDir,
+                     "BScreen::parseMenuFile:"
+                     " [stylesdir/stylesmenu] error, %s is not a"
+                     " directory\n"), stylesdir.c_str());
+        continue;
+      }
 
-                std::vector<string>::iterator it = ls.begin(),
-                  end = ls.end();
-                for (; it != end; ++it) {
-                  const string& fname = *it;
+      Rootmenu *stylesmenu;
 
-                  if (fname[fname.size()-1] == '~')
-                    continue;
+      if (newmenu)
+        stylesmenu = new Rootmenu(this);
+      else
+        stylesmenu = menu;
 
-                  string style = stylesdir;
-                  style += '/';
-                  style += fname;
+      DIR *d = opendir(stylesdir.c_str());
+      struct dirent *p;
+      std::vector<string> ls;
 
-                  if ((! stat(style.c_str(), &statbuf)) &&
-                      S_ISREG(statbuf.st_mode))
-                    stylesmenu->insert(fname, BScreen::SetStyle, style);
-                }
+      while((p = readdir(d)))
+        ls.push_back(p->d_name);
 
-                stylesmenu->update();
+      closedir(d);
 
-                if (newmenu) {
-                  stylesmenu->setLabel(label);
-                  menu->insert(label, stylesmenu);
-                  rootmenuList.push_back(stylesmenu);
-                }
+      std::sort(ls.begin(), ls.end());
 
-                blackbox->addMenuTimestamp(stylesdir);
-              } else {
-                fprintf(stderr,
-                        i18n(ScreenSet, ScreenSTYLESDIRErrorNotDir,
-                             "BScreen::parseMenuFile:"
-                             " [stylesdir/stylesmenu] error, %s is not a"
-                             " directory\n"), stylesdir.c_str());
-              }
-            } else {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenSTYLESDIRErrorNoExist,
-                           "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
-                           " error, %s does not exist\n"), stylesdir.c_str());
-            }
-            break;
-          }
+      std::vector<string>::iterator it = ls.begin(),
+        end = ls.end();
+      for (; it != end; ++it) {
+        const string& fname = *it;
 
-        case 1090: // workspaces
-          {
-            if (! *label) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenWORKSPACESError,
-                           "BScreen:parseMenuFile: [workspaces] error, "
-                           "no menu label defined\n"));
-              continue;
-            }
+        if (fname[fname.size()-1] == '~')
+          continue;
 
-            menu->insert(label, workspacemenu);
+        string style = stylesdir;
+        style += '/';
+        style += fname;
 
-            break;
-          }
-        }
+        if (! stat(style.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
+          stylesmenu->insert(fname, BScreen::SetStyle, style);
+      }
+
+      stylesmenu->update();
+
+      if (newmenu) {
+        stylesmenu->setLabel(label);
+        menu->insert(label, stylesmenu);
+        rootmenuList.push_back(stylesmenu);
       }
+
+      blackbox->addMenuTimestamp(stylesdir);
+    }
+      break;
+
+    case 1090: { // workspaces
+      if (! *label) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenWORKSPACESError,
+                     "BScreen:parseMenuFile: [workspaces] error, "
+                     "no menu label defined\n"));
+        continue;
+      }
+
+      menu->insert(label, workspacemenu);
+    }
+      break;
     }
   }
 
@@ -2028,10 +2193,28 @@ const Rect& BScreen::availableArea(void) const {
 }
 
 
+#ifdef    XINERAMA
+const RectList& BScreen::allAvailableAreas(void) const {
+  assert(isXineramaActive());
+  assert(xineramaUsableArea.size() > 0);
+  fprintf(stderr, "1found x %d y %d w %d h %d\n",
+          xineramaUsableArea[0].x(), xineramaUsableArea[0].y(),
+          xineramaUsableArea[0].width(), xineramaUsableArea[0].height());
+  return xineramaUsableArea;
+}
+#endif // XINERAMA
+
+
 void BScreen::updateAvailableArea(void) {
   Rect old_area = usableArea;
   usableArea = getRect(); // reset to full screen
 
+#ifdef    XINERAMA
+  // reset to the full areas
+  if (isXineramaActive())
+    xineramaUsableArea = getXineramaAreas();
+#endif // XINERAMA
+
   /* these values represent offsets from the screen edge
    * we look for the biggest offset on each edge and then apply them
    * all at once
@@ -2058,6 +2241,27 @@ void BScreen::updateAvailableArea(void) {
   usableArea.setSize(usableArea.width() - (current_left + current_right),
                      usableArea.height() - (current_top + current_bottom));
 
+#ifdef    XINERAMA
+  if (isXineramaActive()) {
+    // keep each of the ximerama-defined areas inside the strut
+    RectList::iterator xit, xend = xineramaUsableArea.end();
+    for (xit = xineramaUsableArea.begin(); xit != xend; ++xit) {
+      if (xit->x() < usableArea.x()) {
+        xit->setX(usableArea.x());
+        xit->setWidth(xit->width() - usableArea.x());
+      }
+      if (xit->y() < usableArea.y()) {
+        xit->setY(usableArea.y());
+        xit->setHeight(xit->height() - usableArea.y());
+      }
+      if (xit->x() + xit->width() > usableArea.width())
+        xit->setWidth(usableArea.width() - xit->x());
+      if (xit->y() + xit->height() > usableArea.height())
+        xit->setHeight(usableArea.height() - xit->y());
+    }
+  }
+#endif // XINERAMA
+
   if (old_area != usableArea) {
     BlackboxWindowList::iterator it = windowList.begin(),
       end = windowList.end();
@@ -2124,13 +2328,15 @@ void BScreen::buttonPressEvent(const XButtonEvent *xbutton) {
       rootmenu->show();
     }
   // mouse wheel up
-  } else if (xbutton->button == 4) {
+  } else if ((xbutton->button == 4 && resource.root_scroll == NormalScroll) ||
+             (xbutton->button == 5 && resource.root_scroll == ReverseScroll)) {
     if (getCurrentWorkspaceID() >= getWorkspaceCount() - 1)
       changeWorkspaceID(0);
     else
       changeWorkspaceID(getCurrentWorkspaceID() + 1);
   // mouse wheel down
-  } else if (xbutton->button == 5) {
+  } else if ((xbutton->button == 5 && resource.root_scroll == NormalScroll) ||
+             (xbutton->button == 4 && resource.root_scroll == ReverseScroll)) {
     if (getCurrentWorkspaceID() == 0)
       changeWorkspaceID(getWorkspaceCount() - 1);
     else