summary refs log tree commit diff
path: root/src/main.rs
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2019-11-22 17:34:58 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-11 00:25:55 +0000
commit65b98f1ccc2ce1d52c12f75a224a259fd399e555 (patch)
tree0e73ceacdb9385cb44521a94303230aec3d8f36a /src/main.rs
parent2767223fdbcf189ccebbffbec8b3a0f254d9d40e (diff)
downloadcrosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar.gz
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar.bz2
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar.lz
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar.xz
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.tar.zst
crosvm-65b98f1ccc2ce1d52c12f75a224a259fd399e555.zip
utilize EventDevices to make virtio-input devices
BUG=chromium:1023975
TEST=./build_test

Change-Id: I10267e535d4d1dae90b2b5f30db046c388791a16
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1930409
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main.rs b/src/main.rs
index 9c97c4d..7f12841 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -511,6 +511,12 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
             }
             cfg.x_display = Some(value.unwrap().to_owned());
         }
+        "display-window-keyboard" => {
+            cfg.display_window_keyboard = true;
+        }
+        "display-window-mouse" => {
+            cfg.display_window_mouse = true;
+        }
         "socket" => {
             if cfg.socket_path.is_some() {
                 return Err(argument::Error::TooManyArguments(
@@ -931,6 +937,8 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> {
                           "),
           Argument::value("syslog-tag", "TAG", "When logging to syslog, use the provided tag."),
           Argument::value("x-display", "DISPLAY", "X11 display name to use."),
+          Argument::flag("display-window-keyboard", "Capture keyboard input from the display window."),
+          Argument::flag("display-window-mouse", "Capture keyboard input from the display window."),
           Argument::value("wayland-sock", "PATH", "Path to the Wayland socket to use."),
           #[cfg(feature = "wl-dmabuf")]
           Argument::flag("wayland-dmabuf", "Enable support for DMABufs in Wayland device."),