summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-04-09 17:20:06 (GMT)
committerrathnor <rathnor>2003-04-09 17:20:06 (GMT)
commit51007f35a531c892b1ee2013cc7f180ff20c0744 (patch)
treebd77d6e845d6742d01d11349e5c5095fe27e866a
parent2f9ba66d12d67e1a0bdd102d1e665b8b55161fe8 (diff)
downloadfluxbox_lack-51007f35a531c892b1ee2013cc7f180ff20c0744.zip
fluxbox_lack-51007f35a531c892b1ee2013cc7f180ff20c0744.tar.bz2
Little fixes to bugs highlighted by valgrind - Simon
-rw-r--r--src/Ewmh.cc3
-rw-r--r--src/FbWinFrame.cc3
-rw-r--r--src/Gnome.cc5
-rw-r--r--src/IconBar.cc3
-rw-r--r--src/Tab.hh6
-rw-r--r--src/Toolbar.cc6
-rw-r--r--src/Window.cc3
7 files changed, 18 insertions, 11 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 5c88b77..f077932 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Ewmh.cc,v 1.13 2003/03/04 21:41:05 fluxgen Exp $ 22// $Id: Ewmh.cc,v 1.14 2003/04/09 17:20:00 rathnor Exp $
23 23
24#include "Ewmh.hh" 24#include "Ewmh.hh"
25 25
@@ -33,6 +33,7 @@ using namespace std;
33 33
34Ewmh::Ewmh() { 34Ewmh::Ewmh() {
35 createAtoms(); 35 createAtoms();
36 enableUpdate();
36} 37}
37 38
38Ewmh::~Ewmh() { 39Ewmh::~Ewmh() {
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 2564263..3bd9bfa 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.cc,v 1.15 2003/04/03 22:37:43 rathnor Exp $ 22// $Id: FbWinFrame.cc,v 1.16 2003/04/09 17:20:01 rathnor Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25#include "ImageControl.hh"
@@ -67,6 +67,7 @@ FbWinFrame::FbWinFrame(FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl,
67 m_bevel(1), 67 m_bevel(1),
68 m_use_titlebar(true), 68 m_use_titlebar(true),
69 m_use_handle(true), 69 m_use_handle(true),
70 m_focused(false),
70 m_button_pm(0), 71 m_button_pm(0),
71 m_themelistener(*this) { 72 m_themelistener(*this) {
72 // m_shape(new Shape(m_window, 0)) { //Shape::TOPLEFT | Shape::TOPRIGHT)) { 73 // m_shape(new Shape(m_window, 0)) { //Shape::TOPLEFT | Shape::TOPRIGHT)) {
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 44a593b..13484c4 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Gnome.cc,v 1.13 2003/03/04 11:13:42 fluxgen Exp $ 22// $Id: Gnome.cc,v 1.14 2003/04/09 17:20:01 rathnor Exp $
23 23
24#include "Gnome.hh" 24#include "Gnome.hh"
25 25
@@ -33,6 +33,7 @@ using namespace std;
33 33
34Gnome::Gnome() { 34Gnome::Gnome() {
35 createAtoms(); 35 createAtoms();
36 enableUpdate();
36} 37}
37 38
38Gnome::~Gnome() { 39Gnome::~Gnome() {
@@ -160,7 +161,7 @@ void Gnome::updateClientList(BScreen &screen) {
160 XA_CARDINAL, 32, 161 XA_CARDINAL, 32,
161 PropModeReplace, (unsigned char *)wl, num); 162 PropModeReplace, (unsigned char *)wl, num);
162 163
163 delete wl; 164 delete[] wl;
164} 165}
165 166
166void Gnome::updateWorkspaceNames(BScreen &screen) { 167void Gnome::updateWorkspaceNames(BScreen &screen) {
diff --git a/src/IconBar.cc b/src/IconBar.cc
index cf3139e..e549e79 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: IconBar.cc,v 1.27 2003/04/09 13:00:21 fluxgen Exp $ 22// $Id: IconBar.cc,v 1.28 2003/04/09 17:20:02 rathnor Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25 25
@@ -80,6 +80,7 @@ unsigned int IconBarObj::height() const {
80IconBar::IconBar(BScreen *scrn, Window parent, FbTk::Font &font): 80IconBar::IconBar(BScreen *scrn, Window parent, FbTk::Font &font):
81 m_screen(scrn), 81 m_screen(scrn),
82 m_parent(parent), 82 m_parent(parent),
83 m_focus_pm(None),
83 m_vertical(false), 84 m_vertical(false),
84 m_font(font) 85 m_font(font)
85{ 86{
diff --git a/src/Tab.hh b/src/Tab.hh
index ab50882..3681c09 100644
--- a/src/Tab.hh
+++ b/src/Tab.hh
@@ -19,15 +19,15 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.hh,v 1.17 2002/12/01 13:42:00 rathnor Exp $ 22// $Id: Tab.hh,v 1.18 2003/04/09 17:20:03 rathnor Exp $
23 23
24#ifndef TAB_HH 24#ifndef TAB_HH
25#define TAB_HH 25#define TAB_HH
26 26
27#include <X11/Xlib.h> 27#include <X11/Xlib.h>
28#include <strings.h> 28#include <strings.h>
29class FluxboxWindow; 29//class FluxboxWindow;
30 30#include "Window.hh"
31/** 31/**
32Note: Tab is a friend of FluxboxWindow 32Note: Tab is a friend of FluxboxWindow
33*/ 33*/
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 4bb877d..00a70e8 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.67 2003/03/23 04:18:59 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.68 2003/04/09 17:20:04 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -194,7 +194,9 @@ Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num):
194 nwbutton(ArrowButton::RIGHT, // arrow type 194 nwbutton(ArrowButton::RIGHT, // arrow type
195 window, // parent 195 window, // parent
196 0, 0, // pos 196 0, 0, // pos
197 1, 1) // size 197 1, 1), // size
198 hour(-1), // start with invalid number to force update
199 minute(-1)
198 200
199{ 201{
200 FbTk::EventManager &evm = *FbTk::EventManager::instance(); 202 FbTk::EventManager &evm = *FbTk::EventManager::instance();
diff --git a/src/Window.cc b/src/Window.cc
index 5692008..ab1f201 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.129 2003/03/22 05:13:08 rathnor Exp $ 25// $Id: Window.cc,v 1.130 2003/04/09 17:20:06 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -202,6 +202,7 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
202 decorations.enabled = true; 202 decorations.enabled = true;
203 // set client window 203 // set client window
204 client.window = w; 204 client.window = w;
205 client.window_group = None;
205 206
206 // set default values for decoration 207 // set default values for decoration
207 decorations.menu = true; //override menu option 208 decorations.menu = true; //override menu option