| 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 "ui/events/x/touch_factory_x11.h" | 5 #include "ui/events/x/touch_factory_x11.h" |
| 6 | 6 |
| 7 #include <X11/Xatom.h> | 7 #include <X11/Xatom.h> |
| 8 #include <X11/cursorfont.h> | 8 #include <X11/cursorfont.h> |
| 9 #include <X11/extensions/XInput.h> | 9 #include <X11/extensions/XInput.h> |
| 10 #include <X11/extensions/XInput2.h> | 10 #include <X11/extensions/XInput2.h> |
| 11 #include <X11/extensions/XIproto.h> | 11 #include <X11/extensions/XIproto.h> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/logging.h" | 16 #include "base/logging.h" |
| 17 #include "base/memory/singleton.h" | 17 #include "base/memory/singleton.h" |
| 18 #include "base/message_loop/message_loop.h" | 18 #include "base/message_loop/message_loop.h" |
| 19 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
| 20 #include "base/strings/string_split.h" | 20 #include "base/strings/string_split.h" |
| 21 #include "base/sys_info.h" | 21 #include "base/sys_info.h" |
| 22 #include "ui/events/devices/device_data_manager_x11.h" |
| 22 #include "ui/events/event_switches.h" | 23 #include "ui/events/event_switches.h" |
| 23 #include "ui/events/x/device_data_manager_x11.h" | |
| 24 #include "ui/events/x/device_list_cache_x.h" | 24 #include "ui/events/x/device_list_cache_x.h" |
| 25 #include "ui/gfx/x/x11_types.h" | 25 #include "ui/gfx/x/x11_types.h" |
| 26 | 26 |
| 27 namespace ui { | 27 namespace ui { |
| 28 | 28 |
| 29 TouchFactory::TouchFactory() | 29 TouchFactory::TouchFactory() |
| 30 : pointer_device_lookup_(), | 30 : pointer_device_lookup_(), |
| 31 touch_events_disabled_(false), | 31 touch_events_disabled_(false), |
| 32 touch_device_list_(), | 32 touch_device_list_(), |
| 33 max_touch_points_(-1), | 33 max_touch_points_(-1), |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 if (ptr[0] || ptr[1]) | 346 if (ptr[0] || ptr[1]) |
| 347 touchscreen_ids_.insert(std::make_pair(ptr[0], ptr[1])); | 347 touchscreen_ids_.insert(std::make_pair(ptr[0], ptr[1])); |
| 348 } | 348 } |
| 349 XFree(prop_return); | 349 XFree(prop_return); |
| 350 } | 350 } |
| 351 | 351 |
| 352 XCloseDevice(display, device); | 352 XCloseDevice(display, device); |
| 353 } | 353 } |
| 354 | 354 |
| 355 } // namespace ui | 355 } // namespace ui |
| OLD | NEW |