Developer Feature: Add Debug Accelerators to Toggle Touchscreen/Touchpad On or Off (CrOS)

ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 
 #include <set>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
@@ skipping 55 matching lines @@
 }  // namespace
 
 ScopedDisableInternalMouseAndKeyboardX11::
     ScopedDisableInternalMouseAndKeyboardX11()
     : touchpad_device_id_(kDeviceIdNone),
       keyboard_device_id_(kDeviceIdNone),
       core_keyboard_device_id_(kDeviceIdNone),
       last_mouse_location_(GetMouseLocationInScreen()) {
 
   ui::DeviceDataManagerX11* device_data_manager =
-      static_cast<ui::DeviceDataManagerX11*>(
-          ui::DeviceDataManager::GetInstance());
+      ui::DeviceDataManagerX11::GetInstance();
   if (device_data_manager->IsXInput2Available()) {
     const XIDeviceList& xi_dev_list =
         ui::DeviceListCacheX11::GetInstance()->GetXI2DeviceList(
             gfx::GetXDisplay());
     for (int i = 0; i < xi_dev_list.count; ++i) {
       std::string device_name(xi_dev_list[i].name);
       base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING, &device_name);
       if (device_name == kInternalTouchpadName) {
-        touchpad_device_id_ = xi_dev_list[i].deviceid;
-        device_data_manager->DisableDevice(touchpad_device_id_);
-        aura::client::GetCursorClient(
-            Shell::GetInstance()->GetPrimaryRootWindow())->HideCursor();
+        if (device_data_manager->IsDeviceEnabled(xi_dev_list[i].deviceid)) {
+          // If the touchpad is already disabled we will do nothing about it.
+          // This will result in doing nothing in the destructor as well since
+          // |touchpad_device_id_| will remain |kDeviceIdNone|.
+          touchpad_device_id_ = xi_dev_list[i].deviceid;
+          device_data_manager->DisableDevice(touchpad_device_id_);
+          aura::client::GetCursorClient(
+              Shell::GetInstance()->GetPrimaryRootWindow())->HideCursor();

[oshima, 2015/10/29 23:38:43]

ditto

[afakhry, 2015/10/30 05:18:03]

Done.

+        }
       } else if (device_name == kCoreKeyboardName) {
         core_keyboard_device_id_ = xi_dev_list[i].deviceid;
         device_data_manager->DisableDevice(core_keyboard_device_id_);
       }
     }
 
     for (const ui::KeyboardDevice& device :
          device_data_manager->keyboard_devices()) {
       if (device.type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) {
         keyboard_device_id_ = device.id;
@@ skipping 11 matching lines @@
   excepted_keys->insert(ui::VKEY_POWER);
   device_data_manager->SetDisabledKeyboardAllowedKeys(excepted_keys.Pass());
   ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
 }
 
 ScopedDisableInternalMouseAndKeyboardX11::
     ~ScopedDisableInternalMouseAndKeyboardX11() {
   ui::DeviceDataManagerX11* device_data_manager =
       static_cast<ui::DeviceDataManagerX11*>(
           ui::DeviceDataManager::GetInstance());
-  if (touchpad_device_id_ != kDeviceIdNone)
+  if (touchpad_device_id_ != kDeviceIdNone) {
     device_data_manager->EnableDevice(touchpad_device_id_);
+    aura::client::GetCursorClient(
+        Shell::GetInstance()->GetPrimaryRootWindow())->ShowCursor();
+  }
   if (keyboard_device_id_ != kDeviceIdNone)
     device_data_manager->EnableDevice(keyboard_device_id_);
   if (core_keyboard_device_id_ != kDeviceIdNone)
     device_data_manager->EnableDevice(core_keyboard_device_id_);
   device_data_manager->SetDisabledKeyboardAllowedKeys(
       scoped_ptr<std::set<ui::KeyboardCode> >());
   ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
 }
 
 void ScopedDisableInternalMouseAndKeyboardX11::WillProcessEvent(
@@ skipping 20 matching lines @@
     // blocked. Move the mouse cursor back to its last known location resulting
     // from an external mouse to prevent the internal touchpad from moving it.
     SetMouseLocationInScreen(last_mouse_location_);
   } else {
     // Track the last location seen from an external mouse event.
     last_mouse_location_ = GetMouseLocationInScreen();
   }
 }
 
 }  // namespace ash