CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-03 02:04:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add pointer handling to fullscreen mode

Browse Source
This commit is contained in:
Zoran Vuckovic 2017-06-03 12:46:53 +02:00
parent 97e3a9e908
commit 39a9ac8444
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
input/drivers/udev_input.c
View File

@ -32,6 +32,8 @@
#include <linux/input.h>
#include <linux/kd.h>
#include <X11/Xlib.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
@ -77,7 +79,7 @@ static const char *g_dev_type_str[] =
typedef struct
{
int16_t x, y;
int16_t x, y, dlt_x, dlt_y;
bool l, r, m;
bool wu, wd, whu, whd;
} udev_input_mouse_t;
@ -199,7 +201,7 @@ static void udev_handle_touchpad(void *data,
float rel_x = x_norm - dev->state.touchpad.x;
if (dev->state.touchpad.touch && mouse)
mouse->x += (int16_t)roundf(dev->state.touchpad.mod_x * rel_x);
mouse->dlt_x += (int16_t)roundf(dev->state.touchpad.mod_x * rel_x);
dev->state.touchpad.x = x_norm;
/* Some factor, not sure what's good to do here ... */
@ -216,7 +218,7 @@ static void udev_handle_touchpad(void *data,
float rel_y = y_norm - dev->state.touchpad.y;
if (dev->state.touchpad.touch && mouse)
mouse->y += (int16_t)roundf(dev->state.touchpad.mod_y * rel_y);
mouse->dlt_y += (int16_t)roundf(dev->state.touchpad.mod_y * rel_y);
dev->state.touchpad.y = y_norm;
@ -275,10 +277,10 @@ static void udev_handle_mouse(void *data,
switch (event->code)
{
case REL_X:
mouse->x += event->value;
mouse->dlt_x += event->value;
break;
case REL_Y:
mouse->y += event->value;
mouse->dlt_y += event->value;
break;
case REL_WHEEL:
if (event->value == 1)
@ -418,22 +420,47 @@ end:
udev_device_unref(dev);
}
static void udev_input_get_pointer_position(int *x, int *y)
{
Display *display;
Window window, w;
int p;
unsigned m;
if (video_driver_display_type_get() != RARCH_DISPLAY_X11)
{
RARCH_WARN("[udev]: Pointer position unavailable.\n");
*x = *y = 0;
return;
}
display = (Display*)video_driver_display_get();
window = (Window)video_driver_window_get();
XQueryPointer(display, window, &w, &w, &p, &p, x, y, &m);
}
static void udev_input_poll(void *data)
{
int i, ret;
struct epoll_event events[32];
udev_input_mouse_t *mouse;
int x, y;
udev_input_t *udev = (udev_input_t*)data;
if (!udev)
return;
udev_input_get_pointer_position(&x, &y);
for (i = 0; i < udev->num_devices; ++i)
{
if (udev->devices[i]->type == UDEV_INPUT_MOUSE)
{
mouse = &udev->devices[i]->state.mouse;
mouse->x = mouse->y = 0;
mouse->x = x;
mouse->y = y;
mouse->dlt_x = mouse->dlt_y = 0;
mouse->wu = mouse->wd = mouse->whu = mouse->whd = false;
}
}
@ -464,7 +491,7 @@ static void udev_input_poll(void *data)
udev->joypad->poll();
}
static int16_t udev_mouse_state(udev_input_t *udev, unsigned port, unsigned id)
static int16_t udev_mouse_state(udev_input_t *udev, unsigned port, unsigned id, bool screen)
{
unsigned i, j;
udev_input_mouse_t *mouse = NULL;
@ -487,9 +514,9 @@ static int16_t udev_mouse_state(udev_input_t *udev, unsigned port, unsigned id)
switch (id)
{
case RETRO_DEVICE_ID_MOUSE_X:
return mouse->x;
return screen ? mouse->x : mouse->dlt_x;
case RETRO_DEVICE_ID_MOUSE_Y:
return mouse->y;
return screen ? mouse->y : mouse->dlt_y;
case RETRO_DEVICE_ID_MOUSE_LEFT:
return mouse->l;
case RETRO_DEVICE_ID_MOUSE_RIGHT:
@ -532,9 +559,9 @@ static int16_t udev_lightgun_state(udev_input_t *udev, unsigned port, unsigned i
switch (id)
{
case RETRO_DEVICE_ID_LIGHTGUN_X:
return mouse->x;
return mouse->dlt_x;
case RETRO_DEVICE_ID_LIGHTGUN_Y:
return mouse->y;
return mouse->dlt_y;
case RETRO_DEVICE_ID_LIGHTGUN_TRIGGER:
return mouse->l;
case RETRO_DEVICE_ID_LIGHTGUN_CURSOR:
@ -661,7 +688,9 @@ static int16_t udev_input_state(void *data,
bit = input_keymaps_translate_rk_to_keysym((enum retro_key)id);
return id < RETROK_LAST && BIT_GET(udev_key_state, bit);
case RETRO_DEVICE_MOUSE:
return udev_mouse_state(udev, port, id);
return udev_mouse_state(udev, port, id, false);
case RARCH_DEVICE_MOUSE_SCREEN:
return udev_mouse_state(udev, port, id, true);
case RETRO_DEVICE_POINTER:
return udev_pointer_state(udev, port, id, false);