mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 15:12:23 +01:00
83f684c66c
byuu says: Note: for Windows users, please go to nall/intrinsics.hpp line 60 and correct the typo from "DISPLAY_WINDOW" to "DISPLAY_WINDOWS" before compiling, otherwise things won't work at all. This will be a really major WIP for the core SNES emulation, so please test as thoroughly as possible. I rewrote the 65816 CPU core's dispatcher from a jump table to a switch table. This was so that I could pass class variables as parameters to opcodes without crazy theatrics. With that, I killed the regs.r[N] stuff, the flag_t operator|=, &=, ^= stuff, and all of the template versions of opcodes. I also removed some stupid pointless flag tests in xcn and pflag that would always be true. I sure hope that AWJ is happy with this; because this change was so that my flag assignments and branch tests won't need to build regs.P into a full 8-bit variable anymore. It does of course incur a slight performance hit when you pass in variables by-value to functions, but it should help with binary size (and thus cache) by reducing a lot of extra functions. (I know I could have used template parameters for some things even with a switch table, but chose not to for the aforementioned reasons.) Overall, it's about a ~1% speedup from the previous build. The CPU core instructions were never a bottleneck, but I did want to fix the P flag building stuff because that really was a dumb mistake v_v'
48 lines
1.3 KiB
C++
48 lines
1.3 KiB
C++
#if defined(Hiro_Mouse)
|
|
|
|
namespace hiro {
|
|
|
|
auto pMouse::position() -> Position {
|
|
#if defined(DISPLAY_WINDOWS)
|
|
POINT point{0};
|
|
GetCursorPos(&point);
|
|
return {point.x, point.y};
|
|
#endif
|
|
|
|
#if defined(DISPLAY_XORG)
|
|
XlibWindow root, child;
|
|
int rootx, rooty, winx, winy;
|
|
unsigned int mask;
|
|
XQueryPointer(pApplication::display, DefaultRootWindow(pApplication::display), &root, &child, &rootx, &rooty, &winx, &winy, &mask);
|
|
return {rootx, rooty};
|
|
#endif
|
|
}
|
|
|
|
auto pMouse::pressed(Mouse::Button button) -> bool {
|
|
#if defined(DISPLAY_WINDOWS)
|
|
switch(button) {
|
|
case Mouse::Button::Left: return GetAsyncKeyState(VK_LBUTTON) & 0x8000;
|
|
case Mouse::Button::Middle: return GetAsyncKeyState(VK_MBUTTON) & 0x8000;
|
|
case Mouse::Button::Right: return GetAsyncKeyState(VK_RBUTTON) & 0x8000;
|
|
}
|
|
#endif
|
|
|
|
#if defined(DISPLAY_XORG)
|
|
XlibWindow root, child;
|
|
int rootx, rooty, winx, winy;
|
|
unsigned int mask;
|
|
XQueryPointer(pApplication::display, DefaultRootWindow(pApplication::display), &root, &child, &rootx, &rooty, &winx, &winy, &mask);
|
|
switch(button) {
|
|
case Mouse::Button::Left: return mask & Button1Mask;
|
|
case Mouse::Button::Middle: return mask & Button2Mask;
|
|
case Mouse::Button::Right: return mask & Button3Mask;
|
|
}
|
|
#endif
|
|
|
|
return false;
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|