moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-19 23:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add mouse and keyboard input for X11

Browse Source
This commit is contained in:
Iwan Timmer
2017-05-25 18:11:08 +02:00
parent e4946b3717
commit 8d4670339f
4 changed files with 140 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/video/x11.c
View File

@@ -18,19 +18,16 @@
*/
#include "../video.h"
#include "../global.h"
#include "../loop.h"
#include "../input/x11.h"
#include "egl.h"
#include "ffmpeg.h"
#include <Limelight.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#include <stdbool.h>
#include <poll.h>
#define DECODER_BUFFER_SIZE 92*1024
@@ -38,20 +35,6 @@ static char* ffmpeg_buffer = NULL;
static Display *display;
static Atom wm_deletemessage;
static int x11_handler(int fd) {
XEvent event;
XNextEvent(display, &event);
switch (event.type) {
case ClientMessage:
if (event.xclient.data.l[0] == wm_deletemessage)
quit();
break;
}
}
void x11_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
int avc_flags = SLICE_THREADING;
if (drFlags & FORCE_HARDWARE_ACCELERATION)
@@ -75,7 +58,7 @@ void x11_setup(int videoFormat, int width, int height, int redrawRate, void* con
}
Window root = DefaultRootWindow(display);
XSetWindowAttributes winattr = {0};
XSetWindowAttributes winattr = { .event_mask = PointerMotionMask | ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyReleaseMask };
Window window = XCreateWindow(display, root, 0, 0, width, height, 0, CopyFromParent, InputOutput, CopyFromParent, CWEventMask, &winattr);
XMapWindow(display, window);
XStoreName(display, window, "Moonlight");
@@ -96,11 +79,8 @@ void x11_setup(int videoFormat, int width, int height, int redrawRate, void* con
XSendEvent(display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
}
wm_deletemessage = XInternAtom(display, "WM_DELETE_WINDOW", False);
XSetWMProtocols(display, window, &wm_deletemessage, 1);
egl_init(display, window, width, height);
loop_add_fd(ConnectionNumber(display), x11_handler, POLLIN | POLLERR | POLLHUP);
x11_input_init(display, window);
}
void x11_cleanup() {