Use SDL for window creation and management
This commit is contained in:
Simon Fels
parent
5ee8c02b8d
commit
bb32b256e2
6 changed files with 439 additions and 216 deletions
|
|
@ -62,9 +62,7 @@ find_package(EGL REQUIRED)
|
|||
find_package(GLESv2 REQUIRED)
|
||||
find_package(Protobuf REQUIRED)
|
||||
|
||||
# TODO(morphis): make mir an optional requirement so we can also add support
|
||||
# for X11, wayland, ... at a later point if needed.
|
||||
pkg_check_modules(MIRCLIENT REQUIRED mirclient)
|
||||
pkg_check_modules(SDL2 sdl2)
|
||||
|
||||
pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
|
||||
pkg_check_modules(DBUS dbus-1 REQUIRED)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ include_directories(
|
|||
${MIRCLIENT_INCLUDE_DIRS}
|
||||
${DBUS_CPP_INCLUDE_DIRS}
|
||||
${DBUS_INCLUDE_DIRS}
|
||||
${SDL2_INCLUDE_DIRS}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_SOURCE_DIR}/src
|
||||
|
|
@ -90,7 +91,6 @@ set(SOURCES
|
|||
anbox/bridge/android_api_stub.cpp
|
||||
|
||||
anbox/ubuntu/platform_api_skeleton.cpp
|
||||
anbox/ubuntu/mir_display_connection.cpp
|
||||
anbox/ubuntu/window_creator.cpp
|
||||
anbox/ubuntu/window.cpp
|
||||
|
||||
|
|
@ -117,6 +117,7 @@ target_link_libraries(anbox-core
|
|||
${MIRCLIENT_LDFLAGS}
|
||||
${MIRCLIENT_LIBRARIES}
|
||||
${DBUS_CPP_LIBRARIES}
|
||||
${SDL2_LIBRARIES}
|
||||
pthread
|
||||
process-cpp
|
||||
OpenglRender
|
||||
|
|
|
|||
|
|
@ -16,17 +16,18 @@
|
|||
*/
|
||||
|
||||
#include "anbox/ubuntu/window.h"
|
||||
#include "anbox/ubuntu/mir_display_connection.h"
|
||||
#include "anbox/input/manager.h"
|
||||
#include "anbox/input/device.h"
|
||||
#include "anbox/logger.h"
|
||||
|
||||
#include <boost/throw_exception.hpp>
|
||||
|
||||
#include <SDL_syswm.h>
|
||||
|
||||
namespace {
|
||||
class SlotFingerMapper {
|
||||
public:
|
||||
int find_or_create(int id) {
|
||||
int find_or_create(SDL_FingerID id) {
|
||||
auto iter = std::find(slots_.begin(), slots_.end(), id);
|
||||
if (iter != slots_.end())
|
||||
return std::distance(slots_.begin(), iter);
|
||||
|
|
@ -45,7 +46,7 @@ public:
|
|||
return slots_.size() - 1;
|
||||
}
|
||||
|
||||
void erase(int id)
|
||||
void erase(SDL_FingerID id)
|
||||
{
|
||||
auto it = std::find(slots_.begin(), slots_.end(), id);
|
||||
|
||||
|
|
@ -62,61 +63,311 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
std::vector<int> slots_;
|
||||
std::vector<SDL_FingerID> slots_;
|
||||
};
|
||||
}
|
||||
|
||||
const std::array<SDL_Scancode, 249> kKeycodes {{
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */
|
||||
SDL_SCANCODE_ESCAPE, /* KEY_ESC 1 */
|
||||
SDL_SCANCODE_1, /* KEY_1 2 */
|
||||
SDL_SCANCODE_2, /* KEY_2 3 */
|
||||
SDL_SCANCODE_3, /* KEY_3 4 */
|
||||
SDL_SCANCODE_4, /* KEY_4 5 */
|
||||
SDL_SCANCODE_5, /* KEY_5 6 */
|
||||
SDL_SCANCODE_6, /* KEY_6 7 */
|
||||
SDL_SCANCODE_7, /* KEY_7 8 */
|
||||
SDL_SCANCODE_8, /* KEY_8 9 */
|
||||
SDL_SCANCODE_9, /* KEY_9 10 */
|
||||
SDL_SCANCODE_0, /* KEY_0 11 */
|
||||
SDL_SCANCODE_MINUS, /* KEY_MINUS 12 */
|
||||
SDL_SCANCODE_EQUALS, /* KEY_EQUAL 13 */
|
||||
SDL_SCANCODE_BACKSPACE, /* KEY_BACKSPACE 14 */
|
||||
SDL_SCANCODE_TAB, /* KEY_TAB 15 */
|
||||
SDL_SCANCODE_Q, /* KEY_Q 16 */
|
||||
SDL_SCANCODE_W, /* KEY_W 17 */
|
||||
SDL_SCANCODE_E, /* KEY_E 18 */
|
||||
SDL_SCANCODE_R, /* KEY_R 19 */
|
||||
SDL_SCANCODE_T, /* KEY_T 20 */
|
||||
SDL_SCANCODE_Y, /* KEY_Y 21 */
|
||||
SDL_SCANCODE_U, /* KEY_U 22 */
|
||||
SDL_SCANCODE_I, /* KEY_I 23 */
|
||||
SDL_SCANCODE_O, /* KEY_O 24 */
|
||||
SDL_SCANCODE_P, /* KEY_P 25 */
|
||||
SDL_SCANCODE_LEFTBRACKET, /* KEY_LEFTBRACE 26 */
|
||||
SDL_SCANCODE_RIGHTBRACKET, /* KEY_RIGHTBRACE 27 */
|
||||
SDL_SCANCODE_RETURN, /* KEY_ENTER 28 */
|
||||
SDL_SCANCODE_LCTRL, /* KEY_LEFTCTRL 29 */
|
||||
SDL_SCANCODE_A, /* KEY_A 30 */
|
||||
SDL_SCANCODE_S, /* KEY_S 31 */
|
||||
SDL_SCANCODE_D, /* KEY_D 32 */
|
||||
SDL_SCANCODE_F, /* KEY_F 33 */
|
||||
SDL_SCANCODE_G, /* KEY_G 34 */
|
||||
SDL_SCANCODE_H, /* KEY_H 35 */
|
||||
SDL_SCANCODE_J, /* KEY_J 36 */
|
||||
SDL_SCANCODE_K, /* KEY_K 37 */
|
||||
SDL_SCANCODE_L, /* KEY_L 38 */
|
||||
SDL_SCANCODE_SEMICOLON, /* KEY_SEMICOLON 39 */
|
||||
SDL_SCANCODE_APOSTROPHE, /* KEY_APOSTROPHE 40 */
|
||||
SDL_SCANCODE_GRAVE, /* KEY_GRAVE 41 */
|
||||
SDL_SCANCODE_LSHIFT, /* KEY_LEFTSHIFT 42 */
|
||||
SDL_SCANCODE_BACKSLASH, /* KEY_BACKSLASH 43 */
|
||||
SDL_SCANCODE_Z, /* KEY_Z 44 */
|
||||
SDL_SCANCODE_X, /* KEY_X 45 */
|
||||
SDL_SCANCODE_C, /* KEY_C 46 */
|
||||
SDL_SCANCODE_V, /* KEY_V 47 */
|
||||
SDL_SCANCODE_B, /* KEY_B 48 */
|
||||
SDL_SCANCODE_N, /* KEY_N 49 */
|
||||
SDL_SCANCODE_M, /* KEY_M 50 */
|
||||
SDL_SCANCODE_COMMA, /* KEY_COMMA 51 */
|
||||
SDL_SCANCODE_PERIOD, /* KEY_DOT 52 */
|
||||
SDL_SCANCODE_SLASH, /* KEY_SLASH 53 */
|
||||
SDL_SCANCODE_RSHIFT, /* KEY_RIGHTSHIFT 54 */
|
||||
SDL_SCANCODE_KP_MULTIPLY, /* KEY_KPASTERISK 55 */
|
||||
SDL_SCANCODE_LALT, /* KEY_LEFTALT 56 */
|
||||
SDL_SCANCODE_SPACE, /* KEY_SPACE 57 */
|
||||
SDL_SCANCODE_CAPSLOCK, /* KEY_CAPSLOCK 58 */
|
||||
SDL_SCANCODE_F1, /* KEY_F1 59 */
|
||||
SDL_SCANCODE_F2, /* KEY_F2 60 */
|
||||
SDL_SCANCODE_F3, /* KEY_F3 61 */
|
||||
SDL_SCANCODE_F4, /* KEY_F4 62 */
|
||||
SDL_SCANCODE_F5, /* KEY_F5 63 */
|
||||
SDL_SCANCODE_F6, /* KEY_F6 64 */
|
||||
SDL_SCANCODE_F7, /* KEY_F7 65 */
|
||||
SDL_SCANCODE_F8, /* KEY_F8 66 */
|
||||
SDL_SCANCODE_F9, /* KEY_F9 67 */
|
||||
SDL_SCANCODE_F10, /* KEY_F10 68 */
|
||||
SDL_SCANCODE_NUMLOCKCLEAR, /* KEY_NUMLOCK 69 */
|
||||
SDL_SCANCODE_SCROLLLOCK, /* KEY_SCROLLLOCK 70 */
|
||||
SDL_SCANCODE_KP_7, /* KEY_KP7 71 */
|
||||
SDL_SCANCODE_KP_8, /* KEY_KP8 72 */
|
||||
SDL_SCANCODE_KP_9, /* KEY_KP9 73 */
|
||||
SDL_SCANCODE_KP_MINUS, /* KEY_KPMINUS 74 */
|
||||
SDL_SCANCODE_KP_4, /* KEY_KP4 75 */
|
||||
SDL_SCANCODE_KP_5, /* KEY_KP5 76 */
|
||||
SDL_SCANCODE_KP_6, /* KEY_KP6 77 */
|
||||
SDL_SCANCODE_KP_PLUS, /* KEY_KPPLUS 78 */
|
||||
SDL_SCANCODE_KP_1, /* KEY_KP1 79 */
|
||||
SDL_SCANCODE_KP_2, /* KEY_KP2 80 */
|
||||
SDL_SCANCODE_KP_3, /* KEY_KP3 81 */
|
||||
SDL_SCANCODE_KP_0, /* KEY_KP0 82 */
|
||||
SDL_SCANCODE_KP_PERIOD, /* KEY_KPDOT 83 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 84 */
|
||||
SDL_SCANCODE_LANG5, /* KEY_ZENKAKUHANKAKU 85 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_102ND 86 */
|
||||
SDL_SCANCODE_F11, /* KEY_F11 87 */
|
||||
SDL_SCANCODE_F12, /* KEY_F12 88 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_RO 89 */
|
||||
SDL_SCANCODE_LANG3, /* KEY_KATAKANA 90 */
|
||||
SDL_SCANCODE_LANG4, /* KEY_HIRAGANA 91 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_HENKAN 92 */
|
||||
SDL_SCANCODE_LANG3, /* KEY_KATAKANAHIRAGANA 93 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_MUHENKAN 94 */
|
||||
SDL_SCANCODE_KP_COMMA, /* KEY_KPJPCOMMA 95 */
|
||||
SDL_SCANCODE_KP_ENTER, /* KEY_KPENTER 96 */
|
||||
SDL_SCANCODE_RCTRL, /* KEY_RIGHTCTRL 97 */
|
||||
SDL_SCANCODE_KP_DIVIDE, /* KEY_KPSLASH 98 */
|
||||
SDL_SCANCODE_SYSREQ, /* KEY_SYSRQ 99 */
|
||||
SDL_SCANCODE_RALT, /* KEY_RIGHTALT 100 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_LINEFEED 101 */
|
||||
SDL_SCANCODE_HOME, /* KEY_HOME 102 */
|
||||
SDL_SCANCODE_UP, /* KEY_UP 103 */
|
||||
SDL_SCANCODE_PAGEUP, /* KEY_PAGEUP 104 */
|
||||
SDL_SCANCODE_LEFT, /* KEY_LEFT 105 */
|
||||
SDL_SCANCODE_RIGHT, /* KEY_RIGHT 106 */
|
||||
SDL_SCANCODE_END, /* KEY_END 107 */
|
||||
SDL_SCANCODE_DOWN, /* KEY_DOWN 108 */
|
||||
SDL_SCANCODE_PAGEDOWN, /* KEY_PAGEDOWN 109 */
|
||||
SDL_SCANCODE_INSERT, /* KEY_INSERT 110 */
|
||||
SDL_SCANCODE_DELETE, /* KEY_DELETE 111 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_MACRO 112 */
|
||||
SDL_SCANCODE_MUTE, /* KEY_MUTE 113 */
|
||||
SDL_SCANCODE_VOLUMEDOWN, /* KEY_VOLUMEDOWN 114 */
|
||||
SDL_SCANCODE_VOLUMEUP, /* KEY_VOLUMEUP 115 */
|
||||
SDL_SCANCODE_POWER, /* KEY_POWER 116 SC System Power Down */
|
||||
SDL_SCANCODE_KP_EQUALS, /* KEY_KPEQUAL 117 */
|
||||
SDL_SCANCODE_KP_MINUS, /* KEY_KPPLUSMINUS 118 */
|
||||
SDL_SCANCODE_PAUSE, /* KEY_PAUSE 119 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SCALE 120 AL Compiz Scale (Expose) */
|
||||
SDL_SCANCODE_KP_COMMA, /* KEY_KPCOMMA 121 */
|
||||
SDL_SCANCODE_LANG1, /* KEY_HANGEUL,KEY_HANGUEL 122 */
|
||||
SDL_SCANCODE_LANG2, /* KEY_HANJA 123 */
|
||||
SDL_SCANCODE_INTERNATIONAL3,/* KEY_YEN 124 */
|
||||
SDL_SCANCODE_LGUI, /* KEY_LEFTMETA 125 */
|
||||
SDL_SCANCODE_RGUI, /* KEY_RIGHTMETA 126 */
|
||||
SDL_SCANCODE_APPLICATION, /* KEY_COMPOSE 127 */
|
||||
SDL_SCANCODE_STOP, /* KEY_STOP 128 AC Stop */
|
||||
SDL_SCANCODE_AGAIN, /* KEY_AGAIN 129 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PROPS 130 AC Properties */
|
||||
SDL_SCANCODE_UNDO, /* KEY_UNDO 131 AC Undo */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_FRONT 132 */
|
||||
SDL_SCANCODE_COPY, /* KEY_COPY 133 AC Copy */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_OPEN 134 AC Open */
|
||||
SDL_SCANCODE_PASTE, /* KEY_PASTE 135 AC Paste */
|
||||
SDL_SCANCODE_FIND, /* KEY_FIND 136 AC Search */
|
||||
SDL_SCANCODE_CUT, /* KEY_CUT 137 AC Cut */
|
||||
SDL_SCANCODE_HELP, /* KEY_HELP 138 AL Integrated Help Center */
|
||||
SDL_SCANCODE_MENU, /* KEY_MENU 139 Menu (show menu) */
|
||||
SDL_SCANCODE_CALCULATOR, /* KEY_CALC 140 AL Calculator */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SETUP 141 */
|
||||
SDL_SCANCODE_SLEEP, /* KEY_SLEEP 142 SC System Sleep */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_WAKEUP 143 System Wake Up */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_FILE 144 AL Local Machine Browser */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SENDFILE 145 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_DELETEFILE 146 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_XFER 147 */
|
||||
SDL_SCANCODE_APP1, /* KEY_PROG1 148 */
|
||||
SDL_SCANCODE_APP1, /* KEY_PROG2 149 */
|
||||
SDL_SCANCODE_WWW, /* KEY_WWW 150 AL Internet Browser */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_MSDOS 151 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_COFFEE,KEY_SCREENLOCK 152 AL Terminal Lock/Screensaver */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_DIRECTION 153 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CYCLEWINDOWS 154 */
|
||||
SDL_SCANCODE_MAIL, /* KEY_MAIL 155 */
|
||||
SDL_SCANCODE_AC_BOOKMARKS, /* KEY_BOOKMARKS 156 AC Bookmarks */
|
||||
SDL_SCANCODE_COMPUTER, /* KEY_COMPUTER 157 */
|
||||
SDL_SCANCODE_AC_BACK, /* KEY_BACK 158 AC Back */
|
||||
SDL_SCANCODE_AC_FORWARD, /* KEY_FORWARD 159 AC Forward */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CLOSECD 160 */
|
||||
SDL_SCANCODE_EJECT, /* KEY_EJECTCD 161 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_EJECTCLOSECD 162 */
|
||||
SDL_SCANCODE_AUDIONEXT, /* KEY_NEXTSONG 163 */
|
||||
SDL_SCANCODE_AUDIOPLAY, /* KEY_PLAYPAUSE 164 */
|
||||
SDL_SCANCODE_AUDIOPREV, /* KEY_PREVIOUSSONG 165 */
|
||||
SDL_SCANCODE_AUDIOSTOP, /* KEY_STOPCD 166 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_RECORD 167 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_REWIND 168 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PHONE 169 Media Select Telephone */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_ISO 170 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CONFIG 171 AL Consumer Control Configuration */
|
||||
SDL_SCANCODE_AC_HOME, /* KEY_HOMEPAGE 172 AC Home */
|
||||
SDL_SCANCODE_AC_REFRESH, /* KEY_REFRESH 173 AC Refresh */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_EXIT 174 AC Exit */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_MOVE 175 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_EDIT 176 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLUP 177 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLDOWN 178 */
|
||||
SDL_SCANCODE_KP_LEFTPAREN, /* KEY_KPLEFTPAREN 179 */
|
||||
SDL_SCANCODE_KP_RIGHTPAREN, /* KEY_KPRIGHTPAREN 180 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_NEW 181 AC New */
|
||||
SDL_SCANCODE_AGAIN, /* KEY_REDO 182 AC Redo/Repeat */
|
||||
SDL_SCANCODE_F13, /* KEY_F13 183 */
|
||||
SDL_SCANCODE_F14, /* KEY_F14 184 */
|
||||
SDL_SCANCODE_F15, /* KEY_F15 185 */
|
||||
SDL_SCANCODE_F16, /* KEY_F16 186 */
|
||||
SDL_SCANCODE_F17, /* KEY_F17 187 */
|
||||
SDL_SCANCODE_F18, /* KEY_F18 188 */
|
||||
SDL_SCANCODE_F19, /* KEY_F19 189 */
|
||||
SDL_SCANCODE_F20, /* KEY_F20 190 */
|
||||
SDL_SCANCODE_F21, /* KEY_F21 191 */
|
||||
SDL_SCANCODE_F22, /* KEY_F22 192 */
|
||||
SDL_SCANCODE_F23, /* KEY_F23 193 */
|
||||
SDL_SCANCODE_F24, /* KEY_F24 194 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 195 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 196 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 197 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 198 */
|
||||
SDL_SCANCODE_UNKNOWN, /* 199 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PLAYCD 200 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PAUSECD 201 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PROG3 202 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PROG4 203 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_DASHBOARD 204 AL Dashboard */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SUSPEND 205 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CLOSE 206 AC Close */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PLAY 207 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_FASTFORWARD 208 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BASSBOOST 209 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_PRINT 210 AC Print */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_HP 211 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CAMERA 212 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SOUND 213 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_QUESTION 214 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_EMAIL 215 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CHAT 216 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SEARCH 217 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CONNECT 218 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_FINANCE 219 AL Checkbook/Finance */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SPORT 220 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SHOP 221 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_ALTERASE 222 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_CANCEL 223 AC Cancel */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSDOWN 224 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESSUP 225 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_MEDIA 226 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SWITCHVIDEOMODE 227 Cycle between available video outputs (Monitor/LCD/TV-out/etc) */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMTOGGLE 228 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMDOWN 229 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_KBDILLUMUP 230 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SEND 231 AC Send */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_REPLY 232 AC Reply */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_FORWARDMAIL 233 AC Forward Msg */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_SAVE 234 AC Save */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_DOCUMENTS 235 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BATTERY 236 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BLUETOOTH 237 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_WLAN 238 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_UWB 239 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_UNKNOWN 240 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_NEXT 241 drive next video source */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_VIDEO_PREV 242 drive previous video source */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_CYCLE 243 brightness up, after max is min */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_BRIGHTNESS_ZERO 244 brightness off, use ambient */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_DISPLAY_OFF 245 display device to off state */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_WIMAX 246 */
|
||||
SDL_SCANCODE_UNKNOWN, /* KEY_RFKILL 247 Key that controls all radios */
|
||||
SDL_SCANCODE_UNKNOWN /* KEY_MICMUTE 248 Mute / unmute the microphone */
|
||||
}};
|
||||
|
||||
std::uint16_t convert_sdl_scancode_to_evdev(const SDL_Scancode &scan_code) {
|
||||
for (std::uint16_t n = 0; n < kKeycodes.size(); n++) {
|
||||
if (kKeycodes[n] == scan_code)
|
||||
return n;
|
||||
}
|
||||
return KEY_RESERVED;
|
||||
}
|
||||
}
|
||||
|
||||
namespace anbox {
|
||||
namespace ubuntu {
|
||||
Window::Window(const std::shared_ptr<MirDisplayConnection> &display,
|
||||
const std::shared_ptr<input::Manager> &input_manager,
|
||||
Window::Window(const std::shared_ptr<input::Manager> &input_manager,
|
||||
int width, int height) :
|
||||
native_window_(0),
|
||||
surface_(nullptr) {
|
||||
native_display_(0),
|
||||
native_window_(0) {
|
||||
|
||||
const auto pixel_format = display->default_pixel_format();
|
||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
|
||||
|
||||
DEBUG("Selected pixel format %i", pixel_format);
|
||||
window_ = SDL_CreateWindow("anbox",
|
||||
SDL_WINDOWPOS_UNDEFINED,
|
||||
SDL_WINDOWPOS_UNDEFINED,
|
||||
width,
|
||||
height,
|
||||
SDL_WINDOW_OPENGL | SDL_WINDOW_MAXIMIZED);
|
||||
if (!window_)
|
||||
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create new window"));
|
||||
|
||||
auto spec = mir_connection_create_spec_for_normal_surface(
|
||||
display->connection(),
|
||||
width,
|
||||
height,
|
||||
pixel_format);
|
||||
|
||||
mir_surface_spec_set_name(spec, "anbox");
|
||||
mir_surface_spec_set_event_handler(spec, handle_surface_event, this);
|
||||
mir_surface_spec_set_fullscreen_on_output(spec, display->output_id());
|
||||
mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_hardware);
|
||||
mir_surface_spec_set_shell_chrome(spec, mir_shell_chrome_normal);
|
||||
|
||||
surface_ = mir_surface_create_sync(spec);
|
||||
mir_surface_spec_release(spec);
|
||||
|
||||
if (!mir_surface_is_valid(surface_)) {
|
||||
DEBUG("surface error: %s", mir_surface_get_error_message(surface_));
|
||||
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create a Mir surface"));
|
||||
SDL_SysWMinfo info;
|
||||
SDL_VERSION(&info.version);
|
||||
SDL_GetWindowWMInfo(window_, &info);
|
||||
switch (info.subsystem) {
|
||||
case SDL_SYSWM_X11:
|
||||
DEBUG("Running on X11");
|
||||
native_display_ = static_cast<EGLNativeDisplayType>(info.info.x11.display);
|
||||
native_window_ = static_cast<EGLNativeWindowType>(info.info.x11.window);
|
||||
break;
|
||||
default:
|
||||
ERROR("Unknown subsystem (%d)", info.subsystem);
|
||||
BOOST_THROW_EXCEPTION(std::runtime_error("SDL subsystem not suported"));
|
||||
}
|
||||
|
||||
MirSurfaceParameters parameters;
|
||||
mir_surface_get_parameters(surface_, ¶meters);
|
||||
DEBUG("width %i height %i output id %i",
|
||||
parameters.width,
|
||||
parameters.height,
|
||||
parameters.output_id);
|
||||
int actual_width = 0, actual_height = 0;
|
||||
SDL_GetWindowSize(window_, &actual_width, &actual_height);
|
||||
|
||||
// We have to tell mir that we want a maximized window otherwise we
|
||||
// get a full screen one.
|
||||
mir_surface_set_state(surface_, mir_surface_state_maximized);
|
||||
|
||||
auto surface_buffer_stream = mir_surface_get_buffer_stream(surface_);
|
||||
native_window_ = reinterpret_cast<EGLNativeWindowType>(
|
||||
mir_buffer_stream_get_egl_native_window(surface_buffer_stream));
|
||||
DEBUG("Window created with %d x %d", actual_width, actual_height);
|
||||
|
||||
// Create our touch panel input device
|
||||
touchpanel_ = input_manager->create_device();
|
||||
touchpanel_->set_name("mir-touchpanel");
|
||||
touchpanel_->set_name("anbox-touchpanel");
|
||||
touchpanel_->set_driver_version(1);
|
||||
touchpanel_->set_input_id({ BUS_VIRTUAL, 1, 1, 1 });
|
||||
touchpanel_->set_physical_location("none");
|
||||
|
|
@ -126,185 +377,116 @@ Window::Window(const std::shared_ptr<MirDisplayConnection> &display,
|
|||
touchpanel_->set_abs_bit(ABS_MT_POSITION_Y);
|
||||
touchpanel_->set_prop_bit(INPUT_PROP_DIRECT);
|
||||
touchpanel_->set_abs_min(ABS_MT_POSITION_X, 0);
|
||||
touchpanel_->set_abs_max(ABS_MT_POSITION_X, parameters.width);
|
||||
touchpanel_->set_abs_max(ABS_MT_POSITION_X, static_cast<std::uint32_t>(actual_width));
|
||||
touchpanel_->set_abs_min(ABS_MT_POSITION_Y, 0);
|
||||
touchpanel_->set_abs_max(ABS_MT_POSITION_Y, parameters.height);
|
||||
touchpanel_->set_abs_max(ABS_MT_POSITION_Y, static_cast<std::uint32_t>(actual_height));
|
||||
touchpanel_->set_abs_max(ABS_MT_SLOT, 10);
|
||||
touchpanel_->set_abs_max(ABS_MT_TRACKING_ID, 255);
|
||||
|
||||
pointer_ = input_manager->create_device();
|
||||
pointer_->set_name("mir-pointer");
|
||||
pointer_->set_name("anbox-pointer");
|
||||
pointer_->set_driver_version(1);
|
||||
pointer_->set_input_id({ BUS_VIRTUAL, 1, 1, 1 });
|
||||
pointer_->set_input_id({ BUS_VIRTUAL, 2, 2, 2 });
|
||||
pointer_->set_physical_location("none");
|
||||
#if 0
|
||||
pointer_->set_key_bit(BTN_MOUSE);
|
||||
pointer_->set_key_bit(BTN_LEFT);
|
||||
pointer_->set_key_bit(BTN_MIDDLE);
|
||||
pointer_->set_key_bit(BTN_RIGHT);
|
||||
#endif
|
||||
// NOTE: We don't use REL_X/REL_Y in reality but have to specify them here
|
||||
// to allow InputFlinger to detect we're a cursor device.
|
||||
pointer_->set_rel_bit(REL_X);
|
||||
pointer_->set_rel_bit(REL_Y);
|
||||
pointer_->set_rel_bit(REL_HWHEEL);
|
||||
pointer_->set_rel_bit(REL_WHEEL);
|
||||
pointer_->set_prop_bit(INPUT_PROP_POINTER);
|
||||
|
||||
keyboard_ = input_manager->create_device();
|
||||
keyboard_->set_name("anbox-keyboard");
|
||||
keyboard_->set_driver_version(1);
|
||||
keyboard_->set_input_id({ BUS_VIRTUAL, 3, 3, 3 });
|
||||
keyboard_->set_physical_location("none");
|
||||
keyboard_->set_key_bit(BTN_MISC);
|
||||
keyboard_->set_key_bit(KEY_OK);
|
||||
}
|
||||
|
||||
Window::~Window() {
|
||||
}
|
||||
|
||||
void Window::handle_touch_event(MirTouchEvent const* touch_event) {
|
||||
const auto point_count = mir_touch_event_point_count(touch_event);
|
||||
|
||||
void Window::process_input_event(const SDL_Event &event) {
|
||||
static SlotFingerMapper mapper;
|
||||
std::vector<input::Event> touch_events;
|
||||
std::vector<input::Event> mouse_events;
|
||||
std::vector<input::Event> keyboard_events;
|
||||
|
||||
for (size_t n = 0; n < point_count; n++) {
|
||||
const auto id = mir_touch_event_id(touch_event, n);
|
||||
const auto slot = mapper.find_or_create(id);
|
||||
const auto x = mir_touch_event_axis_value(touch_event, n, mir_touch_axis_x);
|
||||
const auto y = mir_touch_event_axis_value(touch_event, n, mir_touch_axis_y);
|
||||
const auto touch_major = mir_touch_event_axis_value(touch_event, n, mir_touch_axis_touch_major);
|
||||
const auto touch_minor = mir_touch_event_axis_value(touch_event, n, mir_touch_axis_touch_minor);
|
||||
const auto id = event.tfinger.fingerId;
|
||||
const auto slot = mapper.find_or_create(id);
|
||||
|
||||
std::vector<input::Event> events;
|
||||
|
||||
switch (mir_touch_event_action(touch_event, n)) {
|
||||
case mir_touch_action_up:
|
||||
events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, -1 });
|
||||
events.push_back({ EV_KEY, BTN_TOUCH, 0 });
|
||||
events.push_back({ EV_KEY, BTN_TOOL_FINGER, 0 });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
mapper.erase(id);
|
||||
switch (event.type) {
|
||||
case SDL_FINGERUP:
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, -1 });
|
||||
touch_events.push_back({ EV_KEY, BTN_TOUCH, 0 });
|
||||
touch_events.push_back({ EV_KEY, BTN_TOOL_FINGER, 0 });
|
||||
touch_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
mapper.erase(id);
|
||||
break;
|
||||
case SDL_FINGERDOWN:
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, static_cast<std::int32_t>(id) });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_POSITION_X, static_cast<std::int32_t>(event.tfinger.x) });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_POSITION_Y, static_cast<std::int32_t>(event.tfinger.y) });
|
||||
touch_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case SDL_FINGERMOTION:
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, static_cast<std::int32_t>(id) });
|
||||
touch_events.push_back({ EV_KEY, BTN_TOUCH, 1 });
|
||||
touch_events.push_back({ EV_KEY, BTN_TOOL_FINGER, 1 });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_POSITION_X, static_cast<std::int32_t>(event.tfinger.x) });
|
||||
touch_events.push_back({ EV_ABS, ABS_MT_POSITION_Y, static_cast<std::int32_t>(event.tfinger.y) });
|
||||
touch_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case SDL_MOUSEBUTTONDOWN:
|
||||
mouse_events.push_back({ EV_KEY, BTN_LEFT, 1 });
|
||||
mouse_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case SDL_MOUSEBUTTONUP:
|
||||
mouse_events.push_back({ EV_KEY, BTN_LEFT, 0 });
|
||||
mouse_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case SDL_MOUSEMOTION:
|
||||
// NOTE: Sending relative move events doesn't really work and we have changes
|
||||
// in libinputflinger to take ABS_X/ABS_Y instead for absolute position events.
|
||||
mouse_events.push_back({ EV_ABS, ABS_X, static_cast<std::int32_t>(event.motion.x) });
|
||||
mouse_events.push_back({ EV_ABS, ABS_Y, static_cast<std::int32_t>(event.motion.y) });
|
||||
mouse_events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case SDL_MOUSEWHEEL:
|
||||
mouse_events.push_back({ EV_REL, REL_WHEEL, static_cast<std::int32_t>(event.wheel.direction) });
|
||||
break;
|
||||
case SDL_KEYDOWN: {
|
||||
const auto code = convert_sdl_scancode_to_evdev(event.key.keysym.scancode);
|
||||
if (code == KEY_RESERVED)
|
||||
break;
|
||||
case mir_touch_action_down:
|
||||
events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, id });
|
||||
events.push_back({ EV_ABS, ABS_MT_POSITION_X, static_cast<std::int32_t>(x) });
|
||||
events.push_back({ EV_ABS, ABS_MT_POSITION_Y, static_cast<std::int32_t>(y) });
|
||||
events.push_back({ EV_ABS, ABS_MT_TOUCH_MAJOR, static_cast<std::int32_t>(touch_major) });
|
||||
events.push_back({ EV_ABS, ABS_MT_TOUCH_MINOR, static_cast<std::int32_t>(touch_minor) });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
case mir_touch_action_change:
|
||||
events.push_back({ EV_ABS, ABS_MT_SLOT, slot });
|
||||
events.push_back({ EV_ABS, ABS_MT_TRACKING_ID, id });
|
||||
events.push_back({ EV_KEY, BTN_TOUCH, 1 });
|
||||
events.push_back({ EV_KEY, BTN_TOOL_FINGER, 1 });
|
||||
events.push_back({ EV_ABS, ABS_MT_POSITION_X, static_cast<std::int32_t>(x) });
|
||||
events.push_back({ EV_ABS, ABS_MT_POSITION_Y, static_cast<std::int32_t>(y) });
|
||||
events.push_back({ EV_ABS, ABS_MT_TOUCH_MAJOR, static_cast<std::int32_t>(touch_major) });
|
||||
events.push_back({ EV_ABS, ABS_MT_TOUCH_MINOR, static_cast<std::int32_t>(touch_minor) });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
break;
|
||||
}
|
||||
|
||||
touchpanel_->send_events(events);
|
||||
keyboard_events.push_back({ EV_KEY, code, 1 });
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Window::handle_pointer_button_event(std::vector<input::Event> &events,
|
||||
MirPointerEvent const* pointer_event, bool pressed) {
|
||||
static uint32_t old_button_states = 0;
|
||||
uint32_t new_button_states = mir_pointer_event_buttons(pointer_event);
|
||||
|
||||
MirPointerButton button_state = mir_pointer_button_primary;
|
||||
button_state = static_cast<MirPointerButton>(new_button_states ^ old_button_states);
|
||||
|
||||
std::uint16_t button;
|
||||
|
||||
switch (button_state) {
|
||||
case mir_pointer_button_primary:
|
||||
button = BTN_LEFT;
|
||||
break;
|
||||
case mir_pointer_button_secondary:
|
||||
button = BTN_RIGHT;
|
||||
break;
|
||||
case mir_pointer_button_tertiary:
|
||||
button = BTN_MIDDLE;
|
||||
case SDL_KEYUP: {
|
||||
const auto code = convert_sdl_scancode_to_evdev(event.key.keysym.scancode);
|
||||
if (code == KEY_RESERVED)
|
||||
break;
|
||||
keyboard_events.push_back({ EV_KEY, code, 0 });
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
events.push_back({ EV_KEY, button, pressed ? 1 : 0 });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
}
|
||||
if (touch_events.size() > 0)
|
||||
touchpanel_->send_events(touch_events);
|
||||
|
||||
void Window::handle_pointer_event(MirPointerEvent const* pointer_event) {
|
||||
std::vector<input::Event> events;
|
||||
static MirPointerButtons button_state = 0;
|
||||
if (mouse_events.size() > 0)
|
||||
pointer_->send_events(mouse_events);
|
||||
|
||||
const float x = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_x);
|
||||
const float y = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_y);
|
||||
|
||||
switch (mir_pointer_event_action(pointer_event)) {
|
||||
case mir_pointer_action_button_down:
|
||||
handle_pointer_button_event(events, pointer_event, true);
|
||||
break;
|
||||
case mir_pointer_action_button_up:
|
||||
handle_pointer_button_event(events, pointer_event, false);
|
||||
break;
|
||||
case mir_pointer_action_motion:
|
||||
{
|
||||
const float hdelta = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_hscroll);
|
||||
const float vdelta = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_vscroll);
|
||||
if (hdelta != 0.0 || vdelta != 0.0) {
|
||||
events.push_back({ EV_REL, REL_HWHEEL, static_cast<std::int32_t>(hdelta) });
|
||||
events.push_back({ EV_REL, REL_WHEEL, static_cast<std::int32_t>(vdelta) });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
}
|
||||
|
||||
const float xdelta = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_x);
|
||||
const float ydelta = mir_pointer_event_axis_value(pointer_event, mir_pointer_axis_relative_y);
|
||||
if (xdelta != 0.0 || ydelta != 0.0) {
|
||||
events.push_back({ EV_REL, REL_X, static_cast<std::int32_t>(xdelta) });
|
||||
events.push_back({ EV_REL, REL_Y, static_cast<std::int32_t>(ydelta) });
|
||||
events.push_back({ EV_SYN, SYN_REPORT, 0 });
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
pointer_->send_events(events);
|
||||
}
|
||||
|
||||
void Window::handle_input_event(MirInputEvent const* input_event) {
|
||||
const auto type = mir_input_event_get_type(input_event);
|
||||
MirTouchEvent const* touch_event = nullptr;
|
||||
MirKeyboardEvent const* key_event = nullptr;
|
||||
MirPointerEvent const* pointer_event = nullptr;
|
||||
|
||||
switch (type) {
|
||||
case mir_input_event_type_touch:
|
||||
touch_event = mir_input_event_get_touch_event(input_event);
|
||||
handle_touch_event(touch_event);
|
||||
break;
|
||||
case mir_input_event_type_pointer:
|
||||
#if 0
|
||||
pointer_event = mir_input_event_get_pointer_event(input_event);
|
||||
handle_pointer_event(pointer_event);
|
||||
#endif
|
||||
break;
|
||||
case mir_input_event_type_key:
|
||||
key_event = mir_input_event_get_keyboard_event(input_event);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Window::handle_surface_event(MirSurface*, MirEvent const* event, void *context) {
|
||||
const auto event_type = mir_event_get_type(event);
|
||||
auto thiz = static_cast<Window*>(context);
|
||||
|
||||
switch (event_type) {
|
||||
case mir_event_type_input:
|
||||
thiz->handle_input_event(mir_event_get_input_event(event));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (keyboard_events.size() > 0)
|
||||
keyboard_->send_events(keyboard_events);
|
||||
}
|
||||
|
||||
EGLNativeWindowType Window::native_window() const {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <mirclient/mir_toolkit/mir_client_library.h>
|
||||
#include <SDL.h>
|
||||
|
||||
namespace anbox {
|
||||
namespace input {
|
||||
|
|
@ -32,29 +32,23 @@ class Device;
|
|||
class Event;
|
||||
} // namespace input
|
||||
namespace ubuntu {
|
||||
class MirDisplayConnection;
|
||||
class Window {
|
||||
public:
|
||||
Window(const std::shared_ptr<MirDisplayConnection> &display,
|
||||
const std::shared_ptr<input::Manager> &input_manager,
|
||||
Window(const std::shared_ptr<input::Manager> &input_manager,
|
||||
int width, int height);
|
||||
~Window();
|
||||
|
||||
void process_input_event(const SDL_Event &event);
|
||||
|
||||
EGLNativeWindowType native_window() const;
|
||||
|
||||
private:
|
||||
static void handle_surface_event(MirSurface *surface, MirEvent const* event, void *context);
|
||||
|
||||
void handle_input_event(MirInputEvent const* input_event);
|
||||
void handle_touch_event(MirTouchEvent const* touch_event);
|
||||
void handle_pointer_event(MirPointerEvent const* pointer_event);
|
||||
void handle_pointer_button_event(std::vector<input::Event> &events,
|
||||
MirPointerEvent const* pointer_event, bool pressed);
|
||||
|
||||
std::shared_ptr<input::Device> touchpanel_;
|
||||
std::shared_ptr<input::Device> pointer_;
|
||||
std::shared_ptr<input::Device> keyboard_;
|
||||
EGLNativeDisplayType native_display_;
|
||||
EGLNativeWindowType native_window_;
|
||||
MirSurface *surface_;
|
||||
SDL_Window *window_;
|
||||
};
|
||||
} // namespace bridge
|
||||
} // namespace anbox
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include "anbox/ubuntu/window_creator.h"
|
||||
#include "anbox/ubuntu/window.h"
|
||||
#include "anbox/ubuntu/mir_display_connection.h"
|
||||
#include "anbox/logger.h"
|
||||
|
||||
#include <boost/throw_exception.hpp>
|
||||
|
|
@ -26,20 +25,62 @@ namespace anbox {
|
|||
namespace ubuntu {
|
||||
WindowCreator::WindowCreator(const std::shared_ptr<input::Manager> &input_manager) :
|
||||
graphics::WindowCreator(input_manager),
|
||||
input_manager_(input_manager),
|
||||
display_(std::make_shared<MirDisplayConnection>()) {
|
||||
input_manager_(input_manager) {
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) < 0)
|
||||
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to initialize SDL"));
|
||||
|
||||
event_thread = std::thread(&WindowCreator::process_events, this);
|
||||
}
|
||||
|
||||
WindowCreator::~WindowCreator() {
|
||||
}
|
||||
|
||||
void WindowCreator::process_window_event(const SDL_Event &event) {
|
||||
}
|
||||
|
||||
void WindowCreator::process_events() {
|
||||
while(true) {
|
||||
SDL_Event event;
|
||||
while (SDL_WaitEvent(&event)) {
|
||||
switch (event.type) {
|
||||
case SDL_QUIT:
|
||||
// FIXME once one of our windows is closed we need to decide what
|
||||
// to do base on the configuration we're running in.
|
||||
break;
|
||||
case SDL_WINDOWEVENT:
|
||||
process_window_event(event);
|
||||
break;
|
||||
case SDL_FINGERUP:
|
||||
case SDL_FINGERMOTION:
|
||||
case SDL_FINGERDOWN:
|
||||
case SDL_MOUSEMOTION:
|
||||
case SDL_MOUSEBUTTONDOWN:
|
||||
case SDL_MOUSEBUTTONUP:
|
||||
case SDL_MOUSEWHEEL:
|
||||
case SDL_KEYDOWN:
|
||||
case SDL_KEYUP:
|
||||
if (current_window_)
|
||||
current_window_->process_input_event(event);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
EGLNativeWindowType WindowCreator::create_window(int x, int y, int width, int height) {
|
||||
DEBUG("x %i y %i width %i height %i", x, y, width, height);
|
||||
|
||||
auto window = std::make_shared<Window>(display_, input_manager_,
|
||||
width, height);
|
||||
if (windows_.size() == 1) {
|
||||
WARNING("Tried to create another window but we currently only allow one");
|
||||
return 0;
|
||||
}
|
||||
|
||||
auto window = std::make_shared<Window>(input_manager_, width, height);
|
||||
windows_.insert({window->native_window(), window});
|
||||
|
||||
current_window_ = window;
|
||||
|
||||
return window->native_window();
|
||||
}
|
||||
|
||||
|
|
@ -52,11 +93,12 @@ void WindowCreator::destroy_window(EGLNativeWindowType win) {
|
|||
}
|
||||
|
||||
WindowCreator::DisplayInfo WindowCreator::display_info() const {
|
||||
return {display_->horizontal_resolution(), display_->vertical_resolution()};
|
||||
// FIXME: force for now until we have real detection for this
|
||||
return {1280, 720};
|
||||
}
|
||||
|
||||
EGLNativeDisplayType WindowCreator::native_display() const {
|
||||
return display_->native_display();
|
||||
return 0;
|
||||
}
|
||||
} // namespace bridge
|
||||
} // namespace anbox
|
||||
|
|
|
|||
|
|
@ -21,8 +21,10 @@
|
|||
#include "anbox/graphics/window_creator.h"
|
||||
|
||||
#include <map>
|
||||
#include <thread>
|
||||
|
||||
#include <EGL/egl.h>
|
||||
#include <SDL.h>
|
||||
|
||||
namespace anbox {
|
||||
namespace ubuntu {
|
||||
|
|
@ -40,9 +42,13 @@ public:
|
|||
EGLNativeDisplayType native_display() const override;
|
||||
|
||||
private:
|
||||
void process_events();
|
||||
void process_window_event(const SDL_Event &event);
|
||||
|
||||
std::shared_ptr<input::Manager> input_manager_;
|
||||
std::shared_ptr<MirDisplayConnection> display_;
|
||||
std::map<EGLNativeWindowType,std::shared_ptr<Window>> windows_;
|
||||
std::shared_ptr<Window> current_window_;
|
||||
std::thread event_thread;
|
||||
};
|
||||
} // namespace bridge
|
||||
} // namespace anbox
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue