M CHANGELOG → CHANGELOG

@@ -1,6 +1,16 @@ 
 Changelog for Openbox:
 
 1.2.0:
+ * new version of bsetroot ported from blackbox cvs
+   with intent to support Eterm/Esetroot.               (Sean Perry)
+
+ * make bsetroot behave properly with Eterm/Esetroot.   (Ben Jansens)
+
+ * new version of bsetbg.                               (Timothy King)
+
+ * fix the 'wrong window move' bug displayed by apps
+   such as bbkeys.                                      (Sean Perry)
+
  * fix bug when removing and then readding a titlebar
    button witout restarted (by reconfiguring).          (Ben Jansens)
 
@@ -9,7 +19,7 @@ last round of focus changes.                         (Ben Jansens)
  
  * make image dithering value load correctly.           (Ben Jansens)
 
- * fix segfault with multiple screens.                  (Shaleh Perry)
+ * fix segfault with multiple screens.                  (Sean Perry)
 
 1.1.0:
  * improved focused window logic to remove a segfault

M src/BaseDisplay.cc → src/BaseDisplay.cc

@@ -245,7 +245,6 @@ "as close-on-exec\n"));
     ::exit(2);
   }
 
-  number_of_screens = ScreenCount(display);
   display_name = XDisplayName(dpy_name);
 
 #ifdef    SHAPE
@@ -337,8 +336,8 @@ cursor.ur_angle = XCreateFontCursor(display, XC_ur_angle);
 
   XSetErrorHandler((XErrorHandler) handleXErrors);
 
-  screenInfoList.reserve(ScreenCount(display));
-  for (unsigned int s = 0; s < number_of_screens; s++)
+  screenInfoList.reserve(numberOfScreens());
+  for (unsigned int s = 0; s < numberOfScreens(); s++)
     screenInfoList.push_back(new ScreenInfo(*this, s));
 
 #ifndef   NOCLOBBER

M src/BaseDisplay.h → src/BaseDisplay.h

@@ -137,7 +137,7 @@ typedef std::list<BTimer*> TimerList;
   TimerList timerList;
 
   char *display_name, *application_name;
-  unsigned int number_of_screens, server_grabs, colors_per_channel;
+  unsigned int server_grabs, colors_per_channel;
 
 
 protected:
@@ -308,8 +308,8 @@ { return (const char *) display_name; }
   inline const char *getApplicationName() const
     { return (const char *) application_name; }
 
-  inline const unsigned int getNumberOfScreens() const
-    { return number_of_screens; }
+  inline const unsigned int numberOfScreens() const
+    { return ScreenCount(display); }
   inline const int &getShapeEventBase() const
     { return shape.event_basep; }
 

M src/openbox.cc → src/openbox.cc

@@ -196,7 +196,7 @@ #ifdef    HAVE_GETPID
   openbox_pid = XInternAtom(getXDisplay(), "_BLACKBOX_PID", False);
 #endif // HAVE_GETPID
 
-  for (unsigned int s = 0; s < getNumberOfScreens(); s++) {
+  for (unsigned int s = 0; s < numberOfScreens(); s++) {
     BScreen *screen = new BScreen(*this, s, config);
 
     if (! screen->isScreenManaged()) {