libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Zarch) Reuse menu_input_mouse_state for left/right mouse button

Browse Source
This commit is contained in:
twinaphex 2015-10-23 09:30:46 +02:00
parent bf47d5e0ae
commit a8d4bf6ec4
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menu/drivers/zarch.c
View File

@ -108,10 +108,6 @@ typedef struct zarch_handle
struct
{
bool left;
bool right;
bool oldleft;
bool oldright;
int wheel;
} mouse;
@ -237,8 +233,6 @@ static void zui_begin(void)
/* why do i need this? */
zui->mouse.left = input_driver_state(binds, 0, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT);
zui->mouse.right = input_driver_state(binds, 0, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT);
zui->mouse.wheel = input_driver_state(binds, 0, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_WHEELDOWN) -
input_driver_state(binds, 0, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_WHEELUP);
@ -262,7 +256,7 @@ static void zui_finish(zui_t *zui,
if (!gl)
return;
if (!zui->mouse.left)
if (!menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON))
zui->item.active = 0;
else if (zui->item.active == 0)
zui->item.active = -1;
@ -295,16 +289,6 @@ static bool check_hit(zui_t *zui, int x1, int y1, int x2, int y2)
return ((mouse_x >= x1) && (mouse_x <= x2) && (mouse_y >= y1) && (mouse_y <= y2));
}
static bool mouse_down(zui_t *zui)
{
return zui->mouse.left;
}
static bool mouse_up(zui_t *zui)
{
return !mouse_down(zui);
}
static bool check_button_down(zui_t *zui, unsigned id, int x1, int y1, int x2, int y2)
{
bool result = false;
@ -313,7 +297,7 @@ static bool check_button_down(zui_t *zui, unsigned id, int x1, int y1, int x2, i
if (inside)
zui->item.hot = id;
if (zui->item.hot == id && mouse_down(zui))
if (zui->item.hot == id && menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON))
{
result = true;
zui->item.active = id;
@ -330,7 +314,7 @@ static bool check_button_up(zui_t *zui, unsigned id, int x1, int y1, int x2, int
if (inside)
zui->item.hot = id;
if (zui->item.active == id && mouse_up(zui))
if (zui->item.active == id && !menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON))
{
if (zui->item.hot == id)
result = true;

10
menu/menu_input.c
View File

@ -829,7 +829,7 @@ static int menu_input_mouse(unsigned *action)
0, RETRO_DEVICE_ID_MOUSE_Y);
if (
menu_input->mouse.left ||
menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON) ||
menu_input->mouse.wheelup ||
menu_input->mouse.wheeldown ||
menu_input->mouse.hwheelup ||
@ -951,7 +951,7 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
return 0;
}
if (menu_input->mouse.left)
if (menu_input_mouse_state(MENU_MOUSE_LEFT_BUTTON))
{
if (!menu_input->mouse.oldleft)
{
@ -980,7 +980,7 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
else
menu_input->mouse.oldleft = false;
if (menu_input->mouse.right)
if (menu_input_mouse_state(MENU_MOUSE_RIGHT_BUTTON))
{
if (!menu_input->mouse.oldright)
{
@ -1059,6 +1059,10 @@ int16_t menu_input_mouse_state(enum menu_input_mouse_state state)
return menu->mouse.x;
case MENU_MOUSE_Y_AXIS:
return menu->mouse.y;
case MENU_MOUSE_LEFT_BUTTON:
return menu->mouse.left;
case MENU_MOUSE_RIGHT_BUTTON:
return menu->mouse.right;
}
return 0;

4
menu/menu_input.h
View File

@ -68,7 +68,9 @@ enum menu_input_pointer_state
enum menu_input_mouse_state
{
MENU_MOUSE_X_AXIS = 0,
MENU_MOUSE_Y_AXIS
MENU_MOUSE_Y_AXIS,
MENU_MOUSE_LEFT_BUTTON,
MENU_MOUSE_RIGHT_BUTTON
};
enum menu_input_ctl_state