claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2177 from Cacodemon345/newqt

Browse Source 
qt: Actually make client-side Unix manager integration functional
This commit is contained in:
Miran Grča
2022-02-28 23:31:04 +01:00
committed by GitHub
parent 66b93597ad 08e1993808
commit cdf1722de8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qt_main.cpp
View File

@@ -241,6 +241,16 @@ int main(int argc, char* argv[]) {
UnixManagerSocket socket;
if (qgetenv("86BOX_MANAGER_SOCKET").size())
{
QObject::connect(&socket, &UnixManagerSocket::showsettings, main_window, &MainWindow::showSettings);
QObject::connect(&socket, &UnixManagerSocket::pause, main_window, &MainWindow::togglePause);
QObject::connect(&socket, &UnixManagerSocket::reset, main_window, &MainWindow::hardReset);
QObject::connect(&socket, &UnixManagerSocket::request_shutdown, main_window, &MainWindow::close);
QObject::connect(&socket, &UnixManagerSocket::force_shutdown, [](){
do_stop();
emit main_window->close();
});
QObject::connect(&socket, &UnixManagerSocket::ctrlaltdel, [](){ pc_send_cad(); });
main_window->installEventFilter(&socket);
socket.connectToServer(qgetenv("86BOX_MANAGER_SOCKET"));
}
pc_reset_hard_init();

2
src/qt/qt_unixmanagerfilter.cpp
View File

@@ -32,7 +32,7 @@ void UnixManagerSocket::readyToRead()
if (line.size())
{
line.resize(line.size() - 2);
line.push_back((unsigned char)0);
line.push_back('\0');
if (line == "showsettings")
{
emit showsettings();