mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-23 01:31:51 -05:00
Code Issues Projects Releases Packages Wiki Activity

Qt: Fix middle mouse button uncapture

Browse source
This commit is contained in:
RichardG867 2022-04-21 13:56:39 -03:00
parent 7d6ad0d650
commit bfde3e4867
3 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/qt/qt_mainwindow.cpp
View file

@ -207,12 +207,12 @@ MainWindow::MainWindow(QWidget *parent) :
qt_mouse_capture(mouse_capture);
if (mouse_capture) {
this->grabKeyboard();
if (ui->stackedWidget->mouse_capture)
ui->stackedWidget->mouse_capture(this->windowHandle());
if (ui->stackedWidget->mouse_capture_func)
ui->stackedWidget->mouse_capture_func(this->windowHandle());
} else {
this->releaseKeyboard();
if (ui->stackedWidget->mouse_uncapture)
ui->stackedWidget->mouse_uncapture();
if (ui->stackedWidget->mouse_uncapture_func)
ui->stackedWidget->mouse_uncapture_func();
}
});
@ -509,8 +509,8 @@ void MainWindow::closeEvent(QCloseEvent *event) {
}
qt_nvr_save();
config_save();
if (ui->stackedWidget->mouse_exit)
ui->stackedWidget->mouse_exit();
if (ui->stackedWidget->mouse_exit_func)
ui->stackedWidget->mouse_exit_func();
event->accept();
}

38
src/qt/qt_rendererstack.cpp
View file

@ -42,6 +42,7 @@ extern "C" {
#include <86box/video.h>
}
extern "C" void macos_poll_mouse();
extern MainWindow *main_window;
RendererStack::RendererStack(QWidget *parent)
: QStackedWidget(parent)
@ -65,30 +66,30 @@ RendererStack::RendererStack(QWidget *parent)
# ifdef WAYLAND
if (!stricmp(mouse_type, "wayland")) {
this->mouse_init = wl_init;
this->mouse_poll = wl_mouse_poll;
this->mouse_capture = wl_mouse_capture;
this->mouse_uncapture = wl_mouse_uncapture;
wl_init();
this->mouse_poll_func = wl_mouse_poll;
this->mouse_capture_func = wl_mouse_capture;
this->mouse_uncapture_func = wl_mouse_uncapture;
} else
# endif
# ifdef EVDEV_INPUT
if (!stricmp(mouse_type, "evdev")) {
this->mouse_init = evdev_init;
this->mouse_poll = evdev_mouse_poll;
evdev_init();
this->mouse_poll_func = evdev_mouse_poll;
} else
# endif
if (!stricmp(mouse_type, "xinput2")) {
extern void xinput2_init();
extern void xinput2_poll();
extern void xinput2_exit();
this->mouse_init = xinput2_init;
this->mouse_poll = xinput2_poll;
this->mouse_exit = xinput2_exit;
xinput2_init();
this->mouse_poll_func = xinput2_poll;
this->mouse_exit_func = xinput2_exit;
}
#endif
if (this->mouse_init)
this->mouse_init();
#ifdef __APPLE__
this->mouse_poll_func = macos_poll_mouse;
#endif
}
RendererStack::~RendererStack()
@ -96,7 +97,6 @@ RendererStack::~RendererStack()
delete ui;
}
extern "C" void macos_poll_mouse();
void
qt_mouse_capture(int on)
{
@ -119,18 +119,16 @@ qt_mouse_capture(int on)
void
RendererStack::mousePoll()
{
#ifdef __APPLE__
return macos_poll_mouse();
#else /* !defined __APPLE__ */
#ifndef __APPLE__
mouse_x = mousedata.deltax;
mouse_y = mousedata.deltay;
mouse_z = mousedata.deltaz;
mousedata.deltax = mousedata.deltay = mousedata.deltaz = 0;
mouse_buttons = mousedata.mousebuttons;
mouse_buttons = mousedata.mousebuttons;
if (this->mouse_poll)
this->mouse_poll();
#endif /* !defined __APPLE__ */
if (this->mouse_poll_func)
#endif
this->mouse_poll_func();
}
int ignoreNextMouseEvent = 1;

9
src/qt/qt_rendererstack.hpp
View file

@ -64,11 +64,10 @@ public:
rendererWindow->onResize(width, height);
}
void (*mouse_init)() = nullptr;
void (*mouse_poll)() = nullptr;
void (*mouse_capture)(QWindow *window) = nullptr;
void (*mouse_uncapture)() = nullptr;
void (*mouse_exit)() = nullptr;
void (*mouse_poll_func)() = nullptr;
void (*mouse_capture_func)(QWindow *window) = nullptr;
void (*mouse_uncapture_func)() = nullptr;
void (*mouse_exit_func)() = nullptr;
signals:
void blitToRenderer(int buf_idx, int x, int y, int w, int h);