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

Make window name and window class separate parameters to conf_autogroup.

Browse Source 
No functional change, but will be used shortly.

ok okan@
This commit is contained in:
kspillner 2015-05-17 04:34:01 +00:00
parent 557cd382dc
commit d328f63c7d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calmwm.h
View File

@ -500,7 +500,8 @@ void menuq_clear(struct menu_q *);
int parse_config(const char *, struct conf *); int parse_config(const char *, struct conf *);
void conf_atoms(void); void conf_atoms(void);
void conf_autogroup(struct conf *, int, const char *); void conf_autogroup(struct conf *, int, const char *,
const char *);
int conf_bind_kbd(struct conf *, const char *, int conf_bind_kbd(struct conf *, const char *,
const char *); const char *);
int conf_bind_mouse(struct conf *, const char *, int conf_bind_mouse(struct conf *, const char *,

19
conf.c
View File

@ -71,19 +71,28 @@ conf_cmd_remove(struct conf *c, const char *name)
} }
} }
void void
conf_autogroup(struct conf *c, int num, const char *val) conf_autogroup(struct conf *c, int num, const char *name, const char *class)
{ {
struct autogroupwin *aw; struct autogroupwin *aw;
char *p; char *p;
aw = xmalloc(sizeof(*aw)); aw = xmalloc(sizeof(*aw));
if ((p = strchr(val, ',')) == NULL) { if ((p = strchr(class, ',')) == NULL) {
aw->name = NULL; if (name == NULL)
aw->class = xstrdup(val); aw->name = NULL;
else
aw->name = xstrdup(name);
aw->class = xstrdup(class);
} else { } else {
*(p++) = '\0'; *(p++) = '\0';
aw->name = xstrdup(val);
if (name == NULL)
aw->name = xstrdup(class);
else
aw->name = xstrdup(name);
aw->class = xstrdup(p); aw->class = xstrdup(p);
} }
aw->num = num; aw->num = num;

2
parse.y
View File

@ -154,7 +154,7 @@ main : FONTNAME STRING {
free($3); free($3);
YYERROR; YYERROR;
} }
conf_autogroup(conf, $2, $3); conf_autogroup(conf, $2, NULL, $3);
free($3); free($3);
} }
| IGNORE STRING { | IGNORE STRING {