Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename some vars

This commit is contained in:
Julien Danjou 2007-09-15 14:26:55 +02:00
parent 636459d85d
commit 9130abb0fe
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layouts/tile.c
View File

@ -86,7 +86,7 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
unsigned int nx, ny, nw, nh; unsigned int nx, ny, nw, nh;
/* master size */ /* master size */
unsigned int mw = 0, mh = 0; unsigned int mw = 0, mh = 0;
int n, i, li, last_i = 0, nmaster_screen = 0, otherwin_screen = 0; int n, i, li, last_i = 0, masterwin = 0, otherwin = 0;
int screen_numbers = 1, use_screen = -1; int screen_numbers = 1, use_screen = -1;
int real_ncols = 1, win_by_col = 1, current_col = 0; int real_ncols = 1, win_by_col = 1, current_col = 0;
ScreenInfo *screens_info = NULL; ScreenInfo *screens_info = NULL;
@ -106,7 +106,7 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
if(use_screen == -1 if(use_screen == -1
|| (screen_numbers > 1 || (screen_numbers > 1
&& i && i
&& ((i - last_i) >= nmaster_screen + otherwin_screen && ((i - last_i) >= masterwin + otherwin
|| n == screen_numbers))) || n == screen_numbers)))
{ {
use_screen++; use_screen++;
@ -119,30 +119,30 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
if(n >= awesomeconf->nmaster * screen_numbers) if(n >= awesomeconf->nmaster * screen_numbers)
{ {
nmaster_screen = awesomeconf->nmaster; masterwin = awesomeconf->nmaster;
otherwin_screen = (n - (awesomeconf->nmaster * screen_numbers)) / screen_numbers; otherwin = (n - (awesomeconf->nmaster * screen_numbers)) / screen_numbers;
if(use_screen == 0) if(use_screen == 0)
otherwin_screen += (n - (awesomeconf->nmaster * screen_numbers)) % screen_numbers; otherwin += (n - (awesomeconf->nmaster * screen_numbers)) % screen_numbers;
} }
else else
{ {
nmaster_screen = n / screen_numbers; masterwin = n / screen_numbers;
/* first screen takes more master */ /* first screen takes more master */
if(use_screen == 0) if(use_screen == 0)
nmaster_screen += n % screen_numbers; masterwin += n % screen_numbers;
otherwin_screen = 0; otherwin = 0;
} }
if(awesomeconf->nmaster) if(awesomeconf->nmaster)
{ {
mh = nmaster_screen ? wah / nmaster_screen : waw; mh = masterwin ? wah / masterwin : waw;
mw = otherwin_screen ? waw * awesomeconf->mwfact : waw; mw = otherwin ? waw * awesomeconf->mwfact : waw;
} }
else else
mh = mw = 0; mh = mw = 0;
if(otherwin_screen < awesomeconf->ncols) if(otherwin < awesomeconf->ncols)
real_ncols = otherwin_screen; real_ncols = otherwin;
else else
real_ncols = awesomeconf->ncols; real_ncols = awesomeconf->ncols;
} }
@ -158,22 +158,22 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
} }
else else
{ /* tile window */ { /* tile window */
win_by_col = otherwin_screen / real_ncols; win_by_col = otherwin / real_ncols;
if((li - awesomeconf->nmaster) && (li - awesomeconf->nmaster) % win_by_col == 0 && current_col < real_ncols - 1) if((li - awesomeconf->nmaster) && (li - awesomeconf->nmaster) % win_by_col == 0 && current_col < real_ncols - 1)
current_col++; current_col++;
if(current_col == real_ncols - 1) if(current_col == real_ncols - 1)
win_by_col += otherwin_screen % real_ncols; win_by_col += otherwin % real_ncols;
if(otherwin_screen <= real_ncols) if(otherwin <= real_ncols)
nh = wah - 2 * c->border; nh = wah - 2 * c->border;
else else
nh = (wah / win_by_col) - 2 * c->border; nh = (wah / win_by_col) - 2 * c->border;
nw = (waw - mw) / real_ncols - 2 * c->border; nw = (waw - mw) / real_ncols - 2 * c->border;
if(li == awesomeconf->nmaster || otherwin_screen <= real_ncols || (li - awesomeconf->nmaster) % win_by_col == 0) if(li == awesomeconf->nmaster || otherwin <= real_ncols || (li - awesomeconf->nmaster) % win_by_col == 0)
ny = way; ny = way;
else else
ny = way + ((li - awesomeconf->nmaster) % win_by_col) * (nh + 2 * c->border); ny = way + ((li - awesomeconf->nmaster) % win_by_col) * (nh + 2 * c->border);