awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove static vars from tile layout

This commit is contained in:
Julien Danjou 2007-09-15 14:20:01 +02:00
parent 6f8a267450
commit fa7d80ac4f
1 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
layouts/tile.c
View File

@ -30,39 +30,19 @@
/* extern */ /* extern */
extern Client *sel, *clients; extern Client *sel, *clients;
/* static */
static double mwfact = -1;
static int nmaster = -1;
static int ncols = -1;
static void
init_static_var_layout(awesome_config *awesomeconf)
{
if(mwfact == -1)
mwfact = awesomeconf->mwfact;
if(nmaster == -1)
nmaster = awesomeconf->nmaster;
if(ncols == -1)
ncols = awesomeconf->ncols;
}
void void
uicb_setnmaster(Display *disp, uicb_setnmaster(Display *disp,
DC * drawcontext, DC * drawcontext,
awesome_config *awesomeconf, awesome_config *awesomeconf,
const char * arg) const char * arg)
{ {
if(!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)) if(!arg || (!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)))
return; return;
if(!arg) if((awesomeconf->nmaster = (int) compute_new_value_from_arg(arg, (double) awesomeconf->nmaster)) < 0)
nmaster = awesomeconf->nmaster; awesomeconf->nmaster = 0;
else if((nmaster = (int) compute_new_value_from_arg(arg, (double) nmaster)) < 0)
nmaster = 0;
if(sel) arrange(disp, drawcontext, awesomeconf);
arrange(disp, drawcontext, awesomeconf);
} }
void void
@ -71,16 +51,13 @@ uicb_setncols(Display *disp,
awesome_config *awesomeconf, awesome_config *awesomeconf,
const char * arg) const char * arg)
{ {
if(!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)) if(!arg || (!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)))
return; return;
if(!arg) if((awesomeconf->ncols = (int) compute_new_value_from_arg(arg, (double) awesomeconf->ncols)) < 1)
ncols = awesomeconf->ncols; awesomeconf->ncols = 1;
else if((ncols = (int) compute_new_value_from_arg(arg, (double) ncols)) < 1)
ncols = 1;
if(sel) arrange(disp, drawcontext, awesomeconf);
arrange(disp, drawcontext, awesomeconf);
} }
void void
@ -92,15 +69,11 @@ uicb_setmwfact(Display *disp,
if(!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)) if(!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft))
return; return;
if(!arg) if((awesomeconf->mwfact = compute_new_value_from_arg(arg, awesomeconf->mwfact)) < 0.1)
mwfact = awesomeconf->mwfact; awesomeconf->mwfact = 0.1;
else else if(awesomeconf->mwfact > 0.9)
{ awesomeconf->mwfact = 0.9;
if((mwfact = compute_new_value_from_arg(arg, mwfact)) < 0.1)
mwfact = 0.1;
else if(mwfact > 0.9)
mwfact = 0.9;
}
arrange(disp, drawcontext, awesomeconf); arrange(disp, drawcontext, awesomeconf);
} }
@ -119,7 +92,6 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
ScreenInfo *screens_info = NULL; ScreenInfo *screens_info = NULL;
Client *c; Client *c;
init_static_var_layout(awesomeconf);
screens_info = get_screen_info(disp, awesomeconf->statusbar, &screen_numbers); screens_info = get_screen_info(disp, awesomeconf->statusbar, &screen_numbers);
for(n = 0, c = clients; c; c = c->next) for(n = 0, c = clients; c; c = c->next)
@ -141,12 +113,12 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
wax = screens_info[use_screen].x_org; wax = screens_info[use_screen].x_org;
way = screens_info[use_screen].y_org; way = screens_info[use_screen].y_org;
if(n >= nmaster * screen_numbers) if(n >= awesomeconf->nmaster * screen_numbers)
{ {
nmaster_screen = nmaster; nmaster_screen = awesomeconf->nmaster;
otherwin_screen = (n - (nmaster * screen_numbers)) / screen_numbers; otherwin_screen = (n - (awesomeconf->nmaster * screen_numbers)) / screen_numbers;
if(use_screen == 0) if(use_screen == 0)
otherwin_screen += (n - (nmaster * screen_numbers)) % screen_numbers; otherwin_screen += (n - (awesomeconf->nmaster * screen_numbers)) % screen_numbers;
} }
else else
{ {
@ -157,23 +129,23 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
otherwin_screen = 0; otherwin_screen = 0;
} }
if(nmaster) if(awesomeconf->nmaster)
{ {
mh = nmaster_screen ? wah / nmaster_screen : waw; mh = nmaster_screen ? wah / nmaster_screen : waw;
mw = otherwin_screen ? waw * mwfact : waw; mw = otherwin_screen ? waw * awesomeconf->mwfact : waw;
} }
else else
mh = mw = 0; mh = mw = 0;
if(otherwin_screen < ncols) if(otherwin_screen < awesomeconf->ncols)
real_ncols = otherwin_screen; real_ncols = otherwin_screen;
else else
real_ncols = ncols; real_ncols = awesomeconf->ncols;
} }
c->ismax = False; c->ismax = False;
li = last_i ? i - last_i : i; li = last_i ? i - last_i : i;
if(li < nmaster) if(li < awesomeconf->nmaster)
{ /* master */ { /* master */
ny = way + li * mh; ny = way + li * mh;
if(right) if(right)
@ -187,7 +159,7 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
{ /* tile window */ { /* tile window */
win_by_col = otherwin_screen / real_ncols; win_by_col = otherwin_screen / real_ncols;
if((li - nmaster) && (li - 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)
@ -200,10 +172,10 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
nw = (waw - mw) / real_ncols - 2 * c->border; nw = (waw - mw) / real_ncols - 2 * c->border;
if(li == nmaster || otherwin_screen <= real_ncols || (li - nmaster) % win_by_col == 0) if(li == awesomeconf->nmaster || otherwin_screen <= real_ncols || (li - awesomeconf->nmaster) % win_by_col == 0)
ny = way; ny = way;
else else
ny = way + ((li - nmaster) % win_by_col) * (nh + 2 * c->border); ny = way + ((li - awesomeconf->nmaster) % win_by_col) * (nh + 2 * c->border);
nx = wax + current_col * nw + (right ? mw : 0); nx = wax + current_col * nw + (right ? mw : 0);
} }