mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Defaults are split between defines and conf_init(); normalize these, as

Browse Source 
well as give 'sticky' groups its own variable.
This commit is contained in:
okan 2016-10-03 14:42:34 +00:00
parent 792f85cde9
commit 03f5dc219e
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calmwm.h
View File

@ -284,34 +284,26 @@ struct conf {
struct autogroupwin_q autogroupq;
struct ignore_q ignoreq;
struct cmd_q cmdq;
#define CONF_STICKY_GROUPS 0x0001
int flags;
#define CONF_BWIDTH 1
int stickygroups;
int bwidth;
#define CONF_MAMOUNT 1
int mamount;
#define CONF_SNAPDIST 0
int snapdist;
struct gap gap;
char *color[CWM_COLOR_NITEMS];
char known_hosts[PATH_MAX];
#define CONF_FONT "sans-serif:pixelsize=14:bold"
char *font;
Cursor cursor[CF_NITEMS];
};
/* MWM hints */
struct mwm_hints {
unsigned long flags;
unsigned long functions;
unsigned long decorations;
};
#define MWM_HINTS_ELEMENTS 3L
#define MWM_FLAGS_STATUS (1<<3)
#define MWM_FLAGS_FUNCTIONS (1<<0)
#define MWM_FLAGS_DECORATIONS (1<<1)
#define MWM_FLAGS_INPUT_MODE (1<<2)
#define MWM_FLAGS_STATUS (1<<3)
unsigned long flags;
#define MWM_FUNCS_ALL (1<<0)
#define MWM_FUNCS_RESIZE (1<<1)
@ -319,6 +311,7 @@ struct mwm_hints {
#define MWM_FUNCS_MINIMIZE (1<<3)
#define MWM_FUNCS_MAXIMIZE (1<<4)
#define MWM_FUNCS_CLOSE (1<<5)
unsigned long functions;
#define MWM_DECOR_ALL (1<<0)
#define MWM_DECOR_BORDER (1<<1)
@ -327,6 +320,8 @@ struct mwm_hints {
#define MWM_DECOR_MENU (1<<4)
#define MWM_DECOR_MINIMIZE (1<<5)
#define MWM_DECOR_MAXIMIZE (1<<6)
unsigned long decorations;
};
extern Display *X_Dpy;
extern Time Last_Event_Time;

2
client.c
View File

@ -133,7 +133,7 @@ client_init(Window win, struct screen_ctx *sc, int active)
goto out;
if (group_autogroup(cc))
goto out;
if (Conf.flags & CONF_STICKY_GROUPS)
if (Conf.stickygroups)
group_assign(sc->group_active, cc);
else
group_assign(NULL, cc);

9
conf.c
View File

@ -254,9 +254,10 @@ conf_init(struct conf *c)
{
unsigned int i;
c->bwidth = CONF_BWIDTH;
c->mamount = CONF_MAMOUNT;
c->snapdist = CONF_SNAPDIST;
c->stickygroups = 0;
c->bwidth = 1;
c->mamount = 1;
c->snapdist = 0;
TAILQ_INIT(&c->ignoreq);
TAILQ_INIT(&c->cmdq);
@ -279,7 +280,7 @@ conf_init(struct conf *c)
(void)snprintf(c->known_hosts, sizeof(c->known_hosts), "%s/%s",
homedir, ".ssh/known_hosts");
c->font = xstrdup(CONF_FONT);
c->font = xstrdup("sans-serif:pixelsize=14:bold");
}
void

5
parse.y
View File

@ -112,10 +112,7 @@ main : FONTNAME STRING {
conf->font = $2;
}
| STICKY yesno {
if ($2 == 0)
conf->flags &= ~CONF_STICKY_GROUPS;
else
conf->flags |= CONF_STICKY_GROUPS;
conf->stickygroups = $2;
}
| BORDERWIDTH NUMBER {
if ($2 < 0 || $2 > UINT_MAX) {