From 4d40065a488d20b90ba4ae941ec515f8f45b7192 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Mon, 20 Jun 2016 09:47:50 +0200 Subject: [PATCH] Drop libevdev usage --- CMakeLists.txt | 1 - src/CMakeLists.txt | 3 --- src/anbox/input_channel.cpp | 35 +---------------------------------- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aaf8342..33960f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ find_package(EGL REQUIRED) find_package(GLESv2 REQUIRED) pkg_check_modules(MIRCLIENT REQUIRED mirclient) -pkg_check_modules(LIBEVDEV REQUIRED libevdev) ##################################################################### # Enable code coverage calculation with gcov/gcovr/lcov diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f13fd85..f335159a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${GIO_INCLUDE_DIRS} ${GIO-UNIX_INCLUDE_DIRS} ${MIRCLIENT_INCLUDE_DIRS} - ${LIBEVDEV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/external/process-cpp-minimal/include @@ -70,8 +69,6 @@ target_link_libraries(anbox-core ${Boost_LIBRARIES} ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES} - ${LIBEVDEV_LDFLAGS} - ${LIBEVDEV_LIBRARIES} pthread process-cpp OpenglRender) diff --git a/src/anbox/input_channel.cpp b/src/anbox/input_channel.cpp index f8793c60..b48ec5e2 100644 --- a/src/anbox/input_channel.cpp +++ b/src/anbox/input_channel.cpp @@ -22,54 +22,21 @@ #include -#include -#include - namespace anbox { InputChannel::InputChannel() : dev_(nullptr) { } InputChannel::~InputChannel() { - if (dev_) - libevdev_uinput_destroy(dev_); } void InputChannel::setup(int width, int height) { - DEBUG(""); - auto dev = libevdev_new(); - libevdev_set_name(dev, "anbox-tp"); - - libevdev_enable_event_type(dev, EV_ABS); - struct input_absinfo mt_tracking_id = { 0, 0, 255, 0, 0, 0 }; - libevdev_enable_event_code(dev, EV_ABS, ABS_MT_TRACKING_ID, &mt_tracking_id); - struct input_absinfo mt_slot = { 0, 0, 255, 0, 0, 0 }; - libevdev_enable_event_code(dev, EV_ABS, ABS_MT_SLOT, &mt_slot); - struct input_absinfo mt_pos_x = { 0, 0, width, 0, 0, 0 }; - libevdev_enable_event_code(dev, EV_ABS, ABS_MT_POSITION_X, &mt_pos_x); - struct input_absinfo mt_pos_y = { 0, 0, height, 0, 0, 0 }; - libevdev_enable_event_code(dev, EV_ABS, ABS_MT_POSITION_Y, &mt_pos_y); - struct input_absinfo mt_pressure = { 0, 0, 5, 0, 0, 0 }; - libevdev_enable_event_code(dev, EV_ABS, ABS_MT_PRESSURE, &mt_pressure); - - libevdev_enable_event_type(dev, EV_SYN); - - libevdev_enable_property(dev, INPUT_PROP_DIRECT); - - if (libevdev_uinput_create_from_device(dev, LIBEVDEV_UINPUT_OPEN_MANAGED, &dev_) < 0) { - libevdev_free(dev); - BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create uinput based device")); - } } void InputChannel::push_event(const Event &event) { - libevdev_uinput_write_event(dev_, event.type, event.code, event.value); } std::string InputChannel::dev_path() const { - if (!dev_) - return ""; - - return std::string(libevdev_uinput_get_devnode(dev_)); + return ""; } } // namespace anbox -- GitLab