mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-12-29 12:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(X11) Turn boolean variables into flags

Browse Source
This commit is contained in:
LibretroAdmin 2022-10-26 19:30:36 +02:00
parent 8a0491b282
commit fc78f96a3a
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
input/common/input_x11_common.c
View File

@ -18,11 +18,16 @@
#include "input_x11_common.h"
enum x11_mouse_btn_flags
{
X11_MOUSE_WU_BTN = (1 << 0),
X11_MOUSE_WD_BTN = (1 << 1),
X11_MOUSE_HWU_BTN = (1 << 2),
X11_MOUSE_HWD_BTN = (1 << 3)
};
/* TODO/FIXME - static globals */
static bool x11_mouse_wu;
static bool x11_mouse_wd;
static bool x11_mouse_hwu;
static bool x11_mouse_hwd;
static uint8_t g_x11_mouse_flags = 0;
int16_t x_mouse_state_wheel(unsigned id)
{
@ -31,20 +36,20 @@ int16_t x_mouse_state_wheel(unsigned id)
switch (id)
{
case RETRO_DEVICE_ID_MOUSE_WHEELUP:
ret = x11_mouse_wu;
x11_mouse_wu = 0;
ret = (g_x11_mouse_flags & X11_MOUSE_WU_BTN);
g_x11_mouse_flags &= ~X11_MOUSE_WU_BTN;
break;
case RETRO_DEVICE_ID_MOUSE_WHEELDOWN:
ret = x11_mouse_wd;
x11_mouse_wd = 0;
ret = (g_x11_mouse_flags & X11_MOUSE_WD_BTN);
g_x11_mouse_flags &= ~X11_MOUSE_WD_BTN;
break;
case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP:
ret = x11_mouse_hwu;
x11_mouse_hwu = 0;
ret = (g_x11_mouse_flags & X11_MOUSE_HWU_BTN);
g_x11_mouse_flags &= ~X11_MOUSE_HWU_BTN;
break;
case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN:
ret = x11_mouse_hwd;
x11_mouse_hwd = 0;
ret = (g_x11_mouse_flags & X11_MOUSE_HWD_BTN);
g_x11_mouse_flags &= ~X11_MOUSE_HWD_BTN;
break;
}
@ -56,18 +61,18 @@ void x_input_poll_wheel(XButtonEvent *event, bool latch)
switch (event->button)
{
case 4:
x11_mouse_wu = 1;
g_x11_mouse_flags |= X11_MOUSE_WU_BTN;
break;
case 5:
x11_mouse_wd = 1;
g_x11_mouse_flags |= X11_MOUSE_WD_BTN;
break;
case 6:
/* Scroll wheel left == HORIZ_WHEELDOWN */
x11_mouse_hwd = 1;
g_x11_mouse_flags |= X11_MOUSE_HWD_BTN;
break;
case 7:
/* Scroll wheel right == HORIZ_WHEELUP */
x11_mouse_hwu = 1;
g_x11_mouse_flags |= X11_MOUSE_HWU_BTN;
break;
}
}