From 579eb3cd727b2c0e962b2109c310eeacb520f429 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 24 Oct 2015 03:13:40 +0200 Subject: [PATCH] (Zarch) Add menu_input_mouse_state --- menu/drivers/zarch.c | 4 ++-- menu/menu_input.c | 4 ++++ menu/menu_input.h | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 6edb3c17e0..28262f6f36 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -233,8 +233,8 @@ static void zui_begin(void) /* why do i need this? */ - 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); + zui->mouse.wheel = menu_input_mouse_state(MENU_MOUSE_WHEEL_DOWN) - + menu_input_mouse_state(MENU_MOUSE_WHEEL_UP); zui->ca.coords.vertices = 0; diff --git a/menu/menu_input.c b/menu/menu_input.c index 51fb5cc900..7d64a5cc97 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1081,6 +1081,10 @@ int16_t menu_input_mouse_state(enum menu_input_mouse_state state) return menu->mouse.left; case MENU_MOUSE_RIGHT_BUTTON: return menu->mouse.right; + case MENU_MOUSE_WHEEL_UP: + return menu->mouse.wheelup; + case MENU_MOUSE_WHEEL_DOWN: + return menu->mouse.wheeldown; } return 0; diff --git a/menu/menu_input.h b/menu/menu_input.h index 0bb052643d..a22d770970 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -70,7 +70,9 @@ enum menu_input_mouse_state MENU_MOUSE_X_AXIS = 0, MENU_MOUSE_Y_AXIS, MENU_MOUSE_LEFT_BUTTON, - MENU_MOUSE_RIGHT_BUTTON + MENU_MOUSE_RIGHT_BUTTON, + MENU_MOUSE_WHEEL_UP, + MENU_MOUSE_WHEEL_DOWN }; enum menu_input_ctl_state