chatterino2
Code Issues

improved the extension

Browse Source
This commit is contained in:
fourtf
2018-05-30 17:17:27 +02:00
parent e01a3a0978
commit 3c9c3493ae
8 changed files with 298 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+15 -4
View File
@@ -84,10 +84,10 @@ int runGui(int argc, char *argv[])
qApp->setPalette(darkPalette);
// Install native event handler for hidpi on windows
#ifdef USEWINSDK
a.installNativeEventFilter(new chatterino::util::DpiNativeEventFilter);
#endif
// Install native event handler for hidpi on windows
//#ifdef USEWINSDK
// a.installNativeEventFilter(new chatterino::util::DpiNativeEventFilter);
//#endif
// Initialize NetworkManager
chatterino::util::NetworkManager::init();
@@ -149,6 +149,17 @@ void runNativeMessagingHost()
bool bigEndian = isBigEndian();
#endif
std::atomic<bool> ping(false);
QTimer timer;
QObject::connect(&timer, &QTimer::timeout, [&ping] {
if (!ping.exchange(false)) {
_exit(0);
}
});
timer.setInterval(11000);
timer.start();
while (true) {
char size_c[4];
std::cin.read(size_c, 4);
src/singletons/nativemessagingmanager.cpp
+4 -1
View File
@@ -195,7 +195,10 @@ void NativeMessagingManager::ReceiverThread::handleMessage(const QJsonObject &ro
}
#ifdef USEWINSDK
util::postToThread([winId] { widgets::AttachedWindow::detach(winId); });
util::postToThread([winId] {
qDebug() << "NW detach";
widgets::AttachedWindow::detach(winId);
});
#endif
} else {
qDebug() << "NM unknown action " + action;
src/widgets/attachedwindow.cpp
+79 -62
View File
@@ -1,15 +1,15 @@
#include "attachedwindow.hpp"
#include "application.hpp"
#include "util/debugcount.hpp"
#include "widgets/split.hpp"
#include <QTimer>
#include <QVBoxLayout>
#include "widgets/split.hpp"
#ifdef USEWINSDK
#include "Windows.h"
// don't even think about reordering these
#include "Psapi.h"
#pragma comment(lib, "Dwmapi.lib")
#endif
@@ -19,17 +19,19 @@ namespace widgets {
AttachedWindow::AttachedWindow(void *_target, int _yOffset)
: QWidget(nullptr, Qt::FramelessWindowHint | Qt::Window)
, target(_target)
, yOffset(_yOffset)
, target_(_target)
, yOffset_(_yOffset)
{
QLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
this->setLayout(layout);
auto *split = new Split(this);
this->ui.split = split;
this->ui_.split = split;
split->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
layout->addWidget(split);
util::DebugCount::increase("attached window");
}
AttachedWindow::~AttachedWindow()
@@ -40,6 +42,8 @@ AttachedWindow::~AttachedWindow()
break;
}
}
util::DebugCount::decrease("attached window");
}
AttachedWindow *AttachedWindow::get(void *target, const GetArgs &args)
@@ -64,7 +68,7 @@ AttachedWindow *AttachedWindow::get(void *target, const GetArgs &args)
window->hide();
show = false;
} else {
window->_height = args.height;
window->height_ = args.height;
size.setHeight(args.height);
}
}
@@ -73,14 +77,14 @@ AttachedWindow *AttachedWindow::get(void *target, const GetArgs &args)
window->hide();
show = false;
} else {
window->_width = args.width;
window->width_ = args.width;
size.setWidth(args.width);
}
}
if (show) {
window->updateWindowRect_(window->target_);
window->show();
// window->resize(size);
}
return window;
@@ -97,80 +101,93 @@ void AttachedWindow::detach(const QString &winId)
void AttachedWindow::setChannel(ChannelPtr channel)
{
this->ui.split->setChannel(channel);
this->ui_.split->setChannel(channel);
}
void AttachedWindow::showEvent(QShowEvent *)
{
attachToHwnd(this->target);
attachToHwnd_(this->target_);
}
void AttachedWindow::attachToHwnd(void *_hwnd)
void AttachedWindow::attachToHwnd_(void *_attachedPtr)
{
#ifdef USEWINSDK
QTimer *timer = new QTimer(this);
timer->setInterval(1);
if (this->attached_) {
return;
}
HWND hwnd = HWND(this->winId());
HWND attached = HWND(_hwnd);
this->attached_ = true;
this->timer_.setInterval(1);
QObject::connect(timer, &QTimer::timeout, [this, hwnd, attached, timer] {
auto hwnd = HWND(this->winId());
auto attached = HWND(_attachedPtr);
QObject::connect(&this->timer_, &QTimer::timeout, [this, hwnd, attached] {
// check process id
DWORD processId;
::GetWindowThreadProcessId(attached, &processId);
if (!this->validProcessName_) {
DWORD processId;
::GetWindowThreadProcessId(attached, &processId);
HANDLE process =
::OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, false, processId);
HANDLE process =
::OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, false, processId);
std::unique_ptr<TCHAR[]> filename(new TCHAR[512]);
DWORD filenameLength = ::GetModuleFileNameEx(process, nullptr, filename.get(), 512);
QString qfilename = QString::fromWCharArray(filename.get(), filenameLength);
std::unique_ptr<TCHAR[]> filename(new TCHAR[512]);
DWORD filenameLength = ::GetModuleFileNameEx(process, nullptr, filename.get(), 512);
QString qfilename = QString::fromWCharArray(filename.get(), filenameLength);
if (!qfilename.endsWith("chrome.exe")) {
qDebug() << "NM Illegal callee" << qfilename;
timer->stop();
timer->deleteLater();
this->deleteLater();
return;
if (!qfilename.endsWith("chrome.exe")) {
qDebug() << "NM Illegal caller" << qfilename;
this->timer_.stop();
this->deleteLater();
return;
}
this->validProcessName_ = true;
}
// We get the window rect first so we can close this window when it returns an error.
// If we query the process first and check the filename then it will return and empty string
// that doens't match.
::SetLastError(0);
RECT rect;
::GetWindowRect(attached, &rect);
if (::GetLastError() != 0) {
timer->stop();
timer->deleteLater();
this->deleteLater();
return;
}
// set the correct z-order
HWND next = ::GetNextWindow(attached, GW_HWNDPREV);
::SetWindowPos(hwnd, next ? next : HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
if (this->_height == -1) {
// ::MoveWindow(hwnd, rect.right - this->_width - 8, rect.top + this->yOffset
// - 8,
// this->_width, rect.bottom - rect.top - this->yOffset, false);
} else {
::MoveWindow(hwnd, rect.right - this->_width - 8, rect.bottom - this->_height - 8,
this->_width, this->_height, false);
}
// ::MoveWindow(hwnd, rect.right - 360, rect.top + 82, 360 - 8, rect.bottom -
// rect.top - 82 - 8, false);
this->updateWindowRect_(attached);
});
timer->start();
this->timer_.start();
#endif
}
void AttachedWindow::updateWindowRect_(void *_attachedPtr)
{
auto hwnd = HWND(this->winId());
auto attached = HWND(_attachedPtr);
// We get the window rect first so we can close this window when it returns an error.
// If we query the process first and check the filename then it will return and empty string
// that doens't match.
::SetLastError(0);
RECT rect;
::GetWindowRect(attached, &rect);
if (::GetLastError() != 0) {
qDebug() << "NM GetLastError()" << ::GetLastError();
this->timer_.stop();
this->deleteLater();
return;
}
// set the correct z-order
HWND next = ::GetNextWindow(attached, GW_HWNDPREV);
::SetWindowPos(hwnd, next ? next : HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
if (this->height_ == -1) {
// ::MoveWindow(hwnd, rect.right - this->width_ - 8, rect.top + this->yOffset_ - 8,
// this->width_, rect.bottom - rect.top - this->yOffset_, false);
} else {
::MoveWindow(hwnd, rect.right - this->width_ - 8, rect.bottom - this->height_ - 8,
this->width_, this->height_, false);
}
// ::MoveWindow(hwnd, rect.right - 360, rect.top + 82, 360 - 8, rect.bottom -
// rect.top - 82 - 8, false);
}
// void AttachedWindow::nativeEvent(const QByteArray &eventType, void *message, long *result)
//{
// MSG *msg = reinterpret_cast
src/widgets/attachedwindow.hpp
+14 -10
View File
@@ -10,7 +10,7 @@ namespace widgets {
class AttachedWindow : public QWidget
{
AttachedWindow(void *target, int asdf);
AttachedWindow(void *target_, int asdf);
public:
struct GetArgs {
@@ -20,9 +20,9 @@ public:
int height = -1;
};
~AttachedWindow();
virtual ~AttachedWindow() override;
static AttachedWindow *get(void *target, const GetArgs &args);
static AttachedWindow *get(void *target_, const GetArgs &args);
static void detach(const QString &winId);
void setChannel(ChannelPtr channel);
@@ -33,17 +33,21 @@ protected:
// override;
private:
void *target;
int yOffset;
int currentYOffset;
int _width = 360;
int _height = -1;
void *target_;
int yOffset_;
int currentYOffset_;
int width_ = 360;
int height_ = -1;
bool validProcessName_ = false;
bool attached_ = false;
QTimer timer_;
struct {
Split *split;
} ui;
} ui_;
void attachToHwnd(void *hwnd);
void attachToHwnd_(void *attached);
void updateWindowRect_(void *attached);
struct Item {
void *hwnd;