nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "instance" to matching criteria

This commit is contained in:
Mateusz Poszwa 2011-08-04 17:12:54 +02:00 committed by Michael Stapelberg
parent 3d7f0f4ce3
commit 1913bf0e5c
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cfgparse.l
View File

@ -167,6 +167,7 @@ ctrl { return TOKCONTROL; }
shift { return TOKSHIFT; } shift { return TOKSHIFT; }
class { yy_push_state(WANT_QSTRING); return TOK_CLASS; } class { yy_push_state(WANT_QSTRING); return TOK_CLASS; }
instance { yy_push_state(WANT_QSTRING); return TOK_INSTANCE; }
id { yy_push_state(WANT_QSTRING); return TOK_ID; } id { yy_push_state(WANT_QSTRING); return TOK_ID; }
con_id { yy_push_state(WANT_QSTRING); return TOK_CON_ID; } con_id { yy_push_state(WANT_QSTRING); return TOK_CON_ID; }
con_mark { yy_push_state(WANT_QSTRING); return TOK_MARK; } con_mark { yy_push_state(WANT_QSTRING); return TOK_MARK; }

6
src/cfgparse.y
View File

@ -547,6 +547,7 @@ void parse_file(const char *f) {
%token TOK_MARK "mark" %token TOK_MARK "mark"
%token TOK_CLASS "class" %token TOK_CLASS "class"
%token TOK_INSTANCE "instance"
%token TOK_ID "id" %token TOK_ID "id"
%token TOK_CON_ID "con_id" %token TOK_CON_ID "con_id"
%token TOK_TITLE "title" %token TOK_TITLE "title"
@ -694,6 +695,11 @@ criterion:
printf("criteria: class = %s\n", $3); printf("criteria: class = %s\n", $3);
current_match.class = $3; current_match.class = $3;
} }
| TOK_INSTANCE '=' STR
{
printf("criteria: instance = %s\n", $3);
current_match.instance = $3;
}
| TOK_CON_ID '=' STR | TOK_CON_ID '=' STR
{ {
printf("criteria: id = %s\n", $3); printf("criteria: id = %s\n", $3);

1
src/cmdparse.l
View File

@ -153,6 +153,7 @@ false { return TOK_DISABLE; }
no { return TOK_DISABLE; } no { return TOK_DISABLE; }
class { BEGIN(WANT_QSTRING); return TOK_CLASS; } class { BEGIN(WANT_QSTRING); return TOK_CLASS; }
instance { BEGIN(WANT_QSTRING); return TOK_INSTANCE; }
id { BEGIN(WANT_QSTRING); return TOK_ID; } id { BEGIN(WANT_QSTRING); return TOK_ID; }
con_id { BEGIN(WANT_QSTRING); return TOK_CON_ID; } con_id { BEGIN(WANT_QSTRING); return TOK_CON_ID; }
con_mark { BEGIN(WANT_QSTRING); return TOK_MARK; } con_mark { BEGIN(WANT_QSTRING); return TOK_MARK; }

6
src/cmdparse.y
View File

@ -175,6 +175,7 @@ bool definitelyGreaterThan(float a, float b, float epsilon) {
%token TOK_NOP "nop" %token TOK_NOP "nop"
%token TOK_CLASS "class" %token TOK_CLASS "class"
%token TOK_INSTANCE "instance"
%token TOK_ID "id" %token TOK_ID "id"
%token TOK_CON_ID "con_id" %token TOK_CON_ID "con_id"
%token TOK_TITLE "title" %token TOK_TITLE "title"
@ -300,6 +301,11 @@ criterion:
printf("criteria: class = %s\n", $3); printf("criteria: class = %s\n", $3);
current_match.class = $3; current_match.class = $3;
} }
| TOK_INSTANCE '=' STR
{
printf("criteria: instance = %s\n", $3);
current_match.instance = $3;
}
| TOK_CON_ID '=' STR | TOK_CON_ID '=' STR
{ {
printf("criteria: id = %s\n", $3); printf("criteria: id = %s\n", $3);