hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Eliminate some unnecessary variables. 

SVN revision: 42464
This commit is contained in:
Kim Woelders 2009-09-13 13:45:43 +00:00
parent 40084b45df
commit 0ec7f4e1c3
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/desktops.c
View File

@ -1452,8 +1452,6 @@ DeskGotoByEwin(EWin * ewin)
/* /*
* Areas * Areas
*/ */
static int area_w = 3;
static int area_h = 3;
void void
DesksFixArea(int *ax, int *ay) DesksFixArea(int *ax, int *ay)
@ -1461,31 +1459,31 @@ DesksFixArea(int *ax, int *ay)
if (*ax < 0) if (*ax < 0)
{ {
if (Conf.desks.areas_wraparound) if (Conf.desks.areas_wraparound)
*ax = area_w - 1; *ax = Conf.desks.areas_nx - 1;
else else
*ax = 0; *ax = 0;
} }
else if (*ax >= area_w) else if (*ax >= Conf.desks.areas_nx)
{ {
if (Conf.desks.areas_wraparound) if (Conf.desks.areas_wraparound)
*ax = 0; *ax = 0;
else else
*ax = area_w - 1; *ax = Conf.desks.areas_nx - 1;
} }
if (*ay < 0) if (*ay < 0)
{ {
if (Conf.desks.areas_wraparound) if (Conf.desks.areas_wraparound)
*ay = area_h - 1; *ay = Conf.desks.areas_ny - 1;
else else
*ay = 0; *ay = 0;
} }
else if (*ay >= area_h) else if (*ay >= Conf.desks.areas_ny)
{ {
if (Conf.desks.areas_wraparound) if (Conf.desks.areas_wraparound)
*ay = 0; *ay = 0;
else else
*ay = area_h - 1; *ay = Conf.desks.areas_ny - 1;
} }
} }
@ -1493,7 +1491,7 @@ static int
AreaXYToLinear(int ax, int ay) AreaXYToLinear(int ax, int ay)
{ {
DesksFixArea(&ax, &ay); DesksFixArea(&ax, &ay);
return (ay * area_w) + ax; return (ay * Conf.desks.areas_nx) + ax;
} }
static void static void
@ -1501,10 +1499,10 @@ AreaLinearToXY(int a, int *ax, int *ay)
{ {
if (a < 0) if (a < 0)
a = 0; a = 0;
else if (a >= (area_w * area_h)) else if (a >= (Conf.desks.areas_nx * Conf.desks.areas_ny))
a = (area_w * area_h) - 1; a = (Conf.desks.areas_nx * Conf.desks.areas_ny) - 1;
*ay = a / area_w; *ay = a / Conf.desks.areas_nx;
*ax = a - (*ay * area_w); *ax = a - (*ay * Conf.desks.areas_nx);
} }
static void static void
@ -1514,8 +1512,8 @@ SetAreaSize(int aw, int ah)
aw = 1; aw = 1;
if (ah < 1) if (ah < 1)
ah = 1; ah = 1;
Conf.desks.areas_nx = area_w = aw; Conf.desks.areas_nx = aw;
Conf.desks.areas_ny = area_h = ah; Conf.desks.areas_ny = ah;
HintsSetViewportConfig(); HintsSetViewportConfig();
EdgeWindowsShow(); EdgeWindowsShow();
ModulesSignal(ESIGNAL_AREA_CONFIGURED, NULL); ModulesSignal(ESIGNAL_AREA_CONFIGURED, NULL);
@ -1524,8 +1522,8 @@ SetAreaSize(int aw, int ah)
void void
DesksGetAreaSize(int *aw, int *ah) DesksGetAreaSize(int *aw, int *ah)
{ {
*aw = area_w; *aw = Conf.desks.areas_nx;
*ah = area_h; *ah = Conf.desks.areas_ny;
} }
static void static void