diff options
| -rw-r--r-- | CHANGELOG | 12 | ||||
| -rw-r--r-- | src/BaseDisplay.cc | 5 | ||||
| -rw-r--r-- | src/BaseDisplay.h | 6 | ||||
| -rw-r--r-- | src/openbox.cc | 2 |
4 files changed, 17 insertions, 8 deletions
@@ -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 @@ Changelog for Openbox: * 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 diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc index 01e1b332..28742e98 100644 --- a/src/BaseDisplay.cc +++ b/src/BaseDisplay.cc @@ -245,7 +245,6 @@ BaseDisplay::BaseDisplay(const char *app_name, char *dpy_name) { ::exit(2); } - number_of_screens = ScreenCount(display); display_name = XDisplayName(dpy_name); #ifdef SHAPE @@ -337,8 +336,8 @@ BaseDisplay::BaseDisplay(const char *app_name, char *dpy_name) { 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 diff --git a/src/BaseDisplay.h b/src/BaseDisplay.h index 3e092cfb..8bd13e89 100644 --- a/src/BaseDisplay.h +++ b/src/BaseDisplay.h @@ -137,7 +137,7 @@ private: 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 @@ public: 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; } diff --git a/src/openbox.cc b/src/openbox.cc index 50d17f31..3a7fb6b9 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -196,7 +196,7 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc) 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()) { |