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

fixed unsigned/signed comparison warnings

Browse source
This commit is contained in:
Marius Nita 2002-08-22 01:02:21 +00:00
parent 8a48fff773
commit a04483857a
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
util/epist/screen.cc
View file

@ -602,25 +602,26 @@ void screen::changeWorkspaceVert(const int num) const {
assert(_managed); assert(_managed);
const Config *conf = _epist->getConfig(); const Config *conf = _epist->getConfig();
int width = conf->getNumberValue(Config::workspaceColumns); int width = conf->getNumberValue(Config::workspaceColumns);
int num_desktops = (signed)_num_desktops;
int active_desktop = (signed)_active_desktop;
int wnum = 0;
if (width > _num_desktops || width <= 0) if (width > num_desktops || width <= 0)
return; return;
int wnum;
// a cookie to the person that makes this pretty // a cookie to the person that makes this pretty
if (num < 0) { if (num < 0) {
wnum = _active_desktop - width; wnum = active_desktop - width;
if (wnum < 0) { if (wnum < 0) {
wnum = _num_desktops/width * width + _active_desktop; wnum = num_desktops/width * width + active_desktop;
if (wnum >= _num_desktops) if (wnum >= num_desktops)
wnum = _num_desktops - 1; wnum = num_desktops - 1;
} }
} }
else { else {
wnum = _active_desktop + width; wnum = active_desktop + width;
if (wnum >= _num_desktops) { if (wnum >= num_desktops) {
wnum = (_active_desktop + width) % _num_desktops - 1; wnum = (active_desktop + width) % num_desktops - 1;
if (wnum < 0) if (wnum < 0)
wnum = 0; wnum = 0;
} }
@ -632,28 +633,30 @@ void screen::changeWorkspaceHorz(const int num) const {
assert(_managed); assert(_managed);
const Config *conf = _epist->getConfig(); const Config *conf = _epist->getConfig();
int width = conf->getNumberValue(Config::workspaceColumns); int width = conf->getNumberValue(Config::workspaceColumns);
int wnum; int num_desktops = (signed)_num_desktops;
int active_desktop = (signed)_active_desktop;
int wnum = 0;
if (width > _num_desktops || width <= 0) if (width > num_desktops || width <= 0)
return; return;
if (num < 0) { if (num < 0) {
if (_active_desktop % width != 0) if (active_desktop % width != 0)
changeWorkspace(_active_desktop - 1); changeWorkspace(active_desktop - 1);
else { else {
wnum = _active_desktop + width - 1; wnum = active_desktop + width - 1;
if (wnum >= _num_desktops) if (wnum >= num_desktops)
wnum = _num_desktops - 1; wnum = num_desktops - 1;
} }
} }
else { else {
if (_active_desktop % width != width - 1) { if (active_desktop % width != width - 1) {
wnum = _active_desktop + 1; wnum = active_desktop + 1;
if (wnum >= _num_desktops) if (wnum >= num_desktops)
wnum = _num_desktops / width * width; wnum = num_desktops / width * width;
} }
else else
wnum = _active_desktop - width + 1; wnum = active_desktop - width + 1;
} }
changeWorkspace(wnum); changeWorkspace(wnum);
} }