Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-07-15 11:02:17 +02:00
Code Issues Packages Projects Releases Activity

Refactor

Browse Source
This commit is contained in:
Ximi1970
2020-02-19 13:03:55 +01:00
parent c8cca625de
commit 2022fff57d
4 changed files with 145 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/SysTray-X/preferences.cpp
View File

@@ -1,6 +1,5 @@
#include "preferences.h"
/**
* @brief Preferences. Constructor.
*/

2
app/SysTray-X/preferences.h
View File

@@ -33,7 +33,7 @@ class Preferences : public QObject
public:
/**
* @brief Preferences. Constructor.
* @brief Preferences. Constructor. Destructor.
*/
Preferences( QObject *parent = nullptr );

213
app/SysTray-X/windowctrl-unix.cpp
View File

@@ -24,18 +24,43 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent )
/*
* Get the Thunderbird window ID
* Find window(s) by title
*/
QList< unsigned long > WindowCtrlUnix::getWIds()
bool WindowCtrlUnix::findWindow( const QString& title )
{
return m_tb_windows;
QList< WindowItem > windows = listXWindows( m_display, m_root_window );
m_tb_windows = QList< WinId >();
foreach( WindowItem win, windows )
{
char *name = nullptr;
if( XFetchName( m_display, win.window, &name ) > 0 ) {
QString win_name( name );
XFree( name );
if( win_name.contains( title, Qt::CaseInsensitive ) ) {
/*
* Store the XID
*/
m_tb_windows.append( win.window );
}
}
}
if( m_tb_windows.length() > 0 )
{
return true;
}
return false;
}
/*
* Display window atoms
*/
void WindowCtrlUnix::displayWindowAtoms( const QString& title )
void WindowCtrlUnix::displayWindowElements( const QString& title )
{
QList< WindowItem > windows = listXWindows( m_display, m_root_window );
@@ -120,102 +145,11 @@ void WindowCtrlUnix::displayWindowAtoms( const QString& title )
/*
* Find window(s) by title
* Get the Thunderbird window ID
*/
bool WindowCtrlUnix::findWindow( const QString& title )
QList< WinId > WindowCtrlUnix::getWinIds()
{
QList< WindowItem > windows = listXWindows( m_display, m_root_window );
m_tb_windows = QList< Window >();
foreach( WindowItem win, windows )
{
char *name = nullptr;
if( XFetchName( m_display, win.window, &name ) > 0 ) {
QString win_name( name );
XFree( name );
if( win_name.contains( title, Qt::CaseInsensitive ) ) {
/*
* Store the XID
*/
m_tb_windows.append( win.window );
}
}
}
if( m_tb_windows.length() > 0 )
{
return true;
}
return false;
}
/*
* Find a window by PID
*/
void WindowCtrlUnix::findWindow( pid_t pid )
{
QList< WindowItem > windows = listXWindows( m_display, m_root_window );
// Get the PID property atom.
Atom atom_PID = XInternAtom( m_display, "_NET_WM_PID", True );
if( atom_PID == None )
{
emit signalConsole( QString( "No such atom _NET_WM_PID" ) );
}
foreach( WindowItem win, windows )
{
Atom type;
int format;
unsigned long nItems;
unsigned long bytesAfter;
unsigned char* propPID = nullptr;
if( Success == XGetWindowProperty( m_display, win.window, atom_PID, 0, 1, False, XA_CARDINAL,
&type, &format, &nItems, &bytesAfter, &propPID ) )
{
if( propPID != nullptr )
{
if( pid == *((reinterpret_cast<pid_t *>( propPID ) ) ) )
{
char* name = nullptr;
XFetchName( m_display, win.window, &name );
emit signalConsole( QString( "Found: Level %1, XID %2, Name %3" ).arg( win.level ).arg( win.window ).arg( name ) );
QString atom_name = atomName( m_display, win.window );
emit signalConsole( QString( "Atom Name %1" ).arg( atom_name ) );
QStringList states = atomState( m_display, win.window );
foreach( QString state, states )
{
emit signalConsole( QString( "Atom state: %1" ).arg( state ) );
}
QStringList types = atomWindowType( m_display, win.window );
foreach( QString type, types )
{
emit signalConsole( QString( "Atom type: %1" ).arg( type ) );
}
/*
* Cleanup
*/
if( name != nullptr )
{
XFree( name );
}
}
XFree( propPID );
}
}
}
return m_tb_windows;
}
@@ -229,10 +163,21 @@ void WindowCtrlUnix::minimizeWindow( Window window )
}
/*
* Normalize a window
*/
void WindowCtrlUnix::normalizeWindow( Window window )
{
// XMapRaised( m_display, window );
XMapWindow( m_display, window );
XFlush( m_display );
}
/*
* Remove window from taskbar
*/
void WindowCtrlUnix::skipTaskbarWindow( Window window, bool set )
void WindowCtrlUnix::hideWindow( Window window, bool set )
{
char prop_name[] = "_NET_WM_STATE";
Atom prop = XInternAtom( m_display, prop_name, True );
@@ -305,14 +250,74 @@ void WindowCtrlUnix::skipTaskbarWindow( Window window, bool set )
}
/*
* Normalize a window
* Find a window by PID
*/
void WindowCtrlUnix::normalizeWindow( Window window )
void WindowCtrlUnix::findWindow( pid_t pid )
{
// XMapRaised( m_display, window );
XMapWindow( m_display, window );
XFlush( m_display );
QList< WindowItem > windows = listXWindows( m_display, m_root_window );
// Get the PID property atom.
Atom atom_PID = XInternAtom( m_display, "_NET_WM_PID", True );
if( atom_PID == None )
{
emit signalConsole( QString( "No such atom _NET_WM_PID" ) );
}
foreach( WindowItem win, windows )
{
Atom type;
int format;
unsigned long nItems;
unsigned long bytesAfter;
unsigned char* propPID = nullptr;
if( Success == XGetWindowProperty( m_display, win.window, atom_PID, 0, 1, False, XA_CARDINAL,
&type, &format, &nItems, &bytesAfter, &propPID ) )
{
if( propPID != nullptr )
{
if( pid == *((reinterpret_cast<pid_t *>( propPID ) ) ) )
{
char* name = nullptr;
XFetchName( m_display, win.window, &name );
emit signalConsole( QString( "Found: Level %1, XID %2, Name %3" ).arg( win.level ).arg( win.window ).arg( name ) );
QString atom_name = atomName( m_display, win.window );
emit signalConsole( QString( "Atom Name %1" ).arg( atom_name ) );
QStringList states = atomState( m_display, win.window );
foreach( QString state, states )
{
emit signalConsole( QString( "Atom state: %1" ).arg( state ) );
}
QStringList types = atomWindowType( m_display, win.window );
foreach( QString type, types )
{
emit signalConsole( QString( "Atom type: %1" ).arg( type ) );
}
/*
* Cleanup
*/
if( name != nullptr )
{
XFree( name );
}
}
XFree( propPID );
}
}
}
}

56
app/SysTray-X/windowctrl-unix.h
View File

@@ -19,6 +19,11 @@
*/
#include <QObject>
/*
* Define the windows Id
*/
typedef Window WinId;
/**
* @brief The WindowCtrlUnix class.
*/
@@ -110,20 +115,6 @@ class WindowCtrlUnix : public QObject
*/
explicit WindowCtrlUnix( QObject *parent = nullptr );
/**
* @brief getWIds. Get the Thunderbird window IDs.
*
* @return The list of window IDs.
*/
QList< unsigned long > getWIds();
/**
* @brief displayWindowAtoms. Display window atoms.
*
* @param title The window title to find.
*/
void displayWindowAtoms( const QString& title );
/**
* @brief findWindow. Find window with title.
*
@@ -134,14 +125,18 @@ class WindowCtrlUnix : public QObject
bool findWindow( const QString& title );
/**
* @brief findWindow. Find window of a process.
* @brief displayWindowElements. Display window elements (atoms).
*
* @param pid The process id.
* @param title The window title to find.
*/
void findWindow( int pid );
void displayWindowElements( const QString& title );
void setAtomState();
/**
* @brief getWinIds. Get the Thunderbird window IDs.
*
* @return The list of window IDs.
*/
QList< WinId > getWinIds();
/**
* @brief minimizeWindow. Minimize window.
@@ -157,7 +152,26 @@ class WindowCtrlUnix : public QObject
*/
void normalizeWindow( Window window );
void skipTaskbarWindow( Window window, bool set );
/**
* @brief hideWindow. Hide a window from the taskbar.
*
* @param window The window.
* @param set The state of the window.
*/
void hideWindow( Window window, bool set );
/**
* @brief findWindow. Find window of a process.
*
* @param pid The process id.
*/
void findWindow( int pid );
void setAtomState();
private:
@@ -248,7 +262,7 @@ class WindowCtrlUnix : public QObject
/**
* @brief m_tb_window. The Thunderbird windows.
*/
QList< Window > m_tb_windows;
QList< WinId > m_tb_windows;
};
#endif // WINDOWCTRLUNIX_H