nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some signed/unsigned warnings

Browse source
This commit is contained in:
fluxgen 2002-04-03 12:08:54 +00:00
parent 968f9b5d8e
commit 05761f6059
21 changed files with 185 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Basemenu.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Basemenu.hh,v 1.9 2002/03/27 18:47:12 fluxgen Exp $ // $Id: Basemenu.hh,v 1.10 2002/04/03 12:08:53 fluxgen Exp $
#ifndef BASEMENU_HH #ifndef BASEMENU_HH
#define BASEMENU_HH #define BASEMENU_HH
@ -129,7 +129,7 @@ protected:
inline void setHideTree(bool h) { hide_tree = h; } inline void setHideTree(bool h) { hide_tree = h; }
inline void setMinimumSublevels(int m) { menu.minsub = m; } inline void setMinimumSublevels(int m) { menu.minsub = m; }
virtual void itemSelected(int, int) = 0; virtual void itemSelected(int button, unsigned int index) = 0;
virtual void drawItem(unsigned int index, bool highlight= false, bool clear= false, virtual void drawItem(unsigned int index, bool highlight= false, bool clear= false,
int x= -1, int y= -1, unsigned int width= 0, unsigned int height= 0); int x= -1, int y= -1, unsigned int width= 0, unsigned int height= 0);
virtual void redrawTitle(); virtual void redrawTitle();

2
src/Clientmenu.cc
View file

@ -45,7 +45,7 @@ Clientmenu::Clientmenu(Workspace *ws) : Basemenu(ws->getScreen()) {
} }
void Clientmenu::itemSelected(int button, int index) { void Clientmenu::itemSelected(int button, unsigned int index) {
if (button > 2) return; if (button > 2) return;
FluxboxWindow *win = wkspc->getWindow(index); FluxboxWindow *win = wkspc->getWindow(index);

2
src/Clientmenu.hh
View file

@ -37,7 +37,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:

312
src/Configmenu.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Configmenu.cc,v 1.10 2002/01/11 12:30:22 fluxgen Exp $ // $Id: Configmenu.cc,v 1.11 2002/04/03 12:08:53 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
@ -169,7 +169,7 @@ Configmenu::~Configmenu(void) {
} }
void Configmenu::itemSelected(int button, int index) { void Configmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
@ -303,7 +303,7 @@ Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->screen) {
} }
void Configmenu::Focusmenu::itemSelected(int button, int index) { void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
@ -368,83 +368,51 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : Basemenu(cm->screen)
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
setLabel(i18n->getMessage( setLabel(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuWindowPlacement,
ConfigmenuSet, ConfigmenuWindowPlacement, "Window Placement"));
#else // !NLS
0, 0,
#endif // NLS
"Window Placement"));
setInternalMenu(); setInternalMenu();
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuSmartRows,
ConfigmenuSet, ConfigmenuSmartRows, "Smart Placement (Rows)"), BScreen::ROWSMARTPLACEMENT);
#else // !NLS
0, 0,
#endif // NLS
"Smart Placement (Rows)"), BScreen::ROWSMARTPLACEMENT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuSmartCols,
ConfigmenuSet, ConfigmenuSmartCols, "Smart Placement (Columns)"), BScreen::COLSMARTPLACEMENT);
#else // !NLS
0, 0,
#endif // NLS
"Smart Placement (Columns)"), BScreen::COLSMARTPLACEMENT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuCascade,
ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"), BScreen::CASCADEPLACEMENT);
#else // !NLS
0, 0,
#endif // NLS
"Cascade Placement"), BScreen::CASCADEPLACEMENT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuLeftRight,
ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"), BScreen::LEFTRIGHT);
#else // !NLS
0, 0,
#endif // NLS
"Left to Right"), BScreen::LEFTRIGHT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuRightLeft,
ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"), BScreen::RIGHTLEFT);
#else // !NLS
0, 0,
#endif // NLS
"Right to Left"), BScreen::RIGHTLEFT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuTopBottom,
ConfigmenuSet, ConfigmenuTopBottom, "Top to Bottom"), BScreen::TOPBOTTOM);
#else // !NLS
0, 0,
#endif // NLS
"Top to Bottom"), BScreen::TOPBOTTOM);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuBottomTop,
ConfigmenuSet, ConfigmenuBottomTop, "Bottom to Top"), BScreen::BOTTOMTOP);
#else // !NLS
0, 0,
#endif // NLS
"Bottom to Top"), BScreen::BOTTOMTOP);
update(); update();
switch (configmenu->screen->getPlacementPolicy()) { switch (configmenu->screen->getPlacementPolicy()) {
case BScreen::ROWSMARTPLACEMENT: case BScreen::ROWSMARTPLACEMENT:
setItemSelected(0, True); setItemSelected(0, true);
break; break;
case BScreen::COLSMARTPLACEMENT: case BScreen::COLSMARTPLACEMENT:
setItemSelected(1, True); setItemSelected(1, true);
break; break;
case BScreen::CASCADEPLACEMENT: case BScreen::CASCADEPLACEMENT:
setItemSelected(2, True); setItemSelected(2, true);
break; break;
} }
Bool rl = (configmenu->screen->getRowPlacementDirection() == bool rl = (configmenu->screen->getRowPlacementDirection() ==
BScreen::LEFTRIGHT), BScreen::LEFTRIGHT),
tb = (configmenu->screen->getColPlacementDirection() == tb = (configmenu->screen->getColPlacementDirection() ==
BScreen::TOPBOTTOM); BScreen::TOPBOTTOM);
setItemSelected(3, rl); setItemSelected(3, rl);
@ -455,7 +423,7 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : Basemenu(cm->screen)
} }
void Configmenu::Placementmenu::itemSelected(int button, int index) { void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
@ -464,61 +432,61 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) {
case BScreen::ROWSMARTPLACEMENT: case BScreen::ROWSMARTPLACEMENT:
configmenu->screen->savePlacementPolicy(item->function()); configmenu->screen->savePlacementPolicy(item->function());
setItemSelected(0, True); setItemSelected(0, true);
setItemSelected(1, False); setItemSelected(1, false);
setItemSelected(2, False); setItemSelected(2, false);
break; break;
case BScreen::COLSMARTPLACEMENT: case BScreen::COLSMARTPLACEMENT:
configmenu->screen->savePlacementPolicy(item->function()); configmenu->screen->savePlacementPolicy(item->function());
setItemSelected(0, False); setItemSelected(0, false);
setItemSelected(1, True); setItemSelected(1, true);
setItemSelected(2, False); setItemSelected(2, false);
break; break;
case BScreen::CASCADEPLACEMENT: case BScreen::CASCADEPLACEMENT:
configmenu->screen->savePlacementPolicy(item->function()); configmenu->screen->savePlacementPolicy(item->function());
setItemSelected(0, False); setItemSelected(0, false);
setItemSelected(1, False); setItemSelected(1, false);
setItemSelected(2, True); setItemSelected(2, true);
break; break;
case BScreen::LEFTRIGHT: case BScreen::LEFTRIGHT:
configmenu->screen->saveRowPlacementDirection(BScreen::LEFTRIGHT); configmenu->screen->saveRowPlacementDirection(BScreen::LEFTRIGHT);
setItemSelected(3, True); setItemSelected(3, true);
setItemSelected(4, False); setItemSelected(4, false);
break; break;
case BScreen::RIGHTLEFT: case BScreen::RIGHTLEFT:
configmenu->screen->saveRowPlacementDirection(BScreen::RIGHTLEFT); configmenu->screen->saveRowPlacementDirection(BScreen::RIGHTLEFT);
setItemSelected(3, False); setItemSelected(3, false);
setItemSelected(4, True); setItemSelected(4, true);
break; break;
case BScreen::TOPBOTTOM: case BScreen::TOPBOTTOM:
configmenu->screen->saveColPlacementDirection(BScreen::TOPBOTTOM); configmenu->screen->saveColPlacementDirection(BScreen::TOPBOTTOM);
setItemSelected(5, True); setItemSelected(5, true);
setItemSelected(6, False); setItemSelected(6, false);
break; break;
case BScreen::BOTTOMTOP: case BScreen::BOTTOMTOP:
configmenu->screen->saveColPlacementDirection(BScreen::BOTTOMTOP); configmenu->screen->saveColPlacementDirection(BScreen::BOTTOMTOP);
setItemSelected(5, False); setItemSelected(5, false);
setItemSelected(6, True); setItemSelected(6, true);
break; break;
} }
} }
} }
@ -529,141 +497,71 @@ Configmenu::Tabmenu::Tabmenu(Configmenu *cm) : Basemenu(cm->screen) {
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
setLabel(i18n->getMessage( setLabel(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuTabPlacement,
ConfigmenuSet, ConfigmenuTabPlacement, "Tab Placement"));
#else // !NLS
0, 0,
#endif // NLS
"Tab Placement"));
setInternalMenu(); setInternalMenu();
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementTopLeft,
CommonSet, CommonPlacementTopLeft, "Top Left"), Tab::PTOP + Tab::ALEFT);
#else // !NLS
0, 0,
#endif // NLS
"Top Left"), Tab::PTOP + Tab::ALEFT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementTopCenter,
CommonSet, CommonPlacementTopCenter, "Top Center"), Tab::PTOP + Tab::ACENTER);
#else // !NLS
0, 0,
#endif // NLS
"Top Center"), Tab::PTOP + Tab::ACENTER);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementTopRight,
CommonSet, CommonPlacementTopRight, "Top Right"), Tab::PTOP + Tab::ARIGHT);
#else // !NLS
0, 0,
#endif // NLS
"Top Right"), Tab::PTOP + Tab::ARIGHT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementTopRelative,
CommonSet, CommonPlacementTopRelative, "Top Relative"), Tab::PTOP + Tab::ARELATIVE);
#else // !NLS
0, 0,
#endif // NLS
"Top Relative"), Tab::PTOP + Tab::ARELATIVE);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementBottomLeft,
CommonSet, CommonPlacementBottomLeft, "Bottom Left"), Tab::PBOTTOM + Tab::ALEFT);
#else // !NLS
0, 0,
#endif // NLS
"Bottom Left"), Tab::PBOTTOM + Tab::ALEFT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementBottomCenter,
CommonSet, CommonPlacementBottomCenter, "Bottom Center"), Tab::PBOTTOM + Tab::ACENTER);
#else // !NLS
0, 0,
#endif // NLS
"Bottom Center"), Tab::PBOTTOM + Tab::ACENTER);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementBottomRight,
CommonSet, CommonPlacementBottomRight, "Bottom Right"), Tab::PBOTTOM + Tab::ARIGHT);
#else // !NLS
0, 0,
#endif // NLS
"Bottom Right"), Tab::PBOTTOM + Tab::ARIGHT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementBottomRelative,
CommonSet, CommonPlacementBottomRelative, "Bottom Relative"), Tab::PBOTTOM + Tab::ARELATIVE);
#else // !NLS
0, 0,
#endif // NLS
"Bottom Relative"), Tab::PBOTTOM + Tab::ARELATIVE);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementLeftTop,
CommonSet, CommonPlacementLeftTop, "Left Top"), Tab::PLEFT + Tab::ARIGHT);
#else // !NLS
0, 0,
#endif // NLS
"Left Top"), Tab::PLEFT + Tab::ARIGHT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementLeftCenter,
CommonSet, CommonPlacementLeftCenter, "Left Center"), Tab::PLEFT + Tab::ACENTER);
#else // !NLS
0, 0,
#endif // NLS
"Left Center"), Tab::PLEFT + Tab::ACENTER);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementLeftBottom,
CommonSet, CommonPlacementLeftBottom, "Left Bottom"), Tab::PLEFT + Tab::ALEFT);
#else // !NLS
0, 0,
#endif // NLS
"Left Bottom"), Tab::PLEFT + Tab::ALEFT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementLeftRelative,
CommonSet, CommonPlacementLeftRelative, "Left Relative"), Tab::PLEFT + Tab::ARELATIVE);
#else // !NLS
0, 0,
#endif // NLS
"Left Relative"), Tab::PLEFT + Tab::ARELATIVE);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementRightTop,
CommonSet, CommonPlacementRightTop, "Right Top"), Tab::PRIGHT + Tab::ARIGHT);
#else // !NLS
0, 0,
#endif // NLS
"Right Top"), Tab::PRIGHT + Tab::ARIGHT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementRightCenter,
CommonSet, CommonPlacementRightCenter, "Right Center"), Tab::PRIGHT + Tab::ACENTER);
#else // !NLS
0, 0,
#endif // NLS
"Right Center"), Tab::PRIGHT + Tab::ACENTER);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementRightBottom,
CommonSet, CommonPlacementRightBottom, "Right Bottom"), Tab::PRIGHT + Tab::ALEFT);
#else // !NLS
0, 0,
#endif // NLS
"Right Bottom"), Tab::PRIGHT + Tab::ALEFT);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS CommonSet, CommonPlacementRightRelative,
CommonSet, CommonPlacementRightRelative, "Right Relative"), Tab::PRIGHT + Tab::ARELATIVE);
#else // !NLS
0, 0,
#endif // NLS
"Right Relative"), Tab::PRIGHT + Tab::ARELATIVE);
insert(i18n->getMessage( insert(i18n->getMessage(
#ifdef NLS ConfigmenuSet, ConfigmenuTabRotateVertical,
ConfigmenuSet, ConfigmenuTabRotateVertical, "Rotate Vertical Tabs"), CMENU_TAB_ROTATE);
#else // !NLS
0, 0,
#endif // NLS
"Rotate Vertical Tabs"), CMENU_TAB_ROTATE);
update(); update();
setSelected(); setSelected();
} }
void Configmenu::Tabmenu::itemSelected(int button, int index) { void Configmenu::Tabmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
#ifdef DEBUG
fprintf(stderr, "Item(%d)\n", index); fprintf(stderr, "Item(%d)\n", index);
#endif
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
switch (item->function()) { switch (item->function()) {
@ -808,40 +706,40 @@ void Configmenu::Tabmenu::itemSelected(int button, int index) {
void Configmenu::Tabmenu::setSelected(void) { void Configmenu::Tabmenu::setSelected(void) {
setItemSelected(0, (configmenu->screen->getTabPlacement() == Tab::PTOP && setItemSelected(0, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
configmenu->screen->getTabAlignment() == Tab::ALEFT)); configmenu->screen->getTabAlignment() == Tab::ALEFT));
setItemSelected(1, (configmenu->screen->getTabPlacement() == Tab::PTOP && setItemSelected(1, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
configmenu->screen->getTabAlignment() == Tab::ACENTER)); configmenu->screen->getTabAlignment() == Tab::ACENTER));
setItemSelected(2, (configmenu->screen->getTabPlacement() == Tab::PTOP && setItemSelected(2, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
configmenu->screen->getTabAlignment() == Tab::ARIGHT)); configmenu->screen->getTabAlignment() == Tab::ARIGHT));
setItemSelected(3, (configmenu->screen->getTabPlacement() == Tab::PTOP && setItemSelected(3, (configmenu->screen->getTabPlacement() == Tab::PTOP &&
configmenu->screen->getTabAlignment() == Tab::ARELATIVE)); configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
setItemSelected(4, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM && setItemSelected(4, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
configmenu->screen->getTabAlignment() == Tab::ALEFT)); configmenu->screen->getTabAlignment() == Tab::ALEFT));
setItemSelected(5, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM && setItemSelected(5, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
configmenu->screen->getTabAlignment() == Tab::ACENTER)); configmenu->screen->getTabAlignment() == Tab::ACENTER));
setItemSelected(6, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM && setItemSelected(6, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
configmenu->screen->getTabAlignment() == Tab::ARIGHT)); configmenu->screen->getTabAlignment() == Tab::ARIGHT));
setItemSelected(7, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM && setItemSelected(7, (configmenu->screen->getTabPlacement() == Tab::PBOTTOM &&
configmenu->screen->getTabAlignment() == Tab::ARELATIVE)); configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
setItemSelected(8, (configmenu->screen->getTabPlacement() == Tab::PLEFT && setItemSelected(8, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
configmenu->screen->getTabAlignment() == Tab::ARIGHT)); configmenu->screen->getTabAlignment() == Tab::ARIGHT));
setItemSelected(9, (configmenu->screen->getTabPlacement() == Tab::PLEFT && setItemSelected(9, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
configmenu->screen->getTabAlignment() == Tab::ACENTER)); configmenu->screen->getTabAlignment() == Tab::ACENTER));
setItemSelected(10, (configmenu->screen->getTabPlacement() == Tab::PLEFT && setItemSelected(10, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
configmenu->screen->getTabAlignment() == Tab::ALEFT)); configmenu->screen->getTabAlignment() == Tab::ALEFT));
setItemSelected(11, (configmenu->screen->getTabPlacement() == Tab::PLEFT && setItemSelected(11, (configmenu->screen->getTabPlacement() == Tab::PLEFT &&
configmenu->screen->getTabAlignment() == Tab::ARELATIVE)); configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
setItemSelected(12, (configmenu->screen->getTabPlacement() == Tab::PRIGHT && setItemSelected(12, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
configmenu->screen->getTabAlignment() == Tab::ARIGHT)); configmenu->screen->getTabAlignment() == Tab::ARIGHT));
setItemSelected(13, (configmenu->screen->getTabPlacement() == Tab::PRIGHT && setItemSelected(13, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
configmenu->screen->getTabAlignment() == Tab::ACENTER)); configmenu->screen->getTabAlignment() == Tab::ACENTER));
setItemSelected(14, (configmenu->screen->getTabPlacement() == Tab::PRIGHT && setItemSelected(14, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
configmenu->screen->getTabAlignment() == Tab::ALEFT)); configmenu->screen->getTabAlignment() == Tab::ALEFT));
setItemSelected(15, (configmenu->screen->getTabPlacement() == Tab::PRIGHT && setItemSelected(15, (configmenu->screen->getTabPlacement() == Tab::PRIGHT &&
configmenu->screen->getTabAlignment() == Tab::ARELATIVE)); configmenu->screen->getTabAlignment() == Tab::ARELATIVE));
setItemEnabled(16, (configmenu->screen->getTabPlacement() == Tab::PLEFT || setItemEnabled(16, (configmenu->screen->getTabPlacement() == Tab::PLEFT ||
configmenu->screen->getTabPlacement() == Tab::PRIGHT)); configmenu->screen->getTabPlacement() == Tab::PRIGHT));
setItemSelected(16, (configmenu->screen->isTabRotateVertical() && setItemSelected(16, (configmenu->screen->isTabRotateVertical() &&
(configmenu->screen->getTabPlacement() == Tab::PLEFT || (configmenu->screen->getTabPlacement() == Tab::PLEFT ||
configmenu->screen->getTabPlacement() == Tab::PRIGHT))); configmenu->screen->getTabPlacement() == Tab::PRIGHT)));
} }

10
src/Configmenu.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Configmenu.hh,v 1.3 2002/02/17 18:57:47 fluxgen Exp $ // $Id: Configmenu.hh,v 1.4 2002/04/03 12:08:54 fluxgen Exp $
#ifndef CONFIGMENU_HH #ifndef CONFIGMENU_HH
#define CONFIGMENU_HH #define CONFIGMENU_HH
@ -41,7 +41,7 @@ private:
Configmenu *configmenu; Configmenu *configmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Focusmenu(Configmenu *); Focusmenu(Configmenu *);
@ -52,7 +52,7 @@ private:
Configmenu *configmenu; Configmenu *configmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Placementmenu(Configmenu *); Placementmenu(Configmenu *);
@ -63,7 +63,7 @@ private:
Configmenu *configmenu; Configmenu *configmenu;
void setSelected(void); void setSelected(void);
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Tabmenu(Configmenu *); Tabmenu(Configmenu *);
@ -81,7 +81,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:

7
src/Icon.cc
View file

@ -19,8 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// stupid macros needed to access some functions in version 2 of the GNU C //Use GNU extensions
// library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
@ -50,9 +49,9 @@ Iconmenu::Iconmenu(BScreen *scrn) : Basemenu(scrn) {
} }
void Iconmenu::itemSelected(int button, int index) { void Iconmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
if (index >= 0 && index < screen->getIconCount()) { if (index < screen->getIconCount()) {
FluxboxWindow *win = screen->getIcon(index); FluxboxWindow *win = screen->getIcon(index);
if (win) if (win)

2
src/Icon.hh
View file

@ -36,7 +36,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:

2
src/Rootmenu.cc
View file

@ -56,7 +56,7 @@ Rootmenu::Rootmenu(BScreen *scrn) : Basemenu(scrn) {
} }
void Rootmenu::itemSelected(int button, int index) { void Rootmenu::itemSelected(int button, unsigned int index) {
Fluxbox *fluxbox = Fluxbox::instance(); Fluxbox *fluxbox = Fluxbox::instance();

2
src/Rootmenu.hh
View file

@ -35,7 +35,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:

6
src/Screen.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.hh,v 1.26 2002/04/02 23:14:54 fluxgen Exp $ // $Id: Screen.hh,v 1.27 2002/04/03 12:08:54 fluxgen Exp $
#ifndef SCREEN_HH #ifndef SCREEN_HH
#define SCREEN_HH #define SCREEN_HH
@ -124,8 +124,8 @@ public:
inline const unsigned int getCurrentWorkspaceID() const { return current_workspace->getWorkspaceID(); } inline const unsigned int getCurrentWorkspaceID() const { return current_workspace->getWorkspaceID(); }
typedef std::vector<FluxboxWindow *> Icons; typedef std::vector<FluxboxWindow *> Icons;
inline const unsigned int getCount(void) { return workspacesList.size(); } inline const unsigned int getCount(void) const { return workspacesList.size(); }
inline const int getIconCount(void) { return iconList.size(); } inline const unsigned int getIconCount(void) const { return iconList.size(); }
inline Icons &getIconList(void) { return iconList; } inline Icons &getIconList(void) { return iconList; }
inline const int getNumberOfWorkspaces(void) { return *resource.workspaces; } inline const int getNumberOfWorkspaces(void) { return *resource.workspaces; }

50
src/Slit.cc
View file

@ -722,8 +722,8 @@ Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) {
update(); update();
if (slit->isOnTop()) setItemSelected(2, True); if (slit->isOnTop()) setItemSelected(2, true);
if (slit->doAutoHide()) setItemSelected(3, True); if (slit->doAutoHide()) setItemSelected(3, true);
} }
@ -738,30 +738,32 @@ Slitmenu::~Slitmenu(void) {
} }
void Slitmenu::itemSelected(int button, int index) { void Slitmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) return; if (! item) return;
switch (item->function()) { switch (item->function()) {
case 1: // always on top case 1: // always on top
{ {
Bool change = ((slit->isOnTop()) ? False : True); bool change = ((slit->isOnTop()) ? false : true);
slit->on_top = change; slit->on_top = change;
setItemSelected(2, change); setItemSelected(2, change);
if (slit->isOnTop()) slit->screen->raiseWindows((Window *) 0, 0); if (slit->isOnTop())
break; slit->screen->raiseWindows((Window *) 0, 0);
}
break;
}
case 2: // auto hide case 2: // auto hide
{ {
Bool change = ((slit->doAutoHide()) ? False : True); bool change = ((slit->doAutoHide()) ? false : true);
slit->do_auto_hide = change; slit->do_auto_hide = change;
setItemSelected(3, change); setItemSelected(3, change);
break; break;
} }
} }
} }
} }
@ -820,13 +822,13 @@ Slitmenu::Directionmenu::Directionmenu(Slitmenu *sm) : Basemenu(sm->slit->screen
update(); update();
if (sm->slit->screen->getSlitDirection() == Slit::HORIZONTAL) if (sm->slit->screen->getSlitDirection() == Slit::HORIZONTAL)
setItemSelected(0, True); setItemSelected(0, true);
else else
setItemSelected(1, True); setItemSelected(1, true);
} }
void Slitmenu::Directionmenu::itemSelected(int button, int index) { void Slitmenu::Directionmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) return; if (! item) return;
@ -834,11 +836,11 @@ void Slitmenu::Directionmenu::itemSelected(int button, int index) {
slitmenu->slit->screen->saveSlitDirection(item->function()); slitmenu->slit->screen->saveSlitDirection(item->function());
if (item->function() == Slit::HORIZONTAL) { if (item->function() == Slit::HORIZONTAL) {
setItemSelected(0, True); setItemSelected(0, true);
setItemSelected(1, False); setItemSelected(1, false);
} else { } else {
setItemSelected(0, False); setItemSelected(0, false);
setItemSelected(1, True); setItemSelected(1, true);
} }
hide(); hide();
@ -931,7 +933,7 @@ Slitmenu::Placementmenu::Placementmenu(Slitmenu *sm) : Basemenu(sm->slit->screen
} }
void Slitmenu::Placementmenu::itemSelected(int button, int index) { void Slitmenu::Placementmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) return; if (! item) return;

6
src/Slit.hh
View file

@ -55,7 +55,7 @@ private:
Slitmenu *slitmenu; Slitmenu *slitmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Directionmenu(Slitmenu *); Directionmenu(Slitmenu *);
@ -66,7 +66,7 @@ private:
Slitmenu *slitmenu; Slitmenu *slitmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Placementmenu(Slitmenu *); Placementmenu(Slitmenu *);
@ -101,7 +101,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
virtual void internal_hide(void); virtual void internal_hide(void);
}; };

8
src/Tab.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Tab.cc,v 1.20 2002/02/04 06:50:48 fluxgen Exp $ // $Id: Tab.cc,v 1.21 2002/04/03 12:08:54 fluxgen Exp $
#include "Tab.hh" #include "Tab.hh"
@ -284,8 +284,10 @@ void Tab::stick() {
win->blackbox_attrib.flags ^= BaseDisplay::ATTRIB_OMNIPRESENT; win->blackbox_attrib.flags ^= BaseDisplay::ATTRIB_OMNIPRESENT;
win->blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_OMNIPRESENT; win->blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_OMNIPRESENT;
win->stuck = false; win->stuck = false;
if (!win->isIconic()) if (!win->isIconic()) {
win->getScreen()->reassociateWindow(win, -1, true); BScreen *screen = win->getScreen();
screen->reassociateWindow(win, screen->getCurrentWorkspace()->getWorkspaceID(), true);
}
} else { } else {
win->stuck = true; win->stuck = true;

4
src/Timer.cc
View file

@ -21,11 +21,11 @@
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
# define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "../config.h" #include "../config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include "Timer.hh" #include "Timer.hh"

16
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.16 2002/03/29 21:47:58 pekdon Exp $ // $Id: Toolbar.cc,v 1.17 2002/04/03 12:08:54 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
@ -1308,9 +1308,9 @@ Toolbarmenu::Toolbarmenu(Toolbar *tb) : Basemenu(tb->screen) {
update(); update();
if (toolbar->isOnTop()) if (toolbar->isOnTop())
setItemSelected(1, True); setItemSelected(1, true);
if (toolbar->doAutoHide()) if (toolbar->doAutoHide())
setItemSelected(2, True); setItemSelected(2, true);
} }
@ -1325,7 +1325,7 @@ Toolbarmenu::~Toolbarmenu(void) {
} }
void Toolbarmenu::itemSelected(int button, int index) { void Toolbarmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) return; if (! item) return;
@ -1333,7 +1333,7 @@ void Toolbarmenu::itemSelected(int button, int index) {
switch (item->function()) { switch (item->function()) {
case 1: // always on top case 1: // always on top
{ {
Bool change = ((toolbar->isOnTop()) ? False : True); bool change = ((toolbar->isOnTop()) ? False : True);
toolbar->on_top = change; toolbar->on_top = change;
setItemSelected(1, change); setItemSelected(1, change);
@ -1343,7 +1343,7 @@ void Toolbarmenu::itemSelected(int button, int index) {
case 2: // auto hide case 2: // auto hide
{ {
Bool change = ((toolbar->doAutoHide()) ? False : True); bool change = ((toolbar->doAutoHide()) ? False : True);
toolbar->do_auto_hide = change; toolbar->do_auto_hide = change;
setItemSelected(2, change); setItemSelected(2, change);
@ -1450,7 +1450,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
} }
void Toolbarmenu::Placementmenu::itemSelected(int button, int index) { void Toolbarmenu::Placementmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) if (! item)
@ -1494,7 +1494,7 @@ Toolbarmenu::Headmenu::Headmenu(Toolbarmenu *tm)
} }
void Toolbarmenu::Headmenu::itemSelected(int button, int index) { void Toolbarmenu::Headmenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
if (! item) if (! item)

8
src/Toolbar.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.hh,v 1.9 2002/03/19 14:30:42 fluxgen Exp $ // $Id: Toolbar.hh,v 1.10 2002/04/03 12:08:54 fluxgen Exp $
#ifndef TOOLBAR_HH #ifndef TOOLBAR_HH
#define TOOLBAR_HH #define TOOLBAR_HH
@ -42,7 +42,7 @@ private:
Toolbarmenu *toolbarmenu; Toolbarmenu *toolbarmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Placementmenu(Toolbarmenu *); Placementmenu(Toolbarmenu *);
@ -56,7 +56,7 @@ private:
Toolbarmenu *toolbarmenu; Toolbarmenu *toolbarmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
}; };
#endif // XINERAMA #endif // XINERAMA
@ -73,7 +73,7 @@ private:
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
virtual void internal_hide(void); virtual void internal_hide(void);
public: public:

8
src/Windowmenu.cc
View file

@ -170,7 +170,7 @@ void Windowmenu::show(void) {
} }
void Windowmenu::itemSelected(int button, int index) { void Windowmenu::itemSelected(int button, unsigned int index) {
BasemenuItem *item = find(index); BasemenuItem *item = find(index);
switch (item->function()) { switch (item->function()) {
@ -254,7 +254,7 @@ Windowmenu::SendtoWorkspacemenu::SendtoWorkspacemenu(Windowmenu *w)
} }
void Windowmenu::SendtoWorkspacemenu::itemSelected(int button, int index) { void Windowmenu::SendtoWorkspacemenu::itemSelected(int button, unsigned int index) {
if (button > 2) return; if (button > 2) return;
if (index <= windowmenu->screen->getCount()) { if (index <= windowmenu->screen->getCount()) {
@ -272,7 +272,7 @@ void Windowmenu::SendtoWorkspacemenu::itemSelected(int button, int index) {
void Windowmenu::SendtoWorkspacemenu::update(void) { void Windowmenu::SendtoWorkspacemenu::update(void) {
int i, r = getCount(); unsigned int i, r = getCount();
if (getCount() != 0) { if (getCount() != 0) {
for (i = 0; i < r; ++i) for (i = 0; i < r; ++i)
@ -291,7 +291,7 @@ void Windowmenu::SendtoWorkspacemenu::show(void) {
Basemenu::show(); Basemenu::show();
} }
void Windowmenu::SendGroupToWorkspacemenu::itemSelected(int button, int index) { void Windowmenu::SendGroupToWorkspacemenu::itemSelected(int button, unsigned int index) {
if (button > 2) if (button > 2)
return; return;

8
src/Windowmenu.hh
View file

@ -44,7 +44,7 @@ private:
Windowmenu *windowmenu; Windowmenu *windowmenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
SendtoWorkspacemenu(Windowmenu *); SendtoWorkspacemenu(Windowmenu *);
@ -56,9 +56,9 @@ private:
class SendGroupToWorkspacemenu : public SendtoWorkspacemenu { class SendGroupToWorkspacemenu : public SendtoWorkspacemenu {
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
SendGroupToWorkspacemenu(Windowmenu *); SendGroupToWorkspacemenu(Windowmenu *winmenu);
}; };
@ -69,7 +69,7 @@ private:
friend class SendGroupToWorkspacemenu; friend class SendGroupToWorkspacemenu;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:

3
src/Workspace.hh
View file

@ -1,3 +1,6 @@
// Workspace.hh for Fluxbox
// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Workspace.hh for Blackbox - an X11 Window manager // Workspace.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //

5
src/Workspacemenu.cc
View file

@ -21,8 +21,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// stupid macros needed to access some functions in version 2 of the GNU C //use GNU extension
// library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
@ -71,7 +70,7 @@ Workspacemenu::Workspacemenu(BScreen *scrn) : Basemenu(scrn) {
} }
void Workspacemenu::itemSelected(int button, int index) { void Workspacemenu::itemSelected(int button, unsigned int index) {
if (button == 1) { if (button == 1) {
if (index == 0) if (index == 0)
screen->addWorkspace(); screen->addWorkspace();

2
src/Workspacemenu.hh
View file

@ -32,7 +32,7 @@ private:
BScreen *screen; BScreen *screen;
protected: protected:
virtual void itemSelected(int, int); virtual void itemSelected(int button, unsigned int index);
public: public:
Workspacemenu(BScreen *); Workspacemenu(BScreen *);