X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=d03fa50e6415d73cd19cc7cbd85be6b427f5de5e;hb=25a18140fad2f111ce681cef90be6c13ae6e8996;hp=b6c056191d2ad46fbd3d42044258366a5029f272;hpb=5ec63388b8fbbdffc0999ba727ad718f87d683fc;p=chaz%2Fopenbox

diff --git a/src/Screen.cc b/src/Screen.cc
index b6c05619..d03fa50e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -544,6 +544,18 @@ void BScreen::saveWorkspaceWarping(bool w) {
 }
 
 
+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);
@@ -572,6 +584,7 @@ void BScreen::save_rc(void) {
   savePlaceIgnoreMaximized(resource.ignore_maximized);
   saveAllowScrollLock(resource.allow_scroll_lock);
   saveWorkspaceWarping(resource.workspace_warping);
+  saveRootScrollDirection(resource.root_scroll);
 
   toolbar->save_rc();
   slit->save_rc();
@@ -707,13 +720,21 @@ void BScreen::load_rc(void) {
                          resource.ignore_maximized))
     resource.ignore_maximized = true;
 
-if (! config->getValue(screenstr + "disableBindingsWithScrollLock",
+  if (! config->getValue(screenstr + "disableBindingsWithScrollLock",
                        resource.allow_scroll_lock))
-  resource.allow_scroll_lock = false;
+    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;
+  }
 }
 
 
@@ -1269,9 +1290,14 @@ void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) {
   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()) {
@@ -1515,6 +1541,10 @@ 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();
@@ -1646,37 +1676,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;
         }
       }
     }
@@ -1698,320 +1729,312 @@ void BScreen::InitMenu(void) {
 }
 
 
+static
+void string_within(char begin, char end, const char *input, size_t length,
+                   char *output) {
+  bool parse = False;
+  size_t index = 0;
+
+  for (size_t i = 0; 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';
+}
+
+
 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
+    string_within('[', ']', line, 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
+    string_within('(', ')', line, line_length, label);
 
-        switch (key) {
-        case 311: // end
-          return ((menu->getCount() == 0) ? True : False);
+    // get the command enclosed in {}'s
+    string_within('{', '}', line, 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());
-        }
-          break;
+      string style = expandTilde(command);
 
-        case 630: // config
-          if (! *label) {
-            fprintf(stderr, i18n(ScreenSet, ScreenCONFIGError,
-                                 "BScreen::parseMenufile: [config] error, "
-                                 "no label defined"));
-            continue;
-          }
+      menu->insert(label, BScreen::SetStyle, style.c_str());
+    }
+      break;
 
-          menu->insert(label, configmenu);
+    case 630: // config
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenCONFIGError,
+                             "BScreen::parseMenufile: [config] error, "
+                             "no label defined"));
+        continue;
+      }
 
-          break;
+      menu->insert(label, configmenu);
 
-        case 740: // include
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenINCLUDEError,
-                                   "BScreen::parseMenuFile: [include] error, "
-                                   "no filename defined\n"));
-              continue;
-            }
+      break;
 
-            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());
-            }
-          }
+    case 740: { // include
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenINCLUDEError,
+                             "BScreen::parseMenuFile: [include] error, "
+                             "no filename defined\n"));
+        continue;
+      }
 
-          break;
+      string newfile = expandTilde(label);
+      FILE *submenufile = fopen(newfile.c_str(), "r");
 
-        case 767: // submenu
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenSUBMENUError,
-                                   "BScreen::parseMenuFile: [submenu] error, "
-                                   "no menu label defined\n"));
-              continue;
-            }
+      if (! submenufile) {
+        perror(newfile.c_str());
+        continue;
+      }
 
-            Rootmenu *submenu = new Rootmenu(this);
+      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 (*command)
-              submenu->setLabel(command);
-            else
-              submenu->setLabel(label);
+      if (! feof(submenufile)) {
+        if (! parseMenuFile(submenufile, menu))
+          blackbox->addMenuTimestamp(newfile);
 
-            parseMenuFile(file, submenu);
-            submenu->update();
-            menu->insert(label, submenu);
-            rootmenuList.push_back(submenu);
-          }
+        fclose(submenufile);
+      }
+    }
 
-          break;
+      break;
 
-        case 773: // restart
-          {
-            if (! *label) {
-              fprintf(stderr, i18n(ScreenSet, ScreenRESTARTError,
-                                   "BScreen::parseMenuFile: [restart] error, "
-                                   "no menu label defined\n"));
-              continue;
-            }
+    case 767: { // submenu
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenSUBMENUError,
+                             "BScreen::parseMenuFile: [submenu] error, "
+                             "no menu label defined\n"));
+        continue;
+      }
 
-            if (*command)
-              menu->insert(label, BScreen::RestartOther, command);
-            else
-              menu->insert(label, BScreen::Restart);
-          }
+      Rootmenu *submenu = new Rootmenu(this);
 
-          break;
+      if (*command)
+        submenu->setLabel(command);
+      else
+        submenu->setLabel(label);
 
-        case 845: // reconfig
-          {
-            if (! *label) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenRECONFIGError,
-                           "BScreen::parseMenuFile: [reconfig] error, "
-                           "no menu label defined\n"));
-              continue;
-            }
+      parseMenuFile(file, submenu);
+      submenu->update();
+      menu->insert(label, submenu);
+      rootmenuList.push_back(submenu);
+    }
 
-            menu->insert(label, BScreen::Reconfigure);
-          }
+      break;
 
-          break;
+    case 773: { // restart
+      if (! *label) {
+        fprintf(stderr, i18n(ScreenSet, ScreenRESTARTError,
+                             "BScreen::parseMenuFile: [restart] error, "
+                             "no menu label defined\n"));
+        continue;
+      }
 
-        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;
-            }
+      if (*command)
+        menu->insert(label, BScreen::RestartOther, command);
+      else
+        menu->insert(label, BScreen::Restart);
+    }
 
-            char *directory = ((newmenu) ? command : label);
+      break;
 
-            string stylesdir = expandTilde(directory);
+    case 845: { // reconfig
+      if (! *label) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenRECONFIGError,
+                     "BScreen::parseMenuFile: [reconfig] error, "
+                     "no menu label defined\n"));
+        continue;
+      }
 
-            struct stat statbuf;
+      menu->insert(label, BScreen::Reconfigure);
+    }
 
-            if (! stat(stylesdir.c_str(), &statbuf)) {
-              if (S_ISDIR(statbuf.st_mode)) {
-                Rootmenu *stylesmenu;
+      break;
 
-                if (newmenu)
-                  stylesmenu = new Rootmenu(this);
-                else
-                  stylesmenu = menu;
+    case 995:    // stylesdir
+    case 1113: { // stylesmenu
+      bool newmenu = ((key == 1113) ? True : False);
 
-                DIR *d = opendir(stylesdir.c_str());
-                struct dirent *p;
-                std::vector<string> ls;
+      if (! *label || (! *command && newmenu)) {
+        fprintf(stderr,
+                i18n(ScreenSet, ScreenSTYLESDIRError,
+                     "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
+                     " error, no directory defined\n"));
+        continue;
+      }
 
-                while((p = readdir(d)))
-                  ls.push_back(p->d_name);
+      char *directory = ((newmenu) ? command : label);
 
-                closedir(d);
+      string stylesdir = expandTilde(directory);
 
-                std::sort(ls.begin(), ls.end());
+      struct stat statbuf;
 
-                std::vector<string>::iterator it = ls.begin(),
-                  end = ls.end();
-                for (; it != end; ++it) {
-                  const string& fname = *it;
+      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;
+      }
 
-                  if (fname[fname.size()-1] == '~')
-                    continue;
+      Rootmenu *stylesmenu;
 
-                  string style = stylesdir;
-                  style += '/';
-                  style += fname;
+      if (newmenu)
+        stylesmenu = new Rootmenu(this);
+      else
+        stylesmenu = menu;
 
-                  if (! stat(style.c_str(), &statbuf) &&
-                      S_ISREG(statbuf.st_mode))
-                    stylesmenu->insert(fname, BScreen::SetStyle, style);
-                }
+      DIR *d = opendir(stylesdir.c_str());
+      struct dirent *p;
+      std::vector<string> ls;
 
-                stylesmenu->update();
+      while((p = readdir(d)))
+        ls.push_back(p->d_name);
 
-                if (newmenu) {
-                  stylesmenu->setLabel(label);
-                  menu->insert(label, stylesmenu);
-                  rootmenuList.push_back(stylesmenu);
-                }
+      closedir(d);
 
-                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::sort(ls.begin(), ls.end());
 
-        case 1090: // workspaces
-          {
-            if (! *label) {
-              fprintf(stderr,
-                      i18n(ScreenSet, ScreenWORKSPACESError,
-                           "BScreen:parseMenuFile: [workspaces] error, "
-                           "no menu label defined\n"));
-              continue;
-            }
+      std::vector<string>::iterator it = ls.begin(),
+        end = ls.end();
+      for (; it != end; ++it) {
+        const string& fname = *it;
 
-            menu->insert(label, workspacemenu);
+        if (fname[fname.size()-1] == '~')
+          continue;
 
-            break;
-          }
-        }
+        string style = stylesdir;
+        style += '/';
+        style += fname;
+
+        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;
     }
   }
 
@@ -2240,13 +2263,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