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

make the old assign syntax trigger an i3-nagbar warning (it’s deprecated), adjust test

This commit is contained in:
Michael Stapelberg 2011-09-11 22:01:36 +01:00
parent e47e100819
commit d82698efa7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cfgparse.y
View File

@ -1076,8 +1076,13 @@ workspace_name:
assign: assign:
TOKASSIGN window_class STR TOKASSIGN window_class STR
{ {
/* TODO: the assign command also needs some kind of new syntax where we /* This is the old, deprecated form of assignments. It’s provided for
* just use criteria. Then deprecate the old form */ * compatibility in version (4.1, 4.2, 4.3) and will be removed
* afterwards. It triggers an i3-nagbar warning starting from 4.1. */
ELOG("You are using the old assign syntax (without criteria). "
"Please see the User's Guide for the new syntax and fix "
"your config file.\n");
context->has_errors = true;
printf("assignment of %s to *%s*\n", $2, $3); printf("assignment of %s to *%s*\n", $2, $3);
char *workspace = $3; char *workspace = $3;
char *criteria = $2; char *criteria = $2;

6
testcases/t/66-assign.t
View File

@ -240,7 +240,9 @@ $tmp = fresh_workspace;
ok(@{get_ws_content($tmp)} == 0, 'no containers yet'); ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
my @docked = get_dock_clients; my @docked = get_dock_clients;
is(@docked, 0, 'no dock clients yet'); # We expect i3-nagbar as the first dock client due to using the old assign
# syntax
is(@docked, 1, 'one dock client yet');
my $window = $x->root->create_child( my $window = $x->root->create_child(
class => WINDOW_CLASS_INPUT_OUTPUT, class => WINDOW_CLASS_INPUT_OUTPUT,
@ -259,7 +261,7 @@ my $content = get_ws($tmp);
ok(@{$content->{nodes}} == 0, 'no tiling cons'); ok(@{$content->{nodes}} == 0, 'no tiling cons');
ok(@{$content->{floating_nodes}} == 0, 'one floating con'); ok(@{$content->{floating_nodes}} == 0, 'one floating con');
@docked = get_dock_clients; @docked = get_dock_clients;
is(@docked, 1, 'no dock clients yet'); is(@docked, 2, 'two dock clients now');
$window->destroy; $window->destroy;