From 1b1efab489353734f0047f97fe5fef7f96d0ee68 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 14 May 2002 19:28:34 +0000
Subject: [PATCH] compile with -Wall -W -pendantic when --enable-debug is set.

---
 configure         |  4 ++--
 configure.in      |  4 ++--
 src/BaseDisplay.h |  2 +-
 src/Basemenu.cc   | 42 ++++++++++++++++++++----------------------
 src/Basemenu.h    | 25 ++++++++++++-------------
 src/Netizen.cc    |  4 ++--
 src/Rootmenu.cc   |  4 ++--
 src/Screen.cc     | 13 ++++++-------
 src/Screen.h      |  2 +-
 src/Slit.cc       |  4 ++--
 src/Toolbar.cc    |  4 ++--
 src/Toolbar.h     |  2 +-
 src/Window.cc     | 42 ++++++++++++++++++------------------------
 src/Window.h      |  2 +-
 src/Workspace.cc  | 18 +++++++++---------
 src/Workspace.h   | 10 +++++-----
 16 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/configure b/configure
index 3e92c13a..334088f8 100644
--- a/configure
+++ b/configure
@@ -717,7 +717,7 @@ fi
 
 PACKAGE=openbox
 
-VERSION=1.1.1
+VERSION=1.2.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -2737,7 +2737,7 @@ if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
   if test x$enableval = "xyes"; then
     echo "$ac_t""yes" 1>&6
-    DEBUG="-DDEBUG"
+    DEBUG="-DDEBUG -Wall -W -pedantic"
   else
     echo "$ac_t""no" 1>&6
   fi
diff --git a/configure.in b/configure.in
index a211949d..0e020f52 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Openbox
 dnl Initialize autoconf and automake
 AC_INIT(src/openbox.cc)
-AM_INIT_AUTOMAKE(openbox,1.1.1,no-define)
+AM_INIT_AUTOMAKE(openbox,1.2.0,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -172,7 +172,7 @@ AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code [default=no]],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG"
+    DEBUG="-DDEBUG -Wall -W -pedantic"
   else
     AC_MSG_RESULT([no])
   fi,
diff --git a/src/BaseDisplay.h b/src/BaseDisplay.h
index b30a7170..cf1a7ae6 100644
--- a/src/BaseDisplay.h
+++ b/src/BaseDisplay.h
@@ -276,7 +276,7 @@ public:
 
 #endif // NEWWMSPEC
 
-  inline ScreenInfo *getScreenInfo(int s) {
+  inline ScreenInfo *getScreenInfo(unsigned int s) {
     ASSERT(s < screenInfoList.size());
     return screenInfoList[s];
   }
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 689d2018..99dcbfa0 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -233,7 +233,7 @@ int Basemenu::insert(const char **ulabel, int pos, int function) {
 
 
 int Basemenu::remove(int index) {
-  if (index < 0 || index > menuitems.size()) return -1;
+  if (index < 0 || index > (signed)menuitems.size()) return -1;
 
   BasemenuItem *item = menuitems[index];
   menuitems.erase(menuitems.begin() + index);
@@ -413,7 +413,7 @@ void Basemenu::update(void) {
 
   if (title_vis && visible) redrawTitle();
 
-  for (int i = 0; visible && i < menuitems.size(); i++) {
+  for (int i = 0; visible && i < (signed)menuitems.size(); i++) {
     if (i == which_sub) {
       drawItem(i, True, 0);
       drawSubmenu(i);
@@ -531,7 +531,7 @@ void Basemenu::drawSubmenu(int index) {
       itmp->submenu()->internal_hide();
   }
 
-  if (index >= 0 && index < menuitems.size()) {
+  if (index >= 0 && index < (signed)menuitems.size()) {
     BasemenuItem *item = menuitems[index];
     if (item->submenu() && visible && (! item->submenu()->isTorn()) &&
 	item->isEnabled()) {
@@ -584,19 +584,17 @@ void Basemenu::drawSubmenu(int index) {
 }
 
 
-Bool Basemenu::hasSubmenu(int index) {
-  if ((index >= 0) && (index < menuitems.size()))
-    if (menuitems[index]->submenu())
-      return True;
-
-  return False;
+bool Basemenu::hasSubmenu(int index) {
+  if (index < 0 | index >= (signed)menuitems.size())
+    return false;
+  return (menuitems[index]->submenu());
 }
 
 
 void Basemenu::drawItem(int index, Bool highlight, Bool clear,
 			int x, int y, unsigned int w, unsigned int h)
 {
-  if (index < 0 || index > menuitems.size()) return;
+  if (index < 0 || index > (signed)menuitems.size()) return;
 
   BasemenuItem *item = menuitems[index];
   if (! item) return;
@@ -773,8 +771,8 @@ void Basemenu::setLabel(const char *l) {
 }
 
 
-void Basemenu::setItemSelected(int index, Bool sel) {
-  if (index < 0 || index >= menuitems.size()) return;
+void Basemenu::setItemSelected(int index, bool sel) {
+  if (index < 0 || index >= (signed)menuitems.size()) return;
 
   BasemenuItem *item = find(index);
   if (! item) return;
@@ -784,18 +782,18 @@ void Basemenu::setItemSelected(int index, Bool sel) {
 }
 
 
-Bool Basemenu::isItemSelected(int index) {
-  if (index < 0 || index >= menuitems.size()) return False;
+bool Basemenu::isItemSelected(int index) {
+  if (index < 0 || index >= (signed)menuitems.size()) return false;
 
   BasemenuItem *item = find(index);
-  if (! item) return False;
+  if (! item) return false;
 
   return item->isSelected();
 }
 
 
-void Basemenu::setItemEnabled(int index, Bool enable) {
-  if (index < 0 || index >= menuitems.size()) return;
+void Basemenu::setItemEnabled(int index, bool enable) {
+  if (index < 0 || index >= (signed)menuitems.size()) return;
 
   BasemenuItem *item = find(index);
   if (! item) return;
@@ -805,8 +803,8 @@ void Basemenu::setItemEnabled(int index, Bool enable) {
 }
 
 
-Bool Basemenu::isItemEnabled(int index) {
-  if (index < 0 || index >= menuitems.size()) return False;
+bool Basemenu::isItemEnabled(int index) {
+  if (index < 0 || index >= (signed)menuitems.size()) return false;
 
   BasemenuItem *item = find(index);
   if (! item) return False;
@@ -820,7 +818,7 @@ void Basemenu::buttonPressEvent(XButtonEvent *be) {
     int sbl = (be->x / menu.item_w), i = (be->y / menu.item_h);
     int w = (sbl * menu.persub) + i;
 
-    if (w < menuitems.size() && w >= 0) {
+    if (w < (signed)menuitems.size() && w >= 0) {
       which_press = i;
       which_sbl = sbl;
 
@@ -862,7 +860,7 @@ void Basemenu::buttonReleaseEvent(XButtonEvent *re) {
 	    w = (sbl * menu.persub) + i,
 	    p = (which_sbl * menu.persub) + which_press;
 
-      if (w < menuitems.size() && w >= 0) {
+      if (w < (signed)menuitems.size() && w >= 0) {
 	drawItem(p, (p == which_sub), True);
 
         if  (p == w && isItemEnabled(w)) {
@@ -908,7 +906,7 @@ void Basemenu::motionNotifyEvent(XMotionEvent *me) {
 	  w = (sbl * menu.persub) + i;
 
     if ((i != which_press || sbl != which_sbl) &&
-	(w < menuitems.size() && w >= 0)) {
+	(w < (signed)menuitems.size() && w >= 0)) {
       if (which_press != -1 && which_sbl != -1) {
 	int p = (which_sbl * menu.persub) + which_press;
 	BasemenuItem *item = menuitems[p];
diff --git a/src/Basemenu.h b/src/Basemenu.h
index 83ea3567..35a9791b 100644
--- a/src/Basemenu.h
+++ b/src/Basemenu.h
@@ -91,15 +91,14 @@ public:
   int insert(const char *, Basemenu *, int = -1);
   int remove(int);
 
-  inline const int &getX(void) const { return menu.x; }
-  inline const int &getY(void) const { return menu.y; }
-  inline int getCount(void) { return menuitems.size(); }
-  inline const int &getCurrentSubmenu(void) const { return which_sub; }
+  inline int getX(void) const { return menu.x; }
+  inline int getY(void) const { return menu.y; }
+  inline unsigned int getCount(void) { return menuitems.size(); }
+  inline int getCurrentSubmenu(void) const { return which_sub; }
 
-  inline const unsigned int &getWidth(void) const { return menu.width; }
-  inline const unsigned int &getHeight(void) const { return menu.height; }
-  inline const unsigned int &getTitleHeight(void) const
-  { return menu.title_h; }
+  inline unsigned int getWidth(void) const { return menu.width; }
+  inline unsigned int getHeight(void) const { return menu.height; }
+  inline unsigned int getTitleHeight(void) const { return menu.title_h; }
 
   inline void setInternalMenu(void) { internal_menu = True; }
   inline void setAlignment(int a) { alignment = a; }
@@ -107,9 +106,9 @@ public:
   inline void removeParent(void)
     { if (internal_menu) parent = (Basemenu *) 0; }
 
-  Bool hasSubmenu(int);
-  Bool isItemSelected(int);
-  Bool isItemEnabled(int);
+  bool hasSubmenu(int);
+  bool isItemSelected(int);
+  bool isItemEnabled(int);
 
   void buttonPressEvent(XButtonEvent *);
   void buttonReleaseEvent(XButtonEvent *);
@@ -121,8 +120,8 @@ public:
   void setLabel(const char *n);
   void move(int, int);
   void update(void);
-  void setItemSelected(int, Bool);
-  void setItemEnabled(int, Bool);
+  void setItemSelected(int, bool);
+  void setItemEnabled(int, bool);
 
   virtual void drawSubmenu(int);
   virtual void show(void);
diff --git a/src/Netizen.cc b/src/Netizen.cc
index 0a0663b8..6fbb99ac 100644
--- a/src/Netizen.cc
+++ b/src/Netizen.cc
@@ -33,8 +33,8 @@
 #include "Netizen.h"
 #include "Screen.h"
 
-Netizen::Netizen(BScreen &scr, Window win) : screen(scr),
-  basedisplay(scr.getBaseDisplay()), window(win)
+Netizen::Netizen(BScreen &scr, Window win) :basedisplay(scr.getBaseDisplay()),
+  screen(scr), window(win)
 {
   event.type = ClientMessage;
   event.xclient.message_type = basedisplay.getOpenboxStructureMessagesAtom();
diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index 2bda2070..4728f507 100644
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -55,8 +55,8 @@
 #endif // MAXPATHLEN
 
 
-Rootmenu::Rootmenu(BScreen &scrn) : Basemenu(scrn), screen(scrn),
-  openbox(scrn.getOpenbox())
+Rootmenu::Rootmenu(BScreen &scrn) : Basemenu(scrn), openbox(scrn.getOpenbox()),
+  screen(scrn)  
 {
 }
 
diff --git a/src/Screen.cc b/src/Screen.cc
index 50a0f1d1..bc1b9e65 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -583,7 +583,7 @@ Rect BScreen::availableArea() const {
 #ifdef    SLIT
     int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
     slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
-    int tbarh = resource.hide_toolbar ? 0 :
+    unsigned int tbarh = resource.hide_toolbar ? 0 :
       toolbar->getExposedHeight() + resource.border_width * 2;
     bool tbartop;
     switch (toolbar->placement()) {
@@ -1836,7 +1836,7 @@ void BScreen::LoadStyle(void) {
 
   // load bevel, border and handle widths
   if (conf.getValue("handleWidth", "HandleWidth", l)) {
-    if (l <= size().w() / 2 && l != 0)
+    if (l <= (signed)size().w() / 2 && l != 0)
       resource.handle_width = l;
     else
       resource.handle_width = 6;
@@ -1849,7 +1849,7 @@ void BScreen::LoadStyle(void) {
     resource.border_width = 1;
 
   if (conf.getValue("bevelWidth", "BevelWidth", l)) {
-    if (l <= size().w() / 2 && l != 0)
+    if (l <= (signed)size().w() / 2 && l != 0)
       resource.bevel_width = l;
     else
       resource.bevel_width = 3;
@@ -1857,7 +1857,7 @@ void BScreen::LoadStyle(void) {
     resource.bevel_width = 3;
 
   if (conf.getValue("frameWidth", "FrameWidth", l)) {
-    if (l <= size().w() / 2)
+    if (l <= (signed)size().w() / 2)
       resource.frame_width = l;
     else
       resource.frame_width = resource.bevel_width;
@@ -1912,7 +1912,7 @@ void BScreen::removeIcon(OpenboxWindow *w) {
 
 
 OpenboxWindow *BScreen::getIcon(int index) {
-  if (index < 0 || index >= iconList.size())
+  if (index < 0 || index >= (signed)iconList.size())
     return (OpenboxWindow *) 0;
 
   winList::iterator it = iconList.begin();
@@ -2021,7 +2021,6 @@ void BScreen::addNetizen(Netizen *n) {
 
 void BScreen::removeNetizen(Window w) {
   netList::iterator it;
-  int i = 0;
 
   for (it = netizenList.begin(); it != netizenList.end(); ++it)
     if ((*it)->getWindowID() == w) {
@@ -2147,7 +2146,7 @@ void BScreen::addWorkspaceName(const char *name) {
 
 
 const char *BScreen::getNameOfWorkspace(int id) {
-  if (id < 0 || id >= workspaceNames.size())
+  if (id < 0 || id >= (signed)workspaceNames.size())
     return (const char *) 0;
   return workspaceNames[id].c_str();
 }
diff --git a/src/Screen.h b/src/Screen.h
index 15f83a22..24baba1f 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -197,7 +197,7 @@ public:
 
   Rect availableArea() const;
   
-  inline Workspace *getWorkspace(int w) {
+  inline Workspace *getWorkspace(unsigned int w) {
     ASSERT(w < workspacesList.size());
     return workspacesList[w];
   }
diff --git a/src/Slit.cc b/src/Slit.cc
index 034a054b..47cef350 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -45,8 +45,8 @@
 #include <string>
 using std::ends;
 
-Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
-  openbox(scr.getOpenbox()), config(conf)
+Slit::Slit(BScreen &scr, Resource &conf) : openbox(scr.getOpenbox()),
+  screen(scr), config(conf)
 {
   load();
   
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d801cb4b..8a3ea6b2 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -66,8 +66,8 @@
 #include <string>
 using std::ends;
 
-Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
-  openbox(scrn.getOpenbox()), config(conf)
+Toolbar::Toolbar(BScreen &scrn, Resource &conf) : openbox(scrn.getOpenbox()),
+  screen(scrn), config(conf)
 {
   load();
 
diff --git a/src/Toolbar.h b/src/Toolbar.h
index a4326c12..93d92055 100644
--- a/src/Toolbar.h
+++ b/src/Toolbar.h
@@ -93,9 +93,9 @@ private:
   } hide_handler;
 
   Openbox &openbox;
+  BScreen &screen;
   Resource &config;
   BImageControl *image_ctrl;
-  BScreen &screen;
   BTimer *clock_timer, *hide_timer;
   Toolbarmenu *toolbarmenu;
 
diff --git a/src/Window.cc b/src/Window.cc
index fe13f4c1..0e5af867 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -721,7 +721,7 @@ void OpenboxWindow::createMaximizeButton(void) {
 }
 
 
-void OpenboxWindow::positionButtons(Bool redecorate_label) {
+void OpenboxWindow::positionButtons() {
   const char *format = openbox.getTitleBarLayout();
   const unsigned int bw = frame.bevel_w + 1;
   const unsigned int by = frame.bevel_w + 1;
@@ -785,23 +785,19 @@ void OpenboxWindow::positionButtons(Bool redecorate_label) {
     }
   }
 
-  if (!hasclose) {
-      openbox.removeWindowSearch(frame.close_button);
-      XDestroyWindow(display, frame.close_button);
-      frame.close_button = None;
+  if (!hasclose && frame.close_button) {
+    openbox.removeWindowSearch(frame.close_button);
+    XDestroyWindow(display, frame.close_button);
   }
-  if (!hasiconify) {
-      openbox.removeWindowSearch(frame.iconify_button);
-      XDestroyWindow(display, frame.iconify_button);
-      frame.iconify_button = None;
+  if (!hasiconify && frame.iconify_button) {
+    openbox.removeWindowSearch(frame.iconify_button);
+    XDestroyWindow(display, frame.iconify_button);
   }
-  if (!hasmaximize) {
-      openbox.removeWindowSearch(frame.maximize_button);
-      XDestroyWindow(display, frame.maximize_button);                 
-      frame.maximize_button = None;
+  if (!hasmaximize && frame.iconify_button) {
+    openbox.removeWindowSearch(frame.maximize_button);
+    XDestroyWindow(display, frame.maximize_button);                 
   }
-  if (redecorate_label)
-    decorateLabel();
+
   redrawLabel();
   redrawAllButtons();
 }
@@ -1302,10 +1298,9 @@ void OpenboxWindow::configure(int dx, int dy,
 
     XMoveWindow(display, frame.window, frame.x, frame.y);
 
+    setFocusFlag(flags.focused);
     positionWindows();
     decorate();
-    setFocusFlag(flags.focused);
-    redrawAllButtons();
   } else {
     frame.x = dx;
     frame.y = dy;
@@ -1534,7 +1529,7 @@ void OpenboxWindow::maximize(unsigned int button) {
     openbox_attrib.premax_x = openbox_attrib.premax_y = 0;
     openbox_attrib.premax_w = openbox_attrib.premax_h = 0;
 
-    redrawAllButtons();
+    redrawMaximizeButton(flags.maximized);
     setState(current_state);
     return;
   }
@@ -1608,7 +1603,7 @@ void OpenboxWindow::maximize(unsigned int button) {
 
   configure(dx, dy, dw, dh);
   screen->getWorkspace(workspace_number)->raiseWindow(this);
-  redrawAllButtons();
+  redrawMaximizeButton(flags.maximized);
   setState(current_state);
 }
 
@@ -2241,12 +2236,8 @@ void OpenboxWindow::mapNotifyEvent(XMapEvent *ne) {
     openbox.grab();
     if (! validateClient()) return;
 
-    if (decorations.titlebar) positionButtons();
-
     setState(NormalState);
 
-    redrawAllButtons();
-
     if (flags.transient || screen->focusNew())
       setInputFocus();
     else
@@ -2410,7 +2401,10 @@ void OpenboxWindow::propertyNotifyEvent(Atom atom) {
 
       if (decorations.close && (! frame.close_button)) {
         createCloseButton();
-        if (decorations.titlebar) positionButtons(True);
+        if (decorations.titlebar) {
+          positionButtons();
+          decorateLabel();
+        }
         if (windowmenu) windowmenu->reconfigure();
       }
     }
diff --git a/src/Window.h b/src/Window.h
index 3c9fa867..b91a41fd 100644
--- a/src/Window.h
+++ b/src/Window.h
@@ -220,7 +220,7 @@ protected:
   void associateClientWindow();
   void decorate();
   void decorateLabel();
-  void positionButtons(Bool redecorate_label = False);
+  void positionButtons();
   void positionWindows();
   void createCloseButton();
   void createIconifyButton();
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 41a09324..619b5205 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -81,7 +81,7 @@ Workspace::~Workspace(void) {
 }
 
 
-const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
+int Workspace::addWindow(OpenboxWindow *w, bool place) {
   if (! w) return -1;
 
   if (place) placeWindow(*w);
@@ -103,7 +103,7 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 }
 
 
-const int Workspace::removeWindow(OpenboxWindow *w) {
+int Workspace::removeWindow(OpenboxWindow *w) {
   if (! w) return -1;
 
   _zorder.remove(w);
@@ -190,7 +190,7 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   Workspace *wkspc;
 
   win = bottom;
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowRaise(win->getClientWindow());
 
@@ -229,7 +229,7 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
   Window *nstack = new Window[i], *curr = nstack;
   Workspace *wkspc;
 
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowLower(win->getClientWindow());
 
@@ -267,25 +267,25 @@ void Workspace::reconfigure(void) {
 
 
 OpenboxWindow *Workspace::getWindow(int index) {
-  if ((index >= 0) && (index < _windows.size()))
+  if ((index >= 0) && (index < (signed)_windows.size()))
     return _windows[index];
   else
     return (OpenboxWindow *) 0;
 }
 
 
-const int Workspace::getCount(void) {
-  return _windows.size();
+int Workspace::getCount(void) {
+  return (signed)_windows.size();
 }
 
 
 void Workspace::update(void) {
   clientmenu->update();
-  screen.getToolbar()->redrawWindowLabel(True);
+  screen.getToolbar()->redrawWindowLabel(true);
 }
 
 
-Bool Workspace::isCurrent(void) {
+bool Workspace::isCurrent(void) {
   return (id == screen.getCurrentWorkspaceID());
 }
 
diff --git a/src/Workspace.h b/src/Workspace.h
index 21e65cec..146e1d62 100644
--- a/src/Workspace.h
+++ b/src/Workspace.h
@@ -68,15 +68,15 @@ public:
   inline BScreen &getScreen(void) { return screen; }
   inline Clientmenu *getMenu(void) { return clientmenu; }
   inline const char *getName(void) const { return name; }
-  inline const int &getWorkspaceID(void) const { return id; }
+  inline int getWorkspaceID(void) const { return id; }
   inline OpenboxWindow *focusedWindow() { return _focused; }
   inline OpenboxWindow *lastFocusedWindow() { return _last; }
   void focusWindow(OpenboxWindow *win);
   OpenboxWindow *getWindow(int);
-  Bool isCurrent(void);
-  const int addWindow(OpenboxWindow *, Bool = False);
-  const int removeWindow(OpenboxWindow *);
-  const int getCount(void);
+  bool isCurrent(void);
+  int addWindow(OpenboxWindow *, bool = false);
+  int removeWindow(OpenboxWindow *);
+  int getCount(void);
   void showAll(void);
   void hideAll(void);
   void removeAll(void);
-- 
2.45.2