Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-06 19:45:57 +02:00
Code Issues Packages Projects Releases Activity

Fun with states

Browse Source
This commit is contained in:
Ximi1970
2021-01-05 21:07:13 +01:00
parent a3080028fb
commit 10583e56ef
3 changed files with 122 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,9 +31,9 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent )
* Initialize
*/
m_tb_windows = QList< quint64 >();
m_tb_window_states_x11 = QList< Preferences::WindowState >();
m_tb_window_positions = QList< QPoint >();
m_tb_window_states = QList< Preferences::WindowState >();
m_tb_window_states_internal = QMap< quint64, Preferences::WindowState >();
m_tb_window_states = QMap< quint64, Preferences::WindowState >();
m_tb_window_hints = QMap< quint64, SizeHints >();
/*
@@ -135,7 +135,7 @@ bool WindowCtrlUnix::findWindow( const QString& title )
void WindowCtrlUnix::findWindows( qint64 pid )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( "Find windows and states" );
emit signalConsole( "Find windows" );
#endif
QList< WindowItem > windows = listXWindows( m_display, GetDefaultRootWindow( m_display ) );
@@ -143,6 +143,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
QList< QPoint > old_positions = m_tb_window_positions;
m_tb_windows = QList< quint64 >();
m_tb_window_states_x11 = QList< Preferences::WindowState >();
m_tb_window_positions = QList< QPoint >();
for( int i = 0 ; i < windows.length() ; ++i )
{
@@ -155,28 +156,96 @@ void WindowCtrlUnix::findWindows( qint64 pid )
{
if( pid == *((reinterpret_cast<qint64 *>( propPID ) ) ) )
{
qint32 n_wm_state;
void* wm_stat_ptr = GetWindowProperty( m_display, win.window, "WM_STATE", &n_wm_state );
void* wm_state_ptr = GetWindowProperty( m_display, win.window, "WM_STATE", &n_wm_state );
qint32 n_net_wm_state;
void* net_wm_state_ptr = GetWindowProperty( m_display, win.window, "_NET_WM_STATE", &n_net_wm_state );
if( wm_stat_ptr != nullptr || net_wm_state_ptr != nullptr )
if( wm_state_ptr != nullptr || net_wm_state_ptr != nullptr )
{
m_tb_windows.append( win.window );
if( !m_tb_window_states.contains( win.window ) )
{
/*
* Set the startup state
*/
m_tb_window_states[ win.window ] = Preferences::STATE_NORMAL;
}
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "WinID %1, state: %2").arg(win.window ).
arg( Preferences::WindowStateString.at( m_tb_window_states[ win.window ] ) ) );
#endif
QPoint point;
if( m_tb_windows.length() <= old_positions.length() )
{
point = old_positions.at( m_tb_window_positions.length() - 1 );
point = old_positions.at( m_tb_windows.length() - 1 );
}
m_tb_window_positions.append( point );
if( wm_stat_ptr != nullptr )
/*
* Get the current state
*/
QStringList atom_list;
if( net_wm_state_ptr != nullptr )
{
Free( wm_stat_ptr );
for( qint32 j = 0 ; j < n_net_wm_state ; ++j )
{
char* atom_name = GetAtomName( m_display, reinterpret_cast<long *>( net_wm_state_ptr )[ j ] );
atom_list.append( atom_name );
if( atom_name )
{
Free( atom_name );
}
}
}
int state = -1;
if( wm_state_ptr != nullptr )
{
state = *reinterpret_cast<long *>( wm_state_ptr );
}
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
for( int j = 0 ; j < atom_list.length() ; ++j )
{
emit signalConsole( QString( "Atom: %1").arg( atom_list.at( j ) ) );
}
emit signalConsole( QString( "State: %1").arg( state ) );
#endif
if( state == -1 || ( atom_list.contains( "_NET_WM_STATE_HIDDEN" ) && atom_list.contains( "_NET_WM_STATE_SKIP_TASKBAR" ) ) )
{
/*
* Docked
*/
m_tb_window_states_x11.append( Preferences::STATE_DOCKED );
}
else if( state == 3 || atom_list.contains( "_NET_WM_STATE_HIDDEN" ) )
{
/*
* Minimized
*/
m_tb_window_states_x11.append( Preferences::STATE_MINIMIZED );
}
else
{
/*
* Normal
*/
m_tb_window_states_x11.append( Preferences::STATE_NORMAL );
}
if( wm_state_ptr != nullptr )
{
Free( wm_state_ptr );
}
if( net_wm_state_ptr != nullptr )
@@ -194,166 +263,8 @@ void WindowCtrlUnix::findWindows( qint64 pid )
emit signalConsole( QString( "Number of windows found: %1" ).arg( m_tb_windows.length() ) );
#endif
/*
* Get the new window states, store the old ones
*/
m_tb_window_states = QList< Preferences::WindowState >();
for( int i = 0 ; i< m_tb_windows.length() ; ++i )
{
int state = -1;
qint32 n_state;
void* state_ptr = GetWindowProperty( m_display, m_tb_windows.at( i ), "WM_STATE", &n_state );
if( state_ptr != nullptr )
{
state = *reinterpret_cast<long *>( state_ptr );
Free( state_ptr );
}
/*
if( atom_list.contains( "_NET_WM_STATE_HIDDEN" ) && atom_list.contains( "_NET_WM_STATE_SKIP_TASKBAR" ) )
{
m_tb_window_states.append( Preferences::STATE_DOCKED );
}
else
if( atom_list.contains( "_NET_WM_STATE_HIDDEN" ) )
*/
if( state == -1 || state == 3 )
{
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "WinID %1, state: %2, Minimized").arg( m_tb_windows.at( i ) ).arg( state ) );
#endif
m_tb_window_states.append( Preferences::STATE_MINIMIZED );
}
else
{
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "WinID %1, state: %2, Normal").arg( m_tb_windows.at( i ) ).arg( state ) );
#endif
m_tb_window_states.append( Preferences::STATE_NORMAL );
}
}
#ifdef DEBUG_DISPLAY_ACTIONS_END
emit signalConsole( "Find windows and states done" );
#endif
}
/*
* Find a window by PID
*/
void WindowCtrlUnix::findWindows2( qint64 pid )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( "Find windows and states 2" );
#endif
QList< WindowItem > windows = listXWindows( m_display, GetDefaultRootWindow( m_display ) );
QList< QPoint > old_positions = m_tb_window_positions;
QList< quint64 > tb_windows;
QList< QPoint > tb_window_positions;
for( int i = 0 ; i < windows.length() ; ++i )
{
WindowItem win = windows.at( i );
qint32 n_propPID;
void* propPID = GetWindowProperty( m_display, win.window, "_NET_WM_PID", &n_propPID );
if( propPID != nullptr )
{
if( pid == *((reinterpret_cast<qint64 *>( propPID ) ) ) )
{
qint32 n_wm_state;
void* wm_stat_ptr = GetWindowProperty( m_display, win.window, "WM_STATE", &n_wm_state );
qint32 n_net_wm_state;
void* net_wm_state_ptr = GetWindowProperty( m_display, win.window, "_NET_WM_STATE", &n_net_wm_state );
if( wm_stat_ptr != nullptr )
{
int wm_state = *reinterpret_cast<long *>( wm_stat_ptr );
Free( wm_stat_ptr );
emit signalConsole( QString( "wm_state %1, nr: %2, %3" ).arg( win.window ).arg( n_wm_state ).arg( wm_state ) );
}
if( net_wm_state_ptr != nullptr )
{
Free( net_wm_state_ptr );
emit signalConsole( QString( "net_wm_state %1, nr: %2" ).arg( win.window ).arg( n_net_wm_state ) );
}
if( wm_stat_ptr != nullptr || net_wm_state_ptr != nullptr )
{
tb_windows.append( win.window );
QPoint point;
if( tb_windows.length() <= old_positions.length() )
{
point = old_positions.at( tb_window_positions.length() - 1 );
}
tb_window_positions.append( point );
}
}
Free( propPID );
}
}
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "Number of windows found: %1" ).arg( tb_windows.length() ) );
#endif
/*
* Get the new window states, store the old ones
*/
m_tb_window_states = QList< Preferences::WindowState >();
for( int i = 0 ; i< tb_windows.length() ; ++i )
{
int state = -1;
qint32 n_state;
void* state_ptr = GetWindowProperty( m_display, tb_windows.at( i ), "WM_STATE", &n_state );
if( state_ptr != nullptr )
{
state = *reinterpret_cast<long *>( state_ptr );
Free( state_ptr );
}
if( state == -1 || state == 3 )
{
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "WinID %1, state: %2, Minimized").arg( tb_windows.at( i ) ).arg( state ) );
#endif
m_tb_window_states.append( Preferences::STATE_MINIMIZED );
}
else
{
#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS
emit signalConsole( QString( "WinID %1, state: %2, Normal").arg( tb_windows.at( i ) ).arg( state ) );
#endif
m_tb_window_states.append( Preferences::STATE_NORMAL );
}
}
#ifdef DEBUG_DISPLAY_ACTIONS_END
emit signalConsole( "Find windows and states 2 done" );
emit signalConsole( "Find windows done" );
#endif
}
@@ -370,18 +281,18 @@ QList< quint64 > WindowCtrlUnix::getWinIds()
/*
* Get the states of the TB windows.
*/
const QList< Preferences::WindowState >& WindowCtrlUnix::getWindowStates() const
const Preferences::WindowState& WindowCtrlUnix::getWindowState( const quint64 window )
{
return m_tb_window_states;
return m_tb_window_states[ window ];
}
/*
* Get the state of a TB window.
* Get the x11 states of the TB windows.
*/
Preferences::WindowState& WindowCtrlUnix::getWindowStateInternal( quint64 window )
const Preferences::WindowState& WindowCtrlUnix::getWindowStateX11( int index )
{
return m_tb_window_states_internal[ window ];
return m_tb_window_states_x11[ index ];
}
@@ -550,10 +461,10 @@ void WindowCtrlUnix::updatePositions()
bool changed = false;
for( int i = 0 ; i < m_tb_windows.length() ; ++i )
{
if( m_tb_window_states.at( i ) != Preferences::STATE_MINIMIZED && m_tb_window_states.at( i ) != Preferences::STATE_DOCKED )
{
quint64 window = m_tb_windows.at( i );
quint64 window = m_tb_windows.at( i );
if( m_tb_window_states[ window ] != Preferences::STATE_MINIMIZED && m_tb_window_states[ window ] != Preferences::STATE_DOCKED )
{
/*
* Get border / title bar sizes
*/
@@ -652,14 +563,14 @@ void WindowCtrlUnix::minimizeWindow( quint64 window )
/*
* Store the window state
*/
m_tb_window_states_internal[ window ] = Preferences::STATE_DOCKED;
m_tb_window_states[ window ] = Preferences::STATE_DOCKED;
}
else
{
/*
* Store the window state
*/
m_tb_window_states_internal[ window ] = Preferences::STATE_MINIMIZED;
m_tb_window_states[ window ] = Preferences::STATE_MINIMIZED;
}
/*
@@ -673,44 +584,6 @@ void WindowCtrlUnix::minimizeWindow( quint64 window )
}
/*
* Hide window to system tray
*/
void WindowCtrlUnix::hideWindow( quint64 window, bool hide )
{
if( hide )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( "Remove from taskbar and pager" );
#endif
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_SKIP_TASKBAR );
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_ADD, _ATOM_SKIP_PAGER );
// Sync( m_display );
// ChangeWindowTypeProperty( m_display, window, "_NET_WM_WINDOW_TYPE_DOCK" );
}
else
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( "Display in taskbar and pager" );
#endif
// ChangeWindowTypeProperty( m_display, window, "_NET_WM_WINDOW_TYPE_NORMAL" );
// Sync( m_display );
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_REMOVE, _ATOM_SKIP_TASKBAR );
SendEvent( m_display, window, "_NET_WM_STATE", _NET_WM_STATE_REMOVE, _ATOM_SKIP_PAGER );
}
Flush( m_display );
#ifdef DEBUG_DISPLAY_ACTIONS_END
emit signalConsole( QString( "Hide: %1").arg(hide) );
#endif
}
/*
* Normalize a window
*/
@@ -741,7 +614,7 @@ void WindowCtrlUnix::normalizeWindow( quint64 window )
/*
* Store the window state
*/
m_tb_window_states_internal[ window ] = Preferences::STATE_NORMAL;
m_tb_window_states[ window ] = Preferences::STATE_NORMAL;
/*
* Raise the window to the top

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

@@ -171,7 +171,6 @@ class WindowCtrlUnix : public QObject
* @param pid The process id.
*/
void findWindows( qint64 pid );
void findWindows2( qint64 pid );
/**
* @brief getWinIds. Get the Thunderbird window IDs.
@@ -181,20 +180,22 @@ class WindowCtrlUnix : public QObject
QList< quint64 > getWinIds();
/**
* @brief getWindowStates. Get the states of the TB windows.
* @brief getWindowState. Get the state of a TB windows.
*
* @return The list of window states.
* @param window Window ID.
*
* @return The window state.
*/
const QList< Preferences::WindowState >& getWindowStates() const;
const Preferences::WindowState& getWindowState( const quint64 window );
/**
* @brief getWindowStateInternal
* @brief getWindowStateX11. Get the X11 state of a TB windows.
*
* @param window
* @param index Index in the window list
*
* @return
* @return The window state.
*/
Preferences::WindowState& getWindowStateInternal( quint64 window );
const Preferences::WindowState& getWindowStateX11( int index );
/**
* @brief displayWindowElements. Display window elements (atoms).
@@ -229,14 +230,6 @@ class WindowCtrlUnix : public QObject
*/
void normalizeWindow( quint64 window );
/**
* @brief hideWindow. Hide a window from the taskbar.
*
* @param window The window.
* @param hide Hide state.
*/
void hideWindow( quint64 window, bool hide );
/**
* @brief deleteWindow. Delete the window.
*
@@ -292,6 +285,11 @@ class WindowCtrlUnix : public QObject
*/
QList< quint64 > m_tb_windows;
/**
* @brief m_tb_window_states_x11. The Thunderbird window states.
*/
QList< Preferences::WindowState > m_tb_window_states_x11;
/**
* @brief m_tb_window_positions. The Thunderbird window positions.
*/
@@ -300,12 +298,7 @@ class WindowCtrlUnix : public QObject
/**
* @brief m_tb_window_states. The Thunderbird window states.
*/
QList< Preferences::WindowState > m_tb_window_states;
/**
* @brief m_tb_window_states_internal. The Thunderbird window states (internal).
*/
QMap< quint64, Preferences::WindowState > m_tb_window_states_internal;
QMap< quint64, Preferences::WindowState > m_tb_window_states;
/**
* @brief m_tb_window_hints. The Thunderbird window hints.

56
app/SysTray-X/SysTray-X-app/windowctrl.cpp
View File

@@ -144,7 +144,7 @@ void WindowCtrl::slotWindowTest3()
// emit signalConsole( QString( "Pid %1" ).arg( m_pid ) );
// emit signalConsole( QString( "Ppid %1" ).arg( m_ppid ) );
findWindows2( m_ppid );
findWindows( m_ppid );
emit signalConsole("Test 3 done");
}
@@ -185,18 +185,13 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
findWindows( m_ppid );
QList< quint64 > win_ids = getWinIds();
QList< Preferences::WindowState > win_states = getWindowStates();
/*
* Minimize all?
*/
if( state == Preferences::STATE_MINIMIZED_ALL || state == Preferences::STATE_MINIMIZED_ALL_STARTUP )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( QString( "Minimize all" ) );
#endif
if( state == Preferences::STATE_MINIMIZED_ALL )
if( state == Preferences::STATE_MINIMIZED || state == Preferences::STATE_MINIMIZED_ALL )
{
updatePositions();
}
@@ -209,15 +204,11 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( QString( "Window state: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
.arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) );
#endif
if( ( win_states.at( i ) != Preferences::STATE_MINIMIZED && getMinimizeType() == Preferences::PREF_DEFAULT_MINIMIZE ) ||
( win_states.at( i ) != Preferences::STATE_DOCKED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) )
if( ( getWindowState( win_ids.at( i ) ) != Preferences::STATE_MINIMIZED && getMinimizeType() == Preferences::PREF_DEFAULT_MINIMIZE ) ||
( getWindowState( win_ids.at( i ) ) != Preferences::STATE_DOCKED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) )
{
minimizeWindow( win_ids.at( i ) );
}
@@ -225,19 +216,14 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
}
else
{
/*
* Compare the x11 states and the internal states
*/
for( int i = 0 ; i < win_ids.length() ; ++i )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( QString( "Window state: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
Preferences::WindowState current_state = getWindowStateX11( i );
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
#endif
if( ( win_states.at( i ) == Preferences::STATE_MINIMIZED && getMinimizeType() != Preferences::PREF_DEFAULT_MINIMIZE ) )
if( ( current_state == Preferences::STATE_MINIMIZED || current_state == Preferences::STATE_DOCKED ) && current_state != getWindowState( win_ids.at( i ) ) )
{
minimizeWindow( win_ids.at( i ) );
}
@@ -293,33 +279,25 @@ void WindowCtrl::slotShowHide()
*/
findWindows( m_ppid );
#ifdef Q_OS_UNIX
// updatePositions();
#endif
/*
* Get the window ids
*/
QList< quint64 > win_ids = getWinIds();
QList< Preferences::WindowState > win_states = getWindowStates();
for( int i = 0 ; i < win_ids.length() ; ++i )
{
#ifdef DEBUG_DISPLAY_ACTIONS
emit signalConsole( QString( "Window state: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( win_states.at( i ) ) ) );
emit signalConsole( QString( "Window state internal: %1, %2" )
.arg( win_ids.at( i ) )
.arg( Preferences::WindowStateString.at( getWindowStateInternal( win_ids.at( i ) ) ) ) );
.arg( Preferences::WindowStateString.at( getWindowState( win_ids.at( i ) ) ) ) );
#endif
#ifdef Q_OS_UNIX
updatePositions();
#endif
// if( win_states.at( i ) == Preferences::STATE_MINIMIZED || win_states.at( i ) == Preferences::STATE_DOCKED )
if( getWindowStateInternal( win_ids.at( i ) ) == Preferences::STATE_MINIMIZED || getWindowStateInternal( win_ids.at( i ) ) == Preferences::STATE_DOCKED )
if( getWindowState( win_ids.at( i ) ) == Preferences::STATE_MINIMIZED || getWindowState( win_ids.at( i ) ) == Preferences::STATE_DOCKED )
{
normalizeWindow( win_ids.at( i ) );
}