e3913093b6
The hidden_state and mode of each i3bar instance can now be controlled from within i3.
Therefore, two new i3 command were introduced:
_
bar hidden_state show|hide|toggle [<bar_id>]
show: always show the bar
hide: normal hide mode
toggle: toggle between show and hide (individually for each bar)
_
bar mode dock|hide|invisible|toggle [<bar_id>]
hide,dock: like before
invisible: always keep the bar hidden
toggle: toggle between dock and hide (individually for each bar)
This patch introduces a hidden_state ("hidden_state hide|show") in the
barconfig, which indicates the current hidden_state of each i3bar
instance. It only affects the bar when in hide mode. Additionally, a new
invisible mode was introduced. In order to change the hidden_state or
mode of the bar from i3, a barconfig-update event was introduced, for
which a bar can subscribe and the bar then gets notified about the
currently set hidden_state and mode in its barconfig.
For convenience, an id field ("id <bar_id>") was added to the barconfig, where one can
set the desired id for the corresponding bar. If the id is not specified, i3 will
deterministically choose an id; otherwise, with the previous random approach for finding
a new id, which is actually not shared with i3bar, as it would determine its id on
startup, the event-subscription would be destroyed on reload. Still, this issue remains
when manually changing the bar_id in the config and then reloading.
fixes #833, #651
175 lines
6.2 KiB
Raku
175 lines
6.2 KiB
Raku
#!perl
|
||
# vim:ts=4:sw=4:expandtab
|
||
#
|
||
# Please read the following documents before working on tests:
|
||
# • http://build.i3wm.org/docs/testsuite.html
|
||
# (or docs/testsuite)
|
||
#
|
||
# • http://build.i3wm.org/docs/lib-i3test.html
|
||
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
||
#
|
||
# • http://build.i3wm.org/docs/ipc.html
|
||
# (or docs/ipc)
|
||
#
|
||
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
||
# (unless you are already familiar with Perl)
|
||
#
|
||
# Tests the standalone parser binary to see if it calls the right code when
|
||
# confronted with various commands, if it prints proper error messages for
|
||
# wrong commands and if it terminates in every case.
|
||
#
|
||
use i3test i3_autostart => 0;
|
||
|
||
sub parser_calls {
|
||
my ($command) = @_;
|
||
|
||
# TODO: use a timeout, so that we can error out if it doesn’t terminate
|
||
# TODO: better way of passing arguments
|
||
my $stdout = qx(../test.commands_parser '$command' 2>&1 >&-);
|
||
|
||
# Filter out all debugging output.
|
||
my @lines = split("\n", $stdout);
|
||
@lines = grep { not /^# / } @lines;
|
||
|
||
# The criteria management calls are irrelevant and not what we want to test
|
||
# in the first place.
|
||
@lines = grep { !(/cmd_criteria_init()/ || /cmd_criteria_match_windows/) } @lines;
|
||
return join("\n", @lines);
|
||
}
|
||
|
||
################################################################################
|
||
# 1: First that the parser properly recognizes commands which are ok.
|
||
################################################################################
|
||
|
||
# The first call has only a single command, the following ones are consolidated
|
||
# for performance.
|
||
is(parser_calls('move workspace 3'),
|
||
'cmd_move_con_to_workspace_name(3)',
|
||
'single number (move workspace 3) ok');
|
||
|
||
is(parser_calls(
|
||
'move to workspace 3; ' .
|
||
'move window to workspace 3; ' .
|
||
'move container to workspace 3; ' .
|
||
'move workspace foobar; ' .
|
||
'move workspace torrent; ' .
|
||
'move workspace to output LVDS1; ' .
|
||
'move workspace 3: foobar; ' .
|
||
'move workspace "3: foobar"; ' .
|
||
'move workspace "3: foobar, baz"; '),
|
||
"cmd_move_con_to_workspace_name(3)\n" .
|
||
"cmd_move_con_to_workspace_name(3)\n" .
|
||
"cmd_move_con_to_workspace_name(3)\n" .
|
||
"cmd_move_con_to_workspace_name(foobar)\n" .
|
||
"cmd_move_con_to_workspace_name(torrent)\n" .
|
||
"cmd_move_workspace_to_output(LVDS1)\n" .
|
||
"cmd_move_con_to_workspace_name(3: foobar)\n" .
|
||
"cmd_move_con_to_workspace_name(3: foobar)\n" .
|
||
"cmd_move_con_to_workspace_name(3: foobar, baz)",
|
||
'move ok');
|
||
|
||
is(parser_calls('move workspace 3: foobar, nop foo'),
|
||
"cmd_move_con_to_workspace_name(3: foobar)\n" .
|
||
"cmd_nop(foo)",
|
||
'multiple ops (move workspace 3: foobar, nop foo) ok');
|
||
|
||
is(parser_calls(
|
||
'exec i3-sensible-terminal; ' .
|
||
'exec --no-startup-id i3-sensible-terminal'),
|
||
"cmd_exec((null), i3-sensible-terminal)\n" .
|
||
"cmd_exec(--no-startup-id, i3-sensible-terminal)",
|
||
'exec ok');
|
||
|
||
is(parser_calls(
|
||
'resize shrink left; ' .
|
||
'resize shrink left 25 px; ' .
|
||
'resize shrink left 25 px or 33 ppt; ' .
|
||
'resize shrink left 25'),
|
||
"cmd_resize(shrink, left, 10, 10)\n" .
|
||
"cmd_resize(shrink, left, 25, 10)\n" .
|
||
"cmd_resize(shrink, left, 25, 33)\n" .
|
||
"cmd_resize(shrink, left, 25, 10)",
|
||
'simple resize ok');
|
||
|
||
is(parser_calls('resize shrink left 25 px or 33 ppt,'),
|
||
'cmd_resize(shrink, left, 25, 33)',
|
||
'trailing comma resize ok');
|
||
|
||
is(parser_calls('resize shrink left 25 px or 33 ppt;'),
|
||
'cmd_resize(shrink, left, 25, 33)',
|
||
'trailing semicolon resize ok');
|
||
|
||
is(parser_calls('[con_mark=yay] focus'),
|
||
"cmd_criteria_add(con_mark, yay)\n" .
|
||
"cmd_focus()",
|
||
'criteria focus ok');
|
||
|
||
is(parser_calls("[con_mark=yay con_mark=bar] focus"),
|
||
"cmd_criteria_add(con_mark, yay)\n" .
|
||
"cmd_criteria_add(con_mark, bar)\n" .
|
||
"cmd_focus()",
|
||
'criteria focus ok');
|
||
|
||
is(parser_calls("[con_mark=yay\tcon_mark=bar] focus"),
|
||
"cmd_criteria_add(con_mark, yay)\n" .
|
||
"cmd_criteria_add(con_mark, bar)\n" .
|
||
"cmd_focus()",
|
||
'criteria focus ok');
|
||
|
||
is(parser_calls("[con_mark=yay\tcon_mark=bar]\tfocus"),
|
||
"cmd_criteria_add(con_mark, yay)\n" .
|
||
"cmd_criteria_add(con_mark, bar)\n" .
|
||
"cmd_focus()",
|
||
'criteria focus ok');
|
||
|
||
is(parser_calls('[con_mark="yay"] focus'),
|
||
"cmd_criteria_add(con_mark, yay)\n" .
|
||
"cmd_focus()",
|
||
'quoted criteria focus ok');
|
||
|
||
# Make sure trailing whitespace is stripped off: While this is not an issue for
|
||
# commands being parsed due to the configuration, people might send IPC
|
||
# commands with leading or trailing newlines.
|
||
is(parser_calls("workspace test\n"),
|
||
'cmd_workspace_name(test)',
|
||
'trailing whitespace stripped off ok');
|
||
|
||
is(parser_calls("\nworkspace test"),
|
||
'cmd_workspace_name(test)',
|
||
'trailing whitespace stripped off ok');
|
||
|
||
################################################################################
|
||
# 2: Verify that the parser spits out the right error message on commands which
|
||
# are not ok.
|
||
################################################################################
|
||
|
||
is(parser_calls('unknown_literal'),
|
||
"ERROR: Expected one of these tokens: <end>, '[', 'move', 'exec', 'exit', 'restart', 'reload', 'border', 'layout', 'append_layout', 'workspace', 'focus', 'kill', 'open', 'fullscreen', 'split', 'floating', 'mark', 'resize', 'rename', 'nop', 'scratchpad', 'mode', 'bar'\n" .
|
||
"ERROR: Your command: unknown_literal\n" .
|
||
"ERROR: ^^^^^^^^^^^^^^^",
|
||
'error for unknown literal ok');
|
||
|
||
is(parser_calls('move something to somewhere'),
|
||
"ERROR: Expected one of these tokens: 'window', 'container', 'to', 'workspace', 'output', 'scratchpad', 'left', 'right', 'up', 'down', 'position', 'absolute'\n" .
|
||
"ERROR: Your command: move something to somewhere\n" .
|
||
"ERROR: ^^^^^^^^^^^^^^^^^^^^^^",
|
||
'error for unknown literal ok');
|
||
|
||
################################################################################
|
||
# 3: Verify that escaping of double quotes works correctly
|
||
################################################################################
|
||
|
||
is(parser_calls('workspace "foo"'),
|
||
'cmd_workspace_name(foo)',
|
||
'Command with simple double quotes ok');
|
||
|
||
is(parser_calls('workspace "foo'),
|
||
'cmd_workspace_name(foo)',
|
||
'Command without ending double quotes ok');
|
||
|
||
is(parser_calls('workspace "foo \"bar"'),
|
||
'cmd_workspace_name(foo "bar)',
|
||
'Command with escaped double quotes ok');
|
||
|
||
done_testing;
|