diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index d3fae1da47..ce891e71b9 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -192,6 +192,10 @@ static int16_t cocoa_mouse_state(cocoa_input_data_t *apple, return apple->mouse_wu; case RETRO_DEVICE_ID_MOUSE_WHEELDOWN: return apple->mouse_wd; + case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP: + return apple->mouse_wl; + case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN: + return apple->mouse_wr; } return 0; diff --git a/input/drivers/cocoa_input.h b/input/drivers/cocoa_input.h index 78a202564f..a3be90e30d 100644 --- a/input/drivers/cocoa_input.h +++ b/input/drivers/cocoa_input.h @@ -45,6 +45,8 @@ typedef struct int16_t mouse_rel_y; int16_t mouse_wu; int16_t mouse_wd; + int16_t mouse_wl; + int16_t mouse_wr; const input_device_driver_t *sec_joypad; const input_device_driver_t *joypad; diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index 4094da9cbe..22db7d2f65 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -57,6 +57,16 @@ void cocoagl_gfx_ctx_update(void); void *glkitview_init(void); @implementation CocoaView + +#if defined(HAVE_COCOA) +#include "../../../input/drivers/cocoa_input.h" + +- (void)scrollWheel:(NSEvent *)theEvent { + cocoa_input_data_t *apple = (cocoa_input_data_t*)input_driver_get_data(); + (void)apple; +} +#endif + + (CocoaView*)get { if (!g_instance)