MrBesen/lolautoaccept
MrBesen
/
lolautoaccept
2
1
Fork 1
Code Issues Pull Requests Projects Releases 8 Wiki Activity

check aspect ratio

This commit is contained in:
mrbesen 2023-10-21 21:30:25 +02:00
parent b009411f55
commit 2b4d718481
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/x11helper.h
View File

@ -17,7 +17,7 @@ public:
explicit X11Helper(QObject* parent = nullptr); explicit X11Helper(QObject* parent = nullptr);
virtual ~X11Helper(); virtual ~X11Helper();
Window findWindow(const QString& name); Window findWindow(const QString& name, float aspektRatio = 0.0);
public slots: public slots:
void map(Window win); void map(Window win);
@ -25,7 +25,7 @@ public slots:
void setMap(Window win, bool b); void setMap(Window win, bool b);
private: private:
Window searchWindows(Window top, const QString& search); Window searchWindows(Window top, const QString& search, float aspektRatio);
#ifdef X11SUPPORT #ifdef X11SUPPORT
Display* disp; Display* disp;

4
src/mainwindow.cpp
View File

@ -22,6 +22,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), loading(true), ui
x11Helper(INIT_X11HELPER) { x11Helper(INIT_X11HELPER) {
ui->setupUi(this); ui->setupUi(this);
ui->hideLeague->setEnabled(X11Helper::IsSupported);
QObject::connect(&dd, &DataDragon::fetchingChamp, lwin, &LoadingWindow::setChampion); QObject::connect(&dd, &DataDragon::fetchingChamp, lwin, &LoadingWindow::setChampion);
QObject::connect(&dd, &DataDragon::loading, lwin, &LoadingWindow::setProgress); QObject::connect(&dd, &DataDragon::loading, lwin, &LoadingWindow::setProgress);
QObject::connect(&dd, &DataDragon::loading, this, &MainWindow::loadingStatus); QObject::connect(&dd, &DataDragon::loading, this, &MainWindow::loadingStatus);
@ -110,7 +112,7 @@ void MainWindow::loadingStatus(float f) {
void MainWindow::toggleLeagueVisibility() { void MainWindow::toggleLeagueVisibility() {
if(x11Helper) { if(x11Helper) {
const bool shouldBeHidden = ui->hideLeague->isChecked(); const bool shouldBeHidden = ui->hideLeague->isChecked();
Window win = x11Helper->findWindow("League of Legends"); Window win = x11Helper->findWindow("League of Legends", 1280.0/720.0);
qInfo() << "LeagueClient win id:" << win; qInfo() << "LeagueClient win id:" << win;
if(win != 0) { if(win != 0) {
x11Helper->setMap(win, shouldBeHidden); x11Helper->setMap(win, shouldBeHidden);

8
src/x11helper_other.cpp
View File

@ -10,12 +10,12 @@ X11Helper::X11Helper(QObject *parent) : QObject(parent) {
X11Helper::~X11Helper() {} X11Helper::~X11Helper() {}
Window X11Helper::findWindow(const QString& name) { Window X11Helper::findWindow(const QString&, float) {
return 0; return InvalidWindow;
} }
Window X11Helper::searchWindows(Window top, const QString& search) { Window X11Helper::searchWindows(Window, const QString&, float) {
return 0; return InvalidWindow;
} }
void X11Helper::map(Window win) {} void X11Helper::map(Window win) {}

21
src/x11helper_x11.cpp
View File

@ -12,18 +12,29 @@ X11Helper::~X11Helper() {
XCloseDisplay(this->disp); XCloseDisplay(this->disp);
} }
Window X11Helper::findWindow(const QString& name) { Window X11Helper::findWindow(const QString& name, float aspektRatio) {
return searchWindows(DefaultRootWindow(disp), name); return searchWindows(DefaultRootWindow(disp), name, aspektRatio);
} }
Window X11Helper::searchWindows(Window top, const QString& search) { Window X11Helper::searchWindows(Window top, const QString& search, float aspektRatio) {
{ {
char* window_name; char* window_name;
if (XFetchName(disp, top, &window_name)) { if (XFetchName(disp, top, &window_name)) {
QString winName(window_name); QString winName(window_name);
XFree(window_name); XFree(window_name);
if (search == winName) { if (search == winName) {
return top; // dont look for kids
if(aspektRatio == 0.0) {
return top; // dont look for kids
}
XWindowAttributes attribs;
if(XGetWindowAttributes(disp, top, &attribs)) {
const float winAspektRation = attribs.width / (float) attribs.height;
if(qAbs(winAspektRation - aspektRatio) < aspektRatio/10.0) {
return top;
}
}
} }
} }
} }
@ -36,7 +47,7 @@ Window X11Helper::searchWindows(Window top, const QString& search) {
} }
for (unsigned int i = 0; i < nchildren; i++) { for (unsigned int i = 0; i < nchildren; i++) {
Window res = searchWindows(children[i], search); Window res = searchWindows(children[i], search, aspektRatio);
if(res != InvalidWindow) { if(res != InvalidWindow) {
XFree((char*) children); XFree((char*) children);
return res; return res;