OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/input_injector.h" | 5 #include "remoting/host/input_injector.h" |
6 | 6 |
7 #include <X11/extensions/XInput.h> | 7 #include <X11/extensions/XInput.h> |
8 #include <X11/extensions/XTest.h> | 8 #include <X11/extensions/XTest.h> |
9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
10 | 10 |
11 #include <set> | 11 #include <set> |
12 | 12 |
13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
14 #include "base/bind.h" | 14 #include "base/bind.h" |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
16 #include "base/location.h" | 16 #include "base/location.h" |
17 #include "base/logging.h" | |
18 #include "base/single_thread_task_runner.h" | 17 #include "base/single_thread_task_runner.h" |
| 18 #include "remoting/base/logging.h" |
19 #include "remoting/host/clipboard.h" | 19 #include "remoting/host/clipboard.h" |
20 #include "remoting/proto/internal.pb.h" | 20 #include "remoting/proto/internal.pb.h" |
21 #include "third_party/skia/include/core/SkPoint.h" | 21 #include "third_party/skia/include/core/SkPoint.h" |
22 #include "ui/events/keycodes/dom4/keycode_converter.h" | 22 #include "ui/events/keycodes/dom4/keycode_converter.h" |
23 | 23 |
24 namespace remoting { | 24 namespace remoting { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 using protocol::ClipboardEvent; | 28 using protocol::ClipboardEvent; |
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 if (device_info->use == IsXExtensionPointer && | 426 if (device_info->use == IsXExtensionPointer && |
427 strcmp(device_info->name, "Virtual core XTEST pointer") == 0) { | 427 strcmp(device_info->name, "Virtual core XTEST pointer") == 0) { |
428 device_id = device_info->id; | 428 device_id = device_info->id; |
429 device_found = true; | 429 device_found = true; |
430 break; | 430 break; |
431 } | 431 } |
432 } | 432 } |
433 XFreeDeviceList(devices); | 433 XFreeDeviceList(devices); |
434 | 434 |
435 if (!device_found) { | 435 if (!device_found) { |
436 LOG(INFO) << "Cannot find XTest device."; | 436 HOST_LOG << "Cannot find XTest device."; |
437 return; | 437 return; |
438 } | 438 } |
439 | 439 |
440 XDevice* device = XOpenDevice(display_, device_id); | 440 XDevice* device = XOpenDevice(display_, device_id); |
441 if (!device) { | 441 if (!device) { |
442 LOG(ERROR) << "Cannot open XTest device."; | 442 LOG(ERROR) << "Cannot open XTest device."; |
443 return; | 443 return; |
444 } | 444 } |
445 | 445 |
446 int num_device_buttons = XGetDeviceButtonMapping(display_, device, NULL, 0); | 446 int num_device_buttons = XGetDeviceButtonMapping(display_, device, NULL, 0); |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, | 513 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
514 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { | 514 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { |
515 scoped_ptr<InputInjectorLinux> injector( | 515 scoped_ptr<InputInjectorLinux> injector( |
516 new InputInjectorLinux(main_task_runner)); | 516 new InputInjectorLinux(main_task_runner)); |
517 if (!injector->Init()) | 517 if (!injector->Init()) |
518 return scoped_ptr<InputInjector>(); | 518 return scoped_ptr<InputInjector>(); |
519 return injector.PassAs<InputInjector>(); | 519 return injector.PassAs<InputInjector>(); |
520 } | 520 } |
521 | 521 |
522 } // namespace remoting | 522 } // namespace remoting |
OLD | NEW |