archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gui/input: include Carbon.h on apple

Browse source
This commit is contained in:
Megamouse 2024-02-11 22:48:34 +01:00
parent 06025cd19d
commit 66f694bb39
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Input/gui_pad_thread.cpp
View file

@ -14,7 +14,6 @@
#include "sdl_pad_handler.h" #include "sdl_pad_handler.h"
#endif #endif
#include "Emu/Io/PadHandler.h" #include "Emu/Io/PadHandler.h"
#include "Emu/Io/pad_config.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
@ -26,6 +25,7 @@
#define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread: ioctl failed (errno=%d=%s)", res, strerror(errno)); } #define CHECK_IOCTRL_RET(res) if (res == -1) { gui_log.error("gui_pad_thread: ioctl failed (errno=%d=%s)", res, strerror(errno)); }
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h>
#endif #endif
#include <QApplication> #include <QApplication>
@ -416,7 +416,7 @@ void gui_pad_thread::process_input()
last_state = pressed; last_state = pressed;
}; };
for (const Button& button : m_pad->m_buttons) for (const auto& button : m_pad->m_buttons)
{ {
pad_button button_id = pad_button::pad_button_max_enum; pad_button button_id = pad_button::pad_button_max_enum;
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1) if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
@ -720,7 +720,7 @@ void gui_pad_thread::send_mouse_wheel_event(mouse_wheel wheel, int delta)
} }
constexpr u32 wheel_count = 2; constexpr u32 wheel_count = 2;
CGEventRef ev = CGEventCreateScrollWheelEvent(NULL, CGScrollEventUnit::pixel, wheel_count, v_delta, h_delta); CGEventRef ev = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitPixel, wheel_count, v_delta, h_delta);
if (!ev) if (!ev)
{ {
gui_log.error("gui_pad_thread: CGEventCreateScrollWheelEvent() failed"); gui_log.error("gui_pad_thread: CGEventCreateScrollWheelEvent() failed");