From 425e703dffe2f51380c64cf2db52f656d2ac39f8 Mon Sep 17 00:00:00 2001 From: Martin Graesslin Date: Mon, 12 Oct 2015 16:39:02 +0200 Subject: [PATCH] Drop Android input handling Libinput does work on libhybris enabled devices. There is no need to use Android's input stack. This simplifies our code a lot and increases sharing with normal Linux systems. What's tricky is to convince the system to use libinput through with our logind helper. Logind fails to open the files for us if we start KWin over either ssh or adb shell. We need to get it into a proper session, so only a kwin started through a helper like simplelogin will be able to use libinput. REVIEW: 125608 --- backends/hwcomposer/CMakeLists.txt | 1 - backends/hwcomposer/hwcomposer.json | 4 +- backends/hwcomposer/hwcomposer_backend.cpp | 365 +-------------------- backends/hwcomposer/hwcomposer_backend.h | 5 - cmake/modules/Findlibhybris.cmake | 35 +- 5 files changed, 6 insertions(+), 404 deletions(-) diff --git a/backends/hwcomposer/CMakeLists.txt b/backends/hwcomposer/CMakeLists.txt index 6d6794592c..6181b8eb9c 100644 --- a/backends/hwcomposer/CMakeLists.txt +++ b/backends/hwcomposer/CMakeLists.txt @@ -11,7 +11,6 @@ target_link_libraries(KWinWaylandHwcomposerBackend libhybris::libhardware libhybris::hwcomposer libhybris::hybriseglplatform - libhybris::inputstack libhybris::sync ) diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json index c4d96bcafa..eec46a93e0 100644 --- a/backends/hwcomposer/hwcomposer.json +++ b/backends/hwcomposer/hwcomposer.json @@ -31,5 +31,5 @@ "Name[x-test]": "xxhwcomposerxx", "Name[zh_CN]": "hwcomposer" }, - "input": true -} \ No newline at end of file + "input": false +} diff --git a/backends/hwcomposer/hwcomposer_backend.cpp b/backends/hwcomposer/hwcomposer_backend.cpp index 214aa42e5a..3fa21fe67e 100644 --- a/backends/hwcomposer/hwcomposer_backend.cpp +++ b/backends/hwcomposer/hwcomposer_backend.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . #include "logging.h" #include "screens_hwcomposer.h" #include "composite.h" +#include "virtual_terminal.h" #include "wayland_server.h" // KWayland #include @@ -30,10 +31,6 @@ along with this program. If not, see . // hybris/android #include #include -#include -#include -#include -#include // linux #include @@ -53,338 +50,6 @@ HwcomposerBackend::~HwcomposerBackend() if (m_device) { hwc_close_1(m_device); } - if (m_inputListener) { - android_input_stack_stop(); - android_input_stack_shutdown(); - delete m_inputListener; - } -} - -static uint eventTouchId(Event *event, uint index) -{ - Q_ASSERT(index < event->details.motion.pointer_count); - return event->details.motion.pointer_coordinates[index].id; -} - -static QPointF eventTouchPosition(Event *event, uint index) -{ - Q_ASSERT(index < event->details.motion.pointer_count); - return QPointF(event->details.motion.pointer_coordinates[index].x, - event->details.motion.pointer_coordinates[index].y); -} - -static qint32 translateKey(qint32 key) -{ - static const QHash s_translation = { - {ISCL_KEYCODE_UNKNOWN, KEY_RESERVED}, - {ISCL_KEYCODE_SOFT_LEFT, KEY_RESERVED}, - {ISCL_KEYCODE_SOFT_RIGHT, KEY_RESERVED}, - {ISCL_KEYCODE_HOME, KEY_HOME}, - {ISCL_KEYCODE_BACK, KEY_BACK}, - {ISCL_KEYCODE_CALL, KEY_RESERVED}, - {ISCL_KEYCODE_ENDCALL, KEY_RESERVED}, - {ISCL_KEYCODE_0, KEY_0}, - {ISCL_KEYCODE_1, KEY_1}, - {ISCL_KEYCODE_2, KEY_2}, - {ISCL_KEYCODE_3, KEY_3}, - {ISCL_KEYCODE_4, KEY_4}, - {ISCL_KEYCODE_5, KEY_5}, - {ISCL_KEYCODE_6, KEY_6}, - {ISCL_KEYCODE_7, KEY_7}, - {ISCL_KEYCODE_8, KEY_8}, - {ISCL_KEYCODE_9, KEY_9}, - {ISCL_KEYCODE_STAR, KEY_NUMERIC_STAR}, - {ISCL_KEYCODE_POUND, KEY_NUMERIC_POUND}, - {ISCL_KEYCODE_DPAD_UP, BTN_DPAD_UP}, - {ISCL_KEYCODE_DPAD_DOWN, BTN_DPAD_DOWN}, - {ISCL_KEYCODE_DPAD_LEFT, BTN_DPAD_LEFT}, - {ISCL_KEYCODE_DPAD_RIGHT, BTN_DPAD_RIGHT}, - {ISCL_KEYCODE_DPAD_CENTER, KEY_RESERVED}, - {ISCL_KEYCODE_VOLUME_UP, KEY_VOLUMEUP}, - {ISCL_KEYCODE_VOLUME_DOWN, KEY_VOLUMEDOWN}, - {ISCL_KEYCODE_POWER, KEY_POWER}, - {ISCL_KEYCODE_CAMERA, KEY_CAMERA}, - {ISCL_KEYCODE_CLEAR, KEY_CLEAR}, - {ISCL_KEYCODE_A, KEY_A}, - {ISCL_KEYCODE_B, KEY_B}, - {ISCL_KEYCODE_C, KEY_C}, - {ISCL_KEYCODE_D, KEY_D}, - {ISCL_KEYCODE_E, KEY_E}, - {ISCL_KEYCODE_F, KEY_F}, - {ISCL_KEYCODE_G, KEY_G}, - {ISCL_KEYCODE_H, KEY_H}, - {ISCL_KEYCODE_I, KEY_I}, - {ISCL_KEYCODE_J, KEY_J}, - {ISCL_KEYCODE_K, KEY_K}, - {ISCL_KEYCODE_L, KEY_L}, - {ISCL_KEYCODE_M, KEY_M}, - {ISCL_KEYCODE_N, KEY_N}, - {ISCL_KEYCODE_O, KEY_O}, - {ISCL_KEYCODE_P, KEY_P}, - {ISCL_KEYCODE_Q, KEY_Q}, - {ISCL_KEYCODE_R, KEY_R}, - {ISCL_KEYCODE_S, KEY_S}, - {ISCL_KEYCODE_T, KEY_T}, - {ISCL_KEYCODE_U, KEY_U}, - {ISCL_KEYCODE_V, KEY_V}, - {ISCL_KEYCODE_W, KEY_W}, - {ISCL_KEYCODE_X, KEY_X}, - {ISCL_KEYCODE_Y, KEY_Y}, - {ISCL_KEYCODE_Z, KEY_Z}, - {ISCL_KEYCODE_COMMA, KEY_COMMA}, - {ISCL_KEYCODE_PERIOD, KEY_DOT}, - {ISCL_KEYCODE_ALT_LEFT, KEY_LEFTALT}, - {ISCL_KEYCODE_ALT_RIGHT, KEY_RIGHTALT}, - {ISCL_KEYCODE_SHIFT_LEFT, KEY_LEFTSHIFT}, - {ISCL_KEYCODE_SHIFT_RIGHT, KEY_RIGHTSHIFT}, - {ISCL_KEYCODE_TAB, KEY_TAB}, - {ISCL_KEYCODE_SPACE, KEY_SPACE}, - {ISCL_KEYCODE_SYM, KEY_RESERVED}, - {ISCL_KEYCODE_EXPLORER, KEY_RESERVED}, - {ISCL_KEYCODE_ENVELOPE, KEY_EMAIL}, - {ISCL_KEYCODE_ENTER, KEY_ENTER}, - {ISCL_KEYCODE_DEL, KEY_DELETE}, - {ISCL_KEYCODE_GRAVE, KEY_GRAVE}, - {ISCL_KEYCODE_MINUS, KEY_MINUS}, - {ISCL_KEYCODE_EQUALS, KEY_EQUAL}, - {ISCL_KEYCODE_LEFT_BRACKET, KEY_LEFTBRACE}, - {ISCL_KEYCODE_RIGHT_BRACKET, KEY_RIGHTBRACE}, - {ISCL_KEYCODE_BACKSLASH, KEY_BACKSLASH}, - {ISCL_KEYCODE_SEMICOLON, KEY_SEMICOLON}, - {ISCL_KEYCODE_APOSTROPHE, KEY_APOSTROPHE}, - {ISCL_KEYCODE_SLASH, KEY_SLASH}, - {ISCL_KEYCODE_AT, KEY_RESERVED}, - {ISCL_KEYCODE_NUM, KEY_RESERVED}, - {ISCL_KEYCODE_HEADSETHOOK, KEY_RESERVED}, - {ISCL_KEYCODE_FOCUS, KEY_CAMERA_FOCUS}, - {ISCL_KEYCODE_PLUS, KEY_RESERVED}, - {ISCL_KEYCODE_MENU, KEY_MENU}, - {ISCL_KEYCODE_NOTIFICATION, KEY_RESERVED}, - {ISCL_KEYCODE_SEARCH, KEY_SEARCH}, - {ISCL_KEYCODE_MEDIA_PLAY_PAUSE, KEY_PLAYPAUSE}, - {ISCL_KEYCODE_MEDIA_STOP, KEY_STOPCD}, - {ISCL_KEYCODE_MEDIA_NEXT, KEY_NEXTSONG}, - {ISCL_KEYCODE_MEDIA_PREVIOUS, KEY_PREVIOUSSONG}, - {ISCL_KEYCODE_MEDIA_REWIND, KEY_REWIND}, - {ISCL_KEYCODE_MEDIA_FAST_FORWARD, KEY_FASTFORWARD}, - {ISCL_KEYCODE_MUTE, KEY_MUTE}, - {ISCL_KEYCODE_PAGE_UP, KEY_PAGEUP}, - {ISCL_KEYCODE_PAGE_DOWN, KEY_PAGEDOWN}, - {ISCL_KEYCODE_PICTSYMBOLS, KEY_RESERVED}, - {ISCL_KEYCODE_SWITCH_CHARSET, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_A, BTN_A}, - {ISCL_KEYCODE_BUTTON_B, BTN_B}, - {ISCL_KEYCODE_BUTTON_C, BTN_C}, - {ISCL_KEYCODE_BUTTON_X, BTN_X}, - {ISCL_KEYCODE_BUTTON_Y, BTN_Y}, - {ISCL_KEYCODE_BUTTON_Z, BTN_Z}, - {ISCL_KEYCODE_BUTTON_L1, BTN_TL}, - {ISCL_KEYCODE_BUTTON_R1, BTN_TR}, - {ISCL_KEYCODE_BUTTON_L2, BTN_TL2}, - {ISCL_KEYCODE_BUTTON_R2, BTN_TR2}, - {ISCL_KEYCODE_BUTTON_THUMBL, BTN_THUMBL}, - {ISCL_KEYCODE_BUTTON_THUMBR, BTN_THUMBR}, - {ISCL_KEYCODE_BUTTON_START, BTN_START}, - {ISCL_KEYCODE_BUTTON_SELECT, BTN_SELECT}, - {ISCL_KEYCODE_BUTTON_MODE, BTN_MODE}, - {ISCL_KEYCODE_ESCAPE, KEY_ESC}, - {ISCL_KEYCODE_FORWARD_DEL, KEY_RESERVED}, - {ISCL_KEYCODE_CTRL_LEFT, KEY_LEFTCTRL}, - {ISCL_KEYCODE_CTRL_RIGHT, KEY_RIGHTCTRL}, - {ISCL_KEYCODE_CAPS_LOCK, KEY_CAPSLOCK}, - {ISCL_KEYCODE_SCROLL_LOCK, KEY_SCROLLLOCK}, - {ISCL_KEYCODE_META_LEFT, KEY_LEFTMETA}, - {ISCL_KEYCODE_META_RIGHT, KEY_RIGHTMETA}, - {ISCL_KEYCODE_FUNCTION, KEY_RESERVED}, - {ISCL_KEYCODE_SYSRQ, KEY_SYSRQ}, - {ISCL_KEYCODE_BREAK, KEY_RESERVED}, - {ISCL_KEYCODE_MOVE_HOME, KEY_HOME}, - {ISCL_KEYCODE_MOVE_END, KEY_END}, - {ISCL_KEYCODE_INSERT, KEY_INSERT}, - {ISCL_KEYCODE_FORWARD, KEY_RESERVED}, - {ISCL_KEYCODE_MEDIA_PLAY, KEY_PLAYCD}, - {ISCL_KEYCODE_MEDIA_PAUSE, KEY_PAUSECD}, - {ISCL_KEYCODE_MEDIA_CLOSE, KEY_CLOSECD}, - {ISCL_KEYCODE_MEDIA_EJECT, KEY_EJECTCD}, - {ISCL_KEYCODE_MEDIA_RECORD, KEY_RECORD}, - {ISCL_KEYCODE_F1, KEY_F1}, - {ISCL_KEYCODE_F2, KEY_F2}, - {ISCL_KEYCODE_F3, KEY_F3}, - {ISCL_KEYCODE_F4, KEY_F4}, - {ISCL_KEYCODE_F5, KEY_F5}, - {ISCL_KEYCODE_F6, KEY_F6}, - {ISCL_KEYCODE_F7, KEY_F7}, - {ISCL_KEYCODE_F8, KEY_F8}, - {ISCL_KEYCODE_F9, KEY_F9}, - {ISCL_KEYCODE_F10, KEY_F10}, - {ISCL_KEYCODE_F11, KEY_F11}, - {ISCL_KEYCODE_F12, KEY_F12}, - {ISCL_KEYCODE_NUM_LOCK, KEY_NUMLOCK}, - {ISCL_KEYCODE_NUMPAD_0, KEY_KP0}, - {ISCL_KEYCODE_NUMPAD_1, KEY_KP1}, - {ISCL_KEYCODE_NUMPAD_2, KEY_KP2}, - {ISCL_KEYCODE_NUMPAD_3, KEY_KP3}, - {ISCL_KEYCODE_NUMPAD_4, KEY_KP4}, - {ISCL_KEYCODE_NUMPAD_5, KEY_KP5}, - {ISCL_KEYCODE_NUMPAD_6, KEY_KP6}, - {ISCL_KEYCODE_NUMPAD_7, KEY_KP7}, - {ISCL_KEYCODE_NUMPAD_8, KEY_KP8}, - {ISCL_KEYCODE_NUMPAD_9, KEY_KP9}, - {ISCL_KEYCODE_NUMPAD_DIVIDE, KEY_KPSLASH}, - {ISCL_KEYCODE_NUMPAD_MULTIPLY, KEY_KPASTERISK}, - {ISCL_KEYCODE_NUMPAD_SUBTRACT, KEY_KPMINUS}, - {ISCL_KEYCODE_NUMPAD_ADD, KEY_KPPLUS}, - {ISCL_KEYCODE_NUMPAD_DOT, KEY_KPDOT}, - {ISCL_KEYCODE_NUMPAD_COMMA, KEY_KPCOMMA}, - {ISCL_KEYCODE_NUMPAD_ENTER, KEY_KPENTER}, - {ISCL_KEYCODE_NUMPAD_EQUALS, KEY_KPEQUAL}, - {ISCL_KEYCODE_NUMPAD_LEFT_PAREN, KEY_KPLEFTPAREN}, - {ISCL_KEYCODE_NUMPAD_RIGHT_PAREN, KEY_KPRIGHTPAREN}, - {ISCL_KEYCODE_VOLUME_MUTE, KEY_MUTE}, - {ISCL_KEYCODE_INFO, KEY_RESERVED}, - {ISCL_KEYCODE_CHANNEL_UP, KEY_CHANNELUP}, - {ISCL_KEYCODE_CHANNEL_DOWN, KEY_CHANNELDOWN}, - {ISCL_KEYCODE_ZOOM_IN, KEY_ZOOMIN}, - {ISCL_KEYCODE_ZOOM_OUT, KEY_ZOOMOUT}, - {ISCL_KEYCODE_TV, KEY_RESERVED}, - {ISCL_KEYCODE_WINDOW, KEY_RESERVED}, - {ISCL_KEYCODE_GUIDE, KEY_RESERVED}, - {ISCL_KEYCODE_DVR, KEY_RESERVED}, - {ISCL_KEYCODE_BOOKMARK, KEY_RESERVED}, - {ISCL_KEYCODE_CAPTIONS, KEY_RESERVED}, - {ISCL_KEYCODE_SETTINGS, KEY_RESERVED}, - {ISCL_KEYCODE_TV_POWER, KEY_RESERVED}, - {ISCL_KEYCODE_TV_INPUT, KEY_RESERVED}, - {ISCL_KEYCODE_STB_POWER, KEY_RESERVED}, - {ISCL_KEYCODE_STB_INPUT, KEY_RESERVED}, - {ISCL_KEYCODE_AVR_POWER, KEY_RESERVED}, - {ISCL_KEYCODE_AVR_INPUT, KEY_RESERVED}, - {ISCL_KEYCODE_PROG_RED, KEY_RED}, - {ISCL_KEYCODE_PROG_GREEN, KEY_GREEN}, - {ISCL_KEYCODE_PROG_YELLOW, KEY_YELLOW}, - {ISCL_KEYCODE_PROG_BLUE, KEY_BLUE}, - {ISCL_KEYCODE_APP_SWITCH, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_1, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_2, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_3, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_4, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_5, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_6, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_7, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_8, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_9, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_10, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_11, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_12, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_13, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_14, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_15, KEY_RESERVED}, - {ISCL_KEYCODE_BUTTON_16, KEY_RESERVED}, - {ISCL_KEYCODE_LANGUAGE_SWITCH, KEY_RESERVED}, - {ISCL_KEYCODE_MANNER_MODE, KEY_RESERVED}, - {ISCL_KEYCODE_3D_MODE, KEY_RESERVED}, - {ISCL_KEYCODE_CONTACTS, KEY_ADDRESSBOOK}, - {ISCL_KEYCODE_CALENDAR, KEY_CALENDAR}, - {ISCL_KEYCODE_MUSIC, KEY_MEDIA}, - {ISCL_KEYCODE_CALCULATOR, KEY_CALC} - }; - auto it = s_translation.find(key); - if (it == s_translation.end()) { - return KEY_RESERVED; - } - return it.value(); -} - -void HwcomposerBackend::inputEvent(Event *event, void *context) -{ - HwcomposerBackend *backend = reinterpret_cast(context); - switch (event->type) { - case KEY_EVENT_TYPE: - switch (event->action) { - case ISCL_KEY_EVENT_ACTION_DOWN: { - const qint32 key = translateKey(event->details.key.key_code); - if (key == KEY_RESERVED) { - break; - } - if (key == KEY_POWER) { - // this key is handled internally - // TODO: trigger timer to decide what should be done: short press/release (un)blank screen - // long press should emit the normal key pressed - break; - } - QMetaObject::invokeMethod(backend, "keyboardKeyPressed", Qt::QueuedConnection, - Q_ARG(quint32, key), - Q_ARG(quint32, event->details.key.event_time)); - break; - } - case ISCL_KEY_EVENT_ACTION_UP: { - const qint32 key = translateKey(event->details.key.key_code); - if (key == KEY_RESERVED) { - break; - } - if (key == KEY_POWER) { - // this key is handled internally - QMetaObject::invokeMethod(backend, "toggleBlankOutput", Qt::QueuedConnection); - break; - } - QMetaObject::invokeMethod(backend, "keyboardKeyReleased", Qt::QueuedConnection, - Q_ARG(quint32, key), - Q_ARG(quint32, event->details.key.event_time)); - break; - } - case ISCL_KEY_EVENT_ACTION_MULTIPLE: // TODO: implement - default: - break; - } - break; - case MOTION_EVENT_TYPE: { - const uint buttonIndex = (event->action & ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> ISCL_MOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; - switch (event->action & ISCL_MOTION_EVENT_ACTION_MASK) { - case ISCL_MOTION_EVENT_ACTION_DOWN: - case ISCL_MOTION_EVENT_ACTION_POINTER_DOWN: - QMetaObject::invokeMethod(backend, "touchDown", Qt::QueuedConnection, - Q_ARG(qint32, eventTouchId(event, buttonIndex)), - Q_ARG(QPointF, eventTouchPosition(event, buttonIndex)), - Q_ARG(quint32, event->details.motion.event_time)); - QMetaObject::invokeMethod(backend, "touchFrame", Qt::QueuedConnection); - break; - case ISCL_MOTION_EVENT_ACTION_UP: - case ISCL_MOTION_EVENT_ACTION_POINTER_UP: { - // first update position - up events can contain additional motion events - QMetaObject::invokeMethod(backend, "touchMotion", Qt::QueuedConnection, - Q_ARG(qint32, eventTouchId(event, buttonIndex)), - Q_ARG(QPointF, eventTouchPosition(event, buttonIndex)), - Q_ARG(quint32, event->details.motion.event_time)); - QMetaObject::invokeMethod(backend, "touchFrame", Qt::QueuedConnection); - - QMetaObject::invokeMethod(backend, "touchUp", Qt::QueuedConnection, - Q_ARG(qint32, eventTouchId(event, buttonIndex)), - Q_ARG(quint32, event->details.motion.event_time)); - break; - } - case ISCL_MOTION_EVENT_ACTION_MOVE: - //move events affect all pointers - for (uint i = 0 ; i < event->details.motion.pointer_count ; i++) { - QMetaObject::invokeMethod(backend, "touchMotion", Qt::QueuedConnection, - Q_ARG(qint32, eventTouchId(event, i)), - Q_ARG(QPointF, eventTouchPosition(event, i)), - Q_ARG(quint32, event->details.motion.event_time)); - } - QMetaObject::invokeMethod(backend, "touchFrame", Qt::QueuedConnection); - break; - case ISCL_MOTION_EVENT_ACTION_CANCEL: - QMetaObject::invokeMethod(backend, "touchCancel", Qt::QueuedConnection); - break; - default: - // TODO: implement - break; - } - break; - } - case HW_SWITCH_EVENT_TYPE: - qCDebug(KWIN_HWCOMPOSER) << "HW switch event:"; - break; - } } static KWayland::Server::OutputInterface *createOutput(hwc_composer_device_1_t *device) @@ -458,36 +123,12 @@ void HwcomposerBackend::init() qCDebug(KWIN_HWCOMPOSER) << "Display size:" << m_displaySize; qCDebug(KWIN_HWCOMPOSER) << "Refresh rate:" << m_refreshRate; - initInput(); - + VirtualTerminal::create(this); + VirtualTerminal::self()->init(); emit screensQueried(); setReady(true); } -void HwcomposerBackend::initInput() -{ - Q_ASSERT(!m_inputListener); - m_inputListener = new AndroidEventListener; - m_inputListener->on_new_event = inputEvent; - m_inputListener->context = this; - - struct InputStackConfiguration config = { - true, - 10000, - m_displaySize.width(), - m_displaySize.height() - }; - - android_input_stack_initialize(m_inputListener, &config); - android_input_stack_start(); - - // we don't know what is really supported, but there is touch - // and kind of keyboard - waylandServer()->seat()->setHasPointer(true); - waylandServer()->seat()->setHasKeyboard(true); - waylandServer()->seat()->setHasTouch(true); -} - void HwcomposerBackend::toggleBlankOutput() { if (!m_device) { diff --git a/backends/hwcomposer/hwcomposer_backend.h b/backends/hwcomposer/hwcomposer_backend.h index 4c68b39cd7..a3eae2de1f 100644 --- a/backends/hwcomposer/hwcomposer_backend.h +++ b/backends/hwcomposer/hwcomposer_backend.h @@ -29,8 +29,6 @@ along with this program. If not, see . typedef struct hwc_display_contents_1 hwc_display_contents_1_t; typedef struct hwc_layer_1 hwc_layer_1_t; typedef struct hwc_composer_device_1 hwc_composer_device_1_t; -struct Event; -struct AndroidEventListener; namespace KWin { @@ -67,11 +65,8 @@ private Q_SLOTS: void toggleBlankOutput(); private: - static void inputEvent(Event *event, void *context); - void initInput(); QSize m_displaySize; hwc_composer_device_1_t *m_device = nullptr; - AndroidEventListener *m_inputListener = nullptr; bool m_outputBlank = true; int m_refreshRate = 60000; }; diff --git a/cmake/modules/Findlibhybris.cmake b/cmake/modules/Findlibhybris.cmake index 1c75b205c9..d4ea5d6caa 100644 --- a/cmake/modules/Findlibhybris.cmake +++ b/cmake/modules/Findlibhybris.cmake @@ -202,40 +202,7 @@ if(NOT WIN32) mark_as_advanced(hybrissync_LIBRARY) - ############################################## - # hybrisinputstack - ############################################## - set(hybrisinputstack_DEFINITIONS ${PKG_hybrisinputstack_CFLAGS_OTHER}) - set(hybrisinputstack_VERSION ${PKG_hybrisinputstack_VERSION}) - - find_library(hybrisinputstack_LIBRARY - NAMES - libis.so - HINTS - ${PKG_hybrisinputstack_LIBRARY_DIRS} - ) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(hybrisinputstack - FOUND_VAR - hybrisinputstack_FOUND - REQUIRED_VARS - hybrisinputstack_LIBRARY - VERSION_VAR - hybrisinputstack_VERSION - ) - - if(hybrisinputstack_FOUND AND NOT TARGET libhybris::inputstack) - add_library(libhybris::inputstack UNKNOWN IMPORTED) - set_target_properties(libhybris::inputstack PROPERTIES - IMPORTED_LOCATION "${hybrisinputstack_LIBRARY}" - INTERFACE_COMPILE_OPTIONS "${hybrisinputstack_DEFINITIONS}" - ) - endif() - - mark_as_advanced(hybrisinputstack_LIBRARY) - - if(libhardware_FOUND AND libhwcomposer_FOUND AND hybriseglplatform_FOUND AND hybrissync_FOUND AND hybrisinputstack_FOUND) + if(libhardware_FOUND AND libhwcomposer_FOUND AND hybriseglplatform_FOUND AND hybrissync_FOUND) set(libhybris_FOUND TRUE) else() set(libhybris_FOUND FALSE)