Add configuration option for disabling mouse warping
This patch adds a new configuration option "mouse_warping [output|none]". When mouse warping is disabled, mouse cursor does not jump to middle of current screen when changing workspaces between multiple outputs. This introduces a "special" cursor state, where focus is in one window and cursor on another. Useful for eg. scrolling a web page with mouse wheel while typing into another window on keyboard.
This commit is contained in:
committed by
Michael Stapelberg
parent
f41e81bd96
commit
62ea60ba42
@ -309,6 +309,24 @@ is(parser_calls($config),
|
||||
$expected,
|
||||
'focus_follows_mouse ok');
|
||||
|
||||
################################################################################
|
||||
# mouse_warping
|
||||
################################################################################
|
||||
|
||||
$config = <<'EOT';
|
||||
mouse_warping output
|
||||
mouse_warping none
|
||||
EOT
|
||||
|
||||
$expected = <<'EOT';
|
||||
cfg_mouse_warping(output)
|
||||
cfg_mouse_warping(none)
|
||||
EOT
|
||||
|
||||
is(parser_calls($config),
|
||||
$expected,
|
||||
'mouse_warping ok');
|
||||
|
||||
################################################################################
|
||||
# force_display_urgency_hint
|
||||
################################################################################
|
||||
@ -413,7 +431,7 @@ client.focused #4c7899 #285577 #ffffff #2e9ef4
|
||||
EOT
|
||||
|
||||
my $expected_all_tokens = <<'EOT';
|
||||
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'focus_follows_mouse', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent'
|
||||
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'focus_follows_mouse', 'mouse_warping', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent'
|
||||
EOT
|
||||
|
||||
my $expected_end = <<'EOT';
|
||||
|
52
testcases/t/519-mouse-warping.t
Normal file
52
testcases/t/519-mouse-warping.t
Normal file
@ -0,0 +1,52 @@
|
||||
#!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://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
||||
# (unless you are already familiar with Perl)
|
||||
|
||||
use i3test i3_autostart => 0;
|
||||
|
||||
# Ensure the pointer is at (0, 0) so that we really start on the first
|
||||
# (the left) workspace.
|
||||
$x->root->warp_pointer(0, 0);
|
||||
|
||||
my $config = <<EOT;
|
||||
# i3 config file (v4)
|
||||
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
|
||||
fake-outputs 1024x768+0+0,1024x768+1024+0
|
||||
mouse_warping none
|
||||
EOT
|
||||
my $pid = launch_with_config($config);
|
||||
|
||||
my $i3 = i3(get_socket_path());
|
||||
|
||||
######################################################
|
||||
# Open one workspace with one window on both outputs #
|
||||
######################################################
|
||||
|
||||
# Open window on workspace 1, left output
|
||||
is(focused_ws, '1', 'starting with focus on workspace 1');
|
||||
open_window;
|
||||
|
||||
# Open window on workspace 2, right output
|
||||
cmd 'focus output right';
|
||||
is(focused_ws, '2', 'moved focus to workspace 2');
|
||||
open_window;
|
||||
|
||||
# If mouse_warping is disabled, the pointer has not moved from
|
||||
# position (0, 0) when focus was switched to workspace 2
|
||||
$x->root->warp_pointer(0, 0);
|
||||
|
||||
# Ensure focus is still on workspace 2
|
||||
is(focused_ws, '2', 'warped mouse cursor to (0, 0), focus still in workspace 2');
|
||||
|
||||
# Exit gracefully
|
||||
exit_gracefully($pid);
|
||||
done_testing;
|
Reference in New Issue
Block a user