add scalefactor to cwmrc
This commit is contained in:
1
calmwm.h
1
calmwm.h
@@ -313,6 +313,7 @@ struct conf {
|
||||
int nameqlen;
|
||||
int bwidth;
|
||||
int mamount;
|
||||
int scalefactor;
|
||||
int snapdist;
|
||||
int htile;
|
||||
int vtile;
|
||||
|
||||
1
conf.c
1
conf.c
@@ -288,6 +288,7 @@ conf_init(struct conf *c)
|
||||
c->stickygroups = 0;
|
||||
c->bwidth = 1;
|
||||
c->mamount = 1;
|
||||
c->scalefactor = 10;
|
||||
c->htile = 50;
|
||||
c->vtile = 50;
|
||||
c->snapdist = 0;
|
||||
|
||||
2
kbfunc.c
2
kbfunc.c
@@ -57,7 +57,7 @@ kbfunc_cwm_status(void *ctx, struct cargs *cargs)
|
||||
static void
|
||||
kbfunc_amount(int flags, int amt, int *mx, int *my)
|
||||
{
|
||||
#define CWM_FACTOR 10
|
||||
#define CWM_FACTOR Conf.scalefactor
|
||||
|
||||
if (flags & CWM_BIGAMOUNT)
|
||||
amt *= CWM_FACTOR;
|
||||
|
||||
10
parse.y
10
parse.y
@@ -73,7 +73,7 @@ typedef struct {
|
||||
%token BINDKEY UNBINDKEY BINDMOUSE UNBINDMOUSE
|
||||
%token FONTNAME STICKY GAP
|
||||
%token AUTOGROUP COMMAND IGNORE WM
|
||||
%token YES NO BORDERWIDTH MOVEAMOUNT HTILE VTILE
|
||||
%token YES NO BORDERWIDTH MOVEAMOUNT SCALEFACTOR HTILE VTILE
|
||||
%token COLOR SNAPDIST
|
||||
%token ACTIVEBORDER INACTIVEBORDER URGENCYBORDER
|
||||
%token GROUPBORDER UNGROUPBORDER
|
||||
@@ -156,6 +156,13 @@ main : FONTNAME STRING {
|
||||
}
|
||||
conf->mamount = $2;
|
||||
}
|
||||
| SCALEFACTOR NUMBER {
|
||||
if ($2 < 0 || $2 > INT_MAX) {
|
||||
yyerror("invalid scalefactor");
|
||||
YYERROR;
|
||||
}
|
||||
conf->scalefactor = $2;
|
||||
}
|
||||
| SNAPDIST NUMBER {
|
||||
if ($2 < 0 || $2 > INT_MAX) {
|
||||
yyerror("invalid snapdist");
|
||||
@@ -350,6 +357,7 @@ lookup(char *s)
|
||||
{ "menufg", MENUFG},
|
||||
{ "moveamount", MOVEAMOUNT},
|
||||
{ "no", NO},
|
||||
{ "scalefactor", SCALEFACTOR},
|
||||
{ "selfont", FONTSELCOLOR},
|
||||
{ "snapdist", SNAPDIST},
|
||||
{ "sticky", STICKY},
|
||||
|
||||
Reference in New Issue
Block a user