all repos — openbox @ 1775e867c408bbea2b7f197c0c40b26e586e9ef1

openbox fork - make it a bit more like ryudo 

sync with bb-cvs
Dana Jansens danakj@orodu.net
commit

1775e867c408bbea2b7f197c0c40b26e586e9ef1

parent

4e0fde35ac60dcf36c3180b1606abba84ccace34

9 files changed, 29 insertions(+), 16 deletions(-)

jump to
M src/Basemenu.cc → src/Basemenu.cc 
@@ -40,6 +40,7 @@ #endif // HAVE_STRING_H
 }
 
 #include <algorithm>
+#include <assert.h>
 using namespace std;
 
 #include "i18n.hh"
M src/Color.cc → src/Color.cc 
@@ -25,12 +25,14 @@ #ifdef HAVE_CONFIG_H
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#include "Color.hh"
-#include "BaseDisplay.hh"
-
 extern "C" {
 #include <stdio.h>
 }
+
+#include <assert.h>
+
+#include "Color.hh"
+#include "BaseDisplay.hh"
 
 
 BColor::ColorCache BColor::colorcache;
M src/GCCache.cc → src/GCCache.cc 
@@ -90,8 +90,6 @@ std::for_each(contexts, contexts + context_count, PointerAssassin());
   std::for_each(cache, cache + cache_total_size, PointerAssassin());
   delete [] cache;
   delete [] contexts;
-  cache = 0;
-  contexts = 0;
 }
 
 

@@ -116,6 +114,7 @@ }
 
   fprintf(stderr, "BGCCache: context fault!\n");
   abort();
+  return (BGCCacheContext*) 0; // not reached
 }
M src/Screen.cc → src/Screen.cc 
@@ -66,8 +66,11 @@ #  include <stdarg.h>
 #endif // HAVE_STDARG_H
 }
 
+#include <assert.h>
+
 #include <algorithm>
 #include <functional>
+#include <string>
 using std::string;
 
 #include "i18n.hh"

@@ -1039,7 +1042,7 @@ workspacemenu->setItemSelected(current_workspace->getID() + 2, False);
 
     if (blackbox->getFocusedWindow() &&
         blackbox->getFocusedWindow()->getScreen() == this &&
-        (! blackbox->getFocusedWindow()->isStuck())) {
+        ! blackbox->getFocusedWindow()->isStuck()) {
       current_workspace->setLastFocusedWindow(blackbox->getFocusedWindow());
       blackbox->setFocusedWindow((BlackboxWindow *) 0);
     }
M src/Texture.cc → src/Texture.cc 
@@ -32,6 +32,8 @@ #include <ctype.h>
 #endif
 }
 
+#include <assert.h>
+
 #include "Texture.hh"
 #include "BaseDisplay.hh"
 #include "Image.hh"
M src/Util.cc → src/Util.cc 
@@ -52,6 +52,8 @@ }
 
 #include <X11/Xatom.h>
 
+#include <assert.h>
+
 #include <algorithm>
 
 #include "Util.hh"
M src/Workspace.cc → src/Workspace.cc 
@@ -38,6 +38,8 @@ #  include <string.h>
 #endif // HAVE_STRING_H
 }
 
+#include <assert.h>
+
 #include <functional>
 #include <string>
 

@@ -506,26 +508,26 @@ 
   if (screen->getPlacementPolicy() == BScreen::RowSmartPlacement) {
     if(screen->getRowPlacementDirection() == BScreen::LeftRight) {
       if(screen->getColPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(), spaces.end(), rowLRTB);
+        std::sort(spaces.begin(), spaces.end(), rowLRTB);
       else
-        sort(spaces.begin(), spaces.end(), rowLRBT);
+        std::sort(spaces.begin(), spaces.end(), rowLRBT);
     } else {
       if(screen->getColPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(), spaces.end(), rowRLTB);
+        std::sort(spaces.begin(), spaces.end(), rowRLTB);
       else
-        sort(spaces.begin(), spaces.end(), rowRLBT);
+        std::sort(spaces.begin(), spaces.end(), rowRLBT);
     }
   } else {
     if(screen->getColPlacementDirection() == BScreen::TopBottom) {
       if(screen->getRowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(), spaces.end(), colLRTB);
+        std::sort(spaces.begin(), spaces.end(), colLRTB);
       else
-        sort(spaces.begin(), spaces.end(), colRLTB);
+        std::sort(spaces.begin(), spaces.end(), colRLTB);
     } else {
       if(screen->getRowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(), spaces.end(), colLRBT);
+        std::sort(spaces.begin(), spaces.end(), colLRBT);
       else
-        sort(spaces.begin(), spaces.end(), colRLBT);
+        std::sort(spaces.begin(), spaces.end(), colRLBT);
     }
   }
M src/blackbox.cc → src/blackbox.cc 
@@ -90,6 +90,8 @@ #  include <libgen.h>
 #endif // HAVE_LIBGEN_H
 }
 
+#include <assert.h>
+
 #include <algorithm>
 #include <string>
 using std::string;
M src/main.cc → src/main.cc 
@@ -62,8 +62,8 @@ static void showHelp(int exitval) {
   // print program usage and command line options
   printf(i18n(mainSet, mainUsage,
               "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
-              "                 2001 - 2002 Sean 'Shaleh' Perry\n"
-              "                 1997 - 2000, 2002 Brad Hughes\n\n"
+              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
+              "                    1997 - 2000, 2002 Brad Hughes\n\n"
               "  -display <string>\t\tuse display connection.\n"
               "  -rc <string>\t\t\tuse alternate resource file.\n"
               "  -menu <string>\t\tuse alternate menu file.\n"