mirror of
https://github.com/xmrig/xmrig.git
synced 2024-11-17 00:07:44 +00:00
Added Windows taskbar icon colors
- Red when there's no connection to any pool - Yellow when mining is paused - No color during normal mining
This commit is contained in:
parent
76cd83edb2
commit
387320ad6d
4 changed files with 185 additions and 0 deletions
|
@ -56,6 +56,7 @@ set(HEADERS
|
||||||
src/core/config/usage.h
|
src/core/config/usage.h
|
||||||
src/core/Controller.h
|
src/core/Controller.h
|
||||||
src/core/Miner.h
|
src/core/Miner.h
|
||||||
|
src/core/Taskbar.h
|
||||||
src/net/interfaces/IJobResultListener.h
|
src/net/interfaces/IJobResultListener.h
|
||||||
src/net/JobResult.h
|
src/net/JobResult.h
|
||||||
src/net/JobResults.h
|
src/net/JobResults.h
|
||||||
|
@ -104,6 +105,7 @@ set(SOURCES
|
||||||
src/core/config/ConfigTransform.cpp
|
src/core/config/ConfigTransform.cpp
|
||||||
src/core/Controller.cpp
|
src/core/Controller.cpp
|
||||||
src/core/Miner.cpp
|
src/core/Miner.cpp
|
||||||
|
src/core/Taskbar.cpp
|
||||||
src/net/JobResults.cpp
|
src/net/JobResults.cpp
|
||||||
src/net/Network.cpp
|
src/net/Network.cpp
|
||||||
src/net/strategies/DonateStrategy.cpp
|
src/net/strategies/DonateStrategy.cpp
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "core/Miner.h"
|
#include "core/Miner.h"
|
||||||
|
#include "core/Taskbar.h"
|
||||||
#include "3rdparty/rapidjson/document.h"
|
#include "3rdparty/rapidjson/document.h"
|
||||||
#include "backend/common/Hashrate.h"
|
#include "backend/common/Hashrate.h"
|
||||||
#include "backend/cpu/Cpu.h"
|
#include "backend/cpu/Cpu.h"
|
||||||
|
@ -348,6 +349,8 @@ public:
|
||||||
String userJobId;
|
String userJobId;
|
||||||
Timer *timer = nullptr;
|
Timer *timer = nullptr;
|
||||||
uint64_t ticks = 0;
|
uint64_t ticks = 0;
|
||||||
|
|
||||||
|
Taskbar m_taskbar;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -475,6 +478,7 @@ void xmrig::Miner::execCommand(char command)
|
||||||
void xmrig::Miner::pause()
|
void xmrig::Miner::pause()
|
||||||
{
|
{
|
||||||
d_ptr->active = false;
|
d_ptr->active = false;
|
||||||
|
d_ptr->m_taskbar.setActive(false);
|
||||||
|
|
||||||
Nonce::pause(true);
|
Nonce::pause(true);
|
||||||
Nonce::touch();
|
Nonce::touch();
|
||||||
|
@ -494,6 +498,7 @@ void xmrig::Miner::setEnabled(bool enabled)
|
||||||
}
|
}
|
||||||
|
|
||||||
d_ptr->enabled = enabled;
|
d_ptr->enabled = enabled;
|
||||||
|
d_ptr->m_taskbar.setEnabled(enabled);
|
||||||
|
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
LOG_INFO("%s " GREEN_BOLD("resumed"), Tags::miner());
|
LOG_INFO("%s " GREEN_BOLD("resumed"), Tags::miner());
|
||||||
|
@ -551,6 +556,7 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
|
||||||
mutex.unlock();
|
mutex.unlock();
|
||||||
|
|
||||||
d_ptr->active = true;
|
d_ptr->active = true;
|
||||||
|
d_ptr->m_taskbar.setActive(true);
|
||||||
|
|
||||||
if (ready) {
|
if (ready) {
|
||||||
d_ptr->handleJobChange();
|
d_ptr->handleJobChange();
|
||||||
|
|
126
src/core/Taskbar.cpp
Normal file
126
src/core/Taskbar.cpp
Normal file
|
@ -0,0 +1,126 @@
|
||||||
|
/* XMRig
|
||||||
|
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
|
||||||
|
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "core/Taskbar.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
|
||||||
|
#include <Shobjidl.h>
|
||||||
|
#include <Objbase.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
|
struct TaskbarPrivate
|
||||||
|
{
|
||||||
|
TaskbarPrivate()
|
||||||
|
{
|
||||||
|
HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
|
||||||
|
if (hr < 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr = CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&m_taskbar));
|
||||||
|
if (hr < 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr = m_taskbar->HrInit();
|
||||||
|
if (hr < 0) {
|
||||||
|
m_taskbar->Release();
|
||||||
|
m_taskbar = nullptr;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_consoleWnd = GetConsoleWindow();
|
||||||
|
}
|
||||||
|
|
||||||
|
~TaskbarPrivate()
|
||||||
|
{
|
||||||
|
if (m_taskbar) {
|
||||||
|
m_taskbar->Release();
|
||||||
|
}
|
||||||
|
CoUninitialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
ITaskbarList3* m_taskbar = nullptr;
|
||||||
|
HWND m_consoleWnd = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Taskbar::Taskbar() : d_ptr(new TaskbarPrivate())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Taskbar::~Taskbar()
|
||||||
|
{
|
||||||
|
delete d_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void Taskbar::setActive(bool active)
|
||||||
|
{
|
||||||
|
m_active = active;
|
||||||
|
updateTaskbarColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void Taskbar::setEnabled(bool enabled)
|
||||||
|
{
|
||||||
|
m_enabled = enabled;
|
||||||
|
updateTaskbarColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void Taskbar::updateTaskbarColor()
|
||||||
|
{
|
||||||
|
if (d_ptr->m_taskbar) {
|
||||||
|
if (m_active) {
|
||||||
|
d_ptr->m_taskbar->SetProgressState(d_ptr->m_consoleWnd, m_enabled ? TBPF_NOPROGRESS : TBPF_PAUSED);
|
||||||
|
d_ptr->m_taskbar->SetProgressValue(d_ptr->m_consoleWnd, m_enabled ? 0 : 1, 1);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
d_ptr->m_taskbar->SetProgressState(d_ptr->m_consoleWnd, TBPF_ERROR);
|
||||||
|
d_ptr->m_taskbar->SetProgressValue(d_ptr->m_consoleWnd, 1, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace xmrig
|
||||||
|
|
||||||
|
|
||||||
|
#else // _WIN32
|
||||||
|
|
||||||
|
|
||||||
|
namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
|
Taskbar::Taskbar() {}
|
||||||
|
Taskbar::~Taskbar() {}
|
||||||
|
void Taskbar::setActive(bool) {}
|
||||||
|
void Taskbar::setEnabled(bool) {}
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace xmrig
|
||||||
|
|
||||||
|
|
||||||
|
#endif // _WIN32
|
51
src/core/Taskbar.h
Normal file
51
src/core/Taskbar.h
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
/* XMRig
|
||||||
|
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
|
||||||
|
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef XMRIG_TASKBAR_H
|
||||||
|
#define XMRIG_TASKBAR_H
|
||||||
|
|
||||||
|
|
||||||
|
namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
|
struct TaskbarPrivate;
|
||||||
|
|
||||||
|
|
||||||
|
class Taskbar
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Taskbar();
|
||||||
|
~Taskbar();
|
||||||
|
|
||||||
|
void setActive(bool active);
|
||||||
|
void setEnabled(bool enabled);
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool m_active = false;
|
||||||
|
bool m_enabled = true;
|
||||||
|
|
||||||
|
TaskbarPrivate* d_ptr = nullptr;
|
||||||
|
|
||||||
|
void updateTaskbarColor();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace xmrig
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* XMRIG_TASKBAR_H */
|
Loading…
Reference in a new issue